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

Legend:
Removed from v.1.86  
changed lines
  Added in v.1.116

  ViewVC Help
Powered by ViewVC 1.1.20