/[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.121
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.121 2011/08/29 01:28:10 vapier 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" 186 sys-devel/binutils"
179fi 187fi
180 188
181RDEPEND="${RDEPEND} 189RDEPEND="${RDEPEND}
182 !<=x11-base/xorg-x11-6.9" 190 !<=x11-base/xorg-x11-6.9"
183# Provides virtual/x11 for temporary use until packages are ported 191# Provides virtual/x11 for temporary use until packages are ported
184# x11-base/x11-env" 192# x11-base/x11-env"
185 193
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 194# @FUNCTION: x-modular_specs_check
187 ${FONT_ECLASS} ${GIT_ECLASS} 195# @USAGE:
188 196# @DESCRIPTION:
197# Make any necessary changes related to gcc specs (generally hardened)
189x-modular_specs_check() { 198x-modular_specs_check() {
190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 199 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
191 append-ldflags -Wl,-z,lazy 200 append-ldflags -Wl,-z,lazy
192 # (#116698) breaks loading 201 # (#116698) breaks loading
193 filter-ldflags -Wl,-z,now 202 filter-ldflags -Wl,-z,now
194 fi 203 fi
195} 204}
196 205
206# @FUNCTION: x-modular_dri_check
207# @USAGE:
208# @DESCRIPTION:
209# Ensures the server supports DRI if building a driver with DRI support
197x-modular_dri_check() { 210x-modular_dri_check() {
198 # (#120057) Enabling DRI in drivers requires that the server was built with 211 # (#120057) Enabling DRI in drivers requires that the server was built with
199 # support for it 212 # support for it
213 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
214 # USE=minimal is set (see bug #252084)
200 if [[ -n "${DRIVER}" ]]; then 215 if [[ -n "${DRIVER}" ]]; then
201 if has dri ${IUSE} && use dri; then 216 if has dri ${IUSE} && use dri; then
202 einfo "Checking for direct rendering capabilities ..." 217 einfo "Checking for direct rendering capabilities ..."
218 if has_version '>=x11-base/xorg-server-1.5.3'; then
219 if built_with_use x11-base/xorg-server minimal; then
220 die "You must build x11-base/xorg-server with USE=-minimal."
221 fi
222 else
203 if ! built_with_use x11-base/xorg-server dri; then 223 if ! built_with_use x11-base/xorg-server dri; then
204 die "You must build x11-base/xorg-server with USE=dri." 224 die "You must build x11-base/xorg-server with USE=dri."
225 fi
205 fi 226 fi
206 fi 227 fi
207 fi 228 fi
208} 229}
209 230
231# @FUNCTION: x-modular_server_supports_drivers_check
232# @USAGE:
233# @DESCRIPTION:
234# Ensures the server SDK is installed if a driver is being built
210x-modular_server_supports_drivers_check() { 235x-modular_server_supports_drivers_check() {
211 # (#135873) Only certain servers will actually use or be capable of 236 # (#135873) Only certain servers will actually use or be capable of
212 # building external drivers, including binary drivers. 237 # building external drivers, including binary drivers.
213 if [[ -n "${DRIVER}" ]]; then 238 if [[ -n "${DRIVER}" ]]; then
214 if has_version '>=x11-base/xorg-server-1.1'; then 239 if has_version '>=x11-base/xorg-server-1.1'; then
… …
218 fi 243 fi
219 fi 244 fi
220 fi 245 fi
221} 246}
222 247
248# @FUNCTION: x-modular_unpack_source
249# @USAGE:
250# @DESCRIPTION:
251# Simply unpack source code. Nothing else.
223x-modular_unpack_source() { 252x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then 253 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack 254 git_src_unpack
226 else 255 else
227 unpack ${A} 256 unpack ${A}
228 fi 257 fi
229 cd ${S} 258 cd "${S}"
230 259
231 if [[ -n ${FONT_OPTIONS} ]]; then 260 if [[ -n ${FONT_OPTIONS} ]]; then
232 einfo "Detected font directory: ${FONT_DIR}" 261 einfo "Detected font directory: ${FONT_DIR}"
233 fi 262 fi
234} 263}
235 264
265# @FUNCTION: x-modular_patch_source
266# @USAGE:
267# @DESCRIPTION:
268# Apply all patches
236x-modular_patch_source() { 269x-modular_patch_source() {
237 # Use standardized names and locations with bulk patching 270 # Use standardized names and locations with bulk patching
238 # Patch directory is ${WORKDIR}/patch 271 # Patch directory is ${WORKDIR}/patch
239 # See epatch() in eutils.eclass for more documentation 272 # See epatch() in eutils.eclass for more documentation
240 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 273 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
241 EPATCH_SUFFIX="patch" 274 EPATCH_SUFFIX="patch"
242 fi 275 fi
243 276
244 # If this is a driver package we need to fix man page install location. 277# @VARIABLE: PATCHES
245 # Running autoreconf will use the patched util-macros to make the 278# @DESCRIPTION:
246 # change for us, so we only need to patch if it is not going to run. 279# If you have any patches to apply, set PATCHES to their locations and epatch
247 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\ 280# will apply them. It also handles epatch-style bulk patches, if you know how to
248 && [[ ${XDPVER} != -1 ]]; then 281# use them and set the correct variables. If you don't, read eutils.eclass.
249 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 282 if [[ ${#PATCHES[@]} -gt 1 ]]; then
250 fi 283 for x in "${PATCHES[@]}"; do
251 284 epatch "${x}"
252 # For specific list of patches 285 done
253 if [[ -n "${PATCHES}" ]] ; then 286 elif [[ -n "${PATCHES}" ]]; then
254 for PATCH in ${PATCHES} 287 for x in ${PATCHES}; do
255 do
256 epatch ${PATCH} 288 epatch "${x}"
257 done 289 done
258 # For non-default directory bulk patching 290 # For non-default directory bulk patching
259 elif [[ -n "${PATCH_LOC}" ]] ; then 291 elif [[ -n "${PATCH_LOC}" ]] ; then
260 epatch ${PATCH_LOC} 292 epatch ${PATCH_LOC}
261 # For standard bulk patching 293 # For standard bulk patching
262 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 294 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
263 epatch 295 epatch
264 fi 296 fi
265} 297}
266 298
299# @FUNCTION: x-modular_reconf_source
300# @USAGE:
301# @DESCRIPTION:
302# Run eautoreconf if necessary, and run elibtoolize.
267x-modular_reconf_source() { 303x-modular_reconf_source() {
268 # Run autoreconf for CVS snapshots only
269 if [[ "${SNAPSHOT}" = "yes" ]] 304 if [[ "${SNAPSHOT}" = "yes" ]]
270 then 305 then
271 # If possible, generate configure if it doesn't exist 306 # If possible, generate configure if it doesn't exist
272 if [ -f "./configure.ac" ] 307 if [ -f "./configure.ac" ]
273 then 308 then
… …
278 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
279 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
280 elibtoolize 315 elibtoolize
281} 316}
282 317
318# @FUNCTION: x-modular_src_prepare
319# @USAGE:
320# @DESCRIPTION:
321# Prepare a package after unpacking, performing all X-related tasks.
322x-modular_src_prepare() {
323 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
324 && git_src_prepare
325 x-modular_patch_source
326 x-modular_reconf_source
327}
328
329# @FUNCTION: x-modular_src_unpack
330# @USAGE:
331# @DESCRIPTION:
332# Unpack a package, performing all X-related tasks.
283x-modular_src_unpack() { 333x-modular_src_unpack() {
284 x-modular_specs_check 334 x-modular_specs_check
285 x-modular_server_supports_drivers_check 335 x-modular_server_supports_drivers_check
286 x-modular_dri_check 336 x-modular_dri_check
287 x-modular_unpack_source 337 x-modular_unpack_source
288 x-modular_patch_source 338 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
289 x-modular_reconf_source
290} 339}
291 340
341# @FUNCTION: x-modular_font_configure
342# @USAGE:
343# @DESCRIPTION:
344# If a font package, perform any necessary configuration steps
292x-modular_font_configure() { 345x-modular_font_configure() {
293 if [[ -n "${FONT}" ]]; then 346 if [[ -n "${FONT}" ]]; then
294 # Might be worth adding an option to configure your desired font 347 # Might be worth adding an option to configure your desired font
295 # and exclude all others. Also, should this USE be nls or minimal? 348 # and exclude all others. Also, should this USE be nls or minimal?
296 if ! use nls; then 349 if has nls ${IUSE//+} && ! use nls; then
297 FONT_OPTIONS="${FONT_OPTIONS} 350 FONT_OPTIONS="${FONT_OPTIONS}
298 --disable-iso8859-2 351 --disable-iso8859-2
299 --disable-iso8859-3 352 --disable-iso8859-3
300 --disable-iso8859-4 353 --disable-iso8859-4
301 --disable-iso8859-5 354 --disable-iso8859-5
… …
314 --disable-koi8-r" 367 --disable-koi8-r"
315 fi 368 fi
316 fi 369 fi
317} 370}
318 371
372# @FUNCTION: x-modular_debug_setup
373# @USAGE:
374# @DESCRIPTION:
375# Set up CFLAGS for a debug build
319x-modular_debug_setup() { 376x-modular_debug_setup() {
320 if [[ -n "${DEBUGGABLE}" ]]; then 377 if [[ -n "${DEBUGGABLE}" ]]; then
321 if use debug; then 378 if use debug; then
322 strip-flags 379 strip-flags
323 append-flags -g 380 append-flags -g
324 fi 381 fi
325 fi 382 fi
326} 383}
327 384
385# @FUNCTION: x-modular_src_configure
386# @USAGE:
387# @DESCRIPTION:
388# Perform any necessary pre-configuration steps, then run configure
328x-modular_src_configure() { 389x-modular_src_configure() {
329 x-modular_font_configure 390 x-modular_font_configure
330 x-modular_debug_setup 391 x-modular_debug_setup
392
393# @VARIABLE: CONFIGURE_OPTIONS
394# @DESCRIPTION:
395# Any extra options to pass to configure
331 396
332 # If prefix isn't set here, .pc files cause problems 397 # If prefix isn't set here, .pc files cause problems
333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then 398 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
334 econf --prefix=${XDIR} \ 399 econf --prefix=${XDIR} \
335 --datadir=${XDIR}/share \ 400 --datadir=${XDIR}/share \
… …
337 ${DRIVER_OPTIONS} \ 402 ${DRIVER_OPTIONS} \
338 ${CONFIGURE_OPTIONS} 403 ${CONFIGURE_OPTIONS}
339 fi 404 fi
340} 405}
341 406
407# @FUNCTION: x-modular_src_make
408# @USAGE:
409# @DESCRIPTION:
410# Run make.
342x-modular_src_make() { 411x-modular_src_make() {
343 emake || die "emake failed" 412 emake || die "emake failed"
344} 413}
345 414
415# @FUNCTION: x-modular_src_compile
416# @USAGE:
417# @DESCRIPTION:
418# Compile a package, performing all X-related tasks.
346x-modular_src_compile() { 419x-modular_src_compile() {
347 x-modular_src_configure 420 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
348 x-modular_src_make 421 x-modular_src_make
349} 422}
350 423
424# @FUNCTION: x-modular_src_install
425# @USAGE:
426# @DESCRIPTION:
427# Install a built package to ${D}, performing any necessary steps.
428# Creates a ChangeLog from git if using live ebuilds.
351x-modular_src_install() { 429x-modular_src_install() {
352 # Install everything to ${XDIR} 430 # Install everything to ${XDIR}
431 if [[ ${CATEGORY} = x11-proto ]]; then
353 make \ 432 make \
433 ${PN/proto/}docdir=/usr/share/doc/${PF} \
354 DESTDIR="${D}" \ 434 DESTDIR="${D}" \
355 install 435 install \
436 || die
437 else
438 make \
439 docdir=/usr/share/doc/${PF} \
440 DESTDIR="${D}" \
441 install \
442 || die
443 fi
356# Shouldn't be necessary in XDIR=/usr 444# Shouldn't be necessary in XDIR=/usr
357# einstall forces datadir, so we need to re-force it 445# einstall forces datadir, so we need to re-force it
358# datadir=${XDIR}/share \ 446# datadir=${XDIR}/share \
359# mandir=${XDIR}/share/man \ 447# mandir=${XDIR}/share/man \
360 448
… …
363 git log ${GIT_TREE} > "${S}"/ChangeLog 451 git log ${GIT_TREE} > "${S}"/ChangeLog
364 popd 452 popd
365 fi 453 fi
366 454
367 if [[ -e ${S}/ChangeLog ]]; then 455 if [[ -e ${S}/ChangeLog ]]; then
368 dodoc ${S}/ChangeLog 456 dodoc "${S}"/ChangeLog
369 fi 457 fi
458# @VARIABLE: DOCS
459# @DESCRIPTION:
460# Any documentation to install via dodoc
370 [[ -n $DOCS ]] && dodoc $DOCS 461 [[ -n ${DOCS} ]] && dodoc ${DOCS}
371
372 # Make sure docs get compressed
373 prepalldocs
374 462
375 # Don't install libtool archives for server modules 463 # Don't install libtool archives for server modules
376 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then 464 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
377 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \ 465 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
378 | xargs rm -f 466 | xargs rm -f
379 fi 467 fi
380 468
381 # Don't install overlapping fonts.* files
382 # Generate them instead when possible
383 if [[ -n "${FONT}" ]]; then 469 if [[ -n "${FONT}" ]]; then
384 remove_font_metadata 470 remove_font_metadata
385 fi 471 fi
386 472
387 if [[ -n "${DRIVER}" ]]; then 473 if [[ -n "${DRIVER}" ]]; then
388 install_driver_hwdata 474 install_driver_hwdata
389 fi 475 fi
390} 476}
391 477
478# @FUNCTION: x-modular_pkg_preinst
479# @USAGE:
480# @DESCRIPTION:
481# This function doesn't do anything right now, but it may in the future.
392x-modular_pkg_preinst() { 482x-modular_pkg_preinst() {
393 # We no longer do anything here, but we can't remove it from the API 483 # We no longer do anything here, but we can't remove it from the API
394 : 484 :
395} 485}
396 486
487# @FUNCTION: x-modular_pkg_postinst
488# @USAGE:
489# @DESCRIPTION:
490# Run X-specific post-installation tasks on the live filesystem. The
491# only task right now is some setup for font packages.
397x-modular_pkg_postinst() { 492x-modular_pkg_postinst() {
398 if [[ -n "${FONT}" ]]; then 493 if [[ -n "${FONT}" ]]; then
399 setup_fonts 494 setup_fonts
400 fi 495 fi
401} 496}
402 497
498# @FUNCTION: x-modular_pkg_postrm
499# @USAGE:
500# @DESCRIPTION:
501# Run X-specific post-removal tasks on the live filesystem. The only
502# task right now is some cleanup for font packages.
403x-modular_pkg_postrm() { 503x-modular_pkg_postrm() {
404 if [[ -n "${FONT}" ]]; then 504 if [[ -n "${FONT}" ]]; then
405 cleanup_fonts
406 font_pkg_postrm 505 font_pkg_postrm
407 fi 506 fi
408} 507}
409 508
410cleanup_fonts() { 509# @FUNCTION: setup_fonts
411 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 510# @USAGE:
412 for DIR in ${FONT_DIR}; do 511# @DESCRIPTION:
413 unset KEEP_FONTDIR 512# 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() { 513setup_fonts() {
446 if [[ ! -n "${FONT_DIR}" ]]; then 514 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." 515 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
448 eerror "${msg}" 516 eerror "${msg}"
449 die "${msg}" 517 die "${msg}"
450 fi 518 fi
451 519
452 create_fonts_scale 520 create_fonts_scale
453 create_fonts_dir 521 create_fonts_dir
454 fix_font_permissions
455 create_font_cache 522 create_font_cache
456} 523}
457 524
525# @FUNCTION: remove_font_metadata
526# @USAGE:
527# @DESCRIPTION:
528# Don't let the package install generated font files that may overlap
529# with other packages. Instead, they're generated in pkg_postinst().
458remove_font_metadata() { 530remove_font_metadata() {
459 local DIR 531 local DIR
460 for DIR in ${FONT_DIR}; do 532 for DIR in ${FONT_DIR}; do
461 if [[ "${DIR}" != "Speedo" ]] && \ 533 if [[ "${DIR}" != "Speedo" ]] && \
462 [[ "${DIR}" != "CID" ]] ; then 534 [[ "${DIR}" != "CID" ]] ; then
463 # Delete font metadata files 535 # Delete font metadata files
464 # fonts.scale, fonts.dir, fonts.cache-1 536 # fonts.scale, fonts.dir, fonts.cache-1
465 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 537 rm -f "${D}"/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
466 fi 538 fi
467 done 539 done
468} 540}
469 541
542# @FUNCTION: install_driver_hwdata
543# @USAGE:
544# @DESCRIPTION:
470# Installs device-to-driver mappings for system-config-display 545# Installs device-to-driver mappings for system-config-display and
471# and anything else that uses hwdata 546# anything else that uses hwdata.
472install_driver_hwdata() { 547install_driver_hwdata() {
473 insinto /usr/share/hwdata/videoaliases 548 insinto /usr/share/hwdata/videoaliases
474 for i in "${FILESDIR}"/*.xinf; do 549 for i in "${FILESDIR}"/*.xinf; do
475 # We need this for the case when none exist, 550 # We need this for the case when none exist,
476 # so *.xinf doesn't expand 551 # so *.xinf doesn't expand
… …
478 doins $i 553 doins $i
479 fi 554 fi
480 done 555 done
481} 556}
482 557
558# @FUNCTION: discover_font_dirs
559# @USAGE:
560# @DESCRIPTION:
561# Deprecated. Sets up the now-unused FONT_DIRS variable.
483discover_font_dirs() { 562discover_font_dirs() {
484 FONT_DIRS="${FONT_DIR}" 563 FONT_DIRS="${FONT_DIR}"
485} 564}
486 565
566# @FUNCTION: create_fonts_scale
567# @USAGE:
568# @DESCRIPTION:
569# Create fonts.scale file, used by the old server-side fonts subsystem.
487create_fonts_scale() { 570create_fonts_scale() {
488 ebegin "Creating fonts.scale files" 571 ebegin "Creating fonts.scale files"
489 local x 572 local x
490 for DIR in ${FONT_DIR}; do 573 for DIR in ${FONT_DIR}; do
491 x=${ROOT}/usr/share/fonts/${DIR} 574 x=${ROOT}/usr/share/fonts/${DIR}
… …
498 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 581 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
499 # <dberkholz@gentoo.org> 2 August 2004 582 # <dberkholz@gentoo.org> 2 August 2004
500 if [[ "${x/encodings}" = "${x}" ]] \ 583 if [[ "${x/encodings}" = "${x}" ]] \
501 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 584 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
502 mkfontscale \ 585 mkfontscale \
503 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 586 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
504 -- ${x} 587 -- ${x}
505 fi 588 fi
506 done 589 done
507 eend 0 590 eend 0
508} 591}
509 592
593# @FUNCTION: create_fonts_dir
594# @USAGE:
595# @DESCRIPTION:
596# Create fonts.dir file, used by the old server-side fonts subsystem.
510create_fonts_dir() { 597create_fonts_dir() {
511 ebegin "Generating fonts.dir files" 598 ebegin "Generating fonts.dir files"
512 for DIR in ${FONT_DIR}; do 599 for DIR in ${FONT_DIR}; do
513 x=${ROOT}/usr/share/fonts/${DIR} 600 x=${ROOT}/usr/share/fonts/${DIR}
514 [[ -z "$(ls ${x}/)" ]] && continue 601 [[ -z "$(ls ${x}/)" ]] && continue
515 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 602 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
516 603
517 if [[ "${x/encodings}" = "${x}" ]]; then 604 if [[ "${x/encodings}" = "${x}" ]]; then
518 mkfontdir \ 605 mkfontdir \
519 -e ${ROOT}/usr/share/fonts/encodings \ 606 -e "${ROOT}"/usr/share/fonts/encodings \
520 -e ${ROOT}/usr/share/fonts/encodings/large \ 607 -e "${ROOT}"/usr/share/fonts/encodings/large \
521 -- ${x} 608 -- ${x}
522 fi 609 fi
523 done 610 done
524 eend 0 611 eend 0
525} 612}
526 613
527fix_font_permissions() { 614# @FUNCTION: create_font_cache
528 ebegin "Fixing permissions" 615# @USAGE:
529 for DIR in ${FONT_DIR}; do 616# @DESCRIPTION:
530 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \ 617# Create fonts.cache-1 files, used by the new client-side fonts
531 -exec chmod 0644 {} \; 618# subsystem.
532 done
533 eend 0
534}
535
536create_font_cache() { 619create_font_cache() {
537 font_pkg_postinst 620 font_pkg_postinst
538} 621}
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.121
  ViewVC Help
Powered by ViewVC 1.1.13