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

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

  ViewVC Help
Powered by ViewVC 1.1.20