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

  ViewVC Help
Powered by ViewVC 1.1.20