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

Legend:
Removed from v.1.87  
changed lines
  Added in v.1.107

  ViewVC Help
Powered by ViewVC 1.1.20