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