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

Legend:
Removed from v.1.89  
changed lines
  Added in v.1.118

  ViewVC Help
Powered by ViewVC 1.1.20