/[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.35 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.35 2005/12/23 08:28:00 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# 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
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
… …
38 XDPVER="1" 43 XDPVER="1"
39fi 44fi
40 45
41IUSE="" 46IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
43SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2 48
44 http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/${P}.tar.bz2 49# Set up SRC_URI for individual modular releases
45 http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 50BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 51if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 52 SRC_URI="${SRC_URI}
48 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 53 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49LICENSE="X11" 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
50SLOT="0" 79SLOT="0"
80
81# Set the license for the package. This can be overridden by setting
82# LICENSE after the inherit.
83LICENSE=${PN}
51 84
52# Set up shared dependencies 85# Set up shared dependencies
53if [[ -n "${SNAPSHOT}" ]]; then 86if [[ -n "${SNAPSHOT}" ]]; then
54# FIXME: What's the minimal libtool version supporting arbitrary versioning? 87# FIXME: What's the minimal libtool version supporting arbitrary versioning?
55 DEPEND="${DEPEND} 88 DEPEND="${DEPEND}
56 >=sys-devel/autoconf-2.57
57 >=sys-devel/automake-1.7
58 >=sys-devel/libtool-1.5 89 >=sys-devel/libtool-1.5
59 >=sys-devel/m4-1.4" 90 >=sys-devel/m4-1.4"
91 WANT_AUTOCONF="latest"
92 WANT_AUTOMAKE="latest"
60fi 93fi
61 94
62# 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=""
63if [[ "${PN/#font-}" != "${PN}" ]] \ 97if [[ "${PN/#font-}" != "${PN}" ]] \
98 && [[ "${CATEGORY}" = "media-fonts" ]] \
64 && [[ "${PN}" != "font-alias" ]] \ 99 && [[ "${PN}" != "font-alias" ]] \
65 && [[ "${PN}" != "font-util" ]]; then 100 && [[ "${PN}" != "font-util" ]]; then
66 # Activate font code in the rest of the eclass 101 # Activate font code in the rest of the eclass
67 FONT="yes" 102 FONT="yes"
68 103
104 # Whether to inherit the font eclass
105 FONT_ECLASS="font"
106
69 RDEPEND="${RDEPEND} 107 RDEPEND="${RDEPEND}
70 media-fonts/encodings" 108 media-fonts/encodings
71 DEPEND="${DEPEND}
72 x11-apps/mkfontscale 109 x11-apps/mkfontscale
73 x11-apps/mkfontdir" 110 x11-apps/mkfontdir"
74 PDEPEND="${PDEPEND} 111 PDEPEND="${PDEPEND}
75 media-fonts/font-alias" 112 media-fonts/font-alias"
76 113
… …
99 fi 136 fi
100fi 137fi
101 138
102# If we're a driver package 139# If we're a driver package
103if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 140if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
104 # Don't build static driver modules
105 DRIVER_OPTIONS="--disable-static"
106
107 # Enable driver code in the rest of the eclass 141 # Enable driver code in the rest of the eclass
108 DRIVER="yes" 142 DRIVER="yes"
109 143
144 if [[ ${XDPVER} != -1 ]]; then
110 # Add driver patchset to SRC_URI 145 # Add driver patchset to SRC_URI
111 SRC_URI="${SRC_URI} 146 SRC_URI="${SRC_URI}
112 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"
113fi 163fi
114 164
115DEPEND="${DEPEND} 165DEPEND="${DEPEND}
116 >=dev-util/pkgconfig-0.18 166 >=dev-util/pkgconfig-0.18"
167
168if [[ "${PN/util-macros}" = "${PN}" ]]; then
169 DEPEND="${DEPEND}
117 >=x11-misc/util-macros-0.99.2" 170 >=x11-misc/util-macros-0.99.2
171 >=sys-devel/binutils-2.16.1-r3"
172fi
118 173
119# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
120RDEPEND="${RDEPEND} 174RDEPEND="${RDEPEND}
175 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
121 !<=x11-base/xorg-x11-6.9 176 !<=x11-base/xorg-x11-6.9"
122 >=sys-apps/man-1.6b-r2"
123# Provides virtual/x11 for temporary use until packages are ported 177# Provides virtual/x11 for temporary use until packages are ported
124# 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}
125 215
126x-modular_unpack_source() { 216x-modular_unpack_source() {
127 unpack ${A} 217 unpack ${A}
128 cd ${S} 218 cd ${S}
129 219
… …
141 fi 231 fi
142 232
143 # 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.
144 # Running autoreconf will use the patched util-macros to make the 234 # Running autoreconf will use the patched util-macros to make the
145 # 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.
146 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 236 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
237 && [[ ${XDPVER} != -1 ]]; then
147 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 238 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi 239 fi
149 240
150 # For specific list of patches 241 # For specific list of patches
151 if [[ -n "${PATCHES}" ]] ; then 242 if [[ -n "${PATCHES}" ]] ; then
… …
165x-modular_reconf_source() { 256x-modular_reconf_source() {
166 # Run autoreconf for CVS snapshots only 257 # Run autoreconf for CVS snapshots only
167 if [[ "${SNAPSHOT}" = "yes" ]] 258 if [[ "${SNAPSHOT}" = "yes" ]]
168 then 259 then
169 # If possible, generate configure if it doesn't exist 260 # If possible, generate configure if it doesn't exist
170 if [ -f "${S}/configure.ac" ] 261 if [ -f "./configure.ac" ]
171 then 262 then
172 einfo "Running autoreconf..." 263 eautoreconf
173 autoreconf -v --force --install
174 fi
175 fi 264 fi
265 fi
176 266
267 # Joshua Baergen - October 23, 2005
268 # Fix shared lib issues on MIPS, FBSD, etc etc
269 elibtoolize
177} 270}
178 271
179x-modular_src_unpack() { 272x-modular_src_unpack() {
180 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 273 x-modular_specs_check
181 if gcc-specs-now; then 274 x-modular_server_supports_drivers_check
182 msg="Do not emerge ${PN} without vanilla gcc!" 275 x-modular_dri_check
183 eerror "$msg"
184 die "$msg"
185 fi
186 fi
187
188 x-modular_unpack_source 276 x-modular_unpack_source
189 x-modular_patch_source 277 x-modular_patch_source
190 x-modular_reconf_source 278 x-modular_reconf_source
191
192 # Joshua Baergen - October 23, 2005
193 # Fix shared lib issues on MIPS, FBSD, etc etc
194 elibtoolize
195} 279}
196 280
197x-modular_font_configure() { 281x-modular_font_configure() {
198 if [[ -n "${FONT}" ]]; then 282 if [[ -n "${FONT}" ]]; then
199 # Might be worth adding an option to configure your desired font 283 # Might be worth adding an option to configure your desired font
… …
219 --disable-koi8-r" 303 --disable-koi8-r"
220 fi 304 fi
221 fi 305 fi
222} 306}
223 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
224x-modular_src_configure() { 317x-modular_src_configure() {
225 x-modular_font_configure 318 x-modular_font_configure
319 x-modular_debug_setup
226 320
227 # If prefix isn't set here, .pc files cause problems 321 # If prefix isn't set here, .pc files cause problems
228 if [[ -x ./configure ]]; then 322 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
229 econf --prefix=${XDIR} \ 323 econf --prefix=${XDIR} \
230 --datadir=${XDIR}/share \ 324 --datadir=${XDIR}/share \
231 ${FONT_OPTIONS} \ 325 ${FONT_OPTIONS} \
232 ${DRIVER_OPTIONS} \ 326 ${DRIVER_OPTIONS} \
233 ${CONFIGURE_OPTIONS} 327 ${CONFIGURE_OPTIONS}
… …
251# Shouldn't be necessary in XDIR=/usr 345# Shouldn't be necessary in XDIR=/usr
252# einstall forces datadir, so we need to re-force it 346# einstall forces datadir, so we need to re-force it
253# datadir=${XDIR}/share \ 347# datadir=${XDIR}/share \
254# mandir=${XDIR}/share/man \ 348# mandir=${XDIR}/share/man \
255 349
350 if [[ -e ${S}/ChangeLog ]]; then
351 dodoc ${S}/ChangeLog
352 fi
353
354 # Make sure docs get compressed
355 prepalldocs
356
256 # Don't install libtool archives for server modules 357 # Don't install libtool archives for server modules
257 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 358 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
258 find ${D}/usr/lib/xorg/modules -name '*.la' \ 359 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
259 | xargs rm -f 360 | xargs rm -f
260 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
261} 372}
262 373
263x-modular_pkg_preinst() { 374x-modular_pkg_preinst() {
264 if [[ -n "${FONT}" ]]; then 375 # We no longer do anything here, but we can't remove it from the API
265 discover_font_dirs 376 :
266 fi
267} 377}
268 378
269x-modular_pkg_postinst() { 379x-modular_pkg_postinst() {
270 if [[ -n "${FONT}" ]]; then 380 if [[ -n "${FONT}" ]]; then
271 setup_fonts 381 setup_fonts
… …
273} 383}
274 384
275x-modular_pkg_postrm() { 385x-modular_pkg_postrm() {
276 if [[ -n "${FONT}" ]]; then 386 if [[ -n "${FONT}" ]]; then
277 cleanup_fonts 387 cleanup_fonts
388 font_pkg_postrm
278 fi 389 fi
279} 390}
280 391
281cleanup_fonts() { 392cleanup_fonts() {
282 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"
… …
312 eend 0 423 eend 0
313 done 424 done
314} 425}
315 426
316setup_fonts() { 427setup_fonts() {
317 if [[ ! -n "${FONT_DIRS}" ]]; then 428 if [[ ! -n "${FONT_DIR}" ]]; then
318 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."
319 eerror "${msg}" 430 eerror "${msg}"
320 die "${msg}" 431 die "${msg}"
321 fi 432 fi
322 433
323 create_fonts_scale 434 create_fonts_scale
324 create_fonts_dir 435 create_fonts_dir
325 fix_font_permissions 436 fix_font_permissions
326 create_font_cache 437 create_font_cache
327} 438}
328 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
329discover_font_dirs() { 465discover_font_dirs() {
330 pushd ${IMAGE}/usr/share/fonts 466 FONT_DIRS="${FONT_DIR}"
331 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
332 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
333 popd
334} 467}
335 468
336create_fonts_scale() { 469create_fonts_scale() {
337 ebegin "Creating fonts.scale files" 470 ebegin "Creating fonts.scale files"
338 local x 471 local x
339 for FONT_DIR in ${FONT_DIRS}; do 472 for DIR in ${FONT_DIR}; do
340 x=${ROOT}/usr/share/fonts/${FONT_DIR} 473 x=${ROOT}/usr/share/fonts/${DIR}
341 [[ -z "$(ls ${x}/)" ]] && continue 474 [[ -z "$(ls ${x}/)" ]] && continue
342 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 475 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
343 476
344 # Only generate .scale files if truetype, opentype or type1 477 # Only generate .scale files if truetype, opentype or type1
345 # fonts are present ... 478 # fonts are present ...
346 479
347 # First truetype (ttf,ttc)
348 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
349 # Also, there is no way to regenerate Speedo/CID fonts.scale 480 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
350 # <spyderous@gentoo.org> 2 August 2004 481 # <dberkholz@gentoo.org> 2 August 2004
351 if [[ "${x/encodings}" = "${x}" ]] \ 482 if [[ "${x/encodings}" = "${x}" ]] \
352 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
353 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
354 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
355 ${ROOT}/usr/bin/ttmkfdir -x 2 \
356 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
357 -o ${x}/fonts.scale -d ${x}
358 # ttmkfdir fails on some stuff, so try mkfontscale if it does
359 local ttmkfdir_return=$?
360 else
361 # We didn't use ttmkfdir at all
362 local ttmkfdir_return=2
363 fi
364 if [[ ${ttmkfdir_return} -ne 0 ]]; then
365 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
366 ${ROOT}/usr/bin/mkfontscale \
367 -a /usr/share/fonts/encodings/encodings.dir \
368 -- ${x}
369 fi
370 # Next type1 and opentype (pfa,pfb,otf,otc)
371 elif [[ "${x/encodings}" = "${x}" ]] \
372 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 483 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
373 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 484 mkfontscale \
374 ${ROOT}/usr/bin/mkfontscale \
375 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 485 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
376 -- ${x} 486 -- ${x}
377 fi 487 fi
378 done 488 done
379 eend 0 489 eend 0
380} 490}
381 491
382create_fonts_dir() { 492create_fonts_dir() {
383 ebegin "Generating fonts.dir files" 493 ebegin "Generating fonts.dir files"
384 for FONT_DIR in ${FONT_DIRS}; do 494 for DIR in ${FONT_DIR}; do
385 x=${ROOT}/usr/share/fonts/${FONT_DIR} 495 x=${ROOT}/usr/share/fonts/${DIR}
386 [[ -z "$(ls ${x}/)" ]] && continue 496 [[ -z "$(ls ${x}/)" ]] && continue
387 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 497 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
388 498
389 if [[ "${x/encodings}" = "${x}" ]]; then 499 if [[ "${x/encodings}" = "${x}" ]]; then
390 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 500 mkfontdir \
391 ${ROOT}/usr/bin/mkfontdir \
392 -e ${ROOT}/usr/share/fonts/encodings \ 501 -e ${ROOT}/usr/share/fonts/encodings \
393 -e ${ROOT}/usr/share/fonts/encodings/large \ 502 -e ${ROOT}/usr/share/fonts/encodings/large \
394 -- ${x} 503 -- ${x}
395 fi 504 fi
396 done 505 done
397 eend 0 506 eend 0
398} 507}
399 508
400fix_font_permissions() { 509fix_font_permissions() {
401 ebegin "Fixing permissions" 510 ebegin "Fixing permissions"
402 for FONT_DIR in ${FONT_DIRS}; do 511 for DIR in ${FONT_DIR}; do
403 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 512 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
404 -exec chmod 0644 {} \; 513 -exec chmod 0644 {} \;
405 done 514 done
406 eend 0 515 eend 0
407} 516}
408 517
409create_font_cache() { 518create_font_cache() {
410 # danarmak found out that fc-cache should be run AFTER all the above 519 font_pkg_postinst
411 # stuff, as otherwise the cache is invalid, and has to be run again
412 # as root anyway
413 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
414 ebegin "Creating FC font cache"
415 HOME="/root" ${ROOT}/usr/bin/fc-cache
416 eend 0
417 fi
418} 520}
521
522EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.86
  ViewVC Help
Powered by ViewVC 1.1.20