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

  ViewVC Help
Powered by ViewVC 1.1.20