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

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.113

  ViewVC Help
Powered by ViewVC 1.1.20