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

  ViewVC Help
Powered by ViewVC 1.1.20