/[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.30 Revision 1.86
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.30 2005/12/10 21:49:07 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.86 2007/09/24 08:20:00 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# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to 10# Using this eclass:
11# the subdirectories within /usr/share/fonts to which it installs fonts. 11#
12 12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14 14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15inherit eutils libtool toolchain-funcs 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.
16 36
17# Directory prefix to use for everything 37# Directory prefix to use for everything
18XDIR="/usr" 38XDIR="/usr"
19 39
20# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
23 XDPVER="1" 43 XDPVER="1"
24fi 44fi
25 45
26IUSE="" 46IUSE=""
27HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
28SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 48
29 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 49# Set up SRC_URI for individual modular releases
30 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 50BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
31 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 51if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
32LICENSE="X11" 52 SRC_URI="${SRC_URI}
53 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
54elif [[ ${CATEGORY} = app-doc ]]; then
55 SRC_URI="${SRC_URI}
56 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
57# x11-misc contains data and util, x11-themes contains data
58elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
59 SRC_URI="${SRC_URI}
60 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
61 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
62elif [[ ${CATEGORY} = x11-drivers ]]; then
63 SRC_URI="${SRC_URI}
64 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
65elif [[ ${CATEGORY} = media-fonts ]]; then
66 SRC_URI="${SRC_URI}
67 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
68elif [[ ${CATEGORY} = x11-libs ]]; then
69 SRC_URI="${SRC_URI}
70 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
71elif [[ ${CATEGORY} = x11-proto ]]; then
72 SRC_URI="${SRC_URI}
73 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
74elif [[ ${CATEGORY} = x11-base ]]; then
75 SRC_URI="${SRC_URI}
76 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
77fi
78
33SLOT="0" 79SLOT="0"
80
81# Set the license for the package. This can be overridden by setting
82# LICENSE after the inherit.
83LICENSE=${PN}
34 84
35# Set up shared dependencies 85# Set up shared dependencies
36if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
37# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
38 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
39 >=sys-devel/autoconf-2.57
40 >=sys-devel/automake-1.7
41 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
42 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
43fi 93fi
44 94
45# If we're a font package, but not the font.alias one 95# If we're a font package, but not the font.alias one
96FONT_ECLASS=""
46if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
98 && [[ "${CATEGORY}" = "media-fonts" ]] \
47 && [[ "${PN}" != "font-alias" ]] \ 99 && [[ "${PN}" != "font-alias" ]] \
48 && [[ "${PN}" != "font-util" ]]; then 100 && [[ "${PN}" != "font-util" ]]; then
49 # Activate font code in the rest of the eclass 101 # Activate font code in the rest of the eclass
50 FONT="yes" 102 FONT="yes"
51 103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
106
52 RDEPEND="${RDEPEND} 107 RDEPEND="${RDEPEND}
53 media-fonts/encodings" 108 media-fonts/encodings
54 DEPEND="${DEPEND}
55 x11-apps/mkfontscale 109 x11-apps/mkfontscale
56 x11-apps/mkfontdir" 110 x11-apps/mkfontdir"
57 PDEPEND="${PDEPEND} 111 PDEPEND="${PDEPEND}
58 media-fonts/font-alias" 112 media-fonts/font-alias"
59 113
82 fi 136 fi
83fi 137fi
84 138
85# If we're a driver package 139# If we're a driver package
86if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 140if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
87 # Don't build static driver modules
88 DRIVER_OPTIONS="--disable-static"
89
90 # Enable driver code in the rest of the eclass 141 # Enable driver code in the rest of the eclass
91 DRIVER="yes" 142 DRIVER="yes"
92 143
144 if [[ ${XDPVER} != -1 ]]; then
93 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
94 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
95 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 147 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi
149fi
150
151# Debugging -- ignore packages that can't be built with debugging
152if [[ -z "${FONT}" ]] \
153 || [[ "${PN/app-doc}" != "${PN}" ]] \
154 || [[ "${PN/x11-proto}" != "${PN}" ]] \
155 || [[ "${PN/util-macros}" != "${PN}" ]] \
156 || [[ "${PN/xbitmaps}" != "${PN}" ]] \
157 || [[ "${PN/xkbdata}" != "${PN}" ]] \
158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
159 || [[ "${PN/xcursor}" != "${PN}" ]] \
160 ; then
161 DEBUGGABLE="yes"
162 IUSE="${IUSE} debug"
96fi 163fi
97 164
98DEPEND="${DEPEND} 165DEPEND="${DEPEND}
99 >=dev-util/pkgconfig-0.18 166 >=dev-util/pkgconfig-0.18"
167
168if [[ "${PN/util-macros}" = "${PN}" ]]; then
169 DEPEND="${DEPEND}
100 >=x11-misc/util-macros-0.99.2" 170 >=x11-misc/util-macros-0.99.2
171 >=sys-devel/binutils-2.16.1-r3"
172fi
101 173
102# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
103RDEPEND="${RDEPEND} 174RDEPEND="${RDEPEND}
175 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
104 !<=x11-base/xorg-x11-6.9 176 !<=x11-base/xorg-x11-6.9"
105 >=sys-apps/man-1.6b-r2"
106# Provides virtual/x11 for temporary use until packages are ported 177# Provides virtual/x11 for temporary use until packages are ported
107# x11-base/x11-env" 178# x11-base/x11-env"
179
180inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS}
181
182x-modular_specs_check() {
183 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
184 append-ldflags -Wl,-z,lazy
185 # (#116698) breaks loading
186 filter-ldflags -Wl,-z,now
187 fi
188}
189
190x-modular_dri_check() {
191 # (#120057) Enabling DRI in drivers requires that the server was built with
192 # support for it
193 if [[ -n "${DRIVER}" ]]; then
194 if has dri ${IUSE} && use dri; then
195 einfo "Checking for direct rendering capabilities ..."
196 if ! built_with_use x11-base/xorg-server dri; then
197 die "You must build x11-base/xorg-server with USE=dri."
198 fi
199 fi
200 fi
201}
202
203x-modular_server_supports_drivers_check() {
204 # (#135873) Only certain servers will actually use or be capable of
205 # building external drivers, including binary drivers.
206 if [[ -n "${DRIVER}" ]]; then
207 if has_version '>=x11-base/xorg-server-1.1'; then
208 if ! built_with_use x11-base/xorg-server xorg; then
209 eerror "x11-base/xorg-server is not built with support for external drivers."
210 die "You must build x11-base/xorg-server with USE=xorg."
211 fi
212 fi
213 fi
214}
108 215
109x-modular_unpack_source() { 216x-modular_unpack_source() {
110 unpack ${A} 217 unpack ${A}
111 cd ${S} 218 cd ${S}
112 219
124 fi 231 fi
125 232
126 # If this is a driver package we need to fix man page install location. 233 # If this is a driver package we need to fix man page install location.
127 # Running autoreconf will use the patched util-macros to make the 234 # Running autoreconf will use the patched util-macros to make the
128 # change for us, so we only need to patch if it is not going to run. 235 # change for us, so we only need to patch if it is not going to run.
129 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 236 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
237 && [[ ${XDPVER} != -1 ]]; then
130 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 238 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
131 fi 239 fi
132 240
133 # For specific list of patches 241 # For specific list of patches
134 if [[ -n "${PATCHES}" ]] ; then 242 if [[ -n "${PATCHES}" ]] ; then
148x-modular_reconf_source() { 256x-modular_reconf_source() {
149 # Run autoreconf for CVS snapshots only 257 # Run autoreconf for CVS snapshots only
150 if [[ "${SNAPSHOT}" = "yes" ]] 258 if [[ "${SNAPSHOT}" = "yes" ]]
151 then 259 then
152 # If possible, generate configure if it doesn't exist 260 # If possible, generate configure if it doesn't exist
153 if [ -f "${S}/configure.ac" ] 261 if [ -f "./configure.ac" ]
154 then 262 then
155 einfo "Running autoreconf..." 263 eautoreconf
156 autoreconf -v --force --install
157 fi
158 fi 264 fi
265 fi
159 266
267 # Joshua Baergen - October 23, 2005
268 # Fix shared lib issues on MIPS, FBSD, etc etc
269 elibtoolize
160} 270}
161 271
162x-modular_src_unpack() { 272x-modular_src_unpack() {
163 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 273 x-modular_specs_check
164 if gcc-specs-now; then 274 x-modular_server_supports_drivers_check
165 msg="Do not emerge ${PN} without vanilla gcc!" 275 x-modular_dri_check
166 eerror "$msg"
167 die "$msg"
168 fi
169 fi
170
171 x-modular_unpack_source 276 x-modular_unpack_source
172 x-modular_patch_source 277 x-modular_patch_source
173 x-modular_reconf_source 278 x-modular_reconf_source
174
175 # Joshua Baergen - October 23, 2005
176 # Fix shared lib issues on MIPS, FBSD, etc etc
177 elibtoolize
178} 279}
179 280
180x-modular_font_configure() { 281x-modular_font_configure() {
181 if [[ -n "${FONT}" ]]; then 282 if [[ -n "${FONT}" ]]; then
182 # Might be worth adding an option to configure your desired font 283 # Might be worth adding an option to configure your desired font
202 --disable-koi8-r" 303 --disable-koi8-r"
203 fi 304 fi
204 fi 305 fi
205} 306}
206 307
308x-modular_debug_setup() {
309 if [[ -n "${DEBUGGABLE}" ]]; then
310 if use debug; then
311 strip-flags
312 append-flags -g
313 fi
314 fi
315}
316
207x-modular_src_configure() { 317x-modular_src_configure() {
208 x-modular_font_configure 318 x-modular_font_configure
319 x-modular_debug_setup
209 320
210 # If prefix isn't set here, .pc files cause problems 321 # If prefix isn't set here, .pc files cause problems
211 if [[ -x ./configure ]]; then 322 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
212 econf --prefix=${XDIR} \ 323 econf --prefix=${XDIR} \
213 --datadir=${XDIR}/share \ 324 --datadir=${XDIR}/share \
214 ${FONT_OPTIONS} \ 325 ${FONT_OPTIONS} \
215 ${DRIVER_OPTIONS} \ 326 ${DRIVER_OPTIONS} \
216 ${CONFIGURE_OPTIONS} 327 ${CONFIGURE_OPTIONS}
234# Shouldn't be necessary in XDIR=/usr 345# Shouldn't be necessary in XDIR=/usr
235# einstall forces datadir, so we need to re-force it 346# einstall forces datadir, so we need to re-force it
236# datadir=${XDIR}/share \ 347# datadir=${XDIR}/share \
237# mandir=${XDIR}/share/man \ 348# mandir=${XDIR}/share/man \
238 349
350 if [[ -e ${S}/ChangeLog ]]; then
351 dodoc ${S}/ChangeLog
352 fi
353
354 # Make sure docs get compressed
355 prepalldocs
356
239 # Don't install libtool archives for server modules 357 # Don't install libtool archives for server modules
240 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 358 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
241 find ${D}/usr/lib/xorg/modules -name '*.la' \ 359 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
242 | xargs rm -f 360 | xargs rm -f
243 fi 361 fi
362
363 # Don't install overlapping fonts.* files
364 # Generate them instead when possible
365 if [[ -n "${FONT}" ]]; then
366 remove_font_metadata
367 fi
368
369 if [[ -n "${DRIVER}" ]]; then
370 install_driver_hwdata
371 fi
244} 372}
245 373
246x-modular_pkg_preinst() { 374x-modular_pkg_preinst() {
247 if [[ -n "${FONT}" ]]; then 375 # We no longer do anything here, but we can't remove it from the API
248 discover_font_dirs 376 :
249 fi
250} 377}
251 378
252x-modular_pkg_postinst() { 379x-modular_pkg_postinst() {
253 if [[ -n "${FONT}" ]]; then 380 if [[ -n "${FONT}" ]]; then
254 setup_fonts 381 setup_fonts
256} 383}
257 384
258x-modular_pkg_postrm() { 385x-modular_pkg_postrm() {
259 if [[ -n "${FONT}" ]]; then 386 if [[ -n "${FONT}" ]]; then
260 cleanup_fonts 387 cleanup_fonts
388 font_pkg_postrm
261 fi 389 fi
262} 390}
263 391
264cleanup_fonts() { 392cleanup_fonts() {
265 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 393 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
295 eend 0 423 eend 0
296 done 424 done
297} 425}
298 426
299setup_fonts() { 427setup_fonts() {
300 if [[ ! -n "${FONT_DIRS}" ]]; then 428 if [[ ! -n "${FONT_DIR}" ]]; then
301 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 429 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
302 eerror "${msg}" 430 eerror "${msg}"
303 die "${msg}" 431 die "${msg}"
304 fi 432 fi
305 433
306 create_fonts_scale 434 create_fonts_scale
307 create_fonts_dir 435 create_fonts_dir
308 fix_font_permissions 436 fix_font_permissions
309 create_font_cache 437 create_font_cache
310} 438}
311 439
440remove_font_metadata() {
441 local DIR
442 for DIR in ${FONT_DIR}; do
443 if [[ "${DIR}" != "Speedo" ]] && \
444 [[ "${DIR}" != "CID" ]] ; then
445 # Delete font metadata files
446 # fonts.scale, fonts.dir, fonts.cache-1
447 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
448 fi
449 done
450}
451
452# Installs device-to-driver mappings for system-config-display
453# and anything else that uses hwdata
454install_driver_hwdata() {
455 insinto /usr/share/hwdata/videoaliases
456 for i in "${FILESDIR}"/*.xinf; do
457 # We need this for the case when none exist,
458 # so *.xinf doesn't expand
459 if [[ -e $i ]]; then
460 doins $i
461 fi
462 done
463}
464
312discover_font_dirs() { 465discover_font_dirs() {
313 pushd ${IMAGE}/usr/share/fonts 466 FONT_DIRS="${FONT_DIR}"
314 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
315 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
316 popd
317} 467}
318 468
319create_fonts_scale() { 469create_fonts_scale() {
320 ebegin "Creating fonts.scale files" 470 ebegin "Creating fonts.scale files"
321 local x 471 local x
322 for FONT_DIR in ${FONT_DIRS}; do 472 for DIR in ${FONT_DIR}; do
323 x=${ROOT}/usr/share/fonts/${FONT_DIR} 473 x=${ROOT}/usr/share/fonts/${DIR}
324 [[ -z "$(ls ${x}/)" ]] && continue 474 [[ -z "$(ls ${x}/)" ]] && continue
325 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 475 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
326 476
327 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
328 # fonts are present ... 478 # fonts are present ...
329 479
330 # First truetype (ttf,ttc)
331 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
332 # Also, there is no way to regenerate Speedo/CID fonts.scale 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
333 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
334 if [[ "${x/encodings}" = "${x}" ]] \ 482 if [[ "${x/encodings}" = "${x}" ]] \
335 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
336 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
337 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
338 ${ROOT}/usr/bin/ttmkfdir -x 2 \
339 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
340 -o ${x}/fonts.scale -d ${x}
341 # ttmkfdir fails on some stuff, so try mkfontscale if it does
342 local ttmkfdir_return=$?
343 else
344 # We didn't use ttmkfdir at all
345 local ttmkfdir_return=2
346 fi
347 if [[ ${ttmkfdir_return} -ne 0 ]]; then
348 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
349 ${ROOT}/usr/bin/mkfontscale \
350 -a /usr/share/fonts/encodings/encodings.dir \
351 -- ${x}
352 fi
353 # Next type1 and opentype (pfa,pfb,otf,otc)
354 elif [[ "${x/encodings}" = "${x}" ]] \
355 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
356 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 484 mkfontscale \
357 ${ROOT}/usr/bin/mkfontscale \
358 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
359 -- ${x} 486 -- ${x}
360 fi 487 fi
361 done 488 done
362 eend 0 489 eend 0
363} 490}
364 491
365create_fonts_dir() { 492create_fonts_dir() {
366 ebegin "Generating fonts.dir files" 493 ebegin "Generating fonts.dir files"
367 for FONT_DIR in ${FONT_DIRS}; do 494 for DIR in ${FONT_DIR}; do
368 x=${ROOT}/usr/share/fonts/${FONT_DIR} 495 x=${ROOT}/usr/share/fonts/${DIR}
369 [[ -z "$(ls ${x}/)" ]] && continue 496 [[ -z "$(ls ${x}/)" ]] && continue
370 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 497 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
371 498
372 if [[ "${x/encodings}" = "${x}" ]]; then 499 if [[ "${x/encodings}" = "${x}" ]]; then
373 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 500 mkfontdir \
374 ${ROOT}/usr/bin/mkfontdir \
375 -e ${ROOT}/usr/share/fonts/encodings \ 501 -e ${ROOT}/usr/share/fonts/encodings \
376 -e ${ROOT}/usr/share/fonts/encodings/large \ 502 -e ${ROOT}/usr/share/fonts/encodings/large \
377 -- ${x} 503 -- ${x}
378 fi 504 fi
379 done 505 done
380 eend 0 506 eend 0
381} 507}
382 508
383fix_font_permissions() { 509fix_font_permissions() {
384 ebegin "Fixing permissions" 510 ebegin "Fixing permissions"
385 for FONT_DIR in ${FONT_DIRS}; do 511 for DIR in ${FONT_DIR}; do
386 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 512 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
387 -exec chmod 0644 {} \; 513 -exec chmod 0644 {} \;
388 done 514 done
389 eend 0 515 eend 0
390} 516}
391 517
392create_font_cache() { 518create_font_cache() {
393 # danarmak found out that fc-cache should be run AFTER all the above 519 font_pkg_postinst
394 # stuff, as otherwise the cache is invalid, and has to be run again
395 # as root anyway
396 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
397 ebegin "Creating FC font cache"
398 HOME="/root" ${ROOT}/usr/bin/fc-cache
399 eend 0
400 fi
401} 520}
521
522EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

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

  ViewVC Help
Powered by ViewVC 1.1.20