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

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.94

  ViewVC Help
Powered by ViewVC 1.1.20