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

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.109

  ViewVC Help
Powered by ViewVC 1.1.20