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

  ViewVC Help
Powered by ViewVC 1.1.20