/[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.92 Revision 1.118
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.92 2008/02/22 05:10:03 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.118 2009/12/09 10:21:49 vapier Exp $
4# 4#
5# @ECLASS: x-modular.eclass 5# @ECLASS: x-modular.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
15# All you need to do in a basic ebuild is inherit this eclass and set 15# All you need to do in a basic ebuild is inherit this eclass and set
16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
17# with the other X packages, you don't need to set SRC_URI. Pretty much 17# with the other X packages, you don't need to set SRC_URI. Pretty much
18# everything else should be automatic. 18# everything else should be automatic.
19 19
20if [[ ${PV} = 9999* ]]; then
21 GIT_ECLASS="git"
22 SNAPSHOT="yes"
23 SRC_URI=""
24fi
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
20# @ECLASS-VARIABLE: XDIR 58# @ECLASS-VARIABLE: XDIR
21# @DESCRIPTION: 59# @DESCRIPTION:
22# Directory prefix to use for everything. If you want to install to a 60# Directory prefix to use for everything. If you want to install to a
23# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been 61# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
24# recently tested. You may need to uncomment the setting of datadir and 62# 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 63# 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. 64# there. You may also want to change the SLOT.
27XDIR="/usr" 65XDIR="/usr"
28 66
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.
37 XDPVER="1"
38fi
39
40IUSE="" 67IUSE=""
41HOMEPAGE="http://xorg.freedesktop.org/" 68HOMEPAGE="http://xorg.freedesktop.org/"
42 69
43# @ECLASS-VARIABLE: SNAPSHOT 70# @ECLASS-VARIABLE: SNAPSHOT
44# @DESCRIPTION: 71# @DESCRIPTION:
45# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 72# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
46# before inheriting this eclass. 73# before inheriting this eclass.
47SNAPSHOT="no" 74: ${SNAPSHOT:=no}
48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi
54 75
55# Set up SRC_URI for individual modular releases 76# Set up SRC_URI for individual modular releases
56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 77BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 78# @ECLASS-VARIABLE: MODULE
58 MODULE="app" 79# @DESCRIPTION:
59elif [[ ${CATEGORY} = app-doc ]]; then 80# The subdirectory to download source from. Possible settings are app,
60 MODULE="doc" 81# doc, data, util, driver, font, lib, proto, xserver. Set above the
61# x11-misc contains data and util, x11-themes contains data 82# inherit to override the default autoconfigured module.
62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 83if [[ -z ${MODULE} ]]; then
63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 84 case ${CATEGORY} in
64 MODULE="data" 85 app-doc) MODULE="doc" ;;
65 else 86 media-fonts) MODULE="font" ;;
66 MODULE="data" 87 x11-apps|x11-wm) MODULE="app" ;;
67 fi 88 x11-misc|x11-themes) MODULE="util" ;;
68elif [[ ${CATEGORY} = x11-drivers ]]; then 89 x11-drivers) MODULE="driver" ;;
69 MODULE="driver" 90 x11-base) MODULE="xserver" ;;
70elif [[ ${CATEGORY} = media-fonts ]]; then 91 x11-proto) MODULE="proto" ;;
71 MODULE="font" 92 x11-libs) MODULE="lib" ;;
72elif [[ ${CATEGORY} = x11-libs ]]; then 93 esac
73 MODULE="lib"
74elif [[ ${CATEGORY} = x11-proto ]]; then
75 MODULE="proto"
76elif [[ ${CATEGORY} = x11-base ]]; then
77 MODULE="xserver"
78fi 94fi
79 95
80if [[ -n ${GIT_ECLASS} ]]; then 96if [[ -n ${GIT_ECLASS} ]]; then
81 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 97 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
82else 98else
84fi 100fi
85 101
86SLOT="0" 102SLOT="0"
87 103
88# Set the license for the package. This can be overridden by setting 104# Set the license for the package. This can be overridden by setting
89# LICENSE after the inherit. 105# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
90LICENSE=${PN} 106# are under the MIT license. (This is what Red Hat does in their rpms)
107LICENSE="MIT"
91 108
92# Set up shared dependencies 109# Set up shared dependencies
93if [[ -n "${SNAPSHOT}" ]]; then 110if [[ -n "${SNAPSHOT}" ]]; then
94# FIXME: What's the minimal libtool version supporting arbitrary versioning? 111# FIXME: What's the minimal libtool version supporting arbitrary versioning?
95 DEPEND="${DEPEND} 112 DEPEND="${DEPEND}
97 >=sys-devel/m4-1.4" 114 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest" 115 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest" 116 WANT_AUTOMAKE="latest"
100fi 117fi
101 118
102# If we're a font package, but not the font.alias one 119if [[ -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} 120 RDEPEND="${RDEPEND}
115 media-fonts/encodings 121 media-fonts/encodings
116 x11-apps/mkfontscale 122 x11-apps/mkfontscale
117 x11-apps/mkfontdir" 123 x11-apps/mkfontdir"
118 PDEPEND="${PDEPEND} 124 PDEPEND="${PDEPEND}
119 media-fonts/font-alias" 125 media-fonts/font-alias"
120 126
121 # Starting with 7.0RC3, we can specify the font directory 127 # Starting with 7.0RC3, we can specify the font directory
122 # But oddly, we can't do the same for encodings or font-alias 128 # But oddly, we can't do the same for encodings or font-alias
123 129
124 # Wrap in `if` so ebuilds can set it too
125 if [[ -z ${FONT_DIR} ]]; then
126# @ECLASS-VARIABLE: FONT_DIR 130# @ECLASS-VARIABLE: FONT_DIR
127# @DESCRIPTION: 131# @DESCRIPTION:
128# If you're creating a font package and the suffix of PN is not equal to 132# If you're creating a font package and the suffix of PN is not equal to
129# the subdirectory of /usr/share/fonts/ it should install into, set 133# the subdirectory of /usr/share/fonts/ it should install into, set
130# FONT_DIR to that directory or directories. Set before inheriting this 134# FONT_DIR to that directory or directories. Set before inheriting this
131# eclass. 135# eclass.
132 FONT_DIR=${PN##*-} 136 : ${FONT_DIR:=${PN##*-}}
133
134 fi
135 137
136 # Fix case of font directories 138 # Fix case of font directories
137 FONT_DIR=${FONT_DIR/ttf/TTF} 139 FONT_DIR=${FONT_DIR/ttf/TTF}
138 FONT_DIR=${FONT_DIR/otf/OTF} 140 FONT_DIR=${FONT_DIR/otf/OTF}
139 FONT_DIR=${FONT_DIR/type1/Type1} 141 FONT_DIR=${FONT_DIR/type1/Type1}
140 FONT_DIR=${FONT_DIR/speedo/Speedo} 142 FONT_DIR=${FONT_DIR/speedo/Speedo}
141 143
142 # Set up configure option 144 # Set up configure options, wrapped so ebuilds can override if need be
145 if [[ -z ${FONT_OPTIONS} ]]; then
143 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 146 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
147 fi
144 148
145 if [[ -n "${FONT}" ]]; then 149 if [[ -n "${FONT}" ]]; then
146 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 150 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
147 IUSE="${IUSE} nls" 151 IUSE="${IUSE} nls"
148 fi 152 fi
149 fi 153 fi
150fi 154fi
151 155
152# If we're a driver package 156# If we're a driver package
153if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 157if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
154 # Enable driver code in the rest of the eclass 158 # Enable driver code in the rest of the eclass
155 DRIVER="yes" 159 DRIVER="yes"
156
157 if [[ ${XDPVER} != -1 ]]; then
158 # Add driver patchset to SRC_URI
159 SRC_URI="${SRC_URI}
160 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
161 fi
162fi 160fi
163 161
164# Debugging -- ignore packages that can't be built with debugging 162# Debugging -- ignore packages that can't be built with debugging
165if [[ -z "${FONT}" ]] \ 163if [[ -z "${FONT}" ]] \
166 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 164 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
178DEPEND="${DEPEND} 176DEPEND="${DEPEND}
179 >=dev-util/pkgconfig-0.18" 177 >=dev-util/pkgconfig-0.18"
180 178
181if [[ "${PN/util-macros}" = "${PN}" ]]; then 179if [[ "${PN/util-macros}" = "${PN}" ]]; then
182 DEPEND="${DEPEND} 180 DEPEND="${DEPEND}
183 >=x11-misc/util-macros-0.99.2 181 >=x11-misc/util-macros-1.3.0
184 >=sys-devel/binutils-2.16.1-r3" 182 sys-devel/binutils"
185fi 183fi
186 184
187RDEPEND="${RDEPEND} 185RDEPEND="${RDEPEND}
188 !<=x11-base/xorg-x11-6.9" 186 !<=x11-base/xorg-x11-6.9"
189# Provides virtual/x11 for temporary use until packages are ported 187# Provides virtual/x11 for temporary use until packages are ported
190# x11-base/x11-env" 188# x11-base/x11-env"
191
192inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
193 ${FONT_ECLASS} ${GIT_ECLASS}
194 189
195# @FUNCTION: x-modular_specs_check 190# @FUNCTION: x-modular_specs_check
196# @USAGE: 191# @USAGE:
197# @DESCRIPTION: 192# @DESCRIPTION:
198# Make any necessary changes related to gcc specs (generally hardened) 193# Make any necessary changes related to gcc specs (generally hardened)
209# @DESCRIPTION: 204# @DESCRIPTION:
210# Ensures the server supports DRI if building a driver with DRI support 205# Ensures the server supports DRI if building a driver with DRI support
211x-modular_dri_check() { 206x-modular_dri_check() {
212 # (#120057) Enabling DRI in drivers requires that the server was built with 207 # (#120057) Enabling DRI in drivers requires that the server was built with
213 # support for it 208 # support for it
209 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
210 # USE=minimal is set (see bug #252084)
214 if [[ -n "${DRIVER}" ]]; then 211 if [[ -n "${DRIVER}" ]]; then
215 if has dri ${IUSE} && use dri; then 212 if has dri ${IUSE} && use dri; then
216 einfo "Checking for direct rendering capabilities ..." 213 einfo "Checking for direct rendering capabilities ..."
214 if has_version '>=x11-base/xorg-server-1.5.3'; then
215 if built_with_use x11-base/xorg-server minimal; then
216 die "You must build x11-base/xorg-server with USE=-minimal."
217 fi
218 else
217 if ! built_with_use x11-base/xorg-server dri; then 219 if ! built_with_use x11-base/xorg-server dri; then
218 die "You must build x11-base/xorg-server with USE=dri." 220 die "You must build x11-base/xorg-server with USE=dri."
221 fi
219 fi 222 fi
220 fi 223 fi
221 fi 224 fi
222} 225}
223 226
246 if [[ -n ${GIT_ECLASS} ]]; then 249 if [[ -n ${GIT_ECLASS} ]]; then
247 git_src_unpack 250 git_src_unpack
248 else 251 else
249 unpack ${A} 252 unpack ${A}
250 fi 253 fi
251 cd ${S} 254 cd "${S}"
252 255
253 if [[ -n ${FONT_OPTIONS} ]]; then 256 if [[ -n ${FONT_OPTIONS} ]]; then
254 einfo "Detected font directory: ${FONT_DIR}" 257 einfo "Detected font directory: ${FONT_DIR}"
255 fi 258 fi
256} 259}
265 # See epatch() in eutils.eclass for more documentation 268 # See epatch() in eutils.eclass for more documentation
266 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 269 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
267 EPATCH_SUFFIX="patch" 270 EPATCH_SUFFIX="patch"
268 fi 271 fi
269 272
270 # If this is a driver package we need to fix man page install location.
271 # Running autoreconf will use the patched util-macros to make the
272 # change for us, so we only need to patch if it is not going to run.
273 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
274 && [[ ${XDPVER} != -1 ]]; then
275 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
276 fi
277
278# @VARIABLE: PATCHES 273# @VARIABLE: PATCHES
279# @DESCRIPTION: 274# @DESCRIPTION:
280# If you have any patches to apply, set PATCHES to their locations and epatch 275# If you have any patches to apply, set PATCHES to their locations and epatch
281# will apply them. It also handles epatch-style bulk patches, if you know how to 276# will apply them. It also handles epatch-style bulk patches, if you know how to
282# use them and set the correct variables. If you don't, read eutils.eclass. 277# use them and set the correct variables. If you don't, read eutils.eclass.
278 if [[ ${#PATCHES[@]} -gt 1 ]]; then
279 for x in "${PATCHES[@]}"; do
280 epatch "${x}"
281 done
283 if [[ -n "${PATCHES}" ]] ; then 282 elif [[ -n "${PATCHES}" ]]; then
284 for PATCH in ${PATCHES} 283 for x in ${PATCHES}; do
285 do
286 epatch ${PATCH} 284 epatch "${x}"
287 done 285 done
288 # For non-default directory bulk patching 286 # For non-default directory bulk patching
289 elif [[ -n "${PATCH_LOC}" ]] ; then 287 elif [[ -n "${PATCH_LOC}" ]] ; then
290 epatch ${PATCH_LOC} 288 epatch ${PATCH_LOC}
291 # For standard bulk patching 289 # For standard bulk patching
311 # Joshua Baergen - October 23, 2005 309 # Joshua Baergen - October 23, 2005
312 # Fix shared lib issues on MIPS, FBSD, etc etc 310 # Fix shared lib issues on MIPS, FBSD, etc etc
313 elibtoolize 311 elibtoolize
314} 312}
315 313
314# @FUNCTION: x-modular_src_prepare
315# @USAGE:
316# @DESCRIPTION:
317# Prepare a package after unpacking, performing all X-related tasks.
318x-modular_src_prepare() {
319 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
320 && git_src_prepare
321 x-modular_patch_source
322 x-modular_reconf_source
323}
324
316# @FUNCTION: x-modular_src_unpack 325# @FUNCTION: x-modular_src_unpack
317# @USAGE: 326# @USAGE:
318# @DESCRIPTION: 327# @DESCRIPTION:
319# Unpack a package, performing all X-related tasks. 328# Unpack a package, performing all X-related tasks.
320x-modular_src_unpack() { 329x-modular_src_unpack() {
321 x-modular_specs_check 330 x-modular_specs_check
322 x-modular_server_supports_drivers_check 331 x-modular_server_supports_drivers_check
323 x-modular_dri_check 332 x-modular_dri_check
324 x-modular_unpack_source 333 x-modular_unpack_source
325 x-modular_patch_source 334 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
326 x-modular_reconf_source
327} 335}
328 336
329# @FUNCTION: x-modular_font_configure 337# @FUNCTION: x-modular_font_configure
330# @USAGE: 338# @USAGE:
331# @DESCRIPTION: 339# @DESCRIPTION:
332# If a font package, perform any necessary configuration steps 340# If a font package, perform any necessary configuration steps
333x-modular_font_configure() { 341x-modular_font_configure() {
334 if [[ -n "${FONT}" ]]; then 342 if [[ -n "${FONT}" ]]; then
335 # Might be worth adding an option to configure your desired font 343 # Might be worth adding an option to configure your desired font
336 # and exclude all others. Also, should this USE be nls or minimal? 344 # and exclude all others. Also, should this USE be nls or minimal?
337 if ! use nls; then 345 if has nls ${IUSE//+} && ! use nls; then
338 FONT_OPTIONS="${FONT_OPTIONS} 346 FONT_OPTIONS="${FONT_OPTIONS}
339 --disable-iso8859-2 347 --disable-iso8859-2
340 --disable-iso8859-3 348 --disable-iso8859-3
341 --disable-iso8859-4 349 --disable-iso8859-4
342 --disable-iso8859-5 350 --disable-iso8859-5
378 x-modular_font_configure 386 x-modular_font_configure
379 x-modular_debug_setup 387 x-modular_debug_setup
380 388
381# @VARIABLE: CONFIGURE_OPTIONS 389# @VARIABLE: CONFIGURE_OPTIONS
382# @DESCRIPTION: 390# @DESCRIPTION:
383# Any options to pass to configure 391# Any extra options to pass to configure
384[[ -n ${CONFIGURE_OPTIONTS} ]]
385 392
386 # If prefix isn't set here, .pc files cause problems 393 # If prefix isn't set here, .pc files cause problems
387 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 394 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
388 econf --prefix=${XDIR} \ 395 econf --prefix=${XDIR} \
389 --datadir=${XDIR}/share \ 396 --datadir=${XDIR}/share \
399# Run make. 406# Run make.
400x-modular_src_make() { 407x-modular_src_make() {
401 emake || die "emake failed" 408 emake || die "emake failed"
402} 409}
403 410
404# @FUNCTION: x-modular_src_configure 411# @FUNCTION: x-modular_src_compile
405# @USAGE: 412# @USAGE:
406# @DESCRIPTION: 413# @DESCRIPTION:
407# Compile a package, performing all X-related tasks. 414# Compile a package, performing all X-related tasks.
408x-modular_src_compile() { 415x-modular_src_compile() {
409 x-modular_src_configure 416 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
410 x-modular_src_make 417 x-modular_src_make
411} 418}
412 419
413# @FUNCTION: x-modular_src_install 420# @FUNCTION: x-modular_src_install
414# @USAGE: 421# @USAGE:
415# @DESCRIPTION: 422# @DESCRIPTION:
416# Install a built package to ${D}, performing any necessary steps. 423# Install a built package to ${D}, performing any necessary steps.
417# Creates a ChangeLog from git if using live ebuilds. 424# Creates a ChangeLog from git if using live ebuilds.
418x-modular_src_install() { 425x-modular_src_install() {
419 # Install everything to ${XDIR} 426 # Install everything to ${XDIR}
427 if [[ ${CATEGORY} = x11-proto ]]; then
420 make \ 428 make \
429 ${PN/proto/}docdir=/usr/share/doc/${PF} \
421 DESTDIR="${D}" \ 430 DESTDIR="${D}" \
422 install 431 install \
432 || die
433 else
434 make \
435 docdir=/usr/share/doc/${PF} \
436 DESTDIR="${D}" \
437 install \
438 || die
439 fi
423# Shouldn't be necessary in XDIR=/usr 440# Shouldn't be necessary in XDIR=/usr
424# einstall forces datadir, so we need to re-force it 441# einstall forces datadir, so we need to re-force it
425# datadir=${XDIR}/share \ 442# datadir=${XDIR}/share \
426# mandir=${XDIR}/share/man \ 443# mandir=${XDIR}/share/man \
427 444
430 git log ${GIT_TREE} > "${S}"/ChangeLog 447 git log ${GIT_TREE} > "${S}"/ChangeLog
431 popd 448 popd
432 fi 449 fi
433 450
434 if [[ -e ${S}/ChangeLog ]]; then 451 if [[ -e ${S}/ChangeLog ]]; then
435 dodoc ${S}/ChangeLog 452 dodoc "${S}"/ChangeLog
436 fi 453 fi
437# @VARIABLE: DOCS 454# @VARIABLE: DOCS
438# @DESCRIPTION: 455# @DESCRIPTION:
439# Any documentation to install 456# Any documentation to install via dodoc
440 [[ -n ${DOCS} ]] && dodoc ${DOCS} 457 [[ -n ${DOCS} ]] && dodoc ${DOCS}
441
442 # Make sure docs get compressed
443 prepalldocs
444 458
445 # Don't install libtool archives for server modules 459 # Don't install libtool archives for server modules
446 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 460 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
447 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 461 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
448 | xargs rm -f 462 | xargs rm -f
449 fi 463 fi
450 464
451 if [[ -n "${FONT}" ]]; then 465 if [[ -n "${FONT}" ]]; then
452 remove_font_metadata 466 remove_font_metadata
492# @FUNCTION: cleanup_fonts 506# @FUNCTION: cleanup_fonts
493# @USAGE: 507# @USAGE:
494# @DESCRIPTION: 508# @DESCRIPTION:
495# Get rid of font directories that only contain generated files 509# Get rid of font directories that only contain generated files
496cleanup_fonts() { 510cleanup_fonts() {
497 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 511 local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
498 for DIR in ${FONT_DIR}; do 512 for DIR in ${FONT_DIR}; do
499 unset KEEP_FONTDIR 513 unset KEEP_FONTDIR
500 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 514 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
501 515
502 ebegin "Checking ${REAL_DIR} for useless files" 516 ebegin "Checking ${REAL_DIR} for useless files"
539 die "${msg}" 553 die "${msg}"
540 fi 554 fi
541 555
542 create_fonts_scale 556 create_fonts_scale
543 create_fonts_dir 557 create_fonts_dir
544 fix_font_permissions
545 create_font_cache 558 create_font_cache
546} 559}
547 560
548# @FUNCTION: remove_font_metadata 561# @FUNCTION: remove_font_metadata
549# @USAGE: 562# @USAGE:
555 for DIR in ${FONT_DIR}; do 568 for DIR in ${FONT_DIR}; do
556 if [[ "${DIR}" != "Speedo" ]] && \ 569 if [[ "${DIR}" != "Speedo" ]] && \
557 [[ "${DIR}" != "CID" ]] ; then 570 [[ "${DIR}" != "CID" ]] ; then
558 # Delete font metadata files 571 # Delete font metadata files
559 # fonts.scale, fonts.dir, fonts.cache-1 572 # fonts.scale, fonts.dir, fonts.cache-1
560 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 573 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
561 fi 574 fi
562 done 575 done
563} 576}
564 577
565# @FUNCTION: install_driver_hwdata 578# @FUNCTION: install_driver_hwdata
604 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 617 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
605 # <dberkholz@gentoo.org> 2 August 2004 618 # <dberkholz@gentoo.org> 2 August 2004
606 if [[ "${x/encodings}" = "${x}" ]] \ 619 if [[ "${x/encodings}" = "${x}" ]] \
607 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 620 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
608 mkfontscale \ 621 mkfontscale \
609 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 622 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
610 -- ${x} 623 -- ${x}
611 fi 624 fi
612 done 625 done
613 eend 0 626 eend 0
614} 627}
624 [[ -z "$(ls ${x}/)" ]] && continue 637 [[ -z "$(ls ${x}/)" ]] && continue
625 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 638 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
626 639
627 if [[ "${x/encodings}" = "${x}" ]]; then 640 if [[ "${x/encodings}" = "${x}" ]]; then
628 mkfontdir \ 641 mkfontdir \
629 -e ${ROOT}/usr/share/fonts/encodings \ 642 -e "${ROOT}"/usr/share/fonts/encodings \
630 -e ${ROOT}/usr/share/fonts/encodings/large \ 643 -e "${ROOT}"/usr/share/fonts/encodings/large \
631 -- ${x} 644 -- ${x}
632 fi 645 fi
633 done 646 done
634 eend 0 647 eend 0
635} 648}
636 649
637# @FUNCTION: fix_font_permissions
638# @USAGE:
639# @DESCRIPTION:
640# Font files should have 644 permissions. Ensure this is the case.
641fix_font_permissions() {
642 ebegin "Fixing permissions"
643 for DIR in ${FONT_DIR}; do
644 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
645 -exec chmod 0644 {} \;
646 done
647 eend 0
648}
649
650# @FUNCTION: create_font_cache 650# @FUNCTION: create_font_cache
651# @USAGE: 651# @USAGE:
652# @DESCRIPTION: 652# @DESCRIPTION:
653# Create fonts.cache-1 files, used by the new client-side fonts 653# Create fonts.cache-1 files, used by the new client-side fonts
654# subsystem. 654# subsystem.
655create_font_cache() { 655create_font_cache() {
656 font_pkg_postinst 656 font_pkg_postinst
657} 657}
658
659EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.92  
changed lines
  Added in v.1.118

  ViewVC Help
Powered by ViewVC 1.1.20