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

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

  ViewVC Help
Powered by ViewVC 1.1.20