/[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.33 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.33 2005/12/12 01:59:27 spyderous 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
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-RC3/everything/${P}.tar.bz2 48
44 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 49if [[ ${PV} = 9999* ]]; then
45 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 50 GIT_ECLASS="git"
46 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 51 SNAPSHOT="yes"
47LICENSE="X11" 52 SRC_URI=""
53fi
54
55# Set up SRC_URI for individual modular releases
56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
58 MODULE="app"
59elif [[ ${CATEGORY} = app-doc ]]; then
60 MODULE="doc"
61# x11-misc contains data and util, x11-themes contains data
62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
64 MODULE="data"
65 else
66 MODULE="data"
67 fi
68elif [[ ${CATEGORY} = x11-drivers ]]; then
69 MODULE="driver"
70elif [[ ${CATEGORY} = media-fonts ]]; then
71 MODULE="font"
72elif [[ ${CATEGORY} = x11-libs ]]; then
73 MODULE="lib"
74elif [[ ${CATEGORY} = x11-proto ]]; then
75 MODULE="proto"
76elif [[ ${CATEGORY} = x11-base ]]; then
77 MODULE="xserver"
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"
84fi
85
48SLOT="0" 86SLOT="0"
87
88# Set the license for the package. This can be overridden by setting
89# LICENSE after the inherit.
90LICENSE=${PN}
49 91
50# Set up shared dependencies 92# Set up shared dependencies
51if [[ -n "${SNAPSHOT}" ]]; then 93if [[ -n "${SNAPSHOT}" ]]; then
52# FIXME: What's the minimal libtool version supporting arbitrary versioning? 94# FIXME: What's the minimal libtool version supporting arbitrary versioning?
53 DEPEND="${DEPEND} 95 DEPEND="${DEPEND}
54 >=sys-devel/autoconf-2.57
55 >=sys-devel/automake-1.7
56 >=sys-devel/libtool-1.5 96 >=sys-devel/libtool-1.5
57 >=sys-devel/m4-1.4" 97 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest"
58fi 100fi
59 101
60# 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=""
61if [[ "${PN/#font-}" != "${PN}" ]] \ 104if [[ "${PN/#font-}" != "${PN}" ]] \
105 && [[ "${CATEGORY}" = "media-fonts" ]] \
62 && [[ "${PN}" != "font-alias" ]] \ 106 && [[ "${PN}" != "font-alias" ]] \
63 && [[ "${PN}" != "font-util" ]]; then 107 && [[ "${PN}" != "font-util" ]]; then
64 # Activate font code in the rest of the eclass 108 # Activate font code in the rest of the eclass
65 FONT="yes" 109 FONT="yes"
66 110
111 # Whether to inherit the font eclass
112 FONT_ECLASS="font"
113
67 RDEPEND="${RDEPEND} 114 RDEPEND="${RDEPEND}
68 media-fonts/encodings" 115 media-fonts/encodings
69 DEPEND="${DEPEND}
70 x11-apps/mkfontscale 116 x11-apps/mkfontscale
71 x11-apps/mkfontdir" 117 x11-apps/mkfontdir"
72 PDEPEND="${PDEPEND} 118 PDEPEND="${PDEPEND}
73 media-fonts/font-alias" 119 media-fonts/font-alias"
74 120
97 fi 143 fi
98fi 144fi
99 145
100# If we're a driver package 146# If we're a driver package
101if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 147if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
102 # Don't build static driver modules
103 DRIVER_OPTIONS="--disable-static"
104
105 # Enable driver code in the rest of the eclass 148 # Enable driver code in the rest of the eclass
106 DRIVER="yes" 149 DRIVER="yes"
107 150
151 if [[ ${XDPVER} != -1 ]]; then
108 # Add driver patchset to SRC_URI 152 # Add driver patchset to SRC_URI
109 SRC_URI="${SRC_URI} 153 SRC_URI="${SRC_URI}
110 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
155 fi
156fi
157
158# Debugging -- ignore packages that can't be built with debugging
159if [[ -z "${FONT}" ]] \
160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
161 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
162 && [[ "${PN/util-macros}" = "${PN}" ]] \
163 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
164 && [[ "${PN/xkbdata}" = "${PN}" ]] \
165 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
166 && [[ "${PN/xcursor}" = "${PN}" ]] \
167 ; then
168 DEBUGGABLE="yes"
169 IUSE="${IUSE} debug"
111fi 170fi
112 171
113DEPEND="${DEPEND} 172DEPEND="${DEPEND}
114 >=dev-util/pkgconfig-0.18 173 >=dev-util/pkgconfig-0.18"
174
175if [[ "${PN/util-macros}" = "${PN}" ]]; then
176 DEPEND="${DEPEND}
115 >=x11-misc/util-macros-0.99.2" 177 >=x11-misc/util-macros-0.99.2
178 >=sys-devel/binutils-2.16.1-r3"
179fi
116 180
117# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
118RDEPEND="${RDEPEND} 181RDEPEND="${RDEPEND}
119 !<=x11-base/xorg-x11-6.9 182 !<=x11-base/xorg-x11-6.9"
120 >=sys-apps/man-1.6b-r2"
121# Provides virtual/x11 for temporary use until packages are ported 183# Provides virtual/x11 for temporary use until packages are ported
122# x11-base/x11-env" 184# x11-base/x11-env"
123 185
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
187 ${FONT_ECLASS} ${GIT_ECLASS}
188
189x-modular_specs_check() {
190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
191 append-ldflags -Wl,-z,lazy
192 # (#116698) breaks loading
193 filter-ldflags -Wl,-z,now
194 fi
195}
196
197x-modular_dri_check() {
198 # (#120057) Enabling DRI in drivers requires that the server was built with
199 # support for it
200 if [[ -n "${DRIVER}" ]]; then
201 if has dri ${IUSE} && use dri; then
202 einfo "Checking for direct rendering capabilities ..."
203 if ! built_with_use x11-base/xorg-server dri; then
204 die "You must build x11-base/xorg-server with USE=dri."
205 fi
206 fi
207 fi
208}
209
210x-modular_server_supports_drivers_check() {
211 # (#135873) Only certain servers will actually use or be capable of
212 # building external drivers, including binary drivers.
213 if [[ -n "${DRIVER}" ]]; then
214 if has_version '>=x11-base/xorg-server-1.1'; then
215 if ! built_with_use x11-base/xorg-server xorg; then
216 eerror "x11-base/xorg-server is not built with support for external drivers."
217 die "You must build x11-base/xorg-server with USE=xorg."
218 fi
219 fi
220 fi
221}
222
124x-modular_unpack_source() { 223x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack
226 else
125 unpack ${A} 227 unpack ${A}
228 fi
126 cd ${S} 229 cd ${S}
127 230
128 if [[ -n ${FONT_OPTIONS} ]]; then 231 if [[ -n ${FONT_OPTIONS} ]]; then
129 einfo "Detected font directory: ${FONT_DIR}" 232 einfo "Detected font directory: ${FONT_DIR}"
130 fi 233 fi
139 fi 242 fi
140 243
141 # 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.
142 # Running autoreconf will use the patched util-macros to make the 245 # Running autoreconf will use the patched util-macros to make the
143 # 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.
144 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 247 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
248 && [[ ${XDPVER} != -1 ]]; then
145 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 249 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
146 fi 250 fi
147 251
148 # For specific list of patches 252 # For specific list of patches
149 if [[ -n "${PATCHES}" ]] ; then 253 if [[ -n "${PATCHES}" ]] ; then
163x-modular_reconf_source() { 267x-modular_reconf_source() {
164 # Run autoreconf for CVS snapshots only 268 # Run autoreconf for CVS snapshots only
165 if [[ "${SNAPSHOT}" = "yes" ]] 269 if [[ "${SNAPSHOT}" = "yes" ]]
166 then 270 then
167 # If possible, generate configure if it doesn't exist 271 # If possible, generate configure if it doesn't exist
168 if [ -f "${S}/configure.ac" ] 272 if [ -f "./configure.ac" ]
169 then 273 then
170 einfo "Running autoreconf..." 274 eautoreconf
171 autoreconf -v --force --install
172 fi
173 fi 275 fi
276 fi
174 277
278 # Joshua Baergen - October 23, 2005
279 # Fix shared lib issues on MIPS, FBSD, etc etc
280 elibtoolize
175} 281}
176 282
177x-modular_src_unpack() { 283x-modular_src_unpack() {
178 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 284 x-modular_specs_check
179 if gcc-specs-now; then 285 x-modular_server_supports_drivers_check
180 msg="Do not emerge ${PN} without vanilla gcc!" 286 x-modular_dri_check
181 eerror "$msg"
182 die "$msg"
183 fi
184 fi
185
186 x-modular_unpack_source 287 x-modular_unpack_source
187 x-modular_patch_source 288 x-modular_patch_source
188 x-modular_reconf_source 289 x-modular_reconf_source
189
190 # Joshua Baergen - October 23, 2005
191 # Fix shared lib issues on MIPS, FBSD, etc etc
192 elibtoolize
193} 290}
194 291
195x-modular_font_configure() { 292x-modular_font_configure() {
196 if [[ -n "${FONT}" ]]; then 293 if [[ -n "${FONT}" ]]; then
197 # Might be worth adding an option to configure your desired font 294 # Might be worth adding an option to configure your desired font
217 --disable-koi8-r" 314 --disable-koi8-r"
218 fi 315 fi
219 fi 316 fi
220} 317}
221 318
319x-modular_debug_setup() {
320 if [[ -n "${DEBUGGABLE}" ]]; then
321 if use debug; then
322 strip-flags
323 append-flags -g
324 fi
325 fi
326}
327
222x-modular_src_configure() { 328x-modular_src_configure() {
223 x-modular_font_configure 329 x-modular_font_configure
330 x-modular_debug_setup
224 331
225 # If prefix isn't set here, .pc files cause problems 332 # If prefix isn't set here, .pc files cause problems
226 if [[ -x ./configure ]]; then 333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
227 econf --prefix=${XDIR} \ 334 econf --prefix=${XDIR} \
228 --datadir=${XDIR}/share \ 335 --datadir=${XDIR}/share \
229 ${FONT_OPTIONS} \ 336 ${FONT_OPTIONS} \
230 ${DRIVER_OPTIONS} \ 337 ${DRIVER_OPTIONS} \
231 ${CONFIGURE_OPTIONS} 338 ${CONFIGURE_OPTIONS}
249# Shouldn't be necessary in XDIR=/usr 356# Shouldn't be necessary in XDIR=/usr
250# einstall forces datadir, so we need to re-force it 357# einstall forces datadir, so we need to re-force it
251# datadir=${XDIR}/share \ 358# datadir=${XDIR}/share \
252# mandir=${XDIR}/share/man \ 359# mandir=${XDIR}/share/man \
253 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
367 if [[ -e ${S}/ChangeLog ]]; then
368 dodoc ${S}/ChangeLog
369 fi
370
371 # Make sure docs get compressed
372 prepalldocs
373
254 # Don't install libtool archives for server modules 374 # Don't install libtool archives for server modules
255 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 375 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
256 find ${D}/usr/lib/xorg/modules -name '*.la' \ 376 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
257 | xargs rm -f 377 | xargs rm -f
258 fi 378 fi
379
380 # Don't install overlapping fonts.* files
381 # Generate them instead when possible
382 if [[ -n "${FONT}" ]]; then
383 remove_font_metadata
384 fi
385
386 if [[ -n "${DRIVER}" ]]; then
387 install_driver_hwdata
388 fi
259} 389}
260 390
261x-modular_pkg_preinst() { 391x-modular_pkg_preinst() {
262 if [[ -n "${FONT}" ]]; then 392 # We no longer do anything here, but we can't remove it from the API
263 discover_font_dirs 393 :
264 fi
265} 394}
266 395
267x-modular_pkg_postinst() { 396x-modular_pkg_postinst() {
268 if [[ -n "${FONT}" ]]; then 397 if [[ -n "${FONT}" ]]; then
269 setup_fonts 398 setup_fonts
271} 400}
272 401
273x-modular_pkg_postrm() { 402x-modular_pkg_postrm() {
274 if [[ -n "${FONT}" ]]; then 403 if [[ -n "${FONT}" ]]; then
275 cleanup_fonts 404 cleanup_fonts
405 font_pkg_postrm
276 fi 406 fi
277} 407}
278 408
279cleanup_fonts() { 409cleanup_fonts() {
280 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"
310 eend 0 440 eend 0
311 done 441 done
312} 442}
313 443
314setup_fonts() { 444setup_fonts() {
315 if [[ ! -n "${FONT_DIRS}" ]]; then 445 if [[ ! -n "${FONT_DIR}" ]]; then
316 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."
317 eerror "${msg}" 447 eerror "${msg}"
318 die "${msg}" 448 die "${msg}"
319 fi 449 fi
320 450
321 create_fonts_scale 451 create_fonts_scale
322 create_fonts_dir 452 create_fonts_dir
323 fix_font_permissions 453 fix_font_permissions
324 create_font_cache 454 create_font_cache
325} 455}
326 456
457remove_font_metadata() {
458 local DIR
459 for DIR in ${FONT_DIR}; do
460 if [[ "${DIR}" != "Speedo" ]] && \
461 [[ "${DIR}" != "CID" ]] ; then
462 # Delete font metadata files
463 # fonts.scale, fonts.dir, fonts.cache-1
464 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
465 fi
466 done
467}
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
327discover_font_dirs() { 482discover_font_dirs() {
328 pushd ${IMAGE}/usr/share/fonts 483 FONT_DIRS="${FONT_DIR}"
329 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
330 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
331 popd
332} 484}
333 485
334create_fonts_scale() { 486create_fonts_scale() {
335 ebegin "Creating fonts.scale files" 487 ebegin "Creating fonts.scale files"
336 local x 488 local x
337 for FONT_DIR in ${FONT_DIRS}; do 489 for DIR in ${FONT_DIR}; do
338 x=${ROOT}/usr/share/fonts/${FONT_DIR} 490 x=${ROOT}/usr/share/fonts/${DIR}
339 [[ -z "$(ls ${x}/)" ]] && continue 491 [[ -z "$(ls ${x}/)" ]] && continue
340 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 492 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
341 493
342 # Only generate .scale files if truetype, opentype or type1 494 # Only generate .scale files if truetype, opentype or type1
343 # fonts are present ... 495 # fonts are present ...
344 496
345 # First truetype (ttf,ttc)
346 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
347 # Also, there is no way to regenerate Speedo/CID fonts.scale 497 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
348 # <spyderous@gentoo.org> 2 August 2004 498 # <dberkholz@gentoo.org> 2 August 2004
349 if [[ "${x/encodings}" = "${x}" ]] \ 499 if [[ "${x/encodings}" = "${x}" ]] \
350 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
351 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
352 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
353 ${ROOT}/usr/bin/ttmkfdir -x 2 \
354 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
355 -o ${x}/fonts.scale -d ${x}
356 # ttmkfdir fails on some stuff, so try mkfontscale if it does
357 local ttmkfdir_return=$?
358 else
359 # We didn't use ttmkfdir at all
360 local ttmkfdir_return=2
361 fi
362 if [[ ${ttmkfdir_return} -ne 0 ]]; then
363 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
364 ${ROOT}/usr/bin/mkfontscale \
365 -a /usr/share/fonts/encodings/encodings.dir \
366 -- ${x}
367 fi
368 # Next type1 and opentype (pfa,pfb,otf,otc)
369 elif [[ "${x/encodings}" = "${x}" ]] \
370 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 500 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
371 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 501 mkfontscale \
372 ${ROOT}/usr/bin/mkfontscale \
373 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 502 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
374 -- ${x} 503 -- ${x}
375 fi 504 fi
376 done 505 done
377 eend 0 506 eend 0
378} 507}
379 508
380create_fonts_dir() { 509create_fonts_dir() {
381 ebegin "Generating fonts.dir files" 510 ebegin "Generating fonts.dir files"
382 for FONT_DIR in ${FONT_DIRS}; do 511 for DIR in ${FONT_DIR}; do
383 x=${ROOT}/usr/share/fonts/${FONT_DIR} 512 x=${ROOT}/usr/share/fonts/${DIR}
384 [[ -z "$(ls ${x}/)" ]] && continue 513 [[ -z "$(ls ${x}/)" ]] && continue
385 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 514 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
386 515
387 if [[ "${x/encodings}" = "${x}" ]]; then 516 if [[ "${x/encodings}" = "${x}" ]]; then
388 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 517 mkfontdir \
389 ${ROOT}/usr/bin/mkfontdir \
390 -e ${ROOT}/usr/share/fonts/encodings \ 518 -e ${ROOT}/usr/share/fonts/encodings \
391 -e ${ROOT}/usr/share/fonts/encodings/large \ 519 -e ${ROOT}/usr/share/fonts/encodings/large \
392 -- ${x} 520 -- ${x}
393 fi 521 fi
394 done 522 done
395 eend 0 523 eend 0
396} 524}
397 525
398fix_font_permissions() { 526fix_font_permissions() {
399 ebegin "Fixing permissions" 527 ebegin "Fixing permissions"
400 for FONT_DIR in ${FONT_DIRS}; do 528 for DIR in ${FONT_DIR}; do
401 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 529 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
402 -exec chmod 0644 {} \; 530 -exec chmod 0644 {} \;
403 done 531 done
404 eend 0 532 eend 0
405} 533}
406 534
407create_font_cache() { 535create_font_cache() {
408 # danarmak found out that fc-cache should be run AFTER all the above 536 font_pkg_postinst
409 # stuff, as otherwise the cache is invalid, and has to be run again
410 # as root anyway
411 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
412 ebegin "Creating FC font cache"
413 HOME="/root" ${ROOT}/usr/bin/fc-cache
414 eend 0
415 fi
416} 537}
538
539EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

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

  ViewVC Help
Powered by ViewVC 1.1.20