/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.44 Revision 1.96
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.44 2006/02/15 21:07:00 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.96 2008/04/30 17:37:42 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# @ECLASS: x-modular.eclass
6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching,
13# running eautoreconf, passing options to configure and installing docs.
6# 14#
7# This eclass is designed to reduce code duplication in the modularized X11 15# All you need to do in a basic ebuild is inherit this eclass and set
8# ebuilds. 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
9# 17# with the other X packages, you don't need to set SRC_URI. Pretty much
10# Using this eclass:
11#
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories.
23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25#
26# Pretty much everything else should be automatic. 18# everything else should be automatic.
27 19
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 20# @ECLASS-VARIABLE: XDIR
29 21# @DESCRIPTION:
30inherit eutils libtool toolchain-funcs flag-o-matic 22# Directory prefix to use for everything. If you want to install to a
31 23# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
32# Directory prefix to use for everything 24# recently tested. You may need to uncomment the setting of datadir and
25# mandir in x-modular_src_install() or add it back in if it's no longer
26# there. You may also want to change the SLOT.
33XDIR="/usr" 27XDIR="/usr"
34 28
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then 29if [[ -z "${XDPVER}" ]]; then
30# @ECLASS-VARIABLE: XDPVER
31# @DESCRIPTION:
32# Set up default patchset version(s) if necessary for driver patches. If
33# you want to change the auto-application of the driver patchset or
34# prevent it from applying, edit XDPVER in the ebuild. Set it to -1 to
35# prevent patch application or positive integers for that patch version.
36# Set before inheriting this eclass.
38 XDPVER="1" 37 XDPVER="1"
39fi 38fi
40 39
41IUSE="" 40IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 41HOMEPAGE="http://xorg.freedesktop.org/"
43 42
43if [[ -z ${SNAPSHOT} ]]; then
44# @ECLASS-VARIABLE: SNAPSHOT
45# @DESCRIPTION:
46# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
47# before inheriting this eclass.
48 SNAPSHOT="no"
49fi
50
51if [[ ${PV} = 9999* ]]; then
52 GIT_ECLASS="git"
53 SNAPSHOT="yes"
54 SRC_URI=""
55fi
56
44# Set up SRC_URI for individual modular releases 57# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 58BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 59if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 60 MODULE="app"
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 61elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 62 MODULE="doc"
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data 63# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 64elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI} 65 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 66 MODULE="data"
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 67 else
68 MODULE="util"
69 fi
57elif [[ ${CATEGORY} = x11-drivers ]]; then 70elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI} 71 MODULE="driver"
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then 72elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI} 73 MODULE="font"
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then 74elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI} 75 MODULE="lib"
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then 76elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI} 77 MODULE="proto"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 78elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 79 MODULE="xserver"
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 80fi
73 81
74# SRC_URI for full releases 82if [[ -n ${GIT_ECLASS} ]]; then
75SRC_URI="${SRC_URI} 83 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2 84else
77 http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/${P}.tar.bz2 85 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
78 http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 86fi
79 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
80 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
81 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
82 87
83SLOT="0" 88SLOT="0"
84 89
85# Set the license for the package. This can be overridden by setting 90# Set the license for the package. This can be overridden by setting
86# LICENSE after the inherit. 91# LICENSE after the inherit.
88 93
89# Set up shared dependencies 94# Set up shared dependencies
90if [[ -n "${SNAPSHOT}" ]]; then 95if [[ -n "${SNAPSHOT}" ]]; then
91# FIXME: What's the minimal libtool version supporting arbitrary versioning? 96# FIXME: What's the minimal libtool version supporting arbitrary versioning?
92 DEPEND="${DEPEND} 97 DEPEND="${DEPEND}
93 >=sys-devel/autoconf-2.57
94 >=sys-devel/automake-1.7
95 >=sys-devel/libtool-1.5 98 >=sys-devel/libtool-1.5
96 >=sys-devel/m4-1.4" 99 >=sys-devel/m4-1.4"
100 WANT_AUTOCONF="latest"
101 WANT_AUTOMAKE="latest"
97fi 102fi
98 103
99# If we're a font package, but not the font.alias one 104# If we're a font package, but not the font.alias one
105FONT_ECLASS=""
100if [[ "${PN/#font-}" != "${PN}" ]] \ 106if [[ "${PN/#font-}" != "${PN}" ]] \
107 && [[ "${CATEGORY}" = "media-fonts" ]] \
101 && [[ "${PN}" != "font-alias" ]] \ 108 && [[ "${PN}" != "font-alias" ]] \
102 && [[ "${PN}" != "font-util" ]]; then 109 && [[ "${PN}" != "font-util" ]]; then
103 # Activate font code in the rest of the eclass 110 # Activate font code in the rest of the eclass
104 FONT="yes" 111 FONT="yes"
112
113 # Whether to inherit the font eclass
114 FONT_ECLASS="font"
105 115
106 RDEPEND="${RDEPEND} 116 RDEPEND="${RDEPEND}
107 media-fonts/encodings 117 media-fonts/encodings
108 x11-apps/mkfontscale 118 x11-apps/mkfontscale
109 x11-apps/mkfontdir" 119 x11-apps/mkfontdir"
113 # Starting with 7.0RC3, we can specify the font directory 123 # Starting with 7.0RC3, we can specify the font directory
114 # But oddly, we can't do the same for encodings or font-alias 124 # But oddly, we can't do the same for encodings or font-alias
115 125
116 # Wrap in `if` so ebuilds can set it too 126 # Wrap in `if` so ebuilds can set it too
117 if [[ -z ${FONT_DIR} ]]; then 127 if [[ -z ${FONT_DIR} ]]; then
128# @ECLASS-VARIABLE: FONT_DIR
129# @DESCRIPTION:
130# If you're creating a font package and the suffix of PN is not equal to
131# the subdirectory of /usr/share/fonts/ it should install into, set
132# FONT_DIR to that directory or directories. Set before inheriting this
133# eclass.
118 FONT_DIR=${PN##*-} 134 FONT_DIR=${PN##*-}
119 135
120 fi 136 fi
121 137
122 # Fix case of font directories 138 # Fix case of font directories
127 143
128 # Set up configure option 144 # Set up configure option
129 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 145 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
130 146
131 if [[ -n "${FONT}" ]]; then 147 if [[ -n "${FONT}" ]]; then
132 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 148 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
133 IUSE="${IUSE} nls" 149 IUSE="${IUSE} nls"
134 fi 150 fi
135 fi 151 fi
136fi 152fi
137 153
138# If we're a driver package 154# If we're a driver package
139if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 155if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
140 # Enable driver code in the rest of the eclass 156 # Enable driver code in the rest of the eclass
141 DRIVER="yes" 157 DRIVER="yes"
142 158
159 if [[ ${XDPVER} != -1 ]]; then
143 # Add driver patchset to SRC_URI 160 # Add driver patchset to SRC_URI
144 SRC_URI="${SRC_URI} 161 SRC_URI="${SRC_URI}
145 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 162 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
163 fi
146fi 164fi
147 165
148# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
149if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
150 || [[ "${PN/app-doc}" != "${PN}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
151 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 169 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
152 || [[ "${PN/util-macros}" != "${PN}" ]] \ 170 && [[ "${PN/util-macros}" = "${PN}" ]] \
153 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 171 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
154 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 172 && [[ "${PN/xkbdata}" = "${PN}" ]] \
155 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 173 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
156 || [[ "${PN/xcursor}" != "${PN}" ]] \ 174 && [[ "${PN/xcursor}" = "${PN}" ]] \
157 ; then 175 ; then
158 DEBUGGABLE="yes" 176 DEBUGGABLE="yes"
159 IUSE="${IUSE} debug" 177 IUSE="${IUSE} debug"
160 if use debug; then
161 RESTRICT="${RESTRICT} nostrip"
162 fi
163fi 178fi
164 179
165DEPEND="${DEPEND} 180DEPEND="${DEPEND}
166 >=dev-util/pkgconfig-0.18" 181 >=dev-util/pkgconfig-0.18"
167 182
168if [[ "${PN/util-macros}" = "${PN}" ]]; then 183if [[ "${PN/util-macros}" = "${PN}" ]]; then
169 DEPEND="${DEPEND} 184 DEPEND="${DEPEND}
170 >=x11-misc/util-macros-0.99.2" 185 >=x11-misc/util-macros-0.99.2
186 >=sys-devel/binutils-2.16.1-r3"
171fi 187fi
172 188
173# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
174RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
175 !<=x11-base/xorg-x11-6.9 190 !<=x11-base/xorg-x11-6.9"
176 >=sys-apps/man-1.6b-r2"
177# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
178# x11-base/x11-env" 192# x11-base/x11-env"
179 193
194inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
195 ${FONT_ECLASS} ${GIT_ECLASS}
196
197# @FUNCTION: x-modular_specs_check
198# @USAGE:
199# @DESCRIPTION:
200# Make any necessary changes related to gcc specs (generally hardened)
201x-modular_specs_check() {
202 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
203 append-ldflags -Wl,-z,lazy
204 # (#116698) breaks loading
205 filter-ldflags -Wl,-z,now
206 fi
207}
208
209# @FUNCTION: x-modular_dri_check
210# @USAGE:
211# @DESCRIPTION:
212# Ensures the server supports DRI if building a driver with DRI support
213x-modular_dri_check() {
214 # (#120057) Enabling DRI in drivers requires that the server was built with
215 # support for it
216 if [[ -n "${DRIVER}" ]]; then
217 if has dri ${IUSE} && use dri; then
218 einfo "Checking for direct rendering capabilities ..."
219 if ! built_with_use x11-base/xorg-server dri; then
220 die "You must build x11-base/xorg-server with USE=dri."
221 fi
222 fi
223 fi
224}
225
226# @FUNCTION: x-modular_server_supports_drivers_check
227# @USAGE:
228# @DESCRIPTION:
229# Ensures the server SDK is installed if a driver is being built
230x-modular_server_supports_drivers_check() {
231 # (#135873) Only certain servers will actually use or be capable of
232 # building external drivers, including binary drivers.
233 if [[ -n "${DRIVER}" ]]; then
234 if has_version '>=x11-base/xorg-server-1.1'; then
235 if ! built_with_use x11-base/xorg-server xorg; then
236 eerror "x11-base/xorg-server is not built with support for external drivers."
237 die "You must build x11-base/xorg-server with USE=xorg."
238 fi
239 fi
240 fi
241}
242
243# @FUNCTION: x-modular_unpack_source
244# @USAGE:
245# @DESCRIPTION:
246# Simply unpack source code. Nothing else.
180x-modular_unpack_source() { 247x-modular_unpack_source() {
248 if [[ -n ${GIT_ECLASS} ]]; then
249 git_src_unpack
250 else
181 unpack ${A} 251 unpack ${A}
252 fi
182 cd ${S} 253 cd ${S}
183 254
184 if [[ -n ${FONT_OPTIONS} ]]; then 255 if [[ -n ${FONT_OPTIONS} ]]; then
185 einfo "Detected font directory: ${FONT_DIR}" 256 einfo "Detected font directory: ${FONT_DIR}"
186 fi 257 fi
187} 258}
188 259
260# @FUNCTION: x-modular_patch_source
261# @USAGE:
262# @DESCRIPTION:
263# Apply all patches
189x-modular_patch_source() { 264x-modular_patch_source() {
190 # Use standardized names and locations with bulk patching 265 # Use standardized names and locations with bulk patching
191 # Patch directory is ${WORKDIR}/patch 266 # Patch directory is ${WORKDIR}/patch
192 # See epatch() in eutils.eclass for more documentation 267 # See epatch() in eutils.eclass for more documentation
193 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 268 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
195 fi 270 fi
196 271
197 # If this is a driver package we need to fix man page install location. 272 # If this is a driver package we need to fix man page install location.
198 # Running autoreconf will use the patched util-macros to make the 273 # Running autoreconf will use the patched util-macros to make the
199 # change for us, so we only need to patch if it is not going to run. 274 # change for us, so we only need to patch if it is not going to run.
200 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 275 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
276 && [[ ${XDPVER} != -1 ]]; then
201 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 277 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
202 fi 278 fi
203 279
204 # For specific list of patches 280# @VARIABLE: PATCHES
281# @DESCRIPTION:
282# If you have any patches to apply, set PATCHES to their locations and epatch
283# will apply them. It also handles epatch-style bulk patches, if you know how to
284# use them and set the correct variables. If you don't, read eutils.eclass.
285 if [[ ${#PATCHES[@]} -gt 1 ]]; then
286 for x in "${PATCHES[@]}"; do
287 epatch "${x}"
288 done
205 if [[ -n "${PATCHES}" ]] ; then 289 elif [[ -n "${PATCHES}" ]]; then
206 for PATCH in ${PATCHES} 290 for x in ${PATCHES}; do
207 do
208 epatch ${PATCH} 291 epatch "${x}"
209 done 292 done
210 # For non-default directory bulk patching 293 # For non-default directory bulk patching
211 elif [[ -n "${PATCH_LOC}" ]] ; then 294 elif [[ -n "${PATCH_LOC}" ]] ; then
212 epatch ${PATCH_LOC} 295 epatch ${PATCH_LOC}
213 # For standard bulk patching 296 # For standard bulk patching
214 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 297 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
215 epatch 298 epatch
216 fi 299 fi
217} 300}
218 301
302# @FUNCTION: x-modular_reconf_source
303# @USAGE:
304# @DESCRIPTION:
305# Run eautoreconf if necessary, and run elibtoolize.
219x-modular_reconf_source() { 306x-modular_reconf_source() {
220 # Run autoreconf for CVS snapshots only
221 if [[ "${SNAPSHOT}" = "yes" ]] 307 if [[ "${SNAPSHOT}" = "yes" ]]
222 then 308 then
223 # If possible, generate configure if it doesn't exist 309 # If possible, generate configure if it doesn't exist
224 if [ -f "${S}/configure.ac" ] 310 if [ -f "./configure.ac" ]
225 then 311 then
226 einfo "Running autoreconf..." 312 eautoreconf
227 autoreconf -v --force --install
228 fi
229 fi 313 fi
314 fi
230 315
316 # Joshua Baergen - October 23, 2005
317 # Fix shared lib issues on MIPS, FBSD, etc etc
318 elibtoolize
231} 319}
232 320
321# @FUNCTION: x-modular_src_unpack
322# @USAGE:
323# @DESCRIPTION:
324# Unpack a package, performing all X-related tasks.
233x-modular_src_unpack() { 325x-modular_src_unpack() {
234 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 326 x-modular_specs_check
235 if gcc-specs-now; then 327 x-modular_server_supports_drivers_check
236 msg="Do not emerge ${PN} without vanilla gcc!" 328 x-modular_dri_check
237 eerror "$msg"
238 die "$msg"
239 fi
240 fi
241
242 x-modular_unpack_source 329 x-modular_unpack_source
243 x-modular_patch_source 330 x-modular_patch_source
244 x-modular_reconf_source 331 x-modular_reconf_source
245
246 # Joshua Baergen - October 23, 2005
247 # Fix shared lib issues on MIPS, FBSD, etc etc
248 elibtoolize
249} 332}
250 333
334# @FUNCTION: x-modular_font_configure
335# @USAGE:
336# @DESCRIPTION:
337# If a font package, perform any necessary configuration steps
251x-modular_font_configure() { 338x-modular_font_configure() {
252 if [[ -n "${FONT}" ]]; then 339 if [[ -n "${FONT}" ]]; then
253 # Might be worth adding an option to configure your desired font 340 # Might be worth adding an option to configure your desired font
254 # and exclude all others. Also, should this USE be nls or minimal? 341 # and exclude all others. Also, should this USE be nls or minimal?
255 if ! use nls; then 342 if ! use nls; then
273 --disable-koi8-r" 360 --disable-koi8-r"
274 fi 361 fi
275 fi 362 fi
276} 363}
277 364
365# @FUNCTION: x-modular_debug_setup
366# @USAGE:
367# @DESCRIPTION:
368# Set up CFLAGS for a debug build
278x-modular_debug_setup() { 369x-modular_debug_setup() {
279 if [[ -n "${DEBUGGABLE}" ]]; then 370 if [[ -n "${DEBUGGABLE}" ]]; then
280 if use debug; then 371 if use debug; then
281 strip-flags 372 strip-flags
282 append-flags -g 373 append-flags -g
283 fi 374 fi
284 fi 375 fi
285} 376}
286 377
378# @FUNCTION: x-modular_src_configure
379# @USAGE:
380# @DESCRIPTION:
381# Perform any necessary pre-configuration steps, then run configure
287x-modular_src_configure() { 382x-modular_src_configure() {
288 x-modular_font_configure 383 x-modular_font_configure
289 x-modular_debug_setup 384 x-modular_debug_setup
290 385
386# @VARIABLE: CONFIGURE_OPTIONS
387# @DESCRIPTION:
388# Any options to pass to configure
389[[ -n ${CONFIGURE_OPTIONTS} ]]
390
291 # If prefix isn't set here, .pc files cause problems 391 # If prefix isn't set here, .pc files cause problems
292 if [[ -x ./configure ]]; then 392 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
293 econf --prefix=${XDIR} \ 393 econf --prefix=${XDIR} \
294 --datadir=${XDIR}/share \ 394 --datadir=${XDIR}/share \
295 ${FONT_OPTIONS} \ 395 ${FONT_OPTIONS} \
296 ${DRIVER_OPTIONS} \ 396 ${DRIVER_OPTIONS} \
297 ${CONFIGURE_OPTIONS} 397 ${CONFIGURE_OPTIONS}
298 fi 398 fi
299} 399}
300 400
401# @FUNCTION: x-modular_src_make
402# @USAGE:
403# @DESCRIPTION:
404# Run make.
301x-modular_src_make() { 405x-modular_src_make() {
302 emake || die "emake failed" 406 emake || die "emake failed"
303} 407}
304 408
409# @FUNCTION: x-modular_src_configure
410# @USAGE:
411# @DESCRIPTION:
412# Compile a package, performing all X-related tasks.
305x-modular_src_compile() { 413x-modular_src_compile() {
306 x-modular_src_configure 414 x-modular_src_configure
307 x-modular_src_make 415 x-modular_src_make
308} 416}
309 417
418# @FUNCTION: x-modular_src_install
419# @USAGE:
420# @DESCRIPTION:
421# Install a built package to ${D}, performing any necessary steps.
422# Creates a ChangeLog from git if using live ebuilds.
310x-modular_src_install() { 423x-modular_src_install() {
311 # Install everything to ${XDIR} 424 # Install everything to ${XDIR}
312 make \ 425 make \
313 DESTDIR="${D}" \ 426 DESTDIR="${D}" \
314 install 427 install
315# Shouldn't be necessary in XDIR=/usr 428# Shouldn't be necessary in XDIR=/usr
316# einstall forces datadir, so we need to re-force it 429# einstall forces datadir, so we need to re-force it
317# datadir=${XDIR}/share \ 430# datadir=${XDIR}/share \
318# mandir=${XDIR}/share/man \ 431# mandir=${XDIR}/share/man \
319 432
433 if [[ -n ${GIT_ECLASS} ]]; then
434 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
435 git log ${GIT_TREE} > "${S}"/ChangeLog
436 popd
437 fi
438
439 if [[ -e ${S}/ChangeLog ]]; then
440 dodoc ${S}/ChangeLog
441 fi
442# @VARIABLE: DOCS
443# @DESCRIPTION:
444# Any documentation to install
445 [[ -n ${DOCS} ]] && dodoc ${DOCS}
446
447 # Make sure docs get compressed
448 prepalldocs
449
320 # Don't install libtool archives for server modules 450 # Don't install libtool archives for server modules
321 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 451 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
322 find ${D}/usr/lib/xorg/modules -name '*.la' \ 452 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
323 | xargs rm -f 453 | xargs rm -f
324 fi 454 fi
325}
326 455
456 if [[ -n "${FONT}" ]]; then
457 remove_font_metadata
458 fi
459
460 if [[ -n "${DRIVER}" ]]; then
461 install_driver_hwdata
462 fi
463}
464
465# @FUNCTION: x-modular_pkg_preinst
466# @USAGE:
467# @DESCRIPTION:
468# This function doesn't do anything right now, but it may in the future.
327x-modular_pkg_preinst() { 469x-modular_pkg_preinst() {
328 if [[ -n "${FONT}" ]]; then 470 # We no longer do anything here, but we can't remove it from the API
329 discover_font_dirs 471 :
330 fi
331} 472}
332 473
474# @FUNCTION: x-modular_pkg_postinst
475# @USAGE:
476# @DESCRIPTION:
477# Run X-specific post-installation tasks on the live filesystem. The
478# only task right now is some setup for font packages.
333x-modular_pkg_postinst() { 479x-modular_pkg_postinst() {
334 if [[ -n "${FONT}" ]]; then 480 if [[ -n "${FONT}" ]]; then
335 setup_fonts 481 setup_fonts
336 fi 482 fi
337} 483}
338 484
485# @FUNCTION: x-modular_pkg_postrm
486# @USAGE:
487# @DESCRIPTION:
488# Run X-specific post-removal tasks on the live filesystem. The only
489# task right now is some cleanup for font packages.
339x-modular_pkg_postrm() { 490x-modular_pkg_postrm() {
340 if [[ -n "${FONT}" ]]; then 491 if [[ -n "${FONT}" ]]; then
341 cleanup_fonts 492 cleanup_fonts
493 font_pkg_postrm
342 fi 494 fi
343} 495}
344 496
497# @FUNCTION: cleanup_fonts
498# @USAGE:
499# @DESCRIPTION:
500# Get rid of font directories that only contain generated files
345cleanup_fonts() { 501cleanup_fonts() {
346 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 502 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
347 for DIR in ${FONT_DIR}; do 503 for DIR in ${FONT_DIR}; do
348 unset KEEP_FONTDIR 504 unset KEEP_FONTDIR
349 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 505 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
375 fi 531 fi
376 eend 0 532 eend 0
377 done 533 done
378} 534}
379 535
536# @FUNCTION: setup_fonts
537# @USAGE:
538# @DESCRIPTION:
539# Generates needed files for fonts and fixes font permissions
380setup_fonts() { 540setup_fonts() {
381 if [[ ! -n "${FONT_DIRS}" ]]; then 541 if [[ ! -n "${FONT_DIR}" ]]; then
382 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 542 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
383 eerror "${msg}" 543 eerror "${msg}"
384 die "${msg}" 544 die "${msg}"
385 fi 545 fi
386 546
387 create_fonts_scale 547 create_fonts_scale
388 create_fonts_dir 548 create_fonts_dir
389 fix_font_permissions 549 fix_font_permissions
390 create_font_cache 550 create_font_cache
391} 551}
392 552
553# @FUNCTION: remove_font_metadata
554# @USAGE:
555# @DESCRIPTION:
556# Don't let the package install generated font files that may overlap
557# with other packages. Instead, they're generated in pkg_postinst().
558remove_font_metadata() {
559 local DIR
560 for DIR in ${FONT_DIR}; do
561 if [[ "${DIR}" != "Speedo" ]] && \
562 [[ "${DIR}" != "CID" ]] ; then
563 # Delete font metadata files
564 # fonts.scale, fonts.dir, fonts.cache-1
565 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
566 fi
567 done
568}
569
570# @FUNCTION: install_driver_hwdata
571# @USAGE:
572# @DESCRIPTION:
573# Installs device-to-driver mappings for system-config-display and
574# anything else that uses hwdata.
575install_driver_hwdata() {
576 insinto /usr/share/hwdata/videoaliases
577 for i in "${FILESDIR}"/*.xinf; do
578 # We need this for the case when none exist,
579 # so *.xinf doesn't expand
580 if [[ -e $i ]]; then
581 doins $i
582 fi
583 done
584}
585
586# @FUNCTION: discover_font_dirs
587# @USAGE:
588# @DESCRIPTION:
589# Deprecated. Sets up the now-unused FONT_DIRS variable.
393discover_font_dirs() { 590discover_font_dirs() {
394 pushd ${IMAGE}/usr/share/fonts 591 FONT_DIRS="${FONT_DIR}"
395 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
396 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
397 popd
398} 592}
399 593
594# @FUNCTION: create_fonts_scale
595# @USAGE:
596# @DESCRIPTION:
597# Create fonts.scale file, used by the old server-side fonts subsystem.
400create_fonts_scale() { 598create_fonts_scale() {
401 ebegin "Creating fonts.scale files" 599 ebegin "Creating fonts.scale files"
402 local x 600 local x
403 for FONT_DIR in ${FONT_DIRS}; do 601 for DIR in ${FONT_DIR}; do
404 x=${ROOT}/usr/share/fonts/${FONT_DIR} 602 x=${ROOT}/usr/share/fonts/${DIR}
405 [[ -z "$(ls ${x}/)" ]] && continue 603 [[ -z "$(ls ${x}/)" ]] && continue
406 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 604 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
407 605
408 # Only generate .scale files if truetype, opentype or type1 606 # Only generate .scale files if truetype, opentype or type1
409 # fonts are present ... 607 # fonts are present ...
410 608
411 # First truetype (ttf,ttc)
412 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
413 # Also, there is no way to regenerate Speedo/CID fonts.scale 609 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
414 # <spyderous@gentoo.org> 2 August 2004 610 # <dberkholz@gentoo.org> 2 August 2004
415 if [[ "${x/encodings}" = "${x}" ]] \ 611 if [[ "${x/encodings}" = "${x}" ]] \
416 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
417 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
418 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
419 ${ROOT}/usr/bin/ttmkfdir -x 2 \
420 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
421 -o ${x}/fonts.scale -d ${x}
422 # ttmkfdir fails on some stuff, so try mkfontscale if it does
423 local ttmkfdir_return=$?
424 else
425 # We didn't use ttmkfdir at all
426 local ttmkfdir_return=2
427 fi
428 if [[ ${ttmkfdir_return} -ne 0 ]]; then
429 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
430 ${ROOT}/usr/bin/mkfontscale \
431 -a /usr/share/fonts/encodings/encodings.dir \
432 -- ${x}
433 fi
434 # Next type1 and opentype (pfa,pfb,otf,otc)
435 elif [[ "${x/encodings}" = "${x}" ]] \
436 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 612 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
437 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 613 mkfontscale \
438 ${ROOT}/usr/bin/mkfontscale \
439 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 614 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
440 -- ${x} 615 -- ${x}
441 fi 616 fi
442 done 617 done
443 eend 0 618 eend 0
444} 619}
445 620
621# @FUNCTION: create_fonts_dir
622# @USAGE:
623# @DESCRIPTION:
624# Create fonts.dir file, used by the old server-side fonts subsystem.
446create_fonts_dir() { 625create_fonts_dir() {
447 ebegin "Generating fonts.dir files" 626 ebegin "Generating fonts.dir files"
448 for FONT_DIR in ${FONT_DIRS}; do 627 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 628 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 629 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 630 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 631
453 if [[ "${x/encodings}" = "${x}" ]]; then 632 if [[ "${x/encodings}" = "${x}" ]]; then
454 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 633 mkfontdir \
455 ${ROOT}/usr/bin/mkfontdir \
456 -e ${ROOT}/usr/share/fonts/encodings \ 634 -e ${ROOT}/usr/share/fonts/encodings \
457 -e ${ROOT}/usr/share/fonts/encodings/large \ 635 -e ${ROOT}/usr/share/fonts/encodings/large \
458 -- ${x} 636 -- ${x}
459 fi 637 fi
460 done 638 done
461 eend 0 639 eend 0
462} 640}
463 641
642# @FUNCTION: fix_font_permissions
643# @USAGE:
644# @DESCRIPTION:
645# Font files should have 644 permissions. Ensure this is the case.
464fix_font_permissions() { 646fix_font_permissions() {
465 ebegin "Fixing permissions" 647 ebegin "Fixing permissions"
466 for FONT_DIR in ${FONT_DIRS}; do 648 for DIR in ${FONT_DIR}; do
467 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 649 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
468 -exec chmod 0644 {} \; 650 -exec chmod 0644 {} \;
469 done 651 done
470 eend 0 652 eend 0
471} 653}
472 654
655# @FUNCTION: create_font_cache
656# @USAGE:
657# @DESCRIPTION:
658# Create fonts.cache-1 files, used by the new client-side fonts
659# subsystem.
473create_font_cache() { 660create_font_cache() {
474 # danarmak found out that fc-cache should be run AFTER all the above 661 font_pkg_postinst
475 # stuff, as otherwise the cache is invalid, and has to be run again
476 # as root anyway
477 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
478 ebegin "Creating FC font cache"
479 HOME="/root" ${ROOT}/usr/bin/fc-cache
480 eend 0
481 fi
482} 662}
663
664EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.96

  ViewVC Help
Powered by ViewVC 1.1.20