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

Legend:
Removed from v.1.90  
changed lines
  Added in v.1.122

  ViewVC Help
Powered by ViewVC 1.1.20