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

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.106

  ViewVC Help
Powered by ViewVC 1.1.20