/[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.83 Revision 1.93
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.83 2007/05/02 07:10:33 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.93 2008/03/06 04:42:26 dberkholz Exp $
4# 4#
5# @ECLASS: x-modular.eclass
6# @MAINTAINER:
5# Author: Donnie Berkholz <dberkholz@gentoo.org> 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching,
13# running eautoreconf, passing options to configure and installing docs.
6# 14#
7# This eclass is designed to reduce code duplication in the modularized X11 15# All you need to do in a basic ebuild is inherit this eclass and set
8# ebuilds. 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
9# 17# with the other X packages, you don't need to set SRC_URI. Pretty much
10# Using this eclass:
11#
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories.
23#
24# If you want to change the auto-application of the driver patchset or prevent
25# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
26# application or positive integers for that patch version.
27#
28# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
29#
30# If you want to install to a non-default prefix (e.g., /opt/xorg), change
31# XDIR. This has not been recently tested. You may need to uncomment the
32# setting of datadir and mandir in x-modular_src_install() or add it back in if
33# it's no longer there. You may also want to change the SLOT.
34#
35# Pretty much everything else should be automatic. 18# everything else should be automatic.
36 19
37# Directory prefix to use for everything 20# @ECLASS-VARIABLE: XDIR
21# @DESCRIPTION:
22# 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
24# 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
26# there. You may also want to change the SLOT.
38XDIR="/usr" 27XDIR="/usr"
39 28
40# Set up default patchset version(s) if necessary
41# x11-driver-patches
42if [[ -z "${XDPVER}" ]]; then 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.
43 XDPVER="1" 37 XDPVER="1"
44fi 38fi
45 39
46IUSE="" 40IUSE=""
47HOMEPAGE="http://xorg.freedesktop.org/" 41HOMEPAGE="http://xorg.freedesktop.org/"
42
43if [[ -z ${SNAPSHOT} ]]; then
44# @ECLASS-VARIABLE: SNAPSHOT
45# @DESCRIPTION:
46# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
47# before inheriting this eclass.
48 SNAPSHOT="no"
49fi
50
51if [[ ${PV} = 9999* ]]; then
52 GIT_ECLASS="git"
53 SNAPSHOT="yes"
54 SRC_URI=""
55fi
48 56
49# Set up SRC_URI for individual modular releases 57# Set up SRC_URI for individual modular releases
50BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 58BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
51if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 59if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
52 SRC_URI="${SRC_URI} 60 MODULE="app"
53 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
54elif [[ ${CATEGORY} = app-doc ]]; then 61elif [[ ${CATEGORY} = app-doc ]]; then
55 SRC_URI="${SRC_URI} 62 MODULE="doc"
56 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
57# x11-misc contains data and util, x11-themes contains data 63# x11-misc contains data and util, x11-themes contains data
58elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 64elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
59 SRC_URI="${SRC_URI} 65 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
60 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 66 MODULE="data"
61 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 67 else
68 MODULE="data"
69 fi
62elif [[ ${CATEGORY} = x11-drivers ]]; then 70elif [[ ${CATEGORY} = x11-drivers ]]; then
63 SRC_URI="${SRC_URI} 71 MODULE="driver"
64 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
65elif [[ ${CATEGORY} = media-fonts ]]; then 72elif [[ ${CATEGORY} = media-fonts ]]; then
66 SRC_URI="${SRC_URI} 73 MODULE="font"
67 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
68elif [[ ${CATEGORY} = x11-libs ]]; then 74elif [[ ${CATEGORY} = x11-libs ]]; then
69 SRC_URI="${SRC_URI} 75 MODULE="lib"
70 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
71elif [[ ${CATEGORY} = x11-proto ]]; then 76elif [[ ${CATEGORY} = x11-proto ]]; then
72 SRC_URI="${SRC_URI} 77 MODULE="proto"
73 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
74elif [[ ${CATEGORY} = x11-base ]]; then 78elif [[ ${CATEGORY} = x11-base ]]; then
75 SRC_URI="${SRC_URI} 79 MODULE="xserver"
76 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 80fi
81
82if [[ -n ${GIT_ECLASS} ]]; then
83 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
84else
85 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
77fi 86fi
78 87
79SLOT="0" 88SLOT="0"
80 89
81# Set the license for the package. This can be overridden by setting 90# Set the license for the package. This can be overridden by setting
114 # Starting with 7.0RC3, we can specify the font directory 123 # Starting with 7.0RC3, we can specify the font directory
115 # But oddly, we can't do the same for encodings or font-alias 124 # But oddly, we can't do the same for encodings or font-alias
116 125
117 # Wrap in `if` so ebuilds can set it too 126 # Wrap in `if` so ebuilds can set it too
118 if [[ -z ${FONT_DIR} ]]; then 127 if [[ -z ${FONT_DIR} ]]; then
128# @ECLASS-VARIABLE: FONT_DIR
129# @DESCRIPTION:
130# 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
132# FONT_DIR to that directory or directories. Set before inheriting this
133# eclass.
119 FONT_DIR=${PN##*-} 134 FONT_DIR=${PN##*-}
120 135
121 fi 136 fi
122 137
123 # Fix case of font directories 138 # Fix case of font directories
142 DRIVER="yes" 157 DRIVER="yes"
143 158
144 if [[ ${XDPVER} != -1 ]]; then 159 if [[ ${XDPVER} != -1 ]]; then
145 # Add driver patchset to SRC_URI 160 # Add driver patchset to SRC_URI
146 SRC_URI="${SRC_URI} 161 SRC_URI="${SRC_URI}
147 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 162 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi 163 fi
149fi 164fi
150 165
151# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
152if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
153 || [[ "${PN/app-doc}" != "${PN}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
154 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 169 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
155 || [[ "${PN/util-macros}" != "${PN}" ]] \ 170 && [[ "${PN/util-macros}" = "${PN}" ]] \
156 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 171 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
157 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 172 && [[ "${PN/xkbdata}" = "${PN}" ]] \
158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 173 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
159 || [[ "${PN/xcursor}" != "${PN}" ]] \ 174 && [[ "${PN/xcursor}" = "${PN}" ]] \
160 ; then 175 ; then
161 DEBUGGABLE="yes" 176 DEBUGGABLE="yes"
162 IUSE="${IUSE} debug" 177 IUSE="${IUSE} debug"
163 if use debug; then
164 if ! has splitdebug ${FEATURES}; then
165 RESTRICT="${RESTRICT} nostrip"
166 fi
167 fi
168fi 178fi
169 179
170DEPEND="${DEPEND} 180DEPEND="${DEPEND}
171 >=dev-util/pkgconfig-0.18" 181 >=dev-util/pkgconfig-0.18"
172 182
175 >=x11-misc/util-macros-0.99.2 185 >=x11-misc/util-macros-0.99.2
176 >=sys-devel/binutils-2.16.1-r3" 186 >=sys-devel/binutils-2.16.1-r3"
177fi 187fi
178 188
179RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
181 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
182# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
183# x11-base/x11-env" 192# x11-base/x11-env"
184 193
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS} 194inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
195 ${FONT_ECLASS} ${GIT_ECLASS}
186 196
197# @FUNCTION: x-modular_specs_check
198# @USAGE:
199# @DESCRIPTION:
200# Make any necessary changes related to gcc specs (generally hardened)
187x-modular_specs_check() { 201x-modular_specs_check() {
188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 202 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
189 append-ldflags -Wl,-z,lazy 203 append-ldflags -Wl,-z,lazy
190 # (#116698) breaks loading 204 # (#116698) breaks loading
191 filter-ldflags -Wl,-z,now 205 filter-ldflags -Wl,-z,now
192 fi 206 fi
193} 207}
194 208
209# @FUNCTION: x-modular_dri_check
210# @USAGE:
211# @DESCRIPTION:
212# Ensures the server supports DRI if building a driver with DRI support
195x-modular_dri_check() { 213x-modular_dri_check() {
196 # (#120057) Enabling DRI in drivers requires that the server was built with 214 # (#120057) Enabling DRI in drivers requires that the server was built with
197 # support for it 215 # support for it
198 if [[ -n "${DRIVER}" ]]; then 216 if [[ -n "${DRIVER}" ]]; then
199 if has dri ${IUSE} && use dri; then 217 if has dri ${IUSE} && use dri; then
203 fi 221 fi
204 fi 222 fi
205 fi 223 fi
206} 224}
207 225
226# @FUNCTION: x-modular_server_supports_drivers_check
227# @USAGE:
228# @DESCRIPTION:
229# Ensures the server SDK is installed if a driver is being built
208x-modular_server_supports_drivers_check() { 230x-modular_server_supports_drivers_check() {
209 # (#135873) Only certain servers will actually use or be capable of 231 # (#135873) Only certain servers will actually use or be capable of
210 # building external drivers, including binary drivers. 232 # building external drivers, including binary drivers.
211 if [[ -n "${DRIVER}" ]]; then 233 if [[ -n "${DRIVER}" ]]; then
212 if has_version '>=x11-base/xorg-server-1.1'; then 234 if has_version '>=x11-base/xorg-server-1.1'; then
216 fi 238 fi
217 fi 239 fi
218 fi 240 fi
219} 241}
220 242
243# @FUNCTION: x-modular_unpack_source
244# @USAGE:
245# @DESCRIPTION:
246# Simply unpack source code. Nothing else.
221x-modular_unpack_source() { 247x-modular_unpack_source() {
248 if [[ -n ${GIT_ECLASS} ]]; then
249 git_src_unpack
250 else
222 unpack ${A} 251 unpack ${A}
252 fi
223 cd ${S} 253 cd ${S}
224 254
225 if [[ -n ${FONT_OPTIONS} ]]; then 255 if [[ -n ${FONT_OPTIONS} ]]; then
226 einfo "Detected font directory: ${FONT_DIR}" 256 einfo "Detected font directory: ${FONT_DIR}"
227 fi 257 fi
228} 258}
229 259
260# @FUNCTION: x-modular_patch_source
261# @USAGE:
262# @DESCRIPTION:
263# Apply all patches
230x-modular_patch_source() { 264x-modular_patch_source() {
231 # Use standardized names and locations with bulk patching 265 # Use standardized names and locations with bulk patching
232 # Patch directory is ${WORKDIR}/patch 266 # Patch directory is ${WORKDIR}/patch
233 # See epatch() in eutils.eclass for more documentation 267 # See epatch() in eutils.eclass for more documentation
234 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 268 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
241 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 275 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
242 && [[ ${XDPVER} != -1 ]]; then 276 && [[ ${XDPVER} != -1 ]]; then
243 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 277 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
244 fi 278 fi
245 279
246 # For specific list of patches 280# @VARIABLE: PATCHES
281# @DESCRIPTION:
282# 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
284# use them and set the correct variables. If you don't, read eutils.eclass.
247 if [[ -n "${PATCHES}" ]] ; then 285 if [[ -n "${PATCHES}" ]] ; then
248 for PATCH in ${PATCHES} 286 for PATCH in ${PATCHES}
249 do 287 do
250 epatch ${PATCH} 288 epatch ${PATCH}
251 done 289 done
256 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 294 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
257 epatch 295 epatch
258 fi 296 fi
259} 297}
260 298
299# @FUNCTION: x-modular_reconf_source
300# @USAGE:
301# @DESCRIPTION:
302# Run eautoreconf if necessary, and run elibtoolize.
261x-modular_reconf_source() { 303x-modular_reconf_source() {
262 # Run autoreconf for CVS snapshots only
263 if [[ "${SNAPSHOT}" = "yes" ]] 304 if [[ "${SNAPSHOT}" = "yes" ]]
264 then 305 then
265 # If possible, generate configure if it doesn't exist 306 # If possible, generate configure if it doesn't exist
266 if [ -f "./configure.ac" ] 307 if [ -f "./configure.ac" ]
267 then 308 then
272 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
273 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
274 elibtoolize 315 elibtoolize
275} 316}
276 317
318# @FUNCTION: x-modular_src_unpack
319# @USAGE:
320# @DESCRIPTION:
321# Unpack a package, performing all X-related tasks.
277x-modular_src_unpack() { 322x-modular_src_unpack() {
278 x-modular_specs_check 323 x-modular_specs_check
279 x-modular_server_supports_drivers_check 324 x-modular_server_supports_drivers_check
280 x-modular_dri_check 325 x-modular_dri_check
281 x-modular_unpack_source 326 x-modular_unpack_source
282 x-modular_patch_source 327 x-modular_patch_source
283 x-modular_reconf_source 328 x-modular_reconf_source
284} 329}
285 330
331# @FUNCTION: x-modular_font_configure
332# @USAGE:
333# @DESCRIPTION:
334# If a font package, perform any necessary configuration steps
286x-modular_font_configure() { 335x-modular_font_configure() {
287 if [[ -n "${FONT}" ]]; then 336 if [[ -n "${FONT}" ]]; then
288 # Might be worth adding an option to configure your desired font 337 # Might be worth adding an option to configure your desired font
289 # and exclude all others. Also, should this USE be nls or minimal? 338 # and exclude all others. Also, should this USE be nls or minimal?
290 if ! use nls; then 339 if ! use nls; then
308 --disable-koi8-r" 357 --disable-koi8-r"
309 fi 358 fi
310 fi 359 fi
311} 360}
312 361
362# @FUNCTION: x-modular_debug_setup
363# @USAGE:
364# @DESCRIPTION:
365# Set up CFLAGS for a debug build
313x-modular_debug_setup() { 366x-modular_debug_setup() {
314 if [[ -n "${DEBUGGABLE}" ]]; then 367 if [[ -n "${DEBUGGABLE}" ]]; then
315 if use debug; then 368 if use debug; then
316 strip-flags 369 strip-flags
317 append-flags -g 370 append-flags -g
318 fi 371 fi
319 fi 372 fi
320} 373}
321 374
375# @FUNCTION: x-modular_src_configure
376# @USAGE:
377# @DESCRIPTION:
378# Perform any necessary pre-configuration steps, then run configure
322x-modular_src_configure() { 379x-modular_src_configure() {
323 x-modular_font_configure 380 x-modular_font_configure
324 x-modular_debug_setup 381 x-modular_debug_setup
325 382
383# @VARIABLE: CONFIGURE_OPTIONS
384# @DESCRIPTION:
385# Any options to pass to configure
386[[ -n ${CONFIGURE_OPTIONTS} ]]
387
326 # If prefix isn't set here, .pc files cause problems 388 # If prefix isn't set here, .pc files cause problems
327 if [[ -x ./configure ]]; then 389 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
328 econf --prefix=${XDIR} \ 390 econf --prefix=${XDIR} \
329 --datadir=${XDIR}/share \ 391 --datadir=${XDIR}/share \
330 ${FONT_OPTIONS} \ 392 ${FONT_OPTIONS} \
331 ${DRIVER_OPTIONS} \ 393 ${DRIVER_OPTIONS} \
332 ${CONFIGURE_OPTIONS} 394 ${CONFIGURE_OPTIONS}
333 fi 395 fi
334} 396}
335 397
398# @FUNCTION: x-modular_src_make
399# @USAGE:
400# @DESCRIPTION:
401# Run make.
336x-modular_src_make() { 402x-modular_src_make() {
337 emake || die "emake failed" 403 emake || die "emake failed"
338} 404}
339 405
406# @FUNCTION: x-modular_src_configure
407# @USAGE:
408# @DESCRIPTION:
409# Compile a package, performing all X-related tasks.
340x-modular_src_compile() { 410x-modular_src_compile() {
341 x-modular_src_configure 411 x-modular_src_configure
342 x-modular_src_make 412 x-modular_src_make
343} 413}
344 414
415# @FUNCTION: x-modular_src_install
416# @USAGE:
417# @DESCRIPTION:
418# Install a built package to ${D}, performing any necessary steps.
419# Creates a ChangeLog from git if using live ebuilds.
345x-modular_src_install() { 420x-modular_src_install() {
346 # Install everything to ${XDIR} 421 # Install everything to ${XDIR}
347 make \ 422 make \
348 DESTDIR="${D}" \ 423 DESTDIR="${D}" \
349 install 424 install
350# Shouldn't be necessary in XDIR=/usr 425# Shouldn't be necessary in XDIR=/usr
351# einstall forces datadir, so we need to re-force it 426# einstall forces datadir, so we need to re-force it
352# datadir=${XDIR}/share \ 427# datadir=${XDIR}/share \
353# mandir=${XDIR}/share/man \ 428# mandir=${XDIR}/share/man \
354 429
430 if [[ -n ${GIT_ECLASS} ]]; then
431 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
432 git log ${GIT_TREE} > "${S}"/ChangeLog
433 popd
434 fi
435
355 if [[ -e ${S}/ChangeLog ]]; then 436 if [[ -e ${S}/ChangeLog ]]; then
356 dodoc ${S}/ChangeLog 437 dodoc ${S}/ChangeLog
357 fi 438 fi
439# @VARIABLE: DOCS
440# @DESCRIPTION:
441# Any documentation to install
442 [[ -n ${DOCS} ]] && dodoc ${DOCS}
358 443
359 # Make sure docs get compressed 444 # Make sure docs get compressed
360 prepalldocs 445 prepalldocs
361 446
362 # Don't install libtool archives for server modules 447 # Don't install libtool archives for server modules
363 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 448 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
364 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 449 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
365 | xargs rm -f 450 | xargs rm -f
366 fi 451 fi
367 452
368 # Don't install overlapping fonts.* files
369 # Generate them instead when possible
370 if [[ -n "${FONT}" ]]; then 453 if [[ -n "${FONT}" ]]; then
371 remove_font_metadata 454 remove_font_metadata
372 fi 455 fi
373 456
374 if [[ -n "${DRIVER}" ]]; then 457 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata 458 install_driver_hwdata
376 fi 459 fi
377} 460}
378 461
462# @FUNCTION: x-modular_pkg_preinst
463# @USAGE:
464# @DESCRIPTION:
465# This function doesn't do anything right now, but it may in the future.
379x-modular_pkg_preinst() { 466x-modular_pkg_preinst() {
380 # We no longer do anything here, but we can't remove it from the API 467 # We no longer do anything here, but we can't remove it from the API
381 : 468 :
382} 469}
383 470
471# @FUNCTION: x-modular_pkg_postinst
472# @USAGE:
473# @DESCRIPTION:
474# Run X-specific post-installation tasks on the live filesystem. The
475# only task right now is some setup for font packages.
384x-modular_pkg_postinst() { 476x-modular_pkg_postinst() {
385 if [[ -n "${FONT}" ]]; then 477 if [[ -n "${FONT}" ]]; then
386 setup_fonts 478 setup_fonts
387 fi 479 fi
388} 480}
389 481
482# @FUNCTION: x-modular_pkg_postrm
483# @USAGE:
484# @DESCRIPTION:
485# Run X-specific post-removal tasks on the live filesystem. The only
486# task right now is some cleanup for font packages.
390x-modular_pkg_postrm() { 487x-modular_pkg_postrm() {
391 if [[ -n "${FONT}" ]]; then 488 if [[ -n "${FONT}" ]]; then
392 cleanup_fonts 489 cleanup_fonts
393 font_pkg_postrm 490 font_pkg_postrm
394 fi 491 fi
395} 492}
396 493
494# @FUNCTION: cleanup_fonts
495# @USAGE:
496# @DESCRIPTION:
497# Get rid of font directories that only contain generated files
397cleanup_fonts() { 498cleanup_fonts() {
398 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 499 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
399 for DIR in ${FONT_DIR}; do 500 for DIR in ${FONT_DIR}; do
400 unset KEEP_FONTDIR 501 unset KEEP_FONTDIR
401 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 502 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
427 fi 528 fi
428 eend 0 529 eend 0
429 done 530 done
430} 531}
431 532
533# @FUNCTION: setup_fonts
534# @USAGE:
535# @DESCRIPTION:
536# Generates needed files for fonts and fixes font permissions
432setup_fonts() { 537setup_fonts() {
433 if [[ ! -n "${FONT_DIR}" ]]; then 538 if [[ ! -n "${FONT_DIR}" ]]; then
434 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 539 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
435 eerror "${msg}" 540 eerror "${msg}"
436 die "${msg}" 541 die "${msg}"
440 create_fonts_dir 545 create_fonts_dir
441 fix_font_permissions 546 fix_font_permissions
442 create_font_cache 547 create_font_cache
443} 548}
444 549
550# @FUNCTION: remove_font_metadata
551# @USAGE:
552# @DESCRIPTION:
553# Don't let the package install generated font files that may overlap
554# with other packages. Instead, they're generated in pkg_postinst().
445remove_font_metadata() { 555remove_font_metadata() {
446 local DIR 556 local DIR
447 for DIR in ${FONT_DIR}; do 557 for DIR in ${FONT_DIR}; do
448 if [[ "${DIR}" != "Speedo" ]] && \ 558 if [[ "${DIR}" != "Speedo" ]] && \
449 [[ "${DIR}" != "CID" ]] ; then 559 [[ "${DIR}" != "CID" ]] ; then
452 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 562 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
453 fi 563 fi
454 done 564 done
455} 565}
456 566
567# @FUNCTION: install_driver_hwdata
568# @USAGE:
569# @DESCRIPTION:
457# Installs device-to-driver mappings for system-config-display 570# Installs device-to-driver mappings for system-config-display and
458# and anything else that uses hwdata 571# anything else that uses hwdata.
459install_driver_hwdata() { 572install_driver_hwdata() {
460 insinto /usr/share/hwdata/videoaliases 573 insinto /usr/share/hwdata/videoaliases
461 for i in "${FILESDIR}"/*.xinf; do 574 for i in "${FILESDIR}"/*.xinf; do
462 # We need this for the case when none exist, 575 # We need this for the case when none exist,
463 # so *.xinf doesn't expand 576 # so *.xinf doesn't expand
465 doins $i 578 doins $i
466 fi 579 fi
467 done 580 done
468} 581}
469 582
583# @FUNCTION: discover_font_dirs
584# @USAGE:
585# @DESCRIPTION:
586# Deprecated. Sets up the now-unused FONT_DIRS variable.
470discover_font_dirs() { 587discover_font_dirs() {
471 FONT_DIRS="${FONT_DIR}" 588 FONT_DIRS="${FONT_DIR}"
472} 589}
473 590
591# @FUNCTION: create_fonts_scale
592# @USAGE:
593# @DESCRIPTION:
594# Create fonts.scale file, used by the old server-side fonts subsystem.
474create_fonts_scale() { 595create_fonts_scale() {
475 ebegin "Creating fonts.scale files" 596 ebegin "Creating fonts.scale files"
476 local x 597 local x
477 for DIR in ${FONT_DIR}; do 598 for DIR in ${FONT_DIR}; do
478 x=${ROOT}/usr/share/fonts/${DIR} 599 x=${ROOT}/usr/share/fonts/${DIR}
492 fi 613 fi
493 done 614 done
494 eend 0 615 eend 0
495} 616}
496 617
618# @FUNCTION: create_fonts_dir
619# @USAGE:
620# @DESCRIPTION:
621# Create fonts.dir file, used by the old server-side fonts subsystem.
497create_fonts_dir() { 622create_fonts_dir() {
498 ebegin "Generating fonts.dir files" 623 ebegin "Generating fonts.dir files"
499 for DIR in ${FONT_DIR}; do 624 for DIR in ${FONT_DIR}; do
500 x=${ROOT}/usr/share/fonts/${DIR} 625 x=${ROOT}/usr/share/fonts/${DIR}
501 [[ -z "$(ls ${x}/)" ]] && continue 626 [[ -z "$(ls ${x}/)" ]] && continue
509 fi 634 fi
510 done 635 done
511 eend 0 636 eend 0
512} 637}
513 638
639# @FUNCTION: fix_font_permissions
640# @USAGE:
641# @DESCRIPTION:
642# Font files should have 644 permissions. Ensure this is the case.
514fix_font_permissions() { 643fix_font_permissions() {
515 ebegin "Fixing permissions" 644 ebegin "Fixing permissions"
516 for DIR in ${FONT_DIR}; do 645 for DIR in ${FONT_DIR}; do
517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 646 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
518 -exec chmod 0644 {} \; 647 -exec chmod 0644 {} \;
519 done 648 done
520 eend 0 649 eend 0
521} 650}
522 651
652# @FUNCTION: create_font_cache
653# @USAGE:
654# @DESCRIPTION:
655# Create fonts.cache-1 files, used by the new client-side fonts
656# subsystem.
523create_font_cache() { 657create_font_cache() {
524 font_pkg_postinst 658 font_pkg_postinst
525} 659}
526 660
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 661EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20