/[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.62 Revision 1.89
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.62 2006/06/30 03:37:53 solar Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.89 2007/11/13 22:50:04 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <dberkholz@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
9# 9#
10# Using this eclass: 10# Using this eclass:
19# 19#
20# If you're creating a font package and the suffix of PN is not equal to the 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 21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories. 22# directory or directories.
23# 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#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 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.
25# 34#
26# Pretty much everything else should be automatic. 35# Pretty much everything else should be automatic.
27
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29
30inherit eutils libtool toolchain-funcs flag-o-matic autotools
31 36
32# Directory prefix to use for everything 37# Directory prefix to use for everything
33XDIR="/usr" 38XDIR="/usr"
34 39
35# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
39fi 44fi
40 45
41IUSE="" 46IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
43 48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi
54
44# Set up SRC_URI for individual modular releases 55# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 58 MODULE="app"
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 59elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 60 MODULE="doc"
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data 61# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI} 63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 64 MODULE="data"
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 65 else
66 MODULE="data"
67 fi
57elif [[ ${CATEGORY} = x11-drivers ]]; then 68elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI} 69 MODULE="driver"
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then 70elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI} 71 MODULE="font"
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then 72elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI} 73 MODULE="lib"
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then 74elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI} 75 MODULE="proto"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 76elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 77 MODULE="xserver"
71 ${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"
72fi 84fi
73 85
74SLOT="0" 86SLOT="0"
75 87
76# 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
79 91
80# Set up shared dependencies 92# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 93if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 94# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 95 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 96 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 97 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest"
88fi 100fi
89 101
90# If we're a font package, but not the font.alias one 102# If we're a font package, but not the font.alias one
103FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 104if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 105 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 106 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 107 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 108 # Activate font code in the rest of the eclass
96 FONT="yes" 109 FONT="yes"
97 110
111 # Whether to inherit the font eclass
112 FONT_ECLASS="font"
113
98 RDEPEND="${RDEPEND} 114 RDEPEND="${RDEPEND}
99 media-fonts/encodings 115 media-fonts/encodings
100 x11-apps/mkfontscale 116 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 117 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 118 PDEPEND="${PDEPEND}
130# If we're a driver package 146# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 147if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 148 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 149 DRIVER="yes"
134 150
151 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 152 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 153 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
155 fi
138fi 156fi
139 157
140# Debugging -- ignore packages that can't be built with debugging 158# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 159if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
143 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 161 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
144 || [[ "${PN/util-macros}" != "${PN}" ]] \ 162 && [[ "${PN/util-macros}" = "${PN}" ]] \
145 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 163 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
146 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 164 && [[ "${PN/xkbdata}" = "${PN}" ]] \
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 165 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \ 166 && [[ "${PN/xcursor}" = "${PN}" ]] \
149 ; then 167 ; then
150 DEBUGGABLE="yes" 168 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug" 169 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
157fi 170fi
158 171
159DEPEND="${DEPEND} 172DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 173 >=dev-util/pkgconfig-0.18"
161 174
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 175if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 176 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 177 >=x11-misc/util-macros-0.99.2
178 >=sys-devel/binutils-2.16.1-r3"
165fi 179fi
166 180
167RDEPEND="${RDEPEND} 181RDEPEND="${RDEPEND}
168 !<=x11-base/xorg-x11-6.9" 182 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 183# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 184# x11-base/x11-env"
185
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
187 ${FONT_ECLASS} ${GIT_ECLASS}
171 188
172x-modular_specs_check() { 189x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 append-ldflags -Wl,-z,lazy 191 append-ldflags -Wl,-z,lazy
175 # (#116698) breaks loading 192 # (#116698) breaks loading
192 209
193x-modular_server_supports_drivers_check() { 210x-modular_server_supports_drivers_check() {
194 # (#135873) Only certain servers will actually use or be capable of 211 # (#135873) Only certain servers will actually use or be capable of
195 # building external drivers, including binary drivers. 212 # building external drivers, including binary drivers.
196 if [[ -n "${DRIVER}" ]]; then 213 if [[ -n "${DRIVER}" ]]; then
214 if has_version '>=x11-base/xorg-server-1.1'; then
197 if ! built_with_use x11-base/xorg-server xorg; then 215 if ! built_with_use x11-base/xorg-server xorg; then
198 eerror "x11-base/xorg-server is not built with support for external drivers." 216 eerror "x11-base/xorg-server is not built with support for external drivers."
199 die "You must build x11-base/xorg-server with USE=xorg." 217 die "You must build x11-base/xorg-server with USE=xorg."
218 fi
200 fi 219 fi
201 fi 220 fi
202} 221}
203 222
204x-modular_unpack_source() { 223x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack
226 else
205 unpack ${A} 227 unpack ${A}
228 fi
206 cd ${S} 229 cd ${S}
207 230
208 if [[ -n ${FONT_OPTIONS} ]]; then 231 if [[ -n ${FONT_OPTIONS} ]]; then
209 einfo "Detected font directory: ${FONT_DIR}" 232 einfo "Detected font directory: ${FONT_DIR}"
210 fi 233 fi
219 fi 242 fi
220 243
221 # If this is a driver package we need to fix man page install location. 244 # If this is a driver package we need to fix man page install location.
222 # Running autoreconf will use the patched util-macros to make the 245 # Running autoreconf will use the patched util-macros to make the
223 # change for us, so we only need to patch if it is not going to run. 246 # change for us, so we only need to patch if it is not going to run.
224 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 247 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
248 && [[ ${XDPVER} != -1 ]]; then
225 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 249 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
226 fi 250 fi
227 251
228 # For specific list of patches 252 # For specific list of patches
229 if [[ -n "${PATCHES}" ]] ; then 253 if [[ -n "${PATCHES}" ]] ; then
243x-modular_reconf_source() { 267x-modular_reconf_source() {
244 # Run autoreconf for CVS snapshots only 268 # Run autoreconf for CVS snapshots only
245 if [[ "${SNAPSHOT}" = "yes" ]] 269 if [[ "${SNAPSHOT}" = "yes" ]]
246 then 270 then
247 # If possible, generate configure if it doesn't exist 271 # If possible, generate configure if it doesn't exist
248 if [ -f "${S}/configure.ac" ] 272 if [ -f "./configure.ac" ]
249 then 273 then
250 eautoreconf 274 eautoreconf
251 fi 275 fi
252 fi 276 fi
253 277
304x-modular_src_configure() { 328x-modular_src_configure() {
305 x-modular_font_configure 329 x-modular_font_configure
306 x-modular_debug_setup 330 x-modular_debug_setup
307 331
308 # If prefix isn't set here, .pc files cause problems 332 # If prefix isn't set here, .pc files cause problems
309 if [[ -x ./configure ]]; then 333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
310 econf --prefix=${XDIR} \ 334 econf --prefix=${XDIR} \
311 --datadir=${XDIR}/share \ 335 --datadir=${XDIR}/share \
312 ${FONT_OPTIONS} \ 336 ${FONT_OPTIONS} \
313 ${DRIVER_OPTIONS} \ 337 ${DRIVER_OPTIONS} \
314 ${CONFIGURE_OPTIONS} 338 ${CONFIGURE_OPTIONS}
332# Shouldn't be necessary in XDIR=/usr 356# Shouldn't be necessary in XDIR=/usr
333# einstall forces datadir, so we need to re-force it 357# einstall forces datadir, so we need to re-force it
334# datadir=${XDIR}/share \ 358# datadir=${XDIR}/share \
335# mandir=${XDIR}/share/man \ 359# mandir=${XDIR}/share/man \
336 360
361 if [[ -n ${GIT_ECLASS} ]]; then
362 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
363 git log ${GIT_TREE} > "${S}"/ChangeLog
364 popd
365 fi
366
337 if [[ -e ${S}/ChangeLog ]]; then 367 if [[ -e ${S}/ChangeLog ]]; then
338 dodoc ${S}/ChangeLog 368 dodoc ${S}/ChangeLog
339 fi 369 fi
340 370
341 # Make sure docs get compressed 371 # Make sure docs get compressed
342 prepalldocs 372 prepalldocs
343 373
344 # Don't install libtool archives for server modules 374 # Don't install libtool archives for server modules
345 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 375 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
346 find ${D}/usr/lib/xorg/modules -name '*.la' \ 376 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
347 | xargs rm -f 377 | xargs rm -f
348 fi 378 fi
349 379
350 # Don't install overlapping fonts.* files 380 # Don't install overlapping fonts.* files
351 # Generate them instead when possible 381 # Generate them instead when possible
352 if [[ -n "${FONT}" ]]; then 382 if [[ -n "${FONT}" ]]; then
353 remove_font_metadata 383 remove_font_metadata
354 fi 384 fi
385
386 if [[ -n "${DRIVER}" ]]; then
387 install_driver_hwdata
388 fi
355} 389}
356 390
357x-modular_pkg_preinst() { 391x-modular_pkg_preinst() {
358 if [[ -n "${FONT}" ]]; then 392 # We no longer do anything here, but we can't remove it from the API
359 discover_font_dirs 393 :
360 fi
361} 394}
362 395
363x-modular_pkg_postinst() { 396x-modular_pkg_postinst() {
364 if [[ -n "${FONT}" ]]; then 397 if [[ -n "${FONT}" ]]; then
365 setup_fonts 398 setup_fonts
367} 400}
368 401
369x-modular_pkg_postrm() { 402x-modular_pkg_postrm() {
370 if [[ -n "${FONT}" ]]; then 403 if [[ -n "${FONT}" ]]; then
371 cleanup_fonts 404 cleanup_fonts
405 font_pkg_postrm
372 fi 406 fi
373} 407}
374 408
375cleanup_fonts() { 409cleanup_fonts() {
376 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 410 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
406 eend 0 440 eend 0
407 done 441 done
408} 442}
409 443
410setup_fonts() { 444setup_fonts() {
411 if [[ ! -n "${FONT_DIRS}" ]]; then 445 if [[ ! -n "${FONT_DIR}" ]]; then
412 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 446 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
413 eerror "${msg}" 447 eerror "${msg}"
414 die "${msg}" 448 die "${msg}"
415 fi 449 fi
416 450
417 create_fonts_scale 451 create_fonts_scale
430 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 464 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
431 fi 465 fi
432 done 466 done
433} 467}
434 468
469# Installs device-to-driver mappings for system-config-display
470# and anything else that uses hwdata
471install_driver_hwdata() {
472 insinto /usr/share/hwdata/videoaliases
473 for i in "${FILESDIR}"/*.xinf; do
474 # We need this for the case when none exist,
475 # so *.xinf doesn't expand
476 if [[ -e $i ]]; then
477 doins $i
478 fi
479 done
480}
481
435discover_font_dirs() { 482discover_font_dirs() {
436 pushd ${IMAGE}/usr/share/fonts 483 FONT_DIRS="${FONT_DIR}"
437 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
438 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
439 popd
440} 484}
441 485
442create_fonts_scale() { 486create_fonts_scale() {
443 ebegin "Creating fonts.scale files" 487 ebegin "Creating fonts.scale files"
444 local x 488 local x
445 for FONT_DIR in ${FONT_DIRS}; do 489 for DIR in ${FONT_DIR}; do
446 x=${ROOT}/usr/share/fonts/${FONT_DIR} 490 x=${ROOT}/usr/share/fonts/${DIR}
447 [[ -z "$(ls ${x}/)" ]] && continue 491 [[ -z "$(ls ${x}/)" ]] && continue
448 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 492 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
449 493
450 # Only generate .scale files if truetype, opentype or type1 494 # Only generate .scale files if truetype, opentype or type1
451 # fonts are present ... 495 # fonts are present ...
452 496
453 # First truetype (ttf,ttc)
454 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
455 # Also, there is no way to regenerate Speedo/CID fonts.scale 497 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
456 # <spyderous@gentoo.org> 2 August 2004 498 # <dberkholz@gentoo.org> 2 August 2004
457 if [[ "${x/encodings}" = "${x}" ]] \ 499 if [[ "${x/encodings}" = "${x}" ]] \
458 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
459 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
460 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
461 ${ROOT}/usr/bin/ttmkfdir -x 2 \
462 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
463 -o ${x}/fonts.scale -d ${x}
464 # ttmkfdir fails on some stuff, so try mkfontscale if it does
465 local ttmkfdir_return=$?
466 else
467 # We didn't use ttmkfdir at all
468 local ttmkfdir_return=2
469 fi
470 if [[ ${ttmkfdir_return} -ne 0 ]]; then
471 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
472 ${ROOT}/usr/bin/mkfontscale \
473 -a /usr/share/fonts/encodings/encodings.dir \
474 -- ${x}
475 fi
476 # Next type1 and opentype (pfa,pfb,otf,otc)
477 elif [[ "${x/encodings}" = "${x}" ]] \
478 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 500 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
479 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 501 mkfontscale \
480 ${ROOT}/usr/bin/mkfontscale \
481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 502 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
482 -- ${x} 503 -- ${x}
483 fi 504 fi
484 done 505 done
485 eend 0 506 eend 0
486} 507}
487 508
488create_fonts_dir() { 509create_fonts_dir() {
489 ebegin "Generating fonts.dir files" 510 ebegin "Generating fonts.dir files"
490 for FONT_DIR in ${FONT_DIRS}; do 511 for DIR in ${FONT_DIR}; do
491 x=${ROOT}/usr/share/fonts/${FONT_DIR} 512 x=${ROOT}/usr/share/fonts/${DIR}
492 [[ -z "$(ls ${x}/)" ]] && continue 513 [[ -z "$(ls ${x}/)" ]] && continue
493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 514 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
494 515
495 if [[ "${x/encodings}" = "${x}" ]]; then 516 if [[ "${x/encodings}" = "${x}" ]]; then
496 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 517 mkfontdir \
497 ${ROOT}/usr/bin/mkfontdir \
498 -e ${ROOT}/usr/share/fonts/encodings \ 518 -e ${ROOT}/usr/share/fonts/encodings \
499 -e ${ROOT}/usr/share/fonts/encodings/large \ 519 -e ${ROOT}/usr/share/fonts/encodings/large \
500 -- ${x} 520 -- ${x}
501 fi 521 fi
502 done 522 done
503 eend 0 523 eend 0
504} 524}
505 525
506fix_font_permissions() { 526fix_font_permissions() {
507 ebegin "Fixing permissions" 527 ebegin "Fixing permissions"
508 for FONT_DIR in ${FONT_DIRS}; do 528 for DIR in ${FONT_DIR}; do
509 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
510 -exec chmod 0644 {} \; 530 -exec chmod 0644 {} \;
511 done 531 done
512 eend 0 532 eend 0
513} 533}
514 534
515create_font_cache() { 535create_font_cache() {
516 # danarmak found out that fc-cache should be run AFTER all the above 536 font_pkg_postinst
517 # stuff, as otherwise the cache is invalid, and has to be run again
518 # as root anyway
519 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
520 ebegin "Creating FC font cache"
521 HOME="/root" ${ROOT}/usr/bin/fc-cache
522 eend 0
523 fi
524} 537}
538
539EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.89

  ViewVC Help
Powered by ViewVC 1.1.20