/[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.109
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.109 2009/05/14 12:40:55 remi 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
… …
135 149
136 # Set up configure option 150 # Set up configure option
137 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 151 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
138 152
139 if [[ -n "${FONT}" ]]; then 153 if [[ -n "${FONT}" ]]; then
140 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 154 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
141 IUSE="${IUSE} nls" 155 IUSE="${IUSE} nls"
142 fi 156 fi
143 fi 157 fi
144fi 158fi
145 159
146# If we're a driver package 160# If we're a driver package
147if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 161if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
148 # Enable driver code in the rest of the eclass 162 # Enable driver code in the rest of the eclass
149 DRIVER="yes" 163 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 164fi
157 165
158# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
159if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
… …
181RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
182 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
183# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
184# x11-base/x11-env" 192# x11-base/x11-env"
185 193
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 194# @FUNCTION: x-modular_specs_check
187 ${FONT_ECLASS} ${GIT_ECLASS} 195# @USAGE:
188 196# @DESCRIPTION:
197# Make any necessary changes related to gcc specs (generally hardened)
189x-modular_specs_check() { 198x-modular_specs_check() {
190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 199 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
191 append-ldflags -Wl,-z,lazy 200 append-ldflags -Wl,-z,lazy
192 # (#116698) breaks loading 201 # (#116698) breaks loading
193 filter-ldflags -Wl,-z,now 202 filter-ldflags -Wl,-z,now
194 fi 203 fi
195} 204}
196 205
206# @FUNCTION: x-modular_dri_check
207# @USAGE:
208# @DESCRIPTION:
209# Ensures the server supports DRI if building a driver with DRI support
197x-modular_dri_check() { 210x-modular_dri_check() {
198 # (#120057) Enabling DRI in drivers requires that the server was built with 211 # (#120057) Enabling DRI in drivers requires that the server was built with
199 # support for it 212 # support for it
213 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
214 # USE=minimal is set (see bug #252084)
200 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
201 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
202 einfo "Checking for direct rendering capabilities ..." 217 einfo "Checking for direct rendering capabilities ..."
218 if has_version '>=x11-base/xorg-server-1.5.3'; then
219 if built_with_use x11-base/xorg-server minimal; then
220 die "You must build x11-base/xorg-server with USE=-minimal."
221 fi
222 else
203 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
204 die "You must build x11-base/xorg-server with USE=dri." 224 die "You must build x11-base/xorg-server with USE=dri."
225 fi
205 fi 226 fi
206 fi 227 fi
207 fi 228 fi
208} 229}
209 230
231# @FUNCTION: x-modular_server_supports_drivers_check
232# @USAGE:
233# @DESCRIPTION:
234# Ensures the server SDK is installed if a driver is being built
210x-modular_server_supports_drivers_check() { 235x-modular_server_supports_drivers_check() {
211 # (#135873) Only certain servers will actually use or be capable of 236 # (#135873) Only certain servers will actually use or be capable of
212 # building external drivers, including binary drivers. 237 # building external drivers, including binary drivers.
213 if [[ -n "${DRIVER}" ]]; then 238 if [[ -n "${DRIVER}" ]]; then
214 if has_version '>=x11-base/xorg-server-1.1'; then 239 if has_version '>=x11-base/xorg-server-1.1'; then
… …
218 fi 243 fi
219 fi 244 fi
220 fi 245 fi
221} 246}
222 247
248# @FUNCTION: x-modular_unpack_source
249# @USAGE:
250# @DESCRIPTION:
251# Simply unpack source code. Nothing else.
223x-modular_unpack_source() { 252x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then 253 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack 254 git_src_unpack
226 else 255 else
227 unpack ${A} 256 unpack ${A}
228 fi 257 fi
229 cd ${S} 258 cd "${S}"
230 259
231 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
232 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
233 fi 262 fi
234} 263}
235 264
265# @FUNCTION: x-modular_patch_source
266# @USAGE:
267# @DESCRIPTION:
268# Apply all patches
236x-modular_patch_source() { 269x-modular_patch_source() {
237 # Use standardized names and locations with bulk patching 270 # Use standardized names and locations with bulk patching
238 # Patch directory is ${WORKDIR}/patch 271 # Patch directory is ${WORKDIR}/patch
239 # See epatch() in eutils.eclass for more documentation 272 # See epatch() in eutils.eclass for more documentation
240 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 273 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
241 EPATCH_SUFFIX="patch" 274 EPATCH_SUFFIX="patch"
242 fi 275 fi
243 276
244 # If this is a driver package we need to fix man page install location. 277# @VARIABLE: PATCHES
245 # Running autoreconf will use the patched util-macros to make the 278# @DESCRIPTION:
246 # change for us, so we only need to patch if it is not going to run. 279# If you have any patches to apply, set PATCHES to their locations and epatch
247 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 280# will apply them. It also handles epatch-style bulk patches, if you know how to
248 && [[ ${XDPVER} != -1 ]]; then 281# use them and set the correct variables. If you don't, read eutils.eclass.
249 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 282 if [[ ${#PATCHES[@]} -gt 1 ]]; then
250 fi 283 for x in "${PATCHES[@]}"; do
251 284 epatch "${x}"
252 # For specific list of patches 285 done
253 if [[ -n "${PATCHES}" ]] ; then 286 elif [[ -n "${PATCHES}" ]]; then
254 for PATCH in ${PATCHES} 287 for x in ${PATCHES}; do
255 do
256 epatch ${PATCH} 288 epatch "${x}"
257 done 289 done
258 # For non-default directory bulk patching 290 # For non-default directory bulk patching
259 elif [[ -n "${PATCH_LOC}" ]] ; then 291 elif [[ -n "${PATCH_LOC}" ]] ; then
260 epatch ${PATCH_LOC} 292 epatch ${PATCH_LOC}
261 # For standard bulk patching 293 # For standard bulk patching
262 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 294 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
263 epatch 295 epatch
264 fi 296 fi
265} 297}
266 298
299# @FUNCTION: x-modular_reconf_source
300# @USAGE:
301# @DESCRIPTION:
302# Run eautoreconf if necessary, and run elibtoolize.
267x-modular_reconf_source() { 303x-modular_reconf_source() {
268 # Run autoreconf for CVS snapshots only
269 if [[ "${SNAPSHOT}" = "yes" ]] 304 if [[ "${SNAPSHOT}" = "yes" ]]
270 then 305 then
271 # If possible, generate configure if it doesn't exist 306 # If possible, generate configure if it doesn't exist
272 if [ -f "./configure.ac" ] 307 if [ -f "./configure.ac" ]
273 then 308 then
… …
278 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
279 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
280 elibtoolize 315 elibtoolize
281} 316}
282 317
318# @FUNCTION: x-modular_src_prepare
319# @USAGE:
320# @DESCRIPTION:
321# Prepare a package after unpacking, performing all X-related tasks.
322x-modular_src_prepare() {
323 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
324 && git_src_prepare
325 x-modular_patch_source
326 x-modular_reconf_source
327}
328
329# @FUNCTION: x-modular_src_unpack
330# @USAGE:
331# @DESCRIPTION:
332# Unpack a package, performing all X-related tasks.
283x-modular_src_unpack() { 333x-modular_src_unpack() {
284 x-modular_specs_check 334 x-modular_specs_check
285 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
286 x-modular_dri_check 336 x-modular_dri_check
287 x-modular_unpack_source 337 x-modular_unpack_source
288 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
289 x-modular_reconf_source
290} 339}
291 340
341# @FUNCTION: x-modular_font_configure
342# @USAGE:
343# @DESCRIPTION:
344# If a font package, perform any necessary configuration steps
292x-modular_font_configure() { 345x-modular_font_configure() {
293 if [[ -n "${FONT}" ]]; then 346 if [[ -n "${FONT}" ]]; then
294 # Might be worth adding an option to configure your desired font 347 # Might be worth adding an option to configure your desired font
295 # and exclude all others. Also, should this USE be nls or minimal? 348 # and exclude all others. Also, should this USE be nls or minimal?
296 if ! use nls; then 349 if ! use nls; then
… …
314 --disable-koi8-r" 367 --disable-koi8-r"
315 fi 368 fi
316 fi 369 fi
317} 370}
318 371
372# @FUNCTION: x-modular_debug_setup
373# @USAGE:
374# @DESCRIPTION:
375# Set up CFLAGS for a debug build
319x-modular_debug_setup() { 376x-modular_debug_setup() {
320 if [[ -n "${DEBUGGABLE}" ]]; then 377 if [[ -n "${DEBUGGABLE}" ]]; then
321 if use debug; then 378 if use debug; then
322 strip-flags 379 strip-flags
323 append-flags -g 380 append-flags -g
324 fi 381 fi
325 fi 382 fi
326} 383}
327 384
385# @FUNCTION: x-modular_src_configure
386# @USAGE:
387# @DESCRIPTION:
388# Perform any necessary pre-configuration steps, then run configure
328x-modular_src_configure() { 389x-modular_src_configure() {
329 x-modular_font_configure 390 x-modular_font_configure
330 x-modular_debug_setup 391 x-modular_debug_setup
392
393# @VARIABLE: CONFIGURE_OPTIONS
394# @DESCRIPTION:
395# Any options to pass to configure
396[[ -n ${CONFIGURE_OPTIONS} ]]
331 397
332 # If prefix isn't set here, .pc files cause problems 398 # If prefix isn't set here, .pc files cause problems
333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 399 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
334 econf --prefix=${XDIR} \ 400 econf --prefix=${XDIR} \
335 --datadir=${XDIR}/share \ 401 --datadir=${XDIR}/share \
… …
337 ${DRIVER_OPTIONS} \ 403 ${DRIVER_OPTIONS} \
338 ${CONFIGURE_OPTIONS} 404 ${CONFIGURE_OPTIONS}
339 fi 405 fi
340} 406}
341 407
408# @FUNCTION: x-modular_src_make
409# @USAGE:
410# @DESCRIPTION:
411# Run make.
342x-modular_src_make() { 412x-modular_src_make() {
343 emake || die "emake failed" 413 emake || die "emake failed"
344} 414}
345 415
416# @FUNCTION: x-modular_src_compile
417# @USAGE:
418# @DESCRIPTION:
419# Compile a package, performing all X-related tasks.
346x-modular_src_compile() { 420x-modular_src_compile() {
347 x-modular_src_configure 421 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
348 x-modular_src_make 422 x-modular_src_make
349} 423}
350 424
425# @FUNCTION: x-modular_src_install
426# @USAGE:
427# @DESCRIPTION:
428# Install a built package to ${D}, performing any necessary steps.
429# Creates a ChangeLog from git if using live ebuilds.
351x-modular_src_install() { 430x-modular_src_install() {
352 # Install everything to ${XDIR} 431 # Install everything to ${XDIR}
432 if [[ ${CATEGORY} = x11-proto ]]; then
353 make \ 433 make \
434 ${PN/proto/}docdir=/usr/share/doc/${PF} \
354 DESTDIR="${D}" \ 435 DESTDIR="${D}" \
355 install 436 install \
437 || die
438 else
439 make \
440 DESTDIR="${D}" \
441 install \
442 || die
443 fi
356# Shouldn't be necessary in XDIR=/usr 444# Shouldn't be necessary in XDIR=/usr
357# einstall forces datadir, so we need to re-force it 445# einstall forces datadir, so we need to re-force it
358# datadir=${XDIR}/share \ 446# datadir=${XDIR}/share \
359# mandir=${XDIR}/share/man \ 447# mandir=${XDIR}/share/man \
360 448
… …
363 git log ${GIT_TREE} > "${S}"/ChangeLog 451 git log ${GIT_TREE} > "${S}"/ChangeLog
364 popd 452 popd
365 fi 453 fi
366 454
367 if [[ -e ${S}/ChangeLog ]]; then 455 if [[ -e ${S}/ChangeLog ]]; then
368 dodoc ${S}/ChangeLog 456 dodoc "${S}"/ChangeLog
369 fi 457 fi
370 458# @VARIABLE: DOCS
371 # Make sure docs get compressed 459# @DESCRIPTION:
372 prepalldocs 460# Any documentation to install
461 [[ -n ${DOCS} ]] && dodoc ${DOCS}
373 462
374 # Don't install libtool archives for server modules 463 # Don't install libtool archives for server modules
375 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 464 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
376 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 465 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
377 | xargs rm -f 466 | xargs rm -f
378 fi 467 fi
379 468
380 # Don't install overlapping fonts.* files
381 # Generate them instead when possible
382 if [[ -n "${FONT}" ]]; then 469 if [[ -n "${FONT}" ]]; then
383 remove_font_metadata 470 remove_font_metadata
384 fi 471 fi
385 472
386 if [[ -n "${DRIVER}" ]]; then 473 if [[ -n "${DRIVER}" ]]; then
387 install_driver_hwdata 474 install_driver_hwdata
388 fi 475 fi
389} 476}
390 477
478# @FUNCTION: x-modular_pkg_preinst
479# @USAGE:
480# @DESCRIPTION:
481# This function doesn't do anything right now, but it may in the future.
391x-modular_pkg_preinst() { 482x-modular_pkg_preinst() {
392 # We no longer do anything here, but we can't remove it from the API 483 # We no longer do anything here, but we can't remove it from the API
393 : 484 :
394} 485}
395 486
487# @FUNCTION: x-modular_pkg_postinst
488# @USAGE:
489# @DESCRIPTION:
490# Run X-specific post-installation tasks on the live filesystem. The
491# only task right now is some setup for font packages.
396x-modular_pkg_postinst() { 492x-modular_pkg_postinst() {
397 if [[ -n "${FONT}" ]]; then 493 if [[ -n "${FONT}" ]]; then
398 setup_fonts 494 setup_fonts
399 fi 495 fi
400} 496}
401 497
498# @FUNCTION: x-modular_pkg_postrm
499# @USAGE:
500# @DESCRIPTION:
501# Run X-specific post-removal tasks on the live filesystem. The only
502# task right now is some cleanup for font packages.
402x-modular_pkg_postrm() { 503x-modular_pkg_postrm() {
403 if [[ -n "${FONT}" ]]; then 504 if [[ -n "${FONT}" ]]; then
404 cleanup_fonts 505 cleanup_fonts
405 font_pkg_postrm 506 font_pkg_postrm
406 fi 507 fi
407} 508}
408 509
510# @FUNCTION: cleanup_fonts
511# @USAGE:
512# @DESCRIPTION:
513# Get rid of font directories that only contain generated files
409cleanup_fonts() { 514cleanup_fonts() {
410 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 515 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
411 for DIR in ${FONT_DIR}; do 516 for DIR in ${FONT_DIR}; do
412 unset KEEP_FONTDIR 517 unset KEEP_FONTDIR
413 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 518 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
… …
439 fi 544 fi
440 eend 0 545 eend 0
441 done 546 done
442} 547}
443 548
549# @FUNCTION: setup_fonts
550# @USAGE:
551# @DESCRIPTION:
552# Generates needed files for fonts and fixes font permissions
444setup_fonts() { 553setup_fonts() {
445 if [[ ! -n "${FONT_DIR}" ]]; then 554 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." 555 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
447 eerror "${msg}" 556 eerror "${msg}"
448 die "${msg}" 557 die "${msg}"
… …
452 create_fonts_dir 561 create_fonts_dir
453 fix_font_permissions 562 fix_font_permissions
454 create_font_cache 563 create_font_cache
455} 564}
456 565
566# @FUNCTION: remove_font_metadata
567# @USAGE:
568# @DESCRIPTION:
569# Don't let the package install generated font files that may overlap
570# with other packages. Instead, they're generated in pkg_postinst().
457remove_font_metadata() { 571remove_font_metadata() {
458 local DIR 572 local DIR
459 for DIR in ${FONT_DIR}; do 573 for DIR in ${FONT_DIR}; do
460 if [[ "${DIR}" != "Speedo" ]] && \ 574 if [[ "${DIR}" != "Speedo" ]] && \
461 [[ "${DIR}" != "CID" ]] ; then 575 [[ "${DIR}" != "CID" ]] ; then
462 # Delete font metadata files 576 # Delete font metadata files
463 # fonts.scale, fonts.dir, fonts.cache-1 577 # fonts.scale, fonts.dir, fonts.cache-1
464 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 578 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
465 fi 579 fi
466 done 580 done
467} 581}
468 582
583# @FUNCTION: install_driver_hwdata
584# @USAGE:
585# @DESCRIPTION:
469# Installs device-to-driver mappings for system-config-display 586# Installs device-to-driver mappings for system-config-display and
470# and anything else that uses hwdata 587# anything else that uses hwdata.
471install_driver_hwdata() { 588install_driver_hwdata() {
472 insinto /usr/share/hwdata/videoaliases 589 insinto /usr/share/hwdata/videoaliases
473 for i in "${FILESDIR}"/*.xinf; do 590 for i in "${FILESDIR}"/*.xinf; do
474 # We need this for the case when none exist, 591 # We need this for the case when none exist,
475 # so *.xinf doesn't expand 592 # so *.xinf doesn't expand
… …
477 doins $i 594 doins $i
478 fi 595 fi
479 done 596 done
480} 597}
481 598
599# @FUNCTION: discover_font_dirs
600# @USAGE:
601# @DESCRIPTION:
602# Deprecated. Sets up the now-unused FONT_DIRS variable.
482discover_font_dirs() { 603discover_font_dirs() {
483 FONT_DIRS="${FONT_DIR}" 604 FONT_DIRS="${FONT_DIR}"
484} 605}
485 606
607# @FUNCTION: create_fonts_scale
608# @USAGE:
609# @DESCRIPTION:
610# Create fonts.scale file, used by the old server-side fonts subsystem.
486create_fonts_scale() { 611create_fonts_scale() {
487 ebegin "Creating fonts.scale files" 612 ebegin "Creating fonts.scale files"
488 local x 613 local x
489 for DIR in ${FONT_DIR}; do 614 for DIR in ${FONT_DIR}; do
490 x=${ROOT}/usr/share/fonts/${DIR} 615 x=${ROOT}/usr/share/fonts/${DIR}
… …
497 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 622 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
498 # <dberkholz@gentoo.org> 2 August 2004 623 # <dberkholz@gentoo.org> 2 August 2004
499 if [[ "${x/encodings}" = "${x}" ]] \ 624 if [[ "${x/encodings}" = "${x}" ]] \
500 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 625 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
501 mkfontscale \ 626 mkfontscale \
502 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 627 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
503 -- ${x} 628 -- ${x}
504 fi 629 fi
505 done 630 done
506 eend 0 631 eend 0
507} 632}
508 633
634# @FUNCTION: create_fonts_dir
635# @USAGE:
636# @DESCRIPTION:
637# Create fonts.dir file, used by the old server-side fonts subsystem.
509create_fonts_dir() { 638create_fonts_dir() {
510 ebegin "Generating fonts.dir files" 639 ebegin "Generating fonts.dir files"
511 for DIR in ${FONT_DIR}; do 640 for DIR in ${FONT_DIR}; do
512 x=${ROOT}/usr/share/fonts/${DIR} 641 x=${ROOT}/usr/share/fonts/${DIR}
513 [[ -z "$(ls ${x}/)" ]] && continue 642 [[ -z "$(ls ${x}/)" ]] && continue
514 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 643 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
515 644
516 if [[ "${x/encodings}" = "${x}" ]]; then 645 if [[ "${x/encodings}" = "${x}" ]]; then
517 mkfontdir \ 646 mkfontdir \
518 -e ${ROOT}/usr/share/fonts/encodings \ 647 -e "${ROOT}"/usr/share/fonts/encodings \
519 -e ${ROOT}/usr/share/fonts/encodings/large \ 648 -e "${ROOT}"/usr/share/fonts/encodings/large \
520 -- ${x} 649 -- ${x}
521 fi 650 fi
522 done 651 done
523 eend 0 652 eend 0
524} 653}
525 654
655# @FUNCTION: fix_font_permissions
656# @USAGE:
657# @DESCRIPTION:
658# Font files should have 644 permissions. Ensure this is the case.
526fix_font_permissions() { 659fix_font_permissions() {
527 ebegin "Fixing permissions" 660 ebegin "Fixing permissions"
528 for DIR in ${FONT_DIR}; do 661 for DIR in ${FONT_DIR}; do
529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 662 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
530 -exec chmod 0644 {} \; 663 -exec chmod 0644 {} \;
531 done 664 done
532 eend 0 665 eend 0
533} 666}
534 667
668# @FUNCTION: create_font_cache
669# @USAGE:
670# @DESCRIPTION:
671# Create fonts.cache-1 files, used by the new client-side fonts
672# subsystem.
535create_font_cache() { 673create_font_cache() {
536 font_pkg_postinst 674 font_pkg_postinst
537} 675}
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.109
  ViewVC Help
Powered by ViewVC 1.1.13