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

  ViewVC Help
Powered by ViewVC 1.1.20