/[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.83 Revision 1.104
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.83 2007/05/02 07:10:33 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.104 2009/02/14 18:37:34 maekke 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"
163 if use debug; then
164 if ! has splitdebug ${FEATURES}; then
165 RESTRICT="${RESTRICT} nostrip"
166 fi
167 fi
168fi 157fi
169 158
170DEPEND="${DEPEND} 159DEPEND="${DEPEND}
171 >=dev-util/pkgconfig-0.18" 160 >=dev-util/pkgconfig-0.18"
172 161
175 >=x11-misc/util-macros-0.99.2 164 >=x11-misc/util-macros-0.99.2
176 >=sys-devel/binutils-2.16.1-r3" 165 >=sys-devel/binutils-2.16.1-r3"
177fi 166fi
178 167
179RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
181 !<=x11-base/xorg-x11-6.9" 169 !<=x11-base/xorg-x11-6.9"
182# Provides virtual/x11 for temporary use until packages are ported 170# Provides virtual/x11 for temporary use until packages are ported
183# x11-base/x11-env" 171# x11-base/x11-env"
184 172
185inherit 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}
186 175
176# @FUNCTION: x-modular_specs_check
177# @USAGE:
178# @DESCRIPTION:
179# Make any necessary changes related to gcc specs (generally hardened)
187x-modular_specs_check() { 180x-modular_specs_check() {
188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 181 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
189 append-ldflags -Wl,-z,lazy 182 append-ldflags -Wl,-z,lazy
190 # (#116698) breaks loading 183 # (#116698) breaks loading
191 filter-ldflags -Wl,-z,now 184 filter-ldflags -Wl,-z,now
192 fi 185 fi
193} 186}
194 187
188# @FUNCTION: x-modular_dri_check
189# @USAGE:
190# @DESCRIPTION:
191# Ensures the server supports DRI if building a driver with DRI support
195x-modular_dri_check() { 192x-modular_dri_check() {
196 # (#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
197 # support for it 194 # support for it
198 if [[ -n "${DRIVER}" ]]; then 195 if [[ -n "${DRIVER}" ]]; then
199 if has dri ${IUSE} && use dri; then 196 if has dri ${IUSE} && use dri; then
200 einfo "Checking for direct rendering capabilities ..." 197 einfo "Checking for direct rendering capabilities ..."
201 if ! built_with_use x11-base/xorg-server dri; then 198 if ! built_with_use --missing true x11-base/xorg-server dri; then
202 die "You must build x11-base/xorg-server with USE=dri." 199 die "You must build x11-base/xorg-server with USE=dri."
203 fi 200 fi
204 fi 201 fi
205 fi 202 fi
206} 203}
207 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
208x-modular_server_supports_drivers_check() { 209x-modular_server_supports_drivers_check() {
209 # (#135873) Only certain servers will actually use or be capable of 210 # (#135873) Only certain servers will actually use or be capable of
210 # building external drivers, including binary drivers. 211 # building external drivers, including binary drivers.
211 if [[ -n "${DRIVER}" ]]; then 212 if [[ -n "${DRIVER}" ]]; then
212 if has_version '>=x11-base/xorg-server-1.1'; then 213 if has_version '>=x11-base/xorg-server-1.1'; then
216 fi 217 fi
217 fi 218 fi
218 fi 219 fi
219} 220}
220 221
222# @FUNCTION: x-modular_unpack_source
223# @USAGE:
224# @DESCRIPTION:
225# Simply unpack source code. Nothing else.
221x-modular_unpack_source() { 226x-modular_unpack_source() {
227 if [[ -n ${GIT_ECLASS} ]]; then
228 git_src_unpack
229 else
222 unpack ${A} 230 unpack ${A}
231 fi
223 cd ${S} 232 cd "${S}"
224 233
225 if [[ -n ${FONT_OPTIONS} ]]; then 234 if [[ -n ${FONT_OPTIONS} ]]; then
226 einfo "Detected font directory: ${FONT_DIR}" 235 einfo "Detected font directory: ${FONT_DIR}"
227 fi 236 fi
228} 237}
229 238
239# @FUNCTION: x-modular_patch_source
240# @USAGE:
241# @DESCRIPTION:
242# Apply all patches
230x-modular_patch_source() { 243x-modular_patch_source() {
231 # Use standardized names and locations with bulk patching 244 # Use standardized names and locations with bulk patching
232 # Patch directory is ${WORKDIR}/patch 245 # Patch directory is ${WORKDIR}/patch
233 # See epatch() in eutils.eclass for more documentation 246 # See epatch() in eutils.eclass for more documentation
234 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 247 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
235 EPATCH_SUFFIX="patch" 248 EPATCH_SUFFIX="patch"
236 fi 249 fi
237 250
238 # If this is a driver package we need to fix man page install location. 251# @VARIABLE: PATCHES
239 # Running autoreconf will use the patched util-macros to make the 252# @DESCRIPTION:
240 # 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
241 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 254# will apply them. It also handles epatch-style bulk patches, if you know how to
242 && [[ ${XDPVER} != -1 ]]; then 255# use them and set the correct variables. If you don't, read eutils.eclass.
243 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 256 if [[ ${#PATCHES[@]} -gt 1 ]]; then
244 fi 257 for x in "${PATCHES[@]}"; do
245 258 epatch "${x}"
246 # For specific list of patches 259 done
247 if [[ -n "${PATCHES}" ]] ; then 260 elif [[ -n "${PATCHES}" ]]; then
248 for PATCH in ${PATCHES} 261 for x in ${PATCHES}; do
249 do
250 epatch ${PATCH} 262 epatch "${x}"
251 done 263 done
252 # For non-default directory bulk patching 264 # For non-default directory bulk patching
253 elif [[ -n "${PATCH_LOC}" ]] ; then 265 elif [[ -n "${PATCH_LOC}" ]] ; then
254 epatch ${PATCH_LOC} 266 epatch ${PATCH_LOC}
255 # For standard bulk patching 267 # For standard bulk patching
256 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 268 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
257 epatch 269 epatch
258 fi 270 fi
259} 271}
260 272
273# @FUNCTION: x-modular_reconf_source
274# @USAGE:
275# @DESCRIPTION:
276# Run eautoreconf if necessary, and run elibtoolize.
261x-modular_reconf_source() { 277x-modular_reconf_source() {
262 # Run autoreconf for CVS snapshots only
263 if [[ "${SNAPSHOT}" = "yes" ]] 278 if [[ "${SNAPSHOT}" = "yes" ]]
264 then 279 then
265 # If possible, generate configure if it doesn't exist 280 # If possible, generate configure if it doesn't exist
266 if [ -f "./configure.ac" ] 281 if [ -f "./configure.ac" ]
267 then 282 then
272 # Joshua Baergen - October 23, 2005 287 # Joshua Baergen - October 23, 2005
273 # Fix shared lib issues on MIPS, FBSD, etc etc 288 # Fix shared lib issues on MIPS, FBSD, etc etc
274 elibtoolize 289 elibtoolize
275} 290}
276 291
292# @FUNCTION: x-modular_src_unpack
293# @USAGE:
294# @DESCRIPTION:
295# Unpack a package, performing all X-related tasks.
277x-modular_src_unpack() { 296x-modular_src_unpack() {
278 x-modular_specs_check 297 x-modular_specs_check
279 x-modular_server_supports_drivers_check 298 x-modular_server_supports_drivers_check
280 x-modular_dri_check 299 x-modular_dri_check
281 x-modular_unpack_source 300 x-modular_unpack_source
282 x-modular_patch_source 301 x-modular_patch_source
283 x-modular_reconf_source 302 x-modular_reconf_source
284} 303}
285 304
305# @FUNCTION: x-modular_font_configure
306# @USAGE:
307# @DESCRIPTION:
308# If a font package, perform any necessary configuration steps
286x-modular_font_configure() { 309x-modular_font_configure() {
287 if [[ -n "${FONT}" ]]; then 310 if [[ -n "${FONT}" ]]; then
288 # Might be worth adding an option to configure your desired font 311 # Might be worth adding an option to configure your desired font
289 # 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?
290 if ! use nls; then 313 if ! use nls; then
308 --disable-koi8-r" 331 --disable-koi8-r"
309 fi 332 fi
310 fi 333 fi
311} 334}
312 335
336# @FUNCTION: x-modular_debug_setup
337# @USAGE:
338# @DESCRIPTION:
339# Set up CFLAGS for a debug build
313x-modular_debug_setup() { 340x-modular_debug_setup() {
314 if [[ -n "${DEBUGGABLE}" ]]; then 341 if [[ -n "${DEBUGGABLE}" ]]; then
315 if use debug; then 342 if use debug; then
316 strip-flags 343 strip-flags
317 append-flags -g 344 append-flags -g
318 fi 345 fi
319 fi 346 fi
320} 347}
321 348
349# @FUNCTION: x-modular_src_configure
350# @USAGE:
351# @DESCRIPTION:
352# Perform any necessary pre-configuration steps, then run configure
322x-modular_src_configure() { 353x-modular_src_configure() {
323 x-modular_font_configure 354 x-modular_font_configure
324 x-modular_debug_setup 355 x-modular_debug_setup
325 356
357# @VARIABLE: CONFIGURE_OPTIONS
358# @DESCRIPTION:
359# Any options to pass to configure
360[[ -n ${CONFIGURE_OPTIONS} ]]
361
326 # If prefix isn't set here, .pc files cause problems 362 # If prefix isn't set here, .pc files cause problems
327 if [[ -x ./configure ]]; then 363 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
328 econf --prefix=${XDIR} \ 364 econf --prefix=${XDIR} \
329 --datadir=${XDIR}/share \ 365 --datadir=${XDIR}/share \
330 ${FONT_OPTIONS} \ 366 ${FONT_OPTIONS} \
331 ${DRIVER_OPTIONS} \ 367 ${DRIVER_OPTIONS} \
332 ${CONFIGURE_OPTIONS} 368 ${CONFIGURE_OPTIONS}
333 fi 369 fi
334} 370}
335 371
372# @FUNCTION: x-modular_src_make
373# @USAGE:
374# @DESCRIPTION:
375# Run make.
336x-modular_src_make() { 376x-modular_src_make() {
337 emake || die "emake failed" 377 emake || die "emake failed"
338} 378}
339 379
380# @FUNCTION: x-modular_src_configure
381# @USAGE:
382# @DESCRIPTION:
383# Compile a package, performing all X-related tasks.
340x-modular_src_compile() { 384x-modular_src_compile() {
341 x-modular_src_configure 385 x-modular_src_configure
342 x-modular_src_make 386 x-modular_src_make
343} 387}
344 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.
345x-modular_src_install() { 394x-modular_src_install() {
346 # Install everything to ${XDIR} 395 # Install everything to ${XDIR}
347 make \ 396 make \
348 DESTDIR="${D}" \ 397 DESTDIR="${D}" \
349 install 398 install \
399 || die
350# Shouldn't be necessary in XDIR=/usr 400# Shouldn't be necessary in XDIR=/usr
351# einstall forces datadir, so we need to re-force it 401# einstall forces datadir, so we need to re-force it
352# datadir=${XDIR}/share \ 402# datadir=${XDIR}/share \
353# mandir=${XDIR}/share/man \ 403# mandir=${XDIR}/share/man \
354 404
405 if [[ -n ${GIT_ECLASS} ]]; then
406 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
407 git log ${GIT_TREE} > "${S}"/ChangeLog
408 popd
409 fi
410
355 if [[ -e ${S}/ChangeLog ]]; then 411 if [[ -e ${S}/ChangeLog ]]; then
356 dodoc ${S}/ChangeLog 412 dodoc "${S}"/ChangeLog
357 fi 413 fi
414# @VARIABLE: DOCS
415# @DESCRIPTION:
416# Any documentation to install
417 [[ -n ${DOCS} ]] && dodoc ${DOCS}
358 418
359 # Make sure docs get compressed 419 # Make sure docs get compressed
360 prepalldocs 420 prepalldocs
361 421
362 # Don't install libtool archives for server modules 422 # Don't install libtool archives for server modules
363 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 423 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
364 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 424 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
365 | xargs rm -f 425 | xargs rm -f
366 fi 426 fi
367 427
368 # Don't install overlapping fonts.* files
369 # Generate them instead when possible
370 if [[ -n "${FONT}" ]]; then 428 if [[ -n "${FONT}" ]]; then
371 remove_font_metadata 429 remove_font_metadata
372 fi 430 fi
373 431
374 if [[ -n "${DRIVER}" ]]; then 432 if [[ -n "${DRIVER}" ]]; then
375 install_driver_hwdata 433 install_driver_hwdata
376 fi 434 fi
377} 435}
378 436
437# @FUNCTION: x-modular_pkg_preinst
438# @USAGE:
439# @DESCRIPTION:
440# This function doesn't do anything right now, but it may in the future.
379x-modular_pkg_preinst() { 441x-modular_pkg_preinst() {
380 # We no longer do anything here, but we can't remove it from the API 442 # We no longer do anything here, but we can't remove it from the API
381 : 443 :
382} 444}
383 445
446# @FUNCTION: x-modular_pkg_postinst
447# @USAGE:
448# @DESCRIPTION:
449# Run X-specific post-installation tasks on the live filesystem. The
450# only task right now is some setup for font packages.
384x-modular_pkg_postinst() { 451x-modular_pkg_postinst() {
385 if [[ -n "${FONT}" ]]; then 452 if [[ -n "${FONT}" ]]; then
386 setup_fonts 453 setup_fonts
387 fi 454 fi
388} 455}
389 456
457# @FUNCTION: x-modular_pkg_postrm
458# @USAGE:
459# @DESCRIPTION:
460# Run X-specific post-removal tasks on the live filesystem. The only
461# task right now is some cleanup for font packages.
390x-modular_pkg_postrm() { 462x-modular_pkg_postrm() {
391 if [[ -n "${FONT}" ]]; then 463 if [[ -n "${FONT}" ]]; then
392 cleanup_fonts 464 cleanup_fonts
393 font_pkg_postrm 465 font_pkg_postrm
394 fi 466 fi
395} 467}
396 468
469# @FUNCTION: cleanup_fonts
470# @USAGE:
471# @DESCRIPTION:
472# Get rid of font directories that only contain generated files
397cleanup_fonts() { 473cleanup_fonts() {
398 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 474 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
399 for DIR in ${FONT_DIR}; do 475 for DIR in ${FONT_DIR}; do
400 unset KEEP_FONTDIR 476 unset KEEP_FONTDIR
401 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 477 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
427 fi 503 fi
428 eend 0 504 eend 0
429 done 505 done
430} 506}
431 507
508# @FUNCTION: setup_fonts
509# @USAGE:
510# @DESCRIPTION:
511# Generates needed files for fonts and fixes font permissions
432setup_fonts() { 512setup_fonts() {
433 if [[ ! -n "${FONT_DIR}" ]]; then 513 if [[ ! -n "${FONT_DIR}" ]]; then
434 msg="FONT_DIR 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."
435 eerror "${msg}" 515 eerror "${msg}"
436 die "${msg}" 516 die "${msg}"
440 create_fonts_dir 520 create_fonts_dir
441 fix_font_permissions 521 fix_font_permissions
442 create_font_cache 522 create_font_cache
443} 523}
444 524
525# @FUNCTION: remove_font_metadata
526# @USAGE:
527# @DESCRIPTION:
528# Don't let the package install generated font files that may overlap
529# with other packages. Instead, they're generated in pkg_postinst().
445remove_font_metadata() { 530remove_font_metadata() {
446 local DIR 531 local DIR
447 for DIR in ${FONT_DIR}; do 532 for DIR in ${FONT_DIR}; do
448 if [[ "${DIR}" != "Speedo" ]] && \ 533 if [[ "${DIR}" != "Speedo" ]] && \
449 [[ "${DIR}" != "CID" ]] ; then 534 [[ "${DIR}" != "CID" ]] ; then
450 # Delete font metadata files 535 # Delete font metadata files
451 # fonts.scale, fonts.dir, fonts.cache-1 536 # fonts.scale, fonts.dir, fonts.cache-1
452 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 537 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
453 fi 538 fi
454 done 539 done
455} 540}
456 541
542# @FUNCTION: install_driver_hwdata
543# @USAGE:
544# @DESCRIPTION:
457# Installs device-to-driver mappings for system-config-display 545# Installs device-to-driver mappings for system-config-display and
458# and anything else that uses hwdata 546# anything else that uses hwdata.
459install_driver_hwdata() { 547install_driver_hwdata() {
460 insinto /usr/share/hwdata/videoaliases 548 insinto /usr/share/hwdata/videoaliases
461 for i in "${FILESDIR}"/*.xinf; do 549 for i in "${FILESDIR}"/*.xinf; do
462 # We need this for the case when none exist, 550 # We need this for the case when none exist,
463 # so *.xinf doesn't expand 551 # so *.xinf doesn't expand
465 doins $i 553 doins $i
466 fi 554 fi
467 done 555 done
468} 556}
469 557
558# @FUNCTION: discover_font_dirs
559# @USAGE:
560# @DESCRIPTION:
561# Deprecated. Sets up the now-unused FONT_DIRS variable.
470discover_font_dirs() { 562discover_font_dirs() {
471 FONT_DIRS="${FONT_DIR}" 563 FONT_DIRS="${FONT_DIR}"
472} 564}
473 565
566# @FUNCTION: create_fonts_scale
567# @USAGE:
568# @DESCRIPTION:
569# Create fonts.scale file, used by the old server-side fonts subsystem.
474create_fonts_scale() { 570create_fonts_scale() {
475 ebegin "Creating fonts.scale files" 571 ebegin "Creating fonts.scale files"
476 local x 572 local x
477 for DIR in ${FONT_DIR}; do 573 for DIR in ${FONT_DIR}; do
478 x=${ROOT}/usr/share/fonts/${DIR} 574 x=${ROOT}/usr/share/fonts/${DIR}
485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 581 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
486 # <dberkholz@gentoo.org> 2 August 2004 582 # <dberkholz@gentoo.org> 2 August 2004
487 if [[ "${x/encodings}" = "${x}" ]] \ 583 if [[ "${x/encodings}" = "${x}" ]] \
488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 584 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
489 mkfontscale \ 585 mkfontscale \
490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 586 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
491 -- ${x} 587 -- ${x}
492 fi 588 fi
493 done 589 done
494 eend 0 590 eend 0
495} 591}
496 592
593# @FUNCTION: create_fonts_dir
594# @USAGE:
595# @DESCRIPTION:
596# Create fonts.dir file, used by the old server-side fonts subsystem.
497create_fonts_dir() { 597create_fonts_dir() {
498 ebegin "Generating fonts.dir files" 598 ebegin "Generating fonts.dir files"
499 for DIR in ${FONT_DIR}; do 599 for DIR in ${FONT_DIR}; do
500 x=${ROOT}/usr/share/fonts/${DIR} 600 x=${ROOT}/usr/share/fonts/${DIR}
501 [[ -z "$(ls ${x}/)" ]] && continue 601 [[ -z "$(ls ${x}/)" ]] && continue
502 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 602 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
503 603
504 if [[ "${x/encodings}" = "${x}" ]]; then 604 if [[ "${x/encodings}" = "${x}" ]]; then
505 mkfontdir \ 605 mkfontdir \
506 -e ${ROOT}/usr/share/fonts/encodings \ 606 -e "${ROOT}"/usr/share/fonts/encodings \
507 -e ${ROOT}/usr/share/fonts/encodings/large \ 607 -e "${ROOT}"/usr/share/fonts/encodings/large \
508 -- ${x} 608 -- ${x}
509 fi 609 fi
510 done 610 done
511 eend 0 611 eend 0
512} 612}
513 613
614# @FUNCTION: fix_font_permissions
615# @USAGE:
616# @DESCRIPTION:
617# Font files should have 644 permissions. Ensure this is the case.
514fix_font_permissions() { 618fix_font_permissions() {
515 ebegin "Fixing permissions" 619 ebegin "Fixing permissions"
516 for DIR in ${FONT_DIR}; do 620 for DIR in ${FONT_DIR}; do
517 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 621 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
518 -exec chmod 0644 {} \; 622 -exec chmod 0644 {} \;
519 done 623 done
520 eend 0 624 eend 0
521} 625}
522 626
627# @FUNCTION: create_font_cache
628# @USAGE:
629# @DESCRIPTION:
630# Create fonts.cache-1 files, used by the new client-side fonts
631# subsystem.
523create_font_cache() { 632create_font_cache() {
524 font_pkg_postinst 633 font_pkg_postinst
525} 634}
526 635
527EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 636EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.104

  ViewVC Help
Powered by ViewVC 1.1.20