/[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.87 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.87 2007/10/14 10:12:24 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 48
49if [[ ${PV} = 9999* ]]; then 49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git" 50 GIT_ECLASS="git"
51 SNAPSHOT="yes" 51 SNAPSHOT="yes"
52 SRC_URI="" 52 SRC_URI=""
121 # Starting with 7.0RC3, we can specify the font directory 121 # Starting with 7.0RC3, we can specify the font directory
122 # 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
123 123
124 # Wrap in `if` so ebuilds can set it too 124 # Wrap in `if` so ebuilds can set it too
125 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.
126 FONT_DIR=${PN##*-} 132 FONT_DIR=${PN##*-}
127 133
128 fi 134 fi
129 135
130 # Fix case of font directories 136 # Fix case of font directories
155 fi 161 fi
156fi 162fi
157 163
158# Debugging -- ignore packages that can't be built with debugging 164# Debugging -- ignore packages that can't be built with debugging
159if [[ -z "${FONT}" ]] \ 165if [[ -z "${FONT}" ]] \
160 || [[ "${PN/app-doc}" != "${PN}" ]] \ 166 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
161 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 167 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
162 || [[ "${PN/util-macros}" != "${PN}" ]] \ 168 && [[ "${PN/util-macros}" = "${PN}" ]] \
163 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 169 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
164 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 170 && [[ "${PN/xkbdata}" = "${PN}" ]] \
165 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 171 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
166 || [[ "${PN/xcursor}" != "${PN}" ]] \ 172 && [[ "${PN/xcursor}" = "${PN}" ]] \
167 ; then 173 ; then
168 DEBUGGABLE="yes" 174 DEBUGGABLE="yes"
169 IUSE="${IUSE} debug" 175 IUSE="${IUSE} debug"
170fi 176fi
171 177
177 >=x11-misc/util-macros-0.99.2 183 >=x11-misc/util-macros-0.99.2
178 >=sys-devel/binutils-2.16.1-r3" 184 >=sys-devel/binutils-2.16.1-r3"
179fi 185fi
180 186
181RDEPEND="${RDEPEND} 187RDEPEND="${RDEPEND}
182 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
183 !<=x11-base/xorg-x11-6.9" 188 !<=x11-base/xorg-x11-6.9"
184# Provides virtual/x11 for temporary use until packages are ported 189# Provides virtual/x11 for temporary use until packages are ported
185# x11-base/x11-env" 190# x11-base/x11-env"
186 191
187inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 192inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
188 ${FONT_ECLASS} ${GIT_ECLASS} 193 ${FONT_ECLASS} ${GIT_ECLASS}
189 194
195# @FUNCTION: x-modular_specs_check
196# @USAGE:
197# @DESCRIPTION:
198# Make any necessary changes related to gcc specs (generally hardened)
190x-modular_specs_check() { 199x-modular_specs_check() {
191 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 200 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
192 append-ldflags -Wl,-z,lazy 201 append-ldflags -Wl,-z,lazy
193 # (#116698) breaks loading 202 # (#116698) breaks loading
194 filter-ldflags -Wl,-z,now 203 filter-ldflags -Wl,-z,now
195 fi 204 fi
196} 205}
197 206
207# @FUNCTION: x-modular_dri_check
208# @USAGE:
209# @DESCRIPTION:
210# Ensures the server supports DRI if building a driver with DRI support
198x-modular_dri_check() { 211x-modular_dri_check() {
199 # (#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
200 # support for it 213 # support for it
201 if [[ -n "${DRIVER}" ]]; then 214 if [[ -n "${DRIVER}" ]]; then
202 if has dri ${IUSE} && use dri; then 215 if has dri ${IUSE} && use dri; then
206 fi 219 fi
207 fi 220 fi
208 fi 221 fi
209} 222}
210 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
211x-modular_server_supports_drivers_check() { 228x-modular_server_supports_drivers_check() {
212 # (#135873) Only certain servers will actually use or be capable of 229 # (#135873) Only certain servers will actually use or be capable of
213 # building external drivers, including binary drivers. 230 # building external drivers, including binary drivers.
214 if [[ -n "${DRIVER}" ]]; then 231 if [[ -n "${DRIVER}" ]]; then
215 if has_version '>=x11-base/xorg-server-1.1'; then 232 if has_version '>=x11-base/xorg-server-1.1'; then
219 fi 236 fi
220 fi 237 fi
221 fi 238 fi
222} 239}
223 240
241# @FUNCTION: x-modular_unpack_source
242# @USAGE:
243# @DESCRIPTION:
244# Simply unpack source code. Nothing else.
224x-modular_unpack_source() { 245x-modular_unpack_source() {
225 if [[ -n ${GIT_ECLASS} ]]; then 246 if [[ -n ${GIT_ECLASS} ]]; then
226 git_src_unpack 247 git_src_unpack
227 else 248 else
228 unpack ${A} 249 unpack ${A}
232 if [[ -n ${FONT_OPTIONS} ]]; then 253 if [[ -n ${FONT_OPTIONS} ]]; then
233 einfo "Detected font directory: ${FONT_DIR}" 254 einfo "Detected font directory: ${FONT_DIR}"
234 fi 255 fi
235} 256}
236 257
258# @FUNCTION: x-modular_patch_source
259# @USAGE:
260# @DESCRIPTION:
261# Apply all patches
237x-modular_patch_source() { 262x-modular_patch_source() {
238 # Use standardized names and locations with bulk patching 263 # Use standardized names and locations with bulk patching
239 # Patch directory is ${WORKDIR}/patch 264 # Patch directory is ${WORKDIR}/patch
240 # See epatch() in eutils.eclass for more documentation 265 # See epatch() in eutils.eclass for more documentation
241 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 266 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
248 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 273 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
249 && [[ ${XDPVER} != -1 ]]; then 274 && [[ ${XDPVER} != -1 ]]; then
250 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 275 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
251 fi 276 fi
252 277
253 # 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.
254 if [[ -n "${PATCHES}" ]] ; then 283 if [[ -n "${PATCHES}" ]] ; then
255 for PATCH in ${PATCHES} 284 for PATCH in ${PATCHES}
256 do 285 do
257 epatch ${PATCH} 286 epatch ${PATCH}
258 done 287 done
263 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 292 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
264 epatch 293 epatch
265 fi 294 fi
266} 295}
267 296
297# @FUNCTION: x-modular_reconf_source
298# @USAGE:
299# @DESCRIPTION:
300# Run eautoreconf if necessary, and run elibtoolize.
268x-modular_reconf_source() { 301x-modular_reconf_source() {
269 # Run autoreconf for CVS snapshots only
270 if [[ "${SNAPSHOT}" = "yes" ]] 302 if [[ "${SNAPSHOT}" = "yes" ]]
271 then 303 then
272 # If possible, generate configure if it doesn't exist 304 # If possible, generate configure if it doesn't exist
273 if [ -f "./configure.ac" ] 305 if [ -f "./configure.ac" ]
274 then 306 then
279 # Joshua Baergen - October 23, 2005 311 # Joshua Baergen - October 23, 2005
280 # Fix shared lib issues on MIPS, FBSD, etc etc 312 # Fix shared lib issues on MIPS, FBSD, etc etc
281 elibtoolize 313 elibtoolize
282} 314}
283 315
316# @FUNCTION: x-modular_src_unpack
317# @USAGE:
318# @DESCRIPTION:
319# Unpack a package, performing all X-related tasks.
284x-modular_src_unpack() { 320x-modular_src_unpack() {
285 x-modular_specs_check 321 x-modular_specs_check
286 x-modular_server_supports_drivers_check 322 x-modular_server_supports_drivers_check
287 x-modular_dri_check 323 x-modular_dri_check
288 x-modular_unpack_source 324 x-modular_unpack_source
289 x-modular_patch_source 325 x-modular_patch_source
290 x-modular_reconf_source 326 x-modular_reconf_source
291} 327}
292 328
329# @FUNCTION: x-modular_font_configure
330# @USAGE:
331# @DESCRIPTION:
332# If a font package, perform any necessary configuration steps
293x-modular_font_configure() { 333x-modular_font_configure() {
294 if [[ -n "${FONT}" ]]; then 334 if [[ -n "${FONT}" ]]; then
295 # Might be worth adding an option to configure your desired font 335 # Might be worth adding an option to configure your desired font
296 # 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?
297 if ! use nls; then 337 if ! use nls; then
315 --disable-koi8-r" 355 --disable-koi8-r"
316 fi 356 fi
317 fi 357 fi
318} 358}
319 359
360# @FUNCTION: x-modular_debug_setup
361# @USAGE:
362# @DESCRIPTION:
363# Set up CFLAGS for a debug build
320x-modular_debug_setup() { 364x-modular_debug_setup() {
321 if [[ -n "${DEBUGGABLE}" ]]; then 365 if [[ -n "${DEBUGGABLE}" ]]; then
322 if use debug; then 366 if use debug; then
323 strip-flags 367 strip-flags
324 append-flags -g 368 append-flags -g
325 fi 369 fi
326 fi 370 fi
327} 371}
328 372
373# @FUNCTION: x-modular_src_configure
374# @USAGE:
375# @DESCRIPTION:
376# Perform any necessary pre-configuration steps, then run configure
329x-modular_src_configure() { 377x-modular_src_configure() {
330 x-modular_font_configure 378 x-modular_font_configure
331 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} ]]
332 385
333 # If prefix isn't set here, .pc files cause problems 386 # If prefix isn't set here, .pc files cause problems
334 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 387 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
335 econf --prefix=${XDIR} \ 388 econf --prefix=${XDIR} \
336 --datadir=${XDIR}/share \ 389 --datadir=${XDIR}/share \
338 ${DRIVER_OPTIONS} \ 391 ${DRIVER_OPTIONS} \
339 ${CONFIGURE_OPTIONS} 392 ${CONFIGURE_OPTIONS}
340 fi 393 fi
341} 394}
342 395
396# @FUNCTION: x-modular_src_make
397# @USAGE:
398# @DESCRIPTION:
399# Run make.
343x-modular_src_make() { 400x-modular_src_make() {
344 emake || die "emake failed" 401 emake || die "emake failed"
345} 402}
346 403
404# @FUNCTION: x-modular_src_configure
405# @USAGE:
406# @DESCRIPTION:
407# Compile a package, performing all X-related tasks.
347x-modular_src_compile() { 408x-modular_src_compile() {
348 x-modular_src_configure 409 x-modular_src_configure
349 x-modular_src_make 410 x-modular_src_make
350} 411}
351 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.
352x-modular_src_install() { 418x-modular_src_install() {
353 # Install everything to ${XDIR} 419 # Install everything to ${XDIR}
354 make \ 420 make \
355 DESTDIR="${D}" \ 421 DESTDIR="${D}" \
356 install 422 install
366 fi 432 fi
367 433
368 if [[ -e ${S}/ChangeLog ]]; then 434 if [[ -e ${S}/ChangeLog ]]; then
369 dodoc ${S}/ChangeLog 435 dodoc ${S}/ChangeLog
370 fi 436 fi
437# @VARIABLE: DOCS
438# @DESCRIPTION:
439# Any documentation to install
440 [[ -n ${DOCS} ]] && dodoc ${DOCS}
371 441
372 # Make sure docs get compressed 442 # Make sure docs get compressed
373 prepalldocs 443 prepalldocs
374 444
375 # Don't install libtool archives for server modules 445 # Don't install libtool archives for server modules
376 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 446 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
377 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 447 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
378 | xargs rm -f 448 | xargs rm -f
379 fi 449 fi
380 450
381 # Don't install overlapping fonts.* files
382 # Generate them instead when possible
383 if [[ -n "${FONT}" ]]; then 451 if [[ -n "${FONT}" ]]; then
384 remove_font_metadata 452 remove_font_metadata
385 fi 453 fi
386 454
387 if [[ -n "${DRIVER}" ]]; then 455 if [[ -n "${DRIVER}" ]]; then
388 install_driver_hwdata 456 install_driver_hwdata
389 fi 457 fi
390} 458}
391 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.
392x-modular_pkg_preinst() { 464x-modular_pkg_preinst() {
393 # 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
394 : 466 :
395} 467}
396 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.
397x-modular_pkg_postinst() { 474x-modular_pkg_postinst() {
398 if [[ -n "${FONT}" ]]; then 475 if [[ -n "${FONT}" ]]; then
399 setup_fonts 476 setup_fonts
400 fi 477 fi
401} 478}
402 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.
403x-modular_pkg_postrm() { 485x-modular_pkg_postrm() {
404 if [[ -n "${FONT}" ]]; then 486 if [[ -n "${FONT}" ]]; then
405 cleanup_fonts 487 cleanup_fonts
406 font_pkg_postrm 488 font_pkg_postrm
407 fi 489 fi
408} 490}
409 491
492# @FUNCTION: cleanup_fonts
493# @USAGE:
494# @DESCRIPTION:
495# Get rid of font directories that only contain generated files
410cleanup_fonts() { 496cleanup_fonts() {
411 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"
412 for DIR in ${FONT_DIR}; do 498 for DIR in ${FONT_DIR}; do
413 unset KEEP_FONTDIR 499 unset KEEP_FONTDIR
414 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 500 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
440 fi 526 fi
441 eend 0 527 eend 0
442 done 528 done
443} 529}
444 530
531# @FUNCTION: setup_fonts
532# @USAGE:
533# @DESCRIPTION:
534# Generates needed files for fonts and fixes font permissions
445setup_fonts() { 535setup_fonts() {
446 if [[ ! -n "${FONT_DIR}" ]]; then 536 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." 537 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
448 eerror "${msg}" 538 eerror "${msg}"
449 die "${msg}" 539 die "${msg}"
453 create_fonts_dir 543 create_fonts_dir
454 fix_font_permissions 544 fix_font_permissions
455 create_font_cache 545 create_font_cache
456} 546}
457 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().
458remove_font_metadata() { 553remove_font_metadata() {
459 local DIR 554 local DIR
460 for DIR in ${FONT_DIR}; do 555 for DIR in ${FONT_DIR}; do
461 if [[ "${DIR}" != "Speedo" ]] && \ 556 if [[ "${DIR}" != "Speedo" ]] && \
462 [[ "${DIR}" != "CID" ]] ; then 557 [[ "${DIR}" != "CID" ]] ; then
465 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}
466 fi 561 fi
467 done 562 done
468} 563}
469 564
565# @FUNCTION: install_driver_hwdata
566# @USAGE:
567# @DESCRIPTION:
470# Installs device-to-driver mappings for system-config-display 568# Installs device-to-driver mappings for system-config-display and
471# and anything else that uses hwdata 569# anything else that uses hwdata.
472install_driver_hwdata() { 570install_driver_hwdata() {
473 insinto /usr/share/hwdata/videoaliases 571 insinto /usr/share/hwdata/videoaliases
474 for i in "${FILESDIR}"/*.xinf; do 572 for i in "${FILESDIR}"/*.xinf; do
475 # We need this for the case when none exist, 573 # We need this for the case when none exist,
476 # so *.xinf doesn't expand 574 # so *.xinf doesn't expand
478 doins $i 576 doins $i
479 fi 577 fi
480 done 578 done
481} 579}
482 580
581# @FUNCTION: discover_font_dirs
582# @USAGE:
583# @DESCRIPTION:
584# Deprecated. Sets up the now-unused FONT_DIRS variable.
483discover_font_dirs() { 585discover_font_dirs() {
484 FONT_DIRS="${FONT_DIR}" 586 FONT_DIRS="${FONT_DIR}"
485} 587}
486 588
589# @FUNCTION: create_fonts_scale
590# @USAGE:
591# @DESCRIPTION:
592# Create fonts.scale file, used by the old server-side fonts subsystem.
487create_fonts_scale() { 593create_fonts_scale() {
488 ebegin "Creating fonts.scale files" 594 ebegin "Creating fonts.scale files"
489 local x 595 local x
490 for DIR in ${FONT_DIR}; do 596 for DIR in ${FONT_DIR}; do
491 x=${ROOT}/usr/share/fonts/${DIR} 597 x=${ROOT}/usr/share/fonts/${DIR}
505 fi 611 fi
506 done 612 done
507 eend 0 613 eend 0
508} 614}
509 615
616# @FUNCTION: create_fonts_dir
617# @USAGE:
618# @DESCRIPTION:
619# Create fonts.dir file, used by the old server-side fonts subsystem.
510create_fonts_dir() { 620create_fonts_dir() {
511 ebegin "Generating fonts.dir files" 621 ebegin "Generating fonts.dir files"
512 for DIR in ${FONT_DIR}; do 622 for DIR in ${FONT_DIR}; do
513 x=${ROOT}/usr/share/fonts/${DIR} 623 x=${ROOT}/usr/share/fonts/${DIR}
514 [[ -z "$(ls ${x}/)" ]] && continue 624 [[ -z "$(ls ${x}/)" ]] && continue
522 fi 632 fi
523 done 633 done
524 eend 0 634 eend 0
525} 635}
526 636
637# @FUNCTION: fix_font_permissions
638# @USAGE:
639# @DESCRIPTION:
640# Font files should have 644 permissions. Ensure this is the case.
527fix_font_permissions() { 641fix_font_permissions() {
528 ebegin "Fixing permissions" 642 ebegin "Fixing permissions"
529 for DIR in ${FONT_DIR}; do 643 for DIR in ${FONT_DIR}; do
530 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 644 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
531 -exec chmod 0644 {} \; 645 -exec chmod 0644 {} \;
532 done 646 done
533 eend 0 647 eend 0
534} 648}
535 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.
536create_font_cache() { 655create_font_cache() {
537 font_pkg_postinst 656 font_pkg_postinst
538} 657}
539 658
540EXPORT_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.87  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20