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

Legend:
Removed from v.1.85  
changed lines
  Added in v.1.99

  ViewVC Help
Powered by ViewVC 1.1.20