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

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

  ViewVC Help
Powered by ViewVC 1.1.20