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

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

  ViewVC Help
Powered by ViewVC 1.1.20