/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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

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

  ViewVC Help
Powered by ViewVC 1.1.20