/[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.87 Revision 1.97
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.87 2007/10/14 10:12:24 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.97 2008/05/09 07:18:19 dberkholz Exp $
4# 4#
5# @ECLASS: x-modular.eclass
6# @MAINTAINER:
5# Author: Donnie Berkholz <dberkholz@gentoo.org> 7# Donnie Berkholz <dberkholz@gentoo.org>, x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching,
13# running eautoreconf, passing options to configure and installing docs.
6# 14#
7# This eclass is designed to reduce code duplication in the modularized X11 15# All you need to do in a basic ebuild is inherit this eclass and set
8# ebuilds. 16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
9# 17# with the other X packages, you don't need to set SRC_URI. Pretty much
10# Using this eclass:
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# 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. 18# everything else should be automatic.
36 19
37# Directory prefix to use for everything 20# @ECLASS-VARIABLE: XDIR
21# @DESCRIPTION:
22# Directory prefix to use for everything. If you want to install to a
23# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
24# recently tested. You may need to uncomment the setting of datadir and
25# mandir in x-modular_src_install() or add it back in if it's no longer
26# there. You may also want to change the SLOT.
38XDIR="/usr" 27XDIR="/usr"
39
40# Set up default patchset version(s) if necessary
41# x11-driver-patches
42if [[ -z "${XDPVER}" ]]; then
43 XDPVER="1"
44fi
45 28
46IUSE="" 29IUSE=""
47HOMEPAGE="http://xorg.freedesktop.org/" 30HOMEPAGE="http://xorg.freedesktop.org/"
31
32if [[ -z ${SNAPSHOT} ]]; then
33# @ECLASS-VARIABLE: SNAPSHOT
34# @DESCRIPTION:
35# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
36# before inheriting this eclass.
37 SNAPSHOT="no"
38fi
48 39
49if [[ ${PV} = 9999* ]]; then 40if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git" 41 GIT_ECLASS="git"
51 SNAPSHOT="yes" 42 SNAPSHOT="yes"
52 SRC_URI="" 43 SRC_URI=""
61# x11-misc contains data and util, x11-themes contains data 52# x11-misc contains data and util, x11-themes contains data
62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then 54 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
64 MODULE="data" 55 MODULE="data"
65 else 56 else
66 MODULE="data" 57 MODULE="util"
67 fi 58 fi
68elif [[ ${CATEGORY} = x11-drivers ]]; then 59elif [[ ${CATEGORY} = x11-drivers ]]; then
69 MODULE="driver" 60 MODULE="driver"
70elif [[ ${CATEGORY} = media-fonts ]]; then 61elif [[ ${CATEGORY} = media-fonts ]]; then
71 MODULE="font" 62 MODULE="font"
121 # Starting with 7.0RC3, we can specify the font directory 112 # Starting with 7.0RC3, we can specify the font directory
122 # But oddly, we can't do the same for encodings or font-alias 113 # But oddly, we can't do the same for encodings or font-alias
123 114
124 # Wrap in `if` so ebuilds can set it too 115 # Wrap in `if` so ebuilds can set it too
125 if [[ -z ${FONT_DIR} ]]; then 116 if [[ -z ${FONT_DIR} ]]; then
117# @ECLASS-VARIABLE: FONT_DIR
118# @DESCRIPTION:
119# If you're creating a font package and the suffix of PN is not equal to
120# the subdirectory of /usr/share/fonts/ it should install into, set
121# FONT_DIR to that directory or directories. Set before inheriting this
122# eclass.
126 FONT_DIR=${PN##*-} 123 FONT_DIR=${PN##*-}
127 124
128 fi 125 fi
129 126
130 # Fix case of font directories 127 # Fix case of font directories
135 132
136 # Set up configure option 133 # Set up configure option
137 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 134 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
138 135
139 if [[ -n "${FONT}" ]]; then 136 if [[ -n "${FONT}" ]]; then
140 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 137 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
141 IUSE="${IUSE} nls" 138 IUSE="${IUSE} nls"
142 fi 139 fi
143 fi 140 fi
144fi 141fi
145 142
146# If we're a driver package 143# If we're a driver package
147if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 144if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
148 # Enable driver code in the rest of the eclass 145 # Enable driver code in the rest of the eclass
149 DRIVER="yes" 146 DRIVER="yes"
150
151 if [[ ${XDPVER} != -1 ]]; then
152 # Add driver patchset to SRC_URI
153 SRC_URI="${SRC_URI}
154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
155 fi
156fi 147fi
157 148
158# Debugging -- ignore packages that can't be built with debugging 149# Debugging -- ignore packages that can't be built with debugging
159if [[ -z "${FONT}" ]] \ 150if [[ -z "${FONT}" ]] \
160 || [[ "${PN/app-doc}" != "${PN}" ]] \ 151 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
161 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 152 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
162 || [[ "${PN/util-macros}" != "${PN}" ]] \ 153 && [[ "${PN/util-macros}" = "${PN}" ]] \
163 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 154 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
164 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 155 && [[ "${PN/xkbdata}" = "${PN}" ]] \
165 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 156 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
166 || [[ "${PN/xcursor}" != "${PN}" ]] \ 157 && [[ "${PN/xcursor}" = "${PN}" ]] \
167 ; then 158 ; then
168 DEBUGGABLE="yes" 159 DEBUGGABLE="yes"
169 IUSE="${IUSE} debug" 160 IUSE="${IUSE} debug"
170fi 161fi
171 162
177 >=x11-misc/util-macros-0.99.2 168 >=x11-misc/util-macros-0.99.2
178 >=sys-devel/binutils-2.16.1-r3" 169 >=sys-devel/binutils-2.16.1-r3"
179fi 170fi
180 171
181RDEPEND="${RDEPEND} 172RDEPEND="${RDEPEND}
182 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
183 !<=x11-base/xorg-x11-6.9" 173 !<=x11-base/xorg-x11-6.9"
184# Provides virtual/x11 for temporary use until packages are ported 174# Provides virtual/x11 for temporary use until packages are ported
185# x11-base/x11-env" 175# x11-base/x11-env"
186 176
187inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 177inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
188 ${FONT_ECLASS} ${GIT_ECLASS} 178 ${FONT_ECLASS} ${GIT_ECLASS}
189 179
180# @FUNCTION: x-modular_specs_check
181# @USAGE:
182# @DESCRIPTION:
183# Make any necessary changes related to gcc specs (generally hardened)
190x-modular_specs_check() { 184x-modular_specs_check() {
191 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 185 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
192 append-ldflags -Wl,-z,lazy 186 append-ldflags -Wl,-z,lazy
193 # (#116698) breaks loading 187 # (#116698) breaks loading
194 filter-ldflags -Wl,-z,now 188 filter-ldflags -Wl,-z,now
195 fi 189 fi
196} 190}
197 191
192# @FUNCTION: x-modular_dri_check
193# @USAGE:
194# @DESCRIPTION:
195# Ensures the server supports DRI if building a driver with DRI support
198x-modular_dri_check() { 196x-modular_dri_check() {
199 # (#120057) Enabling DRI in drivers requires that the server was built with 197 # (#120057) Enabling DRI in drivers requires that the server was built with
200 # support for it 198 # support for it
201 if [[ -n "${DRIVER}" ]]; then 199 if [[ -n "${DRIVER}" ]]; then
202 if has dri ${IUSE} && use dri; then 200 if has dri ${IUSE} && use dri; then
206 fi 204 fi
207 fi 205 fi
208 fi 206 fi
209} 207}
210 208
209# @FUNCTION: x-modular_server_supports_drivers_check
210# @USAGE:
211# @DESCRIPTION:
212# Ensures the server SDK is installed if a driver is being built
211x-modular_server_supports_drivers_check() { 213x-modular_server_supports_drivers_check() {
212 # (#135873) Only certain servers will actually use or be capable of 214 # (#135873) Only certain servers will actually use or be capable of
213 # building external drivers, including binary drivers. 215 # building external drivers, including binary drivers.
214 if [[ -n "${DRIVER}" ]]; then 216 if [[ -n "${DRIVER}" ]]; then
215 if has_version '>=x11-base/xorg-server-1.1'; then 217 if has_version '>=x11-base/xorg-server-1.1'; then
219 fi 221 fi
220 fi 222 fi
221 fi 223 fi
222} 224}
223 225
226# @FUNCTION: x-modular_unpack_source
227# @USAGE:
228# @DESCRIPTION:
229# Simply unpack source code. Nothing else.
224x-modular_unpack_source() { 230x-modular_unpack_source() {
225 if [[ -n ${GIT_ECLASS} ]]; then 231 if [[ -n ${GIT_ECLASS} ]]; then
226 git_src_unpack 232 git_src_unpack
227 else 233 else
228 unpack ${A} 234 unpack ${A}
232 if [[ -n ${FONT_OPTIONS} ]]; then 238 if [[ -n ${FONT_OPTIONS} ]]; then
233 einfo "Detected font directory: ${FONT_DIR}" 239 einfo "Detected font directory: ${FONT_DIR}"
234 fi 240 fi
235} 241}
236 242
243# @FUNCTION: x-modular_patch_source
244# @USAGE:
245# @DESCRIPTION:
246# Apply all patches
237x-modular_patch_source() { 247x-modular_patch_source() {
238 # Use standardized names and locations with bulk patching 248 # Use standardized names and locations with bulk patching
239 # Patch directory is ${WORKDIR}/patch 249 # Patch directory is ${WORKDIR}/patch
240 # See epatch() in eutils.eclass for more documentation 250 # See epatch() in eutils.eclass for more documentation
241 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 251 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
242 EPATCH_SUFFIX="patch" 252 EPATCH_SUFFIX="patch"
243 fi 253 fi
244 254
245 # If this is a driver package we need to fix man page install location. 255# @VARIABLE: PATCHES
246 # Running autoreconf will use the patched util-macros to make the 256# @DESCRIPTION:
247 # change for us, so we only need to patch if it is not going to run. 257# If you have any patches to apply, set PATCHES to their locations and epatch
248 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 258# will apply them. It also handles epatch-style bulk patches, if you know how to
249 && [[ ${XDPVER} != -1 ]]; then 259# use them and set the correct variables. If you don't, read eutils.eclass.
250 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 260 if [[ ${#PATCHES[@]} -gt 1 ]]; then
251 fi 261 for x in "${PATCHES[@]}"; do
252 262 epatch "${x}"
253 # For specific list of patches 263 done
254 if [[ -n "${PATCHES}" ]] ; then 264 elif [[ -n "${PATCHES}" ]]; then
255 for PATCH in ${PATCHES} 265 for x in ${PATCHES}; do
256 do
257 epatch ${PATCH} 266 epatch "${x}"
258 done 267 done
259 # For non-default directory bulk patching 268 # For non-default directory bulk patching
260 elif [[ -n "${PATCH_LOC}" ]] ; then 269 elif [[ -n "${PATCH_LOC}" ]] ; then
261 epatch ${PATCH_LOC} 270 epatch ${PATCH_LOC}
262 # For standard bulk patching 271 # For standard bulk patching
263 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 272 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
264 epatch 273 epatch
265 fi 274 fi
266} 275}
267 276
277# @FUNCTION: x-modular_reconf_source
278# @USAGE:
279# @DESCRIPTION:
280# Run eautoreconf if necessary, and run elibtoolize.
268x-modular_reconf_source() { 281x-modular_reconf_source() {
269 # Run autoreconf for CVS snapshots only
270 if [[ "${SNAPSHOT}" = "yes" ]] 282 if [[ "${SNAPSHOT}" = "yes" ]]
271 then 283 then
272 # If possible, generate configure if it doesn't exist 284 # If possible, generate configure if it doesn't exist
273 if [ -f "./configure.ac" ] 285 if [ -f "./configure.ac" ]
274 then 286 then
279 # Joshua Baergen - October 23, 2005 291 # Joshua Baergen - October 23, 2005
280 # Fix shared lib issues on MIPS, FBSD, etc etc 292 # Fix shared lib issues on MIPS, FBSD, etc etc
281 elibtoolize 293 elibtoolize
282} 294}
283 295
296# @FUNCTION: x-modular_src_unpack
297# @USAGE:
298# @DESCRIPTION:
299# Unpack a package, performing all X-related tasks.
284x-modular_src_unpack() { 300x-modular_src_unpack() {
285 x-modular_specs_check 301 x-modular_specs_check
286 x-modular_server_supports_drivers_check 302 x-modular_server_supports_drivers_check
287 x-modular_dri_check 303 x-modular_dri_check
288 x-modular_unpack_source 304 x-modular_unpack_source
289 x-modular_patch_source 305 x-modular_patch_source
290 x-modular_reconf_source 306 x-modular_reconf_source
291} 307}
292 308
309# @FUNCTION: x-modular_font_configure
310# @USAGE:
311# @DESCRIPTION:
312# If a font package, perform any necessary configuration steps
293x-modular_font_configure() { 313x-modular_font_configure() {
294 if [[ -n "${FONT}" ]]; then 314 if [[ -n "${FONT}" ]]; then
295 # Might be worth adding an option to configure your desired font 315 # Might be worth adding an option to configure your desired font
296 # and exclude all others. Also, should this USE be nls or minimal? 316 # and exclude all others. Also, should this USE be nls or minimal?
297 if ! use nls; then 317 if ! use nls; then
315 --disable-koi8-r" 335 --disable-koi8-r"
316 fi 336 fi
317 fi 337 fi
318} 338}
319 339
340# @FUNCTION: x-modular_debug_setup
341# @USAGE:
342# @DESCRIPTION:
343# Set up CFLAGS for a debug build
320x-modular_debug_setup() { 344x-modular_debug_setup() {
321 if [[ -n "${DEBUGGABLE}" ]]; then 345 if [[ -n "${DEBUGGABLE}" ]]; then
322 if use debug; then 346 if use debug; then
323 strip-flags 347 strip-flags
324 append-flags -g 348 append-flags -g
325 fi 349 fi
326 fi 350 fi
327} 351}
328 352
353# @FUNCTION: x-modular_src_configure
354# @USAGE:
355# @DESCRIPTION:
356# Perform any necessary pre-configuration steps, then run configure
329x-modular_src_configure() { 357x-modular_src_configure() {
330 x-modular_font_configure 358 x-modular_font_configure
331 x-modular_debug_setup 359 x-modular_debug_setup
360
361# @VARIABLE: CONFIGURE_OPTIONS
362# @DESCRIPTION:
363# Any options to pass to configure
364[[ -n ${CONFIGURE_OPTIONTS} ]]
332 365
333 # If prefix isn't set here, .pc files cause problems 366 # If prefix isn't set here, .pc files cause problems
334 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 367 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
335 econf --prefix=${XDIR} \ 368 econf --prefix=${XDIR} \
336 --datadir=${XDIR}/share \ 369 --datadir=${XDIR}/share \
338 ${DRIVER_OPTIONS} \ 371 ${DRIVER_OPTIONS} \
339 ${CONFIGURE_OPTIONS} 372 ${CONFIGURE_OPTIONS}
340 fi 373 fi
341} 374}
342 375
376# @FUNCTION: x-modular_src_make
377# @USAGE:
378# @DESCRIPTION:
379# Run make.
343x-modular_src_make() { 380x-modular_src_make() {
344 emake || die "emake failed" 381 emake || die "emake failed"
345} 382}
346 383
384# @FUNCTION: x-modular_src_configure
385# @USAGE:
386# @DESCRIPTION:
387# Compile a package, performing all X-related tasks.
347x-modular_src_compile() { 388x-modular_src_compile() {
348 x-modular_src_configure 389 x-modular_src_configure
349 x-modular_src_make 390 x-modular_src_make
350} 391}
351 392
393# @FUNCTION: x-modular_src_install
394# @USAGE:
395# @DESCRIPTION:
396# Install a built package to ${D}, performing any necessary steps.
397# Creates a ChangeLog from git if using live ebuilds.
352x-modular_src_install() { 398x-modular_src_install() {
353 # Install everything to ${XDIR} 399 # Install everything to ${XDIR}
354 make \ 400 make \
355 DESTDIR="${D}" \ 401 DESTDIR="${D}" \
356 install 402 install
366 fi 412 fi
367 413
368 if [[ -e ${S}/ChangeLog ]]; then 414 if [[ -e ${S}/ChangeLog ]]; then
369 dodoc ${S}/ChangeLog 415 dodoc ${S}/ChangeLog
370 fi 416 fi
417# @VARIABLE: DOCS
418# @DESCRIPTION:
419# Any documentation to install
420 [[ -n ${DOCS} ]] && dodoc ${DOCS}
371 421
372 # Make sure docs get compressed 422 # Make sure docs get compressed
373 prepalldocs 423 prepalldocs
374 424
375 # Don't install libtool archives for server modules 425 # Don't install libtool archives for server modules
376 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 426 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
377 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 427 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
378 | xargs rm -f 428 | xargs rm -f
379 fi 429 fi
380 430
381 # Don't install overlapping fonts.* files
382 # Generate them instead when possible
383 if [[ -n "${FONT}" ]]; then 431 if [[ -n "${FONT}" ]]; then
384 remove_font_metadata 432 remove_font_metadata
385 fi 433 fi
386 434
387 if [[ -n "${DRIVER}" ]]; then 435 if [[ -n "${DRIVER}" ]]; then
388 install_driver_hwdata 436 install_driver_hwdata
389 fi 437 fi
390} 438}
391 439
440# @FUNCTION: x-modular_pkg_preinst
441# @USAGE:
442# @DESCRIPTION:
443# This function doesn't do anything right now, but it may in the future.
392x-modular_pkg_preinst() { 444x-modular_pkg_preinst() {
393 # We no longer do anything here, but we can't remove it from the API 445 # We no longer do anything here, but we can't remove it from the API
394 : 446 :
395} 447}
396 448
449# @FUNCTION: x-modular_pkg_postinst
450# @USAGE:
451# @DESCRIPTION:
452# Run X-specific post-installation tasks on the live filesystem. The
453# only task right now is some setup for font packages.
397x-modular_pkg_postinst() { 454x-modular_pkg_postinst() {
398 if [[ -n "${FONT}" ]]; then 455 if [[ -n "${FONT}" ]]; then
399 setup_fonts 456 setup_fonts
400 fi 457 fi
401} 458}
402 459
460# @FUNCTION: x-modular_pkg_postrm
461# @USAGE:
462# @DESCRIPTION:
463# Run X-specific post-removal tasks on the live filesystem. The only
464# task right now is some cleanup for font packages.
403x-modular_pkg_postrm() { 465x-modular_pkg_postrm() {
404 if [[ -n "${FONT}" ]]; then 466 if [[ -n "${FONT}" ]]; then
405 cleanup_fonts 467 cleanup_fonts
406 font_pkg_postrm 468 font_pkg_postrm
407 fi 469 fi
408} 470}
409 471
472# @FUNCTION: cleanup_fonts
473# @USAGE:
474# @DESCRIPTION:
475# Get rid of font directories that only contain generated files
410cleanup_fonts() { 476cleanup_fonts() {
411 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 477 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
412 for DIR in ${FONT_DIR}; do 478 for DIR in ${FONT_DIR}; do
413 unset KEEP_FONTDIR 479 unset KEEP_FONTDIR
414 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 480 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
440 fi 506 fi
441 eend 0 507 eend 0
442 done 508 done
443} 509}
444 510
511# @FUNCTION: setup_fonts
512# @USAGE:
513# @DESCRIPTION:
514# Generates needed files for fonts and fixes font permissions
445setup_fonts() { 515setup_fonts() {
446 if [[ ! -n "${FONT_DIR}" ]]; then 516 if [[ ! -n "${FONT_DIR}" ]]; then
447 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 517 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
448 eerror "${msg}" 518 eerror "${msg}"
449 die "${msg}" 519 die "${msg}"
453 create_fonts_dir 523 create_fonts_dir
454 fix_font_permissions 524 fix_font_permissions
455 create_font_cache 525 create_font_cache
456} 526}
457 527
528# @FUNCTION: remove_font_metadata
529# @USAGE:
530# @DESCRIPTION:
531# Don't let the package install generated font files that may overlap
532# with other packages. Instead, they're generated in pkg_postinst().
458remove_font_metadata() { 533remove_font_metadata() {
459 local DIR 534 local DIR
460 for DIR in ${FONT_DIR}; do 535 for DIR in ${FONT_DIR}; do
461 if [[ "${DIR}" != "Speedo" ]] && \ 536 if [[ "${DIR}" != "Speedo" ]] && \
462 [[ "${DIR}" != "CID" ]] ; then 537 [[ "${DIR}" != "CID" ]] ; then
465 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 540 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
466 fi 541 fi
467 done 542 done
468} 543}
469 544
545# @FUNCTION: install_driver_hwdata
546# @USAGE:
547# @DESCRIPTION:
470# Installs device-to-driver mappings for system-config-display 548# Installs device-to-driver mappings for system-config-display and
471# and anything else that uses hwdata 549# anything else that uses hwdata.
472install_driver_hwdata() { 550install_driver_hwdata() {
473 insinto /usr/share/hwdata/videoaliases 551 insinto /usr/share/hwdata/videoaliases
474 for i in "${FILESDIR}"/*.xinf; do 552 for i in "${FILESDIR}"/*.xinf; do
475 # We need this for the case when none exist, 553 # We need this for the case when none exist,
476 # so *.xinf doesn't expand 554 # so *.xinf doesn't expand
478 doins $i 556 doins $i
479 fi 557 fi
480 done 558 done
481} 559}
482 560
561# @FUNCTION: discover_font_dirs
562# @USAGE:
563# @DESCRIPTION:
564# Deprecated. Sets up the now-unused FONT_DIRS variable.
483discover_font_dirs() { 565discover_font_dirs() {
484 FONT_DIRS="${FONT_DIR}" 566 FONT_DIRS="${FONT_DIR}"
485} 567}
486 568
569# @FUNCTION: create_fonts_scale
570# @USAGE:
571# @DESCRIPTION:
572# Create fonts.scale file, used by the old server-side fonts subsystem.
487create_fonts_scale() { 573create_fonts_scale() {
488 ebegin "Creating fonts.scale files" 574 ebegin "Creating fonts.scale files"
489 local x 575 local x
490 for DIR in ${FONT_DIR}; do 576 for DIR in ${FONT_DIR}; do
491 x=${ROOT}/usr/share/fonts/${DIR} 577 x=${ROOT}/usr/share/fonts/${DIR}
505 fi 591 fi
506 done 592 done
507 eend 0 593 eend 0
508} 594}
509 595
596# @FUNCTION: create_fonts_dir
597# @USAGE:
598# @DESCRIPTION:
599# Create fonts.dir file, used by the old server-side fonts subsystem.
510create_fonts_dir() { 600create_fonts_dir() {
511 ebegin "Generating fonts.dir files" 601 ebegin "Generating fonts.dir files"
512 for DIR in ${FONT_DIR}; do 602 for DIR in ${FONT_DIR}; do
513 x=${ROOT}/usr/share/fonts/${DIR} 603 x=${ROOT}/usr/share/fonts/${DIR}
514 [[ -z "$(ls ${x}/)" ]] && continue 604 [[ -z "$(ls ${x}/)" ]] && continue
522 fi 612 fi
523 done 613 done
524 eend 0 614 eend 0
525} 615}
526 616
617# @FUNCTION: fix_font_permissions
618# @USAGE:
619# @DESCRIPTION:
620# Font files should have 644 permissions. Ensure this is the case.
527fix_font_permissions() { 621fix_font_permissions() {
528 ebegin "Fixing permissions" 622 ebegin "Fixing permissions"
529 for DIR in ${FONT_DIR}; do 623 for DIR in ${FONT_DIR}; do
530 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 624 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
531 -exec chmod 0644 {} \; 625 -exec chmod 0644 {} \;
532 done 626 done
533 eend 0 627 eend 0
534} 628}
535 629
630# @FUNCTION: create_font_cache
631# @USAGE:
632# @DESCRIPTION:
633# Create fonts.cache-1 files, used by the new client-side fonts
634# subsystem.
536create_font_cache() { 635create_font_cache() {
537 font_pkg_postinst 636 font_pkg_postinst
538} 637}
539 638
540EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 639EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.87  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20