/[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.44 Revision 1.109
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.44 2006/02/15 21:07:00 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.109 2009/05/14 12:40:55 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
20if [[ ${PV} = 9999* ]]; then
21 GIT_ECLASS="git"
22 SNAPSHOT="yes"
23 SRC_URI=""
24fi
25
26# If we're a font package, but not the font.alias one
27FONT_ECLASS=""
28if [[ "${PN/#font-}" != "${PN}" ]] \
29 && [[ "${CATEGORY}" = "media-fonts" ]] \
30 && [[ "${PN}" != "font-alias" ]] \
31 && [[ "${PN}" != "font-util" ]]; then
32 # Activate font code in the rest of the eclass
33 FONT="yes"
34
35 # Whether to inherit the font eclass
36 FONT_ECLASS="font"
37fi
38
39inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
40 ${FONT_ECLASS} ${GIT_ECLASS}
41
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 42EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm"
29 43
30inherit eutils libtool toolchain-funcs flag-o-matic 44case "${EAPI:-0}" in
45 0|1)
46 ;;
47 2)
48 EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure"
49 ;;
50 *)
51 die "Unknown EAPI ${EAPI}"
52 ;;
53esac
31 54
32# Directory prefix to use for everything 55# exports must be ALWAYS after inherit
56EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
57
58# @ECLASS-VARIABLE: XDIR
59# @DESCRIPTION:
60# Directory prefix to use for everything. If you want to install to a
61# non-default prefix (e.g., /opt/xorg), change XDIR. This has not been
62# recently tested. You may need to uncomment the setting of datadir and
63# mandir in x-modular_src_install() or add it back in if it's no longer
64# there. You may also want to change the SLOT.
33XDIR="/usr" 65XDIR="/usr"
34
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then
38 XDPVER="1"
39fi
40 66
41IUSE="" 67IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 68HOMEPAGE="http://xorg.freedesktop.org/"
43 69
70if [[ -z ${SNAPSHOT} ]]; then
71# @ECLASS-VARIABLE: SNAPSHOT
72# @DESCRIPTION:
73# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
74# before inheriting this eclass.
75 SNAPSHOT="no"
76fi
77
44# Set up SRC_URI for individual modular releases 78# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 79BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 80# @ECLASS-VARIABLE: MODULE
47 SRC_URI="${SRC_URI} 81# @DESCRIPTION:
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 82# The subdirectory to download source from. Possible settings are app,
49elif [[ ${CATEGORY} = app-doc ]]; then 83# doc, data, util, driver, font, lib, proto, xserver. Set above the
50 SRC_URI="${SRC_URI} 84# inherit to override the default autoconfigured module.
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 85if [[ -z ${MODULE} ]]; then
52# x11-misc contains data and util, x11-themes contains data 86 MODULE=""
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 87 case ${CATEGORY} in
54 SRC_URI="${SRC_URI} 88 app-doc) MODULE="doc" ;;
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 89 media-fonts) MODULE="font" ;;
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 90 x11-apps|x11-wm) MODULE="app" ;;
57elif [[ ${CATEGORY} = x11-drivers ]]; then 91 x11-misc|x11-themes) MODULE="util" ;;
58 SRC_URI="${SRC_URI} 92 x11-drivers) MODULE="driver" ;;
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2" 93 x11-base) MODULE="xserver" ;;
60elif [[ ${CATEGORY} = media-fonts ]]; then 94 x11-proto) MODULE="proto" ;;
61 SRC_URI="${SRC_URI} 95 x11-libs) MODULE="lib" ;;
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2" 96 esac
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI}
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI}
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 97fi
73 98
74# SRC_URI for full releases 99if [[ -n ${GIT_ECLASS} ]]; then
75SRC_URI="${SRC_URI} 100 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2 101else
77 http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/${P}.tar.bz2 102 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
78 http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 103fi
79 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
80 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
81 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
82 104
83SLOT="0" 105SLOT="0"
84 106
85# Set the license for the package. This can be overridden by setting 107# Set the license for the package. This can be overridden by setting
86# LICENSE after the inherit. 108# LICENSE after the inherit.
88 110
89# Set up shared dependencies 111# Set up shared dependencies
90if [[ -n "${SNAPSHOT}" ]]; then 112if [[ -n "${SNAPSHOT}" ]]; then
91# FIXME: What's the minimal libtool version supporting arbitrary versioning? 113# FIXME: What's the minimal libtool version supporting arbitrary versioning?
92 DEPEND="${DEPEND} 114 DEPEND="${DEPEND}
93 >=sys-devel/autoconf-2.57
94 >=sys-devel/automake-1.7
95 >=sys-devel/libtool-1.5 115 >=sys-devel/libtool-1.5
96 >=sys-devel/m4-1.4" 116 >=sys-devel/m4-1.4"
117 WANT_AUTOCONF="latest"
118 WANT_AUTOMAKE="latest"
97fi 119fi
98 120
99# If we're a font package, but not the font.alias one 121if [[ -n "${FONT}" ]]; then
100if [[ "${PN/#font-}" != "${PN}" ]] \
101 && [[ "${PN}" != "font-alias" ]] \
102 && [[ "${PN}" != "font-util" ]]; then
103 # Activate font code in the rest of the eclass
104 FONT="yes"
105
106 RDEPEND="${RDEPEND} 122 RDEPEND="${RDEPEND}
107 media-fonts/encodings 123 media-fonts/encodings
108 x11-apps/mkfontscale 124 x11-apps/mkfontscale
109 x11-apps/mkfontdir" 125 x11-apps/mkfontdir"
110 PDEPEND="${PDEPEND} 126 PDEPEND="${PDEPEND}
113 # Starting with 7.0RC3, we can specify the font directory 129 # Starting with 7.0RC3, we can specify the font directory
114 # But oddly, we can't do the same for encodings or font-alias 130 # But oddly, we can't do the same for encodings or font-alias
115 131
116 # Wrap in `if` so ebuilds can set it too 132 # Wrap in `if` so ebuilds can set it too
117 if [[ -z ${FONT_DIR} ]]; then 133 if [[ -z ${FONT_DIR} ]]; then
134# @ECLASS-VARIABLE: FONT_DIR
135# @DESCRIPTION:
136# If you're creating a font package and the suffix of PN is not equal to
137# the subdirectory of /usr/share/fonts/ it should install into, set
138# FONT_DIR to that directory or directories. Set before inheriting this
139# eclass.
118 FONT_DIR=${PN##*-} 140 FONT_DIR=${PN##*-}
119 141
120 fi 142 fi
121 143
122 # Fix case of font directories 144 # Fix case of font directories
127 149
128 # Set up configure option 150 # Set up configure option
129 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 151 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
130 152
131 if [[ -n "${FONT}" ]]; then 153 if [[ -n "${FONT}" ]]; then
132 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 154 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
133 IUSE="${IUSE} nls" 155 IUSE="${IUSE} nls"
134 fi 156 fi
135 fi 157 fi
136fi 158fi
137 159
138# If we're a driver package 160# If we're a driver package
139if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 161if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
140 # Enable driver code in the rest of the eclass 162 # Enable driver code in the rest of the eclass
141 DRIVER="yes" 163 DRIVER="yes"
142
143 # Add driver patchset to SRC_URI
144 SRC_URI="${SRC_URI}
145 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
146fi 164fi
147 165
148# Debugging -- ignore packages that can't be built with debugging 166# Debugging -- ignore packages that can't be built with debugging
149if [[ -z "${FONT}" ]] \ 167if [[ -z "${FONT}" ]] \
150 || [[ "${PN/app-doc}" != "${PN}" ]] \ 168 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
151 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 169 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
152 || [[ "${PN/util-macros}" != "${PN}" ]] \ 170 && [[ "${PN/util-macros}" = "${PN}" ]] \
153 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 171 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
154 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 172 && [[ "${PN/xkbdata}" = "${PN}" ]] \
155 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 173 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
156 || [[ "${PN/xcursor}" != "${PN}" ]] \ 174 && [[ "${PN/xcursor}" = "${PN}" ]] \
157 ; then 175 ; then
158 DEBUGGABLE="yes" 176 DEBUGGABLE="yes"
159 IUSE="${IUSE} debug" 177 IUSE="${IUSE} debug"
160 if use debug; then
161 RESTRICT="${RESTRICT} nostrip"
162 fi
163fi 178fi
164 179
165DEPEND="${DEPEND} 180DEPEND="${DEPEND}
166 >=dev-util/pkgconfig-0.18" 181 >=dev-util/pkgconfig-0.18"
167 182
168if [[ "${PN/util-macros}" = "${PN}" ]]; then 183if [[ "${PN/util-macros}" = "${PN}" ]]; then
169 DEPEND="${DEPEND} 184 DEPEND="${DEPEND}
170 >=x11-misc/util-macros-0.99.2" 185 >=x11-misc/util-macros-0.99.2
186 >=sys-devel/binutils-2.16.1-r3"
171fi 187fi
172 188
173# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
174RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
175 !<=x11-base/xorg-x11-6.9 190 !<=x11-base/xorg-x11-6.9"
176 >=sys-apps/man-1.6b-r2"
177# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
178# x11-base/x11-env" 192# x11-base/x11-env"
179 193
194# @FUNCTION: x-modular_specs_check
195# @USAGE:
196# @DESCRIPTION:
197# Make any necessary changes related to gcc specs (generally hardened)
198x-modular_specs_check() {
199 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
200 append-ldflags -Wl,-z,lazy
201 # (#116698) breaks loading
202 filter-ldflags -Wl,-z,now
203 fi
204}
205
206# @FUNCTION: x-modular_dri_check
207# @USAGE:
208# @DESCRIPTION:
209# Ensures the server supports DRI if building a driver with DRI support
210x-modular_dri_check() {
211 # (#120057) Enabling DRI in drivers requires that the server was built with
212 # support for it
213 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
214 # USE=minimal is set (see bug #252084)
215 if [[ -n "${DRIVER}" ]]; then
216 if has dri ${IUSE} && use dri; then
217 einfo "Checking for direct rendering capabilities ..."
218 if has_version '>=x11-base/xorg-server-1.5.3'; then
219 if built_with_use x11-base/xorg-server minimal; then
220 die "You must build x11-base/xorg-server with USE=-minimal."
221 fi
222 else
223 if ! built_with_use x11-base/xorg-server dri; then
224 die "You must build x11-base/xorg-server with USE=dri."
225 fi
226 fi
227 fi
228 fi
229}
230
231# @FUNCTION: x-modular_server_supports_drivers_check
232# @USAGE:
233# @DESCRIPTION:
234# Ensures the server SDK is installed if a driver is being built
235x-modular_server_supports_drivers_check() {
236 # (#135873) Only certain servers will actually use or be capable of
237 # building external drivers, including binary drivers.
238 if [[ -n "${DRIVER}" ]]; then
239 if has_version '>=x11-base/xorg-server-1.1'; then
240 if ! built_with_use x11-base/xorg-server xorg; then
241 eerror "x11-base/xorg-server is not built with support for external drivers."
242 die "You must build x11-base/xorg-server with USE=xorg."
243 fi
244 fi
245 fi
246}
247
248# @FUNCTION: x-modular_unpack_source
249# @USAGE:
250# @DESCRIPTION:
251# Simply unpack source code. Nothing else.
180x-modular_unpack_source() { 252x-modular_unpack_source() {
253 if [[ -n ${GIT_ECLASS} ]]; then
254 git_src_unpack
255 else
181 unpack ${A} 256 unpack ${A}
257 fi
182 cd ${S} 258 cd "${S}"
183 259
184 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
185 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
186 fi 262 fi
187} 263}
188 264
265# @FUNCTION: x-modular_patch_source
266# @USAGE:
267# @DESCRIPTION:
268# Apply all patches
189x-modular_patch_source() { 269x-modular_patch_source() {
190 # Use standardized names and locations with bulk patching 270 # Use standardized names and locations with bulk patching
191 # Patch directory is ${WORKDIR}/patch 271 # Patch directory is ${WORKDIR}/patch
192 # See epatch() in eutils.eclass for more documentation 272 # See epatch() in eutils.eclass for more documentation
193 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 273 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
194 EPATCH_SUFFIX="patch" 274 EPATCH_SUFFIX="patch"
195 fi 275 fi
196 276
197 # If this is a driver package we need to fix man page install location. 277# @VARIABLE: PATCHES
198 # Running autoreconf will use the patched util-macros to make the 278# @DESCRIPTION:
199 # change for us, so we only need to patch if it is not going to run. 279# If you have any patches to apply, set PATCHES to their locations and epatch
200 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 280# will apply them. It also handles epatch-style bulk patches, if you know how to
201 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 281# use them and set the correct variables. If you don't, read eutils.eclass.
202 fi 282 if [[ ${#PATCHES[@]} -gt 1 ]]; then
203 283 for x in "${PATCHES[@]}"; do
204 # For specific list of patches 284 epatch "${x}"
285 done
205 if [[ -n "${PATCHES}" ]] ; then 286 elif [[ -n "${PATCHES}" ]]; then
206 for PATCH in ${PATCHES} 287 for x in ${PATCHES}; do
207 do
208 epatch ${PATCH} 288 epatch "${x}"
209 done 289 done
210 # For non-default directory bulk patching 290 # For non-default directory bulk patching
211 elif [[ -n "${PATCH_LOC}" ]] ; then 291 elif [[ -n "${PATCH_LOC}" ]] ; then
212 epatch ${PATCH_LOC} 292 epatch ${PATCH_LOC}
213 # For standard bulk patching 293 # For standard bulk patching
214 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 294 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
215 epatch 295 epatch
216 fi 296 fi
217} 297}
218 298
299# @FUNCTION: x-modular_reconf_source
300# @USAGE:
301# @DESCRIPTION:
302# Run eautoreconf if necessary, and run elibtoolize.
219x-modular_reconf_source() { 303x-modular_reconf_source() {
220 # Run autoreconf for CVS snapshots only
221 if [[ "${SNAPSHOT}" = "yes" ]] 304 if [[ "${SNAPSHOT}" = "yes" ]]
222 then 305 then
223 # If possible, generate configure if it doesn't exist 306 # If possible, generate configure if it doesn't exist
224 if [ -f "${S}/configure.ac" ] 307 if [ -f "./configure.ac" ]
225 then 308 then
226 einfo "Running autoreconf..." 309 eautoreconf
227 autoreconf -v --force --install
228 fi
229 fi 310 fi
230
231}
232
233x-modular_src_unpack() {
234 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
235 if gcc-specs-now; then
236 msg="Do not emerge ${PN} without vanilla gcc!"
237 eerror "$msg"
238 die "$msg"
239 fi 311 fi
240 fi
241
242 x-modular_unpack_source
243 x-modular_patch_source
244 x-modular_reconf_source
245 312
246 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
247 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
248 elibtoolize 315 elibtoolize
249} 316}
250 317
318# @FUNCTION: x-modular_src_prepare
319# @USAGE:
320# @DESCRIPTION:
321# Prepare a package after unpacking, performing all X-related tasks.
322x-modular_src_prepare() {
323 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
324 && git_src_prepare
325 x-modular_patch_source
326 x-modular_reconf_source
327}
328
329# @FUNCTION: x-modular_src_unpack
330# @USAGE:
331# @DESCRIPTION:
332# Unpack a package, performing all X-related tasks.
333x-modular_src_unpack() {
334 x-modular_specs_check
335 x-modular_server_supports_drivers_check
336 x-modular_dri_check
337 x-modular_unpack_source
338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
339}
340
341# @FUNCTION: x-modular_font_configure
342# @USAGE:
343# @DESCRIPTION:
344# If a font package, perform any necessary configuration steps
251x-modular_font_configure() { 345x-modular_font_configure() {
252 if [[ -n "${FONT}" ]]; then 346 if [[ -n "${FONT}" ]]; then
253 # Might be worth adding an option to configure your desired font 347 # Might be worth adding an option to configure your desired font
254 # and exclude all others. Also, should this USE be nls or minimal? 348 # and exclude all others. Also, should this USE be nls or minimal?
255 if ! use nls; then 349 if ! use nls; then
273 --disable-koi8-r" 367 --disable-koi8-r"
274 fi 368 fi
275 fi 369 fi
276} 370}
277 371
372# @FUNCTION: x-modular_debug_setup
373# @USAGE:
374# @DESCRIPTION:
375# Set up CFLAGS for a debug build
278x-modular_debug_setup() { 376x-modular_debug_setup() {
279 if [[ -n "${DEBUGGABLE}" ]]; then 377 if [[ -n "${DEBUGGABLE}" ]]; then
280 if use debug; then 378 if use debug; then
281 strip-flags 379 strip-flags
282 append-flags -g 380 append-flags -g
283 fi 381 fi
284 fi 382 fi
285} 383}
286 384
385# @FUNCTION: x-modular_src_configure
386# @USAGE:
387# @DESCRIPTION:
388# Perform any necessary pre-configuration steps, then run configure
287x-modular_src_configure() { 389x-modular_src_configure() {
288 x-modular_font_configure 390 x-modular_font_configure
289 x-modular_debug_setup 391 x-modular_debug_setup
290 392
393# @VARIABLE: CONFIGURE_OPTIONS
394# @DESCRIPTION:
395# Any options to pass to configure
396[[ -n ${CONFIGURE_OPTIONS} ]]
397
291 # If prefix isn't set here, .pc files cause problems 398 # If prefix isn't set here, .pc files cause problems
292 if [[ -x ./configure ]]; then 399 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
293 econf --prefix=${XDIR} \ 400 econf --prefix=${XDIR} \
294 --datadir=${XDIR}/share \ 401 --datadir=${XDIR}/share \
295 ${FONT_OPTIONS} \ 402 ${FONT_OPTIONS} \
296 ${DRIVER_OPTIONS} \ 403 ${DRIVER_OPTIONS} \
297 ${CONFIGURE_OPTIONS} 404 ${CONFIGURE_OPTIONS}
298 fi 405 fi
299} 406}
300 407
408# @FUNCTION: x-modular_src_make
409# @USAGE:
410# @DESCRIPTION:
411# Run make.
301x-modular_src_make() { 412x-modular_src_make() {
302 emake || die "emake failed" 413 emake || die "emake failed"
303} 414}
304 415
416# @FUNCTION: x-modular_src_compile
417# @USAGE:
418# @DESCRIPTION:
419# Compile a package, performing all X-related tasks.
305x-modular_src_compile() { 420x-modular_src_compile() {
306 x-modular_src_configure 421 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
307 x-modular_src_make 422 x-modular_src_make
308} 423}
309 424
425# @FUNCTION: x-modular_src_install
426# @USAGE:
427# @DESCRIPTION:
428# Install a built package to ${D}, performing any necessary steps.
429# Creates a ChangeLog from git if using live ebuilds.
310x-modular_src_install() { 430x-modular_src_install() {
311 # Install everything to ${XDIR} 431 # Install everything to ${XDIR}
432 if [[ ${CATEGORY} = x11-proto ]]; then
312 make \ 433 make \
434 ${PN/proto/}docdir=/usr/share/doc/${PF} \
313 DESTDIR="${D}" \ 435 DESTDIR="${D}" \
314 install 436 install \
437 || die
438 else
439 make \
440 DESTDIR="${D}" \
441 install \
442 || die
443 fi
315# Shouldn't be necessary in XDIR=/usr 444# Shouldn't be necessary in XDIR=/usr
316# einstall forces datadir, so we need to re-force it 445# einstall forces datadir, so we need to re-force it
317# datadir=${XDIR}/share \ 446# datadir=${XDIR}/share \
318# mandir=${XDIR}/share/man \ 447# mandir=${XDIR}/share/man \
319 448
449 if [[ -n ${GIT_ECLASS} ]]; then
450 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
451 git log ${GIT_TREE} > "${S}"/ChangeLog
452 popd
453 fi
454
455 if [[ -e ${S}/ChangeLog ]]; then
456 dodoc "${S}"/ChangeLog
457 fi
458# @VARIABLE: DOCS
459# @DESCRIPTION:
460# Any documentation to install
461 [[ -n ${DOCS} ]] && dodoc ${DOCS}
462
320 # Don't install libtool archives for server modules 463 # Don't install libtool archives for server modules
321 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 464 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
322 find ${D}/usr/lib/xorg/modules -name '*.la' \ 465 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
323 | xargs rm -f 466 | xargs rm -f
324 fi 467 fi
325}
326 468
469 if [[ -n "${FONT}" ]]; then
470 remove_font_metadata
471 fi
472
473 if [[ -n "${DRIVER}" ]]; then
474 install_driver_hwdata
475 fi
476}
477
478# @FUNCTION: x-modular_pkg_preinst
479# @USAGE:
480# @DESCRIPTION:
481# This function doesn't do anything right now, but it may in the future.
327x-modular_pkg_preinst() { 482x-modular_pkg_preinst() {
328 if [[ -n "${FONT}" ]]; then 483 # We no longer do anything here, but we can't remove it from the API
329 discover_font_dirs 484 :
330 fi
331} 485}
332 486
487# @FUNCTION: x-modular_pkg_postinst
488# @USAGE:
489# @DESCRIPTION:
490# Run X-specific post-installation tasks on the live filesystem. The
491# only task right now is some setup for font packages.
333x-modular_pkg_postinst() { 492x-modular_pkg_postinst() {
334 if [[ -n "${FONT}" ]]; then 493 if [[ -n "${FONT}" ]]; then
335 setup_fonts 494 setup_fonts
336 fi 495 fi
337} 496}
338 497
498# @FUNCTION: x-modular_pkg_postrm
499# @USAGE:
500# @DESCRIPTION:
501# Run X-specific post-removal tasks on the live filesystem. The only
502# task right now is some cleanup for font packages.
339x-modular_pkg_postrm() { 503x-modular_pkg_postrm() {
340 if [[ -n "${FONT}" ]]; then 504 if [[ -n "${FONT}" ]]; then
341 cleanup_fonts 505 cleanup_fonts
506 font_pkg_postrm
342 fi 507 fi
343} 508}
344 509
510# @FUNCTION: cleanup_fonts
511# @USAGE:
512# @DESCRIPTION:
513# Get rid of font directories that only contain generated files
345cleanup_fonts() { 514cleanup_fonts() {
346 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 515 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
347 for DIR in ${FONT_DIR}; do 516 for DIR in ${FONT_DIR}; do
348 unset KEEP_FONTDIR 517 unset KEEP_FONTDIR
349 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 518 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
375 fi 544 fi
376 eend 0 545 eend 0
377 done 546 done
378} 547}
379 548
549# @FUNCTION: setup_fonts
550# @USAGE:
551# @DESCRIPTION:
552# Generates needed files for fonts and fixes font permissions
380setup_fonts() { 553setup_fonts() {
381 if [[ ! -n "${FONT_DIRS}" ]]; then 554 if [[ ! -n "${FONT_DIR}" ]]; then
382 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 555 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
383 eerror "${msg}" 556 eerror "${msg}"
384 die "${msg}" 557 die "${msg}"
385 fi 558 fi
386 559
387 create_fonts_scale 560 create_fonts_scale
388 create_fonts_dir 561 create_fonts_dir
389 fix_font_permissions 562 fix_font_permissions
390 create_font_cache 563 create_font_cache
391} 564}
392 565
566# @FUNCTION: remove_font_metadata
567# @USAGE:
568# @DESCRIPTION:
569# Don't let the package install generated font files that may overlap
570# with other packages. Instead, they're generated in pkg_postinst().
571remove_font_metadata() {
572 local DIR
573 for DIR in ${FONT_DIR}; do
574 if [[ "${DIR}" != "Speedo" ]] && \
575 [[ "${DIR}" != "CID" ]] ; then
576 # Delete font metadata files
577 # fonts.scale, fonts.dir, fonts.cache-1
578 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
579 fi
580 done
581}
582
583# @FUNCTION: install_driver_hwdata
584# @USAGE:
585# @DESCRIPTION:
586# Installs device-to-driver mappings for system-config-display and
587# anything else that uses hwdata.
588install_driver_hwdata() {
589 insinto /usr/share/hwdata/videoaliases
590 for i in "${FILESDIR}"/*.xinf; do
591 # We need this for the case when none exist,
592 # so *.xinf doesn't expand
593 if [[ -e $i ]]; then
594 doins $i
595 fi
596 done
597}
598
599# @FUNCTION: discover_font_dirs
600# @USAGE:
601# @DESCRIPTION:
602# Deprecated. Sets up the now-unused FONT_DIRS variable.
393discover_font_dirs() { 603discover_font_dirs() {
394 pushd ${IMAGE}/usr/share/fonts 604 FONT_DIRS="${FONT_DIR}"
395 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
396 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
397 popd
398} 605}
399 606
607# @FUNCTION: create_fonts_scale
608# @USAGE:
609# @DESCRIPTION:
610# Create fonts.scale file, used by the old server-side fonts subsystem.
400create_fonts_scale() { 611create_fonts_scale() {
401 ebegin "Creating fonts.scale files" 612 ebegin "Creating fonts.scale files"
402 local x 613 local x
403 for FONT_DIR in ${FONT_DIRS}; do 614 for DIR in ${FONT_DIR}; do
404 x=${ROOT}/usr/share/fonts/${FONT_DIR} 615 x=${ROOT}/usr/share/fonts/${DIR}
405 [[ -z "$(ls ${x}/)" ]] && continue 616 [[ -z "$(ls ${x}/)" ]] && continue
406 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 617 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
407 618
408 # Only generate .scale files if truetype, opentype or type1 619 # Only generate .scale files if truetype, opentype or type1
409 # fonts are present ... 620 # fonts are present ...
410 621
411 # First truetype (ttf,ttc)
412 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
413 # Also, there is no way to regenerate Speedo/CID fonts.scale 622 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
414 # <spyderous@gentoo.org> 2 August 2004 623 # <dberkholz@gentoo.org> 2 August 2004
415 if [[ "${x/encodings}" = "${x}" ]] \ 624 if [[ "${x/encodings}" = "${x}" ]] \
416 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
417 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
418 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
419 ${ROOT}/usr/bin/ttmkfdir -x 2 \
420 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
421 -o ${x}/fonts.scale -d ${x}
422 # ttmkfdir fails on some stuff, so try mkfontscale if it does
423 local ttmkfdir_return=$?
424 else
425 # We didn't use ttmkfdir at all
426 local ttmkfdir_return=2
427 fi
428 if [[ ${ttmkfdir_return} -ne 0 ]]; then
429 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
430 ${ROOT}/usr/bin/mkfontscale \
431 -a /usr/share/fonts/encodings/encodings.dir \
432 -- ${x}
433 fi
434 # Next type1 and opentype (pfa,pfb,otf,otc)
435 elif [[ "${x/encodings}" = "${x}" ]] \
436 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 625 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
437 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 626 mkfontscale \
438 ${ROOT}/usr/bin/mkfontscale \
439 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 627 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
440 -- ${x} 628 -- ${x}
441 fi 629 fi
442 done 630 done
443 eend 0 631 eend 0
444} 632}
445 633
634# @FUNCTION: create_fonts_dir
635# @USAGE:
636# @DESCRIPTION:
637# Create fonts.dir file, used by the old server-side fonts subsystem.
446create_fonts_dir() { 638create_fonts_dir() {
447 ebegin "Generating fonts.dir files" 639 ebegin "Generating fonts.dir files"
448 for FONT_DIR in ${FONT_DIRS}; do 640 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 641 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 642 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 643 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 644
453 if [[ "${x/encodings}" = "${x}" ]]; then 645 if [[ "${x/encodings}" = "${x}" ]]; then
454 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 646 mkfontdir \
455 ${ROOT}/usr/bin/mkfontdir \
456 -e ${ROOT}/usr/share/fonts/encodings \ 647 -e "${ROOT}"/usr/share/fonts/encodings \
457 -e ${ROOT}/usr/share/fonts/encodings/large \ 648 -e "${ROOT}"/usr/share/fonts/encodings/large \
458 -- ${x} 649 -- ${x}
459 fi 650 fi
460 done 651 done
461 eend 0 652 eend 0
462} 653}
463 654
655# @FUNCTION: fix_font_permissions
656# @USAGE:
657# @DESCRIPTION:
658# Font files should have 644 permissions. Ensure this is the case.
464fix_font_permissions() { 659fix_font_permissions() {
465 ebegin "Fixing permissions" 660 ebegin "Fixing permissions"
466 for FONT_DIR in ${FONT_DIRS}; do 661 for DIR in ${FONT_DIR}; do
467 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 662 find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \
468 -exec chmod 0644 {} \; 663 -exec chmod 0644 {} \;
469 done 664 done
470 eend 0 665 eend 0
471} 666}
472 667
668# @FUNCTION: create_font_cache
669# @USAGE:
670# @DESCRIPTION:
671# Create fonts.cache-1 files, used by the new client-side fonts
672# subsystem.
473create_font_cache() { 673create_font_cache() {
474 # danarmak found out that fc-cache should be run AFTER all the above 674 font_pkg_postinst
475 # stuff, as otherwise the cache is invalid, and has to be run again
476 # as root anyway
477 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
478 ebegin "Creating FC font cache"
479 HOME="/root" ${ROOT}/usr/bin/fc-cache
480 eend 0
481 fi
482} 675}

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.109

  ViewVC Help
Powered by ViewVC 1.1.20