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

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20