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

Legend:
Removed from v.1.94  
changed lines
  Added in v.1.125

  ViewVC Help
Powered by ViewVC 1.1.20