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

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.125

  ViewVC Help
Powered by ViewVC 1.1.20