/[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.26 Revision 1.118
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.26 2005/12/07 22:10:45 joshuabaergen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.118 2009/12/09 10:21:49 vapier Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# @ECLASS: x-modular.eclass
6# @MAINTAINER:
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# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to 18# everything else should be automatic.
11# the subdirectories within /usr/share/fonts to which it installs fonts.
12 19
13EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 20if [[ ${PV} = 9999* ]]; then
14 21 GIT_ECLASS="git"
15inherit eutils libtool toolchain-funcs 22 SNAPSHOT="yes"
16 23 SRC_URI=""
17# Directory prefix to use for everything
18XDIR="/usr"
19
20IUSE=""
21HOMEPAGE="http://xorg.freedesktop.org/"
22SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2
23 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
24 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
26LICENSE="X11"
27SLOT="0"
28
29# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5
36 >=sys-devel/m4-1.4"
37fi 24fi
38 25
39# If we're a font package, but not the font.alias one 26# If we're a font package, but not the font.alias one
27FONT_ECLASS=""
40if [[ "${PN/#font-}" != "${PN}" ]] \ 28if [[ "${PN/#font-}" != "${PN}" ]] \
29 && [[ "${CATEGORY}" = "media-fonts" ]] \
41 && [[ "${PN}" != "font-alias" ]] \ 30 && [[ "${PN}" != "font-alias" ]] \
42 && [[ "${PN}" != "font-util" ]]; then 31 && [[ "${PN}" != "font-util" ]]; then
43 # Activate font code in the rest of the eclass 32 # Activate font code in the rest of the eclass
44 FONT="yes" 33 FONT="yes"
45 34
35 # Whether to inherit the font eclass
36 FONT_ECLASS="font"
37fi
38
39inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
40 ${FONT_ECLASS} ${GIT_ECLASS}
41
42EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
43
44case "${EAPI:-0}" in
45 0|1)
46 ;;
47 2)
48 EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure"
49 ;;
50 *)
51 die "Unknown EAPI ${EAPI}"
52 ;;
53esac
54
55# exports must be ALWAYS after inherit
56EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
57
58# @ECLASS-VARIABLE: XDIR
59# @DESCRIPTION:
60# Directory prefix to use for everything. If you want to install to a
61# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
62# recently tested. You may need to uncomment the setting of datadir and
63# mandir in x-modular_src_install() or add it back in if it's no longer
64# there. You may also want to change the SLOT.
65XDIR="/usr"
66
67IUSE=""
68HOMEPAGE="http://xorg.freedesktop.org/"
69
70# @ECLASS-VARIABLE: SNAPSHOT
71# @DESCRIPTION:
72# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
73# before inheriting this eclass.
74: ${SNAPSHOT:=no}
75
76# Set up SRC_URI for individual modular releases
77BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
78# @ECLASS-VARIABLE: MODULE
79# @DESCRIPTION:
80# The subdirectory to download source from. Possible settings are app,
81# doc, data, util, driver, font, lib, proto, xserver. Set above the
82# inherit to override the default autoconfigured module.
83if [[ -z ${MODULE} ]]; then
84 case ${CATEGORY} in
85 app-doc) MODULE="doc" ;;
86 media-fonts) MODULE="font" ;;
87 x11-apps|x11-wm) MODULE="app" ;;
88 x11-misc|x11-themes) MODULE="util" ;;
89 x11-drivers) MODULE="driver" ;;
90 x11-base) MODULE="xserver" ;;
91 x11-proto) MODULE="proto" ;;
92 x11-libs) MODULE="lib" ;;
93 esac
94fi
95
96if [[ -n ${GIT_ECLASS} ]]; then
97 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
98else
99 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
100fi
101
102SLOT="0"
103
104# Set the license for the package. This can be overridden by setting
105# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
106# are under the MIT license. (This is what Red Hat does in their rpms)
107LICENSE="MIT"
108
109# Set up shared dependencies
110if [[ -n "${SNAPSHOT}" ]]; then
111# FIXME: What's the minimal libtool version supporting arbitrary versioning?
112 DEPEND="${DEPEND}
113 >=sys-devel/libtool-1.5
114 >=sys-devel/m4-1.4"
115 WANT_AUTOCONF="latest"
116 WANT_AUTOMAKE="latest"
117fi
118
119if [[ -n "${FONT}" ]]; then
46 RDEPEND="${RDEPEND} 120 RDEPEND="${RDEPEND}
47 media-fonts/encodings" 121 media-fonts/encodings
122 x11-apps/mkfontscale
123 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 124 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 125 media-fonts/font-alias"
50 126
51 # Starting with 7.0RC3, we can specify the font directory 127 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 128 # But oddly, we can't do the same for encodings or font-alias
53 129
54 # Wrap in `if` so ebuilds can set it too 130# @ECLASS-VARIABLE: FONT_DIR
55 if [[ -z ${FONT_DIR} ]]; then 131# @DESCRIPTION:
132# If you're creating a font package and the suffix of PN is not equal to
133# the subdirectory of /usr/share/fonts/ it should install into, set
134# FONT_DIR to that directory or directories. Set before inheriting this
135# eclass.
56 FONT_DIR=${PN##*-} 136 : ${FONT_DIR:=${PN##*-}}
57
58 fi
59 137
60 # Fix case of font directories 138 # Fix case of font directories
61 FONT_DIR=${FONT_DIR/ttf/TTF} 139 FONT_DIR=${FONT_DIR/ttf/TTF}
62 FONT_DIR=${FONT_DIR/otf/OTF} 140 FONT_DIR=${FONT_DIR/otf/OTF}
63 FONT_DIR=${FONT_DIR/type1/Type1} 141 FONT_DIR=${FONT_DIR/type1/Type1}
64 FONT_DIR=${FONT_DIR/speedo/Speedo} 142 FONT_DIR=${FONT_DIR/speedo/Speedo}
65 143
66 # Set up configure option 144 # Set up configure options, wrapped so ebuilds can override if need be
145 if [[ -z ${FONT_OPTIONS} ]]; then
67 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 146 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
147 fi
68 148
69 if [[ -n "${FONT}" ]]; then 149 if [[ -n "${FONT}" ]]; then
70 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 150 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
71 IUSE="${IUSE} nls" 151 IUSE="${IUSE} nls"
72 fi 152 fi
73 fi 153 fi
74fi 154fi
75 155
76# If we're a driver package 156# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 157if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 158 # Enable driver code in the rest of the eclass
79 DRIVER_OPTIONS="--disable-static" 159 DRIVER="yes"
160fi
161
162# Debugging -- ignore packages that can't be built with debugging
163if [[ -z "${FONT}" ]] \
164 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
165 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
166 && [[ "${PN/util-macros}" = "${PN}" ]] \
167 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
168 && [[ "${PN/xkbdata}" = "${PN}" ]] \
169 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
170 && [[ "${PN/xcursor}" = "${PN}" ]] \
171 ; then
172 DEBUGGABLE="yes"
173 IUSE="${IUSE} debug"
80fi 174fi
81 175
82DEPEND="${DEPEND} 176DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 177 >=dev-util/pkgconfig-0.18"
178
179if [[ "${PN/util-macros}" = "${PN}" ]]; then
180 DEPEND="${DEPEND}
84 >=x11-misc/util-macros-0.99.2" 181 >=x11-misc/util-macros-1.3.0
182 sys-devel/binutils"
183fi
85 184
86# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
87RDEPEND="${RDEPEND} 185RDEPEND="${RDEPEND}
88 !<=x11-base/xorg-x11-6.9 186 !<=x11-base/xorg-x11-6.9"
89 >=sys-apps/man-1.6b-r2"
90# Provides virtual/x11 for temporary use until packages are ported 187# Provides virtual/x11 for temporary use until packages are ported
91# x11-base/x11-env" 188# x11-base/x11-env"
92 189
190# @FUNCTION: x-modular_specs_check
191# @USAGE:
192# @DESCRIPTION:
193# Make any necessary changes related to gcc specs (generally hardened)
194x-modular_specs_check() {
195 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
196 append-ldflags -Wl,-z,lazy
197 # (#116698) breaks loading
198 filter-ldflags -Wl,-z,now
199 fi
200}
201
202# @FUNCTION: x-modular_dri_check
203# @USAGE:
204# @DESCRIPTION:
205# Ensures the server supports DRI if building a driver with DRI support
206x-modular_dri_check() {
207 # (#120057) Enabling DRI in drivers requires that the server was built with
208 # support for it
209 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
210 # USE=minimal is set (see bug #252084)
211 if [[ -n "${DRIVER}" ]]; then
212 if has dri ${IUSE} && use dri; then
213 einfo "Checking for direct rendering capabilities ..."
214 if has_version '>=x11-base/xorg-server-1.5.3'; then
215 if built_with_use x11-base/xorg-server minimal; then
216 die "You must build x11-base/xorg-server with USE=-minimal."
217 fi
218 else
219 if ! built_with_use x11-base/xorg-server dri; then
220 die "You must build x11-base/xorg-server with USE=dri."
221 fi
222 fi
223 fi
224 fi
225}
226
227# @FUNCTION: x-modular_server_supports_drivers_check
228# @USAGE:
229# @DESCRIPTION:
230# Ensures the server SDK is installed if a driver is being built
231x-modular_server_supports_drivers_check() {
232 # (#135873) Only certain servers will actually use or be capable of
233 # building external drivers, including binary drivers.
234 if [[ -n "${DRIVER}" ]]; then
235 if has_version '>=x11-base/xorg-server-1.1'; then
236 if ! built_with_use x11-base/xorg-server xorg; then
237 eerror "x11-base/xorg-server is not built with support for external drivers."
238 die "You must build x11-base/xorg-server with USE=xorg."
239 fi
240 fi
241 fi
242}
243
244# @FUNCTION: x-modular_unpack_source
245# @USAGE:
246# @DESCRIPTION:
247# Simply unpack source code. Nothing else.
93x-modular_unpack_source() { 248x-modular_unpack_source() {
249 if [[ -n ${GIT_ECLASS} ]]; then
250 git_src_unpack
251 else
94 unpack ${A} 252 unpack ${A}
253 fi
95 cd ${S} 254 cd "${S}"
96
97 # Joshua Baergen - October 23, 2005
98 # Fix shared lib issues on MIPS, FBSD, etc etc
99 elibtoolize
100 255
101 if [[ -n ${FONT_OPTIONS} ]]; then 256 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 257 einfo "Detected font directory: ${FONT_DIR}"
103 fi 258 fi
104} 259}
105 260
261# @FUNCTION: x-modular_patch_source
262# @USAGE:
263# @DESCRIPTION:
264# Apply all patches
106x-modular_patch_source() { 265x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 266 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 267 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 268 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 269 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 270 EPATCH_SUFFIX="patch"
112 fi 271 fi
113 272
114 # For specific list of patches 273# @VARIABLE: PATCHES
274# @DESCRIPTION:
275# If you have any patches to apply, set PATCHES to their locations and epatch
276# will apply them. It also handles epatch-style bulk patches, if you know how to
277# use them and set the correct variables. If you don't, read eutils.eclass.
278 if [[ ${#PATCHES[@]} -gt 1 ]]; then
279 for x in "${PATCHES[@]}"; do
280 epatch "${x}"
281 done
115 if [ -n "${PATCHES}" ] ; then 282 elif [[ -n "${PATCHES}" ]]; then
116 for PATCH in ${PATCHES} 283 for x in ${PATCHES}; do
117 do
118 epatch ${PATCH} 284 epatch "${x}"
119 done 285 done
120 # For non-default directory bulk patching 286 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 287 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 288 epatch ${PATCH_LOC}
123 # For standard bulk patching 289 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 290 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 291 epatch
126 fi 292 fi
127} 293}
128 294
295# @FUNCTION: x-modular_reconf_source
296# @USAGE:
297# @DESCRIPTION:
298# Run eautoreconf if necessary, and run elibtoolize.
129x-modular_reconf_source() { 299x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 300 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 301 then
133 # If possible, generate configure if it doesn't exist 302 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 303 if [ -f "./configure.ac" ]
135 then 304 then
136 einfo "Running autoreconf..." 305 eautoreconf
137 autoreconf -v --force --install
138 fi
139 fi 306 fi
140
141}
142
143x-modular_src_unpack() {
144 for x in xorg-server xf86-video- xf86-input- ; do
145 if [[ ${PN:0:11} = $x ]] && gcc-specs-now; then
146 msg="Do not emerge ${PN} without vanilla gcc!"
147 eerror "$msg"
148 die "$msg"
149 fi 307 fi
150 done
151 308
152 x-modular_unpack_source 309 # Joshua Baergen - October 23, 2005
310 # Fix shared lib issues on MIPS, FBSD, etc etc
311 elibtoolize
312}
313
314# @FUNCTION: x-modular_src_prepare
315# @USAGE:
316# @DESCRIPTION:
317# Prepare a package after unpacking, performing all X-related tasks.
318x-modular_src_prepare() {
319 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
320 && git_src_prepare
153 x-modular_patch_source 321 x-modular_patch_source
154 x-modular_reconf_source 322 x-modular_reconf_source
155} 323}
156 324
325# @FUNCTION: x-modular_src_unpack
326# @USAGE:
327# @DESCRIPTION:
328# Unpack a package, performing all X-related tasks.
329x-modular_src_unpack() {
330 x-modular_specs_check
331 x-modular_server_supports_drivers_check
332 x-modular_dri_check
333 x-modular_unpack_source
334 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
335}
336
337# @FUNCTION: x-modular_font_configure
338# @USAGE:
339# @DESCRIPTION:
340# If a font package, perform any necessary configuration steps
157x-modular_font_configure() { 341x-modular_font_configure() {
158 if [[ -n "${FONT}" ]]; then 342 if [[ -n "${FONT}" ]]; then
159 # Might be worth adding an option to configure your desired font 343 # Might be worth adding an option to configure your desired font
160 # and exclude all others. Also, should this USE be nls or minimal? 344 # and exclude all others. Also, should this USE be nls or minimal?
161 if ! use nls; then 345 if has nls ${IUSE//+} && ! use nls; then
162 FONT_OPTIONS="${FONT_OPTIONS} 346 FONT_OPTIONS="${FONT_OPTIONS}
163 --disable-iso8859-2 347 --disable-iso8859-2
164 --disable-iso8859-3 348 --disable-iso8859-3
165 --disable-iso8859-4 349 --disable-iso8859-4
166 --disable-iso8859-5 350 --disable-iso8859-5
179 --disable-koi8-r" 363 --disable-koi8-r"
180 fi 364 fi
181 fi 365 fi
182} 366}
183 367
368# @FUNCTION: x-modular_debug_setup
369# @USAGE:
370# @DESCRIPTION:
371# Set up CFLAGS for a debug build
372x-modular_debug_setup() {
373 if [[ -n "${DEBUGGABLE}" ]]; then
374 if use debug; then
375 strip-flags
376 append-flags -g
377 fi
378 fi
379}
380
381# @FUNCTION: x-modular_src_configure
382# @USAGE:
383# @DESCRIPTION:
384# Perform any necessary pre-configuration steps, then run configure
184x-modular_src_configure() { 385x-modular_src_configure() {
185 x-modular_font_configure 386 x-modular_font_configure
387 x-modular_debug_setup
388
389# @VARIABLE: CONFIGURE_OPTIONS
390# @DESCRIPTION:
391# Any extra options to pass to configure
186 392
187 # If prefix isn't set here, .pc files cause problems 393 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 394 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
189 econf --prefix=${XDIR} \ 395 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 396 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 397 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 398 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 399 ${CONFIGURE_OPTIONS}
194 fi 400 fi
195} 401}
196 402
403# @FUNCTION: x-modular_src_make
404# @USAGE:
405# @DESCRIPTION:
406# Run make.
197x-modular_src_make() { 407x-modular_src_make() {
198 emake || die "emake failed" 408 emake || die "emake failed"
199} 409}
200 410
411# @FUNCTION: x-modular_src_compile
412# @USAGE:
413# @DESCRIPTION:
414# Compile a package, performing all X-related tasks.
201x-modular_src_compile() { 415x-modular_src_compile() {
202 x-modular_src_configure 416 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
203 x-modular_src_make 417 x-modular_src_make
204} 418}
205 419
420# @FUNCTION: x-modular_src_install
421# @USAGE:
422# @DESCRIPTION:
423# Install a built package to ${D}, performing any necessary steps.
424# Creates a ChangeLog from git if using live ebuilds.
206x-modular_src_install() { 425x-modular_src_install() {
207 # Install everything to ${XDIR} 426 # Install everything to ${XDIR}
427 if [[ ${CATEGORY} = x11-proto ]]; then
208 make \ 428 make \
429 ${PN/proto/}docdir=/usr/share/doc/${PF} \
209 DESTDIR="${D}" \ 430 DESTDIR="${D}" \
210 install 431 install \
432 || die
433 else
434 make \
435 docdir=/usr/share/doc/${PF} \
436 DESTDIR="${D}" \
437 install \
438 || die
439 fi
211# Shouldn't be necessary in XDIR=/usr 440# Shouldn't be necessary in XDIR=/usr
212# einstall forces datadir, so we need to re-force it 441# einstall forces datadir, so we need to re-force it
213# datadir=${XDIR}/share \ 442# datadir=${XDIR}/share \
214# mandir=${XDIR}/share/man \ 443# mandir=${XDIR}/share/man \
215 444
445 if [[ -n ${GIT_ECLASS} ]]; then
446 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
447 git log ${GIT_TREE} > "${S}"/ChangeLog
448 popd
449 fi
450
451 if [[ -e ${S}/ChangeLog ]]; then
452 dodoc "${S}"/ChangeLog
453 fi
454# @VARIABLE: DOCS
455# @DESCRIPTION:
456# Any documentation to install via dodoc
457 [[ -n ${DOCS} ]] && dodoc ${DOCS}
458
216 # Don't install libtool archives for server modules 459 # Don't install libtool archives for server modules
217 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 460 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
218 find ${D}/usr/lib/xorg/modules -name '*.la' \ 461 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
219 | xargs rm -f 462 | xargs rm -f
220 fi 463 fi
221}
222 464
465 if [[ -n "${FONT}" ]]; then
466 remove_font_metadata
467 fi
468
469 if [[ -n "${DRIVER}" ]]; then
470 install_driver_hwdata
471 fi
472}
473
474# @FUNCTION: x-modular_pkg_preinst
475# @USAGE:
476# @DESCRIPTION:
477# This function doesn't do anything right now, but it may in the future.
223x-modular_pkg_preinst() { 478x-modular_pkg_preinst() {
224 if [[ -n "${FONT}" ]]; then 479 # We no longer do anything here, but we can't remove it from the API
225 discover_font_dirs 480 :
226 fi
227} 481}
228 482
483# @FUNCTION: x-modular_pkg_postinst
484# @USAGE:
485# @DESCRIPTION:
486# Run X-specific post-installation tasks on the live filesystem. The
487# only task right now is some setup for font packages.
229x-modular_pkg_postinst() { 488x-modular_pkg_postinst() {
230 if [[ -n "${FONT}" ]]; then 489 if [[ -n "${FONT}" ]]; then
231 setup_fonts 490 setup_fonts
232 fi 491 fi
233} 492}
234 493
494# @FUNCTION: x-modular_pkg_postrm
495# @USAGE:
496# @DESCRIPTION:
497# Run X-specific post-removal tasks on the live filesystem. The only
498# task right now is some cleanup for font packages.
235x-modular_pkg_postrm() { 499x-modular_pkg_postrm() {
236 if [[ -n "${FONT}" ]]; then 500 if [[ -n "${FONT}" ]]; then
237 cleanup_fonts 501 cleanup_fonts
502 font_pkg_postrm
238 fi 503 fi
239} 504}
240 505
506# @FUNCTION: cleanup_fonts
507# @USAGE:
508# @DESCRIPTION:
509# Get rid of font directories that only contain generated files
241cleanup_fonts() { 510cleanup_fonts() {
242 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 511 local ALLOWED_FILES="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
243 for DIR in ${FONT_DIR}; do 512 for DIR in ${FONT_DIR}; do
244 unset KEEP_FONTDIR 513 unset KEEP_FONTDIR
245 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 514 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
246 515
247 ebegin "Checking ${REAL_DIR} for useless files" 516 ebegin "Checking ${REAL_DIR} for useless files"
271 fi 540 fi
272 eend 0 541 eend 0
273 done 542 done
274} 543}
275 544
545# @FUNCTION: setup_fonts
546# @USAGE:
547# @DESCRIPTION:
548# Generates needed files for fonts and fixes font permissions
276setup_fonts() { 549setup_fonts() {
277 if [[ ! -n "${FONT_DIRS}" ]]; then 550 if [[ ! -n "${FONT_DIR}" ]]; then
278 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 551 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
279 eerror "${msg}" 552 eerror "${msg}"
280 die "${msg}" 553 die "${msg}"
281 fi 554 fi
282 555
283 create_fonts_scale 556 create_fonts_scale
284 create_fonts_dir 557 create_fonts_dir
285 fix_font_permissions
286 create_font_cache 558 create_font_cache
287} 559}
288 560
561# @FUNCTION: remove_font_metadata
562# @USAGE:
563# @DESCRIPTION:
564# Don't let the package install generated font files that may overlap
565# with other packages. Instead, they're generated in pkg_postinst().
566remove_font_metadata() {
567 local DIR
568 for DIR in ${FONT_DIR}; do
569 if [[ "${DIR}" != "Speedo" ]] && \
570 [[ "${DIR}" != "CID" ]] ; then
571 # Delete font metadata files
572 # fonts.scale, fonts.dir, fonts.cache-1
573 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
574 fi
575 done
576}
577
578# @FUNCTION: install_driver_hwdata
579# @USAGE:
580# @DESCRIPTION:
581# Installs device-to-driver mappings for system-config-display and
582# anything else that uses hwdata.
583install_driver_hwdata() {
584 insinto /usr/share/hwdata/videoaliases
585 for i in "${FILESDIR}"/*.xinf; do
586 # We need this for the case when none exist,
587 # so *.xinf doesn't expand
588 if [[ -e $i ]]; then
589 doins $i
590 fi
591 done
592}
593
594# @FUNCTION: discover_font_dirs
595# @USAGE:
596# @DESCRIPTION:
597# Deprecated. Sets up the now-unused FONT_DIRS variable.
289discover_font_dirs() { 598discover_font_dirs() {
290 pushd ${IMAGE}/usr/share/fonts 599 FONT_DIRS="${FONT_DIR}"
291 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
292 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
293 popd
294} 600}
295 601
602# @FUNCTION: create_fonts_scale
603# @USAGE:
604# @DESCRIPTION:
605# Create fonts.scale file, used by the old server-side fonts subsystem.
296create_fonts_scale() { 606create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 607 ebegin "Creating fonts.scale files"
298 local x 608 local x
299 for FONT_DIR in ${FONT_DIRS}; do 609 for DIR in ${FONT_DIR}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 610 x=${ROOT}/usr/share/fonts/${DIR}
301 [ -z "$(ls ${x}/)" ] && continue 611 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 612 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 613
304 # Only generate .scale files if truetype, opentype or type1 614 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 615 # fonts are present ...
306 616
307 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 617 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 618 # <dberkholz@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 619 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$?
320 else
321 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2
323 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x}
329 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 620 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 621 mkfontscale \
334 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 622 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 623 -- ${x}
337 fi 624 fi
338 done 625 done
339 eend 0 626 eend 0
340} 627}
341 628
629# @FUNCTION: create_fonts_dir
630# @USAGE:
631# @DESCRIPTION:
632# Create fonts.dir file, used by the old server-side fonts subsystem.
342create_fonts_dir() { 633create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 634 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 635 for DIR in ${FONT_DIR}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 636 x=${ROOT}/usr/share/fonts/${DIR}
346 [ -z "$(ls ${x}/)" ] && continue 637 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 638 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 639
349 if [ "${x/encodings}" = "${x}" ]; then 640 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 641 mkfontdir \
351 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 642 -e "${ROOT}"/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 643 -e "${ROOT}"/usr/share/fonts/encodings/large \
354 -- ${x} 644 -- ${x}
355 fi 645 fi
356 done 646 done
357 eend 0 647 eend 0
358} 648}
359 649
360fix_font_permissions() { 650# @FUNCTION: create_font_cache
361 ebegin "Fixing permissions" 651# @USAGE:
362 for FONT_DIR in ${FONT_DIRS}; do 652# @DESCRIPTION:
363 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 653# Create fonts.cache-1 files, used by the new client-side fonts
364 -exec chmod 0644 {} \; 654# subsystem.
365 done
366 eend 0
367}
368
369create_font_cache() { 655create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 656 font_pkg_postinst
371 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then
374 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0
377 fi
378} 657}

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.118

  ViewVC Help
Powered by ViewVC 1.1.20