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

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.122

  ViewVC Help
Powered by ViewVC 1.1.20