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

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.110

  ViewVC Help
Powered by ViewVC 1.1.20