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