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