/[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.90 Revision 1.99
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.90 2008/02/21 22:50:51 cardoe Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.99 2008/05/27 18:42:33 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
40# Set up default patchset version(s) if necessary
41# x11-driver-patches
42if [[ -z "${XDPVER}" ]]; then
43 XDPVER="1"
44fi
45 28
46IUSE="" 29IUSE=""
47HOMEPAGE="http://xorg.freedesktop.org/" 30HOMEPAGE="http://xorg.freedesktop.org/"
31
32if [[ -z ${SNAPSHOT} ]]; then
33# @ECLASS-VARIABLE: SNAPSHOT
34# @DESCRIPTION:
35# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
36# before inheriting this eclass.
37 SNAPSHOT="no"
38fi
48 39
49if [[ ${PV} = 9999* ]]; then 40if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git" 41 GIT_ECLASS="git"
51 SNAPSHOT="yes" 42 SNAPSHOT="yes"
52 SRC_URI="" 43 SRC_URI=""
53fi 44fi
54 45
55# Set up SRC_URI for individual modular releases 46# Set up SRC_URI for individual modular releases
56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 47BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
48if [[ -z ${MODULE} ]]; then
49# @ECLASS-VARIABLE: MODULE
50# @DESCRIPTION:
51# The subdirectory to download source from. Possible settings are app,
52# doc, data, util, driver, font, lib, proto, xserver. Set above the
53# inherit to override the default autoconfigured module.
54 MODULE=""
57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 55 if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
58 MODULE="app" 56 MODULE="app"
59elif [[ ${CATEGORY} = app-doc ]]; then 57 elif [[ ${CATEGORY} = app-doc ]]; then
60 MODULE="doc" 58 MODULE="doc"
61# x11-misc contains data and util, x11-themes contains data 59 # x11-misc contains data and util, x11-themes contains data
62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 60 elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 61 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
64 MODULE="data" 62 MODULE="data"
65 else 63 else
66 MODULE="data" 64 MODULE="util"
67 fi 65 fi
68elif [[ ${CATEGORY} = x11-drivers ]]; then 66 elif [[ ${CATEGORY} = x11-drivers ]]; then
69 MODULE="driver" 67 MODULE="driver"
70elif [[ ${CATEGORY} = media-fonts ]]; then 68 elif [[ ${CATEGORY} = media-fonts ]]; then
71 MODULE="font" 69 MODULE="font"
72elif [[ ${CATEGORY} = x11-libs ]]; then 70 elif [[ ${CATEGORY} = x11-libs ]]; then
73 MODULE="lib" 71 MODULE="lib"
74elif [[ ${CATEGORY} = x11-proto ]]; then 72 elif [[ ${CATEGORY} = x11-proto ]]; then
75 MODULE="proto" 73 MODULE="proto"
76elif [[ ${CATEGORY} = x11-base ]]; then 74 elif [[ ${CATEGORY} = x11-base ]]; then
77 MODULE="xserver" 75 MODULE="xserver"
76 fi
78fi 77fi
79 78
80if [[ -n ${GIT_ECLASS} ]]; then 79if [[ -n ${GIT_ECLASS} ]]; then
81 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 80 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
82else 81else
121 # Starting with 7.0RC3, we can specify the font directory 120 # Starting with 7.0RC3, we can specify the font directory
122 # But oddly, we can't do the same for encodings or font-alias 121 # But oddly, we can't do the same for encodings or font-alias
123 122
124 # Wrap in `if` so ebuilds can set it too 123 # Wrap in `if` so ebuilds can set it too
125 if [[ -z ${FONT_DIR} ]]; then 124 if [[ -z ${FONT_DIR} ]]; then
125# @ECLASS-VARIABLE: FONT_DIR
126# @DESCRIPTION:
127# If you're creating a font package and the suffix of PN is not equal to
128# the subdirectory of /usr/share/fonts/ it should install into, set
129# FONT_DIR to that directory or directories. Set before inheriting this
130# eclass.
126 FONT_DIR=${PN##*-} 131 FONT_DIR=${PN##*-}
127 132
128 fi 133 fi
129 134
130 # Fix case of font directories 135 # Fix case of font directories
135 140
136 # Set up configure option 141 # Set up configure option
137 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 142 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
138 143
139 if [[ -n "${FONT}" ]]; then 144 if [[ -n "${FONT}" ]]; then
140 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 145 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
141 IUSE="${IUSE} nls" 146 IUSE="${IUSE} nls"
142 fi 147 fi
143 fi 148 fi
144fi 149fi
145 150
146# If we're a driver package 151# If we're a driver package
147if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 152if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
148 # Enable driver code in the rest of the eclass 153 # Enable driver code in the rest of the eclass
149 DRIVER="yes" 154 DRIVER="yes"
150
151 if [[ ${XDPVER} != -1 ]]; then
152 # Add driver patchset to SRC_URI
153 SRC_URI="${SRC_URI}
154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
155 fi
156fi 155fi
157 156
158# Debugging -- ignore packages that can't be built with debugging 157# Debugging -- ignore packages that can't be built with debugging
159if [[ -z "${FONT}" ]] \ 158if [[ -z "${FONT}" ]] \
160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \ 159 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
184# x11-base/x11-env" 183# x11-base/x11-env"
185 184
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
187 ${FONT_ECLASS} ${GIT_ECLASS} 186 ${FONT_ECLASS} ${GIT_ECLASS}
188 187
188# @FUNCTION: x-modular_specs_check
189# @USAGE:
190# @DESCRIPTION:
191# Make any necessary changes related to gcc specs (generally hardened)
189x-modular_specs_check() { 192x-modular_specs_check() {
190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 193 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
191 append-ldflags -Wl,-z,lazy 194 append-ldflags -Wl,-z,lazy
192 # (#116698) breaks loading 195 # (#116698) breaks loading
193 filter-ldflags -Wl,-z,now 196 filter-ldflags -Wl,-z,now
194 fi 197 fi
195} 198}
196 199
200# @FUNCTION: x-modular_dri_check
201# @USAGE:
202# @DESCRIPTION:
203# Ensures the server supports DRI if building a driver with DRI support
197x-modular_dri_check() { 204x-modular_dri_check() {
198 # (#120057) Enabling DRI in drivers requires that the server was built with 205 # (#120057) Enabling DRI in drivers requires that the server was built with
199 # support for it 206 # support for it
200 if [[ -n "${DRIVER}" ]]; then 207 if [[ -n "${DRIVER}" ]]; then
201 if has dri ${IUSE} && use dri; then 208 if has dri ${IUSE} && use dri; then
205 fi 212 fi
206 fi 213 fi
207 fi 214 fi
208} 215}
209 216
217# @FUNCTION: x-modular_server_supports_drivers_check
218# @USAGE:
219# @DESCRIPTION:
220# Ensures the server SDK is installed if a driver is being built
210x-modular_server_supports_drivers_check() { 221x-modular_server_supports_drivers_check() {
211 # (#135873) Only certain servers will actually use or be capable of 222 # (#135873) Only certain servers will actually use or be capable of
212 # building external drivers, including binary drivers. 223 # building external drivers, including binary drivers.
213 if [[ -n "${DRIVER}" ]]; then 224 if [[ -n "${DRIVER}" ]]; then
214 if has_version '>=x11-base/xorg-server-1.1'; then 225 if has_version '>=x11-base/xorg-server-1.1'; then
218 fi 229 fi
219 fi 230 fi
220 fi 231 fi
221} 232}
222 233
234# @FUNCTION: x-modular_unpack_source
235# @USAGE:
236# @DESCRIPTION:
237# Simply unpack source code. Nothing else.
223x-modular_unpack_source() { 238x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then 239 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack 240 git_src_unpack
226 else 241 else
227 unpack ${A} 242 unpack ${A}
231 if [[ -n ${FONT_OPTIONS} ]]; then 246 if [[ -n ${FONT_OPTIONS} ]]; then
232 einfo "Detected font directory: ${FONT_DIR}" 247 einfo "Detected font directory: ${FONT_DIR}"
233 fi 248 fi
234} 249}
235 250
251# @FUNCTION: x-modular_patch_source
252# @USAGE:
253# @DESCRIPTION:
254# Apply all patches
236x-modular_patch_source() { 255x-modular_patch_source() {
237 # Use standardized names and locations with bulk patching 256 # Use standardized names and locations with bulk patching
238 # Patch directory is ${WORKDIR}/patch 257 # Patch directory is ${WORKDIR}/patch
239 # See epatch() in eutils.eclass for more documentation 258 # See epatch() in eutils.eclass for more documentation
240 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 259 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
241 EPATCH_SUFFIX="patch" 260 EPATCH_SUFFIX="patch"
242 fi 261 fi
243 262
244 # If this is a driver package we need to fix man page install location. 263# @VARIABLE: PATCHES
245 # Running autoreconf will use the patched util-macros to make the 264# @DESCRIPTION:
246 # change for us, so we only need to patch if it is not going to run. 265# If you have any patches to apply, set PATCHES to their locations and epatch
247 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 266# will apply them. It also handles epatch-style bulk patches, if you know how to
248 && [[ ${XDPVER} != -1 ]]; then 267# use them and set the correct variables. If you don't, read eutils.eclass.
249 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 268 if [[ ${#PATCHES[@]} -gt 1 ]]; then
250 fi 269 for x in "${PATCHES[@]}"; do
251 270 epatch "${x}"
252 # For specific list of patches 271 done
253 if [[ -n "${PATCHES}" ]] ; then 272 elif [[ -n "${PATCHES}" ]]; then
254 for PATCH in ${PATCHES} 273 for x in ${PATCHES}; do
255 do
256 epatch ${PATCH} 274 epatch "${x}"
257 done 275 done
258 # For non-default directory bulk patching 276 # For non-default directory bulk patching
259 elif [[ -n "${PATCH_LOC}" ]] ; then 277 elif [[ -n "${PATCH_LOC}" ]] ; then
260 epatch ${PATCH_LOC} 278 epatch ${PATCH_LOC}
261 # For standard bulk patching 279 # For standard bulk patching
262 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 280 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
263 epatch 281 epatch
264 fi 282 fi
265} 283}
266 284
285# @FUNCTION: x-modular_reconf_source
286# @USAGE:
287# @DESCRIPTION:
288# Run eautoreconf if necessary, and run elibtoolize.
267x-modular_reconf_source() { 289x-modular_reconf_source() {
268 # Run autoreconf for CVS snapshots only
269 if [[ "${SNAPSHOT}" = "yes" ]] 290 if [[ "${SNAPSHOT}" = "yes" ]]
270 then 291 then
271 # If possible, generate configure if it doesn't exist 292 # If possible, generate configure if it doesn't exist
272 if [ -f "./configure.ac" ] 293 if [ -f "./configure.ac" ]
273 then 294 then
278 # Joshua Baergen - October 23, 2005 299 # Joshua Baergen - October 23, 2005
279 # Fix shared lib issues on MIPS, FBSD, etc etc 300 # Fix shared lib issues on MIPS, FBSD, etc etc
280 elibtoolize 301 elibtoolize
281} 302}
282 303
304# @FUNCTION: x-modular_src_unpack
305# @USAGE:
306# @DESCRIPTION:
307# Unpack a package, performing all X-related tasks.
283x-modular_src_unpack() { 308x-modular_src_unpack() {
284 x-modular_specs_check 309 x-modular_specs_check
285 x-modular_server_supports_drivers_check 310 x-modular_server_supports_drivers_check
286 x-modular_dri_check 311 x-modular_dri_check
287 x-modular_unpack_source 312 x-modular_unpack_source
288 x-modular_patch_source 313 x-modular_patch_source
289 x-modular_reconf_source 314 x-modular_reconf_source
290} 315}
291 316
317# @FUNCTION: x-modular_font_configure
318# @USAGE:
319# @DESCRIPTION:
320# If a font package, perform any necessary configuration steps
292x-modular_font_configure() { 321x-modular_font_configure() {
293 if [[ -n "${FONT}" ]]; then 322 if [[ -n "${FONT}" ]]; then
294 # Might be worth adding an option to configure your desired font 323 # Might be worth adding an option to configure your desired font
295 # and exclude all others. Also, should this USE be nls or minimal? 324 # and exclude all others. Also, should this USE be nls or minimal?
296 if ! use nls; then 325 if ! use nls; then
314 --disable-koi8-r" 343 --disable-koi8-r"
315 fi 344 fi
316 fi 345 fi
317} 346}
318 347
348# @FUNCTION: x-modular_debug_setup
349# @USAGE:
350# @DESCRIPTION:
351# Set up CFLAGS for a debug build
319x-modular_debug_setup() { 352x-modular_debug_setup() {
320 if [[ -n "${DEBUGGABLE}" ]]; then 353 if [[ -n "${DEBUGGABLE}" ]]; then
321 if use debug; then 354 if use debug; then
322 strip-flags 355 strip-flags
323 append-flags -g 356 append-flags -g
324 fi 357 fi
325 fi 358 fi
326} 359}
327 360
361# @FUNCTION: x-modular_src_configure
362# @USAGE:
363# @DESCRIPTION:
364# Perform any necessary pre-configuration steps, then run configure
328x-modular_src_configure() { 365x-modular_src_configure() {
329 x-modular_font_configure 366 x-modular_font_configure
330 x-modular_debug_setup 367 x-modular_debug_setup
368
369# @VARIABLE: CONFIGURE_OPTIONS
370# @DESCRIPTION:
371# Any options to pass to configure
372[[ -n ${CONFIGURE_OPTIONS} ]]
331 373
332 # If prefix isn't set here, .pc files cause problems 374 # If prefix isn't set here, .pc files cause problems
333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 375 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
334 econf --prefix=${XDIR} \ 376 econf --prefix=${XDIR} \
335 --datadir=${XDIR}/share \ 377 --datadir=${XDIR}/share \
337 ${DRIVER_OPTIONS} \ 379 ${DRIVER_OPTIONS} \
338 ${CONFIGURE_OPTIONS} 380 ${CONFIGURE_OPTIONS}
339 fi 381 fi
340} 382}
341 383
384# @FUNCTION: x-modular_src_make
385# @USAGE:
386# @DESCRIPTION:
387# Run make.
342x-modular_src_make() { 388x-modular_src_make() {
343 emake || die "emake failed" 389 emake || die "emake failed"
344} 390}
345 391
392# @FUNCTION: x-modular_src_configure
393# @USAGE:
394# @DESCRIPTION:
395# Compile a package, performing all X-related tasks.
346x-modular_src_compile() { 396x-modular_src_compile() {
347 x-modular_src_configure 397 x-modular_src_configure
348 x-modular_src_make 398 x-modular_src_make
349} 399}
350 400
401# @FUNCTION: x-modular_src_install
402# @USAGE:
403# @DESCRIPTION:
404# Install a built package to ${D}, performing any necessary steps.
405# Creates a ChangeLog from git if using live ebuilds.
351x-modular_src_install() { 406x-modular_src_install() {
352 # Install everything to ${XDIR} 407 # Install everything to ${XDIR}
353 make \ 408 make \
354 DESTDIR="${D}" \ 409 DESTDIR="${D}" \
355 install 410 install
365 fi 420 fi
366 421
367 if [[ -e ${S}/ChangeLog ]]; then 422 if [[ -e ${S}/ChangeLog ]]; then
368 dodoc ${S}/ChangeLog 423 dodoc ${S}/ChangeLog
369 fi 424 fi
425# @VARIABLE: DOCS
426# @DESCRIPTION:
427# Any documentation to install
370 [[ -n $DOCS ]] && dodoc $DOCS 428 [[ -n ${DOCS} ]] && dodoc ${DOCS}
371 429
372 # Make sure docs get compressed 430 # Make sure docs get compressed
373 prepalldocs 431 prepalldocs
374 432
375 # Don't install libtool archives for server modules 433 # Don't install libtool archives for server modules
376 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 434 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
377 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 435 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
378 | xargs rm -f 436 | xargs rm -f
379 fi 437 fi
380 438
381 # Don't install overlapping fonts.* files
382 # Generate them instead when possible
383 if [[ -n "${FONT}" ]]; then 439 if [[ -n "${FONT}" ]]; then
384 remove_font_metadata 440 remove_font_metadata
385 fi 441 fi
386 442
387 if [[ -n "${DRIVER}" ]]; then 443 if [[ -n "${DRIVER}" ]]; then
388 install_driver_hwdata 444 install_driver_hwdata
389 fi 445 fi
390} 446}
391 447
448# @FUNCTION: x-modular_pkg_preinst
449# @USAGE:
450# @DESCRIPTION:
451# This function doesn't do anything right now, but it may in the future.
392x-modular_pkg_preinst() { 452x-modular_pkg_preinst() {
393 # We no longer do anything here, but we can't remove it from the API 453 # We no longer do anything here, but we can't remove it from the API
394 : 454 :
395} 455}
396 456
457# @FUNCTION: x-modular_pkg_postinst
458# @USAGE:
459# @DESCRIPTION:
460# Run X-specific post-installation tasks on the live filesystem. The
461# only task right now is some setup for font packages.
397x-modular_pkg_postinst() { 462x-modular_pkg_postinst() {
398 if [[ -n "${FONT}" ]]; then 463 if [[ -n "${FONT}" ]]; then
399 setup_fonts 464 setup_fonts
400 fi 465 fi
401} 466}
402 467
468# @FUNCTION: x-modular_pkg_postrm
469# @USAGE:
470# @DESCRIPTION:
471# Run X-specific post-removal tasks on the live filesystem. The only
472# task right now is some cleanup for font packages.
403x-modular_pkg_postrm() { 473x-modular_pkg_postrm() {
404 if [[ -n "${FONT}" ]]; then 474 if [[ -n "${FONT}" ]]; then
405 cleanup_fonts 475 cleanup_fonts
406 font_pkg_postrm 476 font_pkg_postrm
407 fi 477 fi
408} 478}
409 479
480# @FUNCTION: cleanup_fonts
481# @USAGE:
482# @DESCRIPTION:
483# Get rid of font directories that only contain generated files
410cleanup_fonts() { 484cleanup_fonts() {
411 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 485 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
412 for DIR in ${FONT_DIR}; do 486 for DIR in ${FONT_DIR}; do
413 unset KEEP_FONTDIR 487 unset KEEP_FONTDIR
414 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 488 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
440 fi 514 fi
441 eend 0 515 eend 0
442 done 516 done
443} 517}
444 518
519# @FUNCTION: setup_fonts
520# @USAGE:
521# @DESCRIPTION:
522# Generates needed files for fonts and fixes font permissions
445setup_fonts() { 523setup_fonts() {
446 if [[ ! -n "${FONT_DIR}" ]]; then 524 if [[ ! -n "${FONT_DIR}" ]]; then
447 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 525 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
448 eerror "${msg}" 526 eerror "${msg}"
449 die "${msg}" 527 die "${msg}"
453 create_fonts_dir 531 create_fonts_dir
454 fix_font_permissions 532 fix_font_permissions
455 create_font_cache 533 create_font_cache
456} 534}
457 535
536# @FUNCTION: remove_font_metadata
537# @USAGE:
538# @DESCRIPTION:
539# Don't let the package install generated font files that may overlap
540# with other packages. Instead, they're generated in pkg_postinst().
458remove_font_metadata() { 541remove_font_metadata() {
459 local DIR 542 local DIR
460 for DIR in ${FONT_DIR}; do 543 for DIR in ${FONT_DIR}; do
461 if [[ "${DIR}" != "Speedo" ]] && \ 544 if [[ "${DIR}" != "Speedo" ]] && \
462 [[ "${DIR}" != "CID" ]] ; then 545 [[ "${DIR}" != "CID" ]] ; then
465 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 548 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
466 fi 549 fi
467 done 550 done
468} 551}
469 552
553# @FUNCTION: install_driver_hwdata
554# @USAGE:
555# @DESCRIPTION:
470# Installs device-to-driver mappings for system-config-display 556# Installs device-to-driver mappings for system-config-display and
471# and anything else that uses hwdata 557# anything else that uses hwdata.
472install_driver_hwdata() { 558install_driver_hwdata() {
473 insinto /usr/share/hwdata/videoaliases 559 insinto /usr/share/hwdata/videoaliases
474 for i in "${FILESDIR}"/*.xinf; do 560 for i in "${FILESDIR}"/*.xinf; do
475 # We need this for the case when none exist, 561 # We need this for the case when none exist,
476 # so *.xinf doesn't expand 562 # so *.xinf doesn't expand
478 doins $i 564 doins $i
479 fi 565 fi
480 done 566 done
481} 567}
482 568
569# @FUNCTION: discover_font_dirs
570# @USAGE:
571# @DESCRIPTION:
572# Deprecated. Sets up the now-unused FONT_DIRS variable.
483discover_font_dirs() { 573discover_font_dirs() {
484 FONT_DIRS="${FONT_DIR}" 574 FONT_DIRS="${FONT_DIR}"
485} 575}
486 576
577# @FUNCTION: create_fonts_scale
578# @USAGE:
579# @DESCRIPTION:
580# Create fonts.scale file, used by the old server-side fonts subsystem.
487create_fonts_scale() { 581create_fonts_scale() {
488 ebegin "Creating fonts.scale files" 582 ebegin "Creating fonts.scale files"
489 local x 583 local x
490 for DIR in ${FONT_DIR}; do 584 for DIR in ${FONT_DIR}; do
491 x=${ROOT}/usr/share/fonts/${DIR} 585 x=${ROOT}/usr/share/fonts/${DIR}
505 fi 599 fi
506 done 600 done
507 eend 0 601 eend 0
508} 602}
509 603
604# @FUNCTION: create_fonts_dir
605# @USAGE:
606# @DESCRIPTION:
607# Create fonts.dir file, used by the old server-side fonts subsystem.
510create_fonts_dir() { 608create_fonts_dir() {
511 ebegin "Generating fonts.dir files" 609 ebegin "Generating fonts.dir files"
512 for DIR in ${FONT_DIR}; do 610 for DIR in ${FONT_DIR}; do
513 x=${ROOT}/usr/share/fonts/${DIR} 611 x=${ROOT}/usr/share/fonts/${DIR}
514 [[ -z "$(ls ${x}/)" ]] && continue 612 [[ -z "$(ls ${x}/)" ]] && continue
522 fi 620 fi
523 done 621 done
524 eend 0 622 eend 0
525} 623}
526 624
625# @FUNCTION: fix_font_permissions
626# @USAGE:
627# @DESCRIPTION:
628# Font files should have 644 permissions. Ensure this is the case.
527fix_font_permissions() { 629fix_font_permissions() {
528 ebegin "Fixing permissions" 630 ebegin "Fixing permissions"
529 for DIR in ${FONT_DIR}; do 631 for DIR in ${FONT_DIR}; do
530 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 632 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
531 -exec chmod 0644 {} \; 633 -exec chmod 0644 {} \;
532 done 634 done
533 eend 0 635 eend 0
534} 636}
535 637
638# @FUNCTION: create_font_cache
639# @USAGE:
640# @DESCRIPTION:
641# Create fonts.cache-1 files, used by the new client-side fonts
642# subsystem.
536create_font_cache() { 643create_font_cache() {
537 font_pkg_postinst 644 font_pkg_postinst
538} 645}
539 646
540EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 647EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.90  
changed lines
  Added in v.1.99

  ViewVC Help
Powered by ViewVC 1.1.20