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

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

  ViewVC Help
Powered by ViewVC 1.1.20