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

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.82

  ViewVC Help
Powered by ViewVC 1.1.20