/[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.68 Revision 1.114
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.68 2006/07/01 05:36:26 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.114 2009/10/11 07:41:36 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. Nearly all FreeDesktop-hosted X packages
109# are under the MIT license. (This is what Red Hat does in their rpms)
110LICENSE="MIT"
111
112# Set up shared dependencies
113if [[ -n "${SNAPSHOT}" ]]; then
114# FIXME: What's the minimal libtool version supporting arbitrary versioning?
115 DEPEND="${DEPEND}
116 >=sys-devel/libtool-1.5
117 >=sys-devel/m4-1.4"
118 WANT_AUTOCONF="latest"
119 WANT_AUTOMAKE="latest"
120fi
121
122if [[ -n "${FONT}" ]]; then
98 RDEPEND="${RDEPEND} 123 RDEPEND="${RDEPEND}
99 media-fonts/encodings 124 media-fonts/encodings
100 x11-apps/mkfontscale 125 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 126 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 127 PDEPEND="${PDEPEND}
105 # Starting with 7.0RC3, we can specify the font directory 130 # Starting with 7.0RC3, we can specify the font directory
106 # But oddly, we can't do the same for encodings or font-alias 131 # But oddly, we can't do the same for encodings or font-alias
107 132
108 # Wrap in `if` so ebuilds can set it too 133 # Wrap in `if` so ebuilds can set it too
109 if [[ -z ${FONT_DIR} ]]; then 134 if [[ -z ${FONT_DIR} ]]; then
135# @ECLASS-VARIABLE: FONT_DIR
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 142
112 fi 143 fi
113 144
114 # Fix case of font directories 145 # Fix case of font directories
115 FONT_DIR=${FONT_DIR/ttf/TTF} 146 FONT_DIR=${FONT_DIR/ttf/TTF}
116 FONT_DIR=${FONT_DIR/otf/OTF} 147 FONT_DIR=${FONT_DIR/otf/OTF}
117 FONT_DIR=${FONT_DIR/type1/Type1} 148 FONT_DIR=${FONT_DIR/type1/Type1}
118 FONT_DIR=${FONT_DIR/speedo/Speedo} 149 FONT_DIR=${FONT_DIR/speedo/Speedo}
119 150
120 # Set up configure option 151 # Set up configure options, wrapped so ebuilds can override if need be
152 if [[ -z ${FONT_OPTIONS} ]]; then
121 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" 153 FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\""
154 fi
122 155
123 if [[ -n "${FONT}" ]]; then 156 if [[ -n "${FONT}" ]]; then
124 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]]; then 157 if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then
125 IUSE="${IUSE} nls" 158 IUSE="${IUSE} nls"
126 fi 159 fi
127 fi 160 fi
128fi 161fi
129 162
130# If we're a driver package 163# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 164if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 165 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 166 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 167fi
139 168
140# Debugging -- ignore packages that can't be built with debugging 169# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 170if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 171 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
143 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 172 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
144 || [[ "${PN/util-macros}" != "${PN}" ]] \ 173 && [[ "${PN/util-macros}" = "${PN}" ]] \
145 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 174 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
146 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 175 && [[ "${PN/xkbdata}" = "${PN}" ]] \
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 176 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \ 177 && [[ "${PN/xcursor}" = "${PN}" ]] \
149 ; then 178 ; then
150 DEBUGGABLE="yes" 179 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug" 180 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
157fi 181fi
158 182
159DEPEND="${DEPEND} 183DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 184 >=dev-util/pkgconfig-0.18"
161 185
168RDEPEND="${RDEPEND} 192RDEPEND="${RDEPEND}
169 !<=x11-base/xorg-x11-6.9" 193 !<=x11-base/xorg-x11-6.9"
170# Provides virtual/x11 for temporary use until packages are ported 194# Provides virtual/x11 for temporary use until packages are ported
171# x11-base/x11-env" 195# x11-base/x11-env"
172 196
197# @FUNCTION: x-modular_specs_check
198# @USAGE:
199# @DESCRIPTION:
200# Make any necessary changes related to gcc specs (generally hardened)
173x-modular_specs_check() { 201x-modular_specs_check() {
174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 202 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
175 append-ldflags -Wl,-z,lazy 203 append-ldflags -Wl,-z,lazy
176 # (#116698) breaks loading 204 # (#116698) breaks loading
177 filter-ldflags -Wl,-z,now 205 filter-ldflags -Wl,-z,now
178 fi 206 fi
179} 207}
180 208
209# @FUNCTION: x-modular_dri_check
210# @USAGE:
211# @DESCRIPTION:
212# Ensures the server supports DRI if building a driver with DRI support
181x-modular_dri_check() { 213x-modular_dri_check() {
182 # (#120057) Enabling DRI in drivers requires that the server was built with 214 # (#120057) Enabling DRI in drivers requires that the server was built with
183 # support for it 215 # support for it
216 # Starting with xorg-server 1.5.3, DRI support is always enabled unless
217 # USE=minimal is set (see bug #252084)
184 if [[ -n "${DRIVER}" ]]; then 218 if [[ -n "${DRIVER}" ]]; then
185 if has dri ${IUSE} && use dri; then 219 if has dri ${IUSE} && use dri; then
186 einfo "Checking for direct rendering capabilities ..." 220 einfo "Checking for direct rendering capabilities ..."
221 if has_version '>=x11-base/xorg-server-1.5.3'; then
222 if built_with_use x11-base/xorg-server minimal; then
223 die "You must build x11-base/xorg-server with USE=-minimal."
224 fi
225 else
187 if ! built_with_use x11-base/xorg-server dri; then 226 if ! built_with_use x11-base/xorg-server dri; then
188 die "You must build x11-base/xorg-server with USE=dri." 227 die "You must build x11-base/xorg-server with USE=dri."
228 fi
189 fi 229 fi
190 fi 230 fi
191 fi 231 fi
192} 232}
193 233
234# @FUNCTION: x-modular_server_supports_drivers_check
235# @USAGE:
236# @DESCRIPTION:
237# Ensures the server SDK is installed if a driver is being built
194x-modular_server_supports_drivers_check() { 238x-modular_server_supports_drivers_check() {
195 # (#135873) Only certain servers will actually use or be capable of 239 # (#135873) Only certain servers will actually use or be capable of
196 # building external drivers, including binary drivers. 240 # building external drivers, including binary drivers.
197 if [[ -n "${DRIVER}" ]]; then 241 if [[ -n "${DRIVER}" ]]; then
198 if has_version '>=x11-base/xorg-server-1.1'; then 242 if has_version '>=x11-base/xorg-server-1.1'; then
202 fi 246 fi
203 fi 247 fi
204 fi 248 fi
205} 249}
206 250
251# @FUNCTION: x-modular_unpack_source
252# @USAGE:
253# @DESCRIPTION:
254# Simply unpack source code. Nothing else.
207x-modular_unpack_source() { 255x-modular_unpack_source() {
256 if [[ -n ${GIT_ECLASS} ]]; then
257 git_src_unpack
258 else
208 unpack ${A} 259 unpack ${A}
260 fi
209 cd ${S} 261 cd "${S}"
210 262
211 if [[ -n ${FONT_OPTIONS} ]]; then 263 if [[ -n ${FONT_OPTIONS} ]]; then
212 einfo "Detected font directory: ${FONT_DIR}" 264 einfo "Detected font directory: ${FONT_DIR}"
213 fi 265 fi
214} 266}
215 267
268# @FUNCTION: x-modular_patch_source
269# @USAGE:
270# @DESCRIPTION:
271# Apply all patches
216x-modular_patch_source() { 272x-modular_patch_source() {
217 # Use standardized names and locations with bulk patching 273 # Use standardized names and locations with bulk patching
218 # Patch directory is ${WORKDIR}/patch 274 # Patch directory is ${WORKDIR}/patch
219 # See epatch() in eutils.eclass for more documentation 275 # See epatch() in eutils.eclass for more documentation
220 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 276 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
221 EPATCH_SUFFIX="patch" 277 EPATCH_SUFFIX="patch"
222 fi 278 fi
223 279
224 # If this is a driver package we need to fix man page install location. 280# @VARIABLE: PATCHES
225 # Running autoreconf will use the patched util-macros to make the 281# @DESCRIPTION:
226 # change for us, so we only need to patch if it is not going to run. 282# If you have any patches to apply, set PATCHES to their locations and epatch
227 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 283# will apply them. It also handles epatch-style bulk patches, if you know how to
228 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 284# use them and set the correct variables. If you don't, read eutils.eclass.
229 fi 285 if [[ ${#PATCHES[@]} -gt 1 ]]; then
230 286 for x in "${PATCHES[@]}"; do
231 # For specific list of patches 287 epatch "${x}"
288 done
232 if [[ -n "${PATCHES}" ]] ; then 289 elif [[ -n "${PATCHES}" ]]; then
233 for PATCH in ${PATCHES} 290 for x in ${PATCHES}; do
234 do
235 epatch ${PATCH} 291 epatch "${x}"
236 done 292 done
237 # For non-default directory bulk patching 293 # For non-default directory bulk patching
238 elif [[ -n "${PATCH_LOC}" ]] ; then 294 elif [[ -n "${PATCH_LOC}" ]] ; then
239 epatch ${PATCH_LOC} 295 epatch ${PATCH_LOC}
240 # For standard bulk patching 296 # For standard bulk patching
241 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 297 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
242 epatch 298 epatch
243 fi 299 fi
244} 300}
245 301
302# @FUNCTION: x-modular_reconf_source
303# @USAGE:
304# @DESCRIPTION:
305# Run eautoreconf if necessary, and run elibtoolize.
246x-modular_reconf_source() { 306x-modular_reconf_source() {
247 # Run autoreconf for CVS snapshots only
248 if [[ "${SNAPSHOT}" = "yes" ]] 307 if [[ "${SNAPSHOT}" = "yes" ]]
249 then 308 then
250 # If possible, generate configure if it doesn't exist 309 # If possible, generate configure if it doesn't exist
251 if [ -f "${S}/configure.ac" ] 310 if [ -f "./configure.ac" ]
252 then 311 then
253 eautoreconf 312 eautoreconf
254 fi 313 fi
255 fi 314 fi
256 315
257 # Joshua Baergen - October 23, 2005 316 # Joshua Baergen - October 23, 2005
258 # Fix shared lib issues on MIPS, FBSD, etc etc 317 # Fix shared lib issues on MIPS, FBSD, etc etc
259 elibtoolize 318 elibtoolize
260} 319}
261 320
321# @FUNCTION: x-modular_src_prepare
322# @USAGE:
323# @DESCRIPTION:
324# Prepare a package after unpacking, performing all X-related tasks.
325x-modular_src_prepare() {
326 [[ -n ${GIT_ECLASS} ]] && has src_prepare ${EXPORTED_FUNCTIONS} \
327 && git_src_prepare
328 x-modular_patch_source
329 x-modular_reconf_source
330}
331
332# @FUNCTION: x-modular_src_unpack
333# @USAGE:
334# @DESCRIPTION:
335# Unpack a package, performing all X-related tasks.
262x-modular_src_unpack() { 336x-modular_src_unpack() {
263 x-modular_specs_check 337 x-modular_specs_check
264 x-modular_server_supports_drivers_check 338 x-modular_server_supports_drivers_check
265 x-modular_dri_check 339 x-modular_dri_check
266 x-modular_unpack_source 340 x-modular_unpack_source
267 x-modular_patch_source 341 has src_prepare ${EXPORTED_FUNCTIONS} || x-modular_src_prepare
268 x-modular_reconf_source
269} 342}
270 343
344# @FUNCTION: x-modular_font_configure
345# @USAGE:
346# @DESCRIPTION:
347# If a font package, perform any necessary configuration steps
271x-modular_font_configure() { 348x-modular_font_configure() {
272 if [[ -n "${FONT}" ]]; then 349 if [[ -n "${FONT}" ]]; then
273 # Might be worth adding an option to configure your desired font 350 # Might be worth adding an option to configure your desired font
274 # and exclude all others. Also, should this USE be nls or minimal? 351 # and exclude all others. Also, should this USE be nls or minimal?
275 if ! use nls; then 352 if has nls ${IUSE//+} && ! use nls; then
276 FONT_OPTIONS="${FONT_OPTIONS} 353 FONT_OPTIONS="${FONT_OPTIONS}
277 --disable-iso8859-2 354 --disable-iso8859-2
278 --disable-iso8859-3 355 --disable-iso8859-3
279 --disable-iso8859-4 356 --disable-iso8859-4
280 --disable-iso8859-5 357 --disable-iso8859-5
293 --disable-koi8-r" 370 --disable-koi8-r"
294 fi 371 fi
295 fi 372 fi
296} 373}
297 374
375# @FUNCTION: x-modular_debug_setup
376# @USAGE:
377# @DESCRIPTION:
378# Set up CFLAGS for a debug build
298x-modular_debug_setup() { 379x-modular_debug_setup() {
299 if [[ -n "${DEBUGGABLE}" ]]; then 380 if [[ -n "${DEBUGGABLE}" ]]; then
300 if use debug; then 381 if use debug; then
301 strip-flags 382 strip-flags
302 append-flags -g 383 append-flags -g
303 fi 384 fi
304 fi 385 fi
305} 386}
306 387
388# @FUNCTION: x-modular_src_configure
389# @USAGE:
390# @DESCRIPTION:
391# Perform any necessary pre-configuration steps, then run configure
307x-modular_src_configure() { 392x-modular_src_configure() {
308 x-modular_font_configure 393 x-modular_font_configure
309 x-modular_debug_setup 394 x-modular_debug_setup
310 395
396# @VARIABLE: CONFIGURE_OPTIONS
397# @DESCRIPTION:
398# Any options to pass to configure
399[[ -n ${CONFIGURE_OPTIONS} ]]
400
311 # If prefix isn't set here, .pc files cause problems 401 # If prefix isn't set here, .pc files cause problems
312 if [[ -x ./configure ]]; then 402 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
313 econf --prefix=${XDIR} \ 403 econf --prefix=${XDIR} \
314 --datadir=${XDIR}/share \ 404 --datadir=${XDIR}/share \
315 ${FONT_OPTIONS} \ 405 ${FONT_OPTIONS} \
316 ${DRIVER_OPTIONS} \ 406 ${DRIVER_OPTIONS} \
317 ${CONFIGURE_OPTIONS} 407 ${CONFIGURE_OPTIONS}
318 fi 408 fi
319} 409}
320 410
411# @FUNCTION: x-modular_src_make
412# @USAGE:
413# @DESCRIPTION:
414# Run make.
321x-modular_src_make() { 415x-modular_src_make() {
322 emake || die "emake failed" 416 emake || die "emake failed"
323} 417}
324 418
419# @FUNCTION: x-modular_src_compile
420# @USAGE:
421# @DESCRIPTION:
422# Compile a package, performing all X-related tasks.
325x-modular_src_compile() { 423x-modular_src_compile() {
326 x-modular_src_configure 424 has src_configure ${EXPORTED_FUNCTIONS} || x-modular_src_configure
327 x-modular_src_make 425 x-modular_src_make
328} 426}
329 427
428# @FUNCTION: x-modular_src_install
429# @USAGE:
430# @DESCRIPTION:
431# Install a built package to ${D}, performing any necessary steps.
432# Creates a ChangeLog from git if using live ebuilds.
330x-modular_src_install() { 433x-modular_src_install() {
331 # Install everything to ${XDIR} 434 # Install everything to ${XDIR}
435 if [[ ${CATEGORY} = x11-proto ]]; then
332 make \ 436 make \
437 ${PN/proto/}docdir=/usr/share/doc/${PF} \
333 DESTDIR="${D}" \ 438 DESTDIR="${D}" \
334 install 439 install \
440 || die
441 else
442 make \
443 DESTDIR="${D}" \
444 install \
445 || die
446 fi
335# Shouldn't be necessary in XDIR=/usr 447# Shouldn't be necessary in XDIR=/usr
336# einstall forces datadir, so we need to re-force it 448# einstall forces datadir, so we need to re-force it
337# datadir=${XDIR}/share \ 449# datadir=${XDIR}/share \
338# mandir=${XDIR}/share/man \ 450# mandir=${XDIR}/share/man \
339 451
452 if [[ -n ${GIT_ECLASS} ]]; then
453 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
454 git log ${GIT_TREE} > "${S}"/ChangeLog
455 popd
456 fi
457
340 if [[ -e ${S}/ChangeLog ]]; then 458 if [[ -e ${S}/ChangeLog ]]; then
341 dodoc ${S}/ChangeLog 459 dodoc "${S}"/ChangeLog
342 fi 460 fi
343 461# @VARIABLE: DOCS
344 # Make sure docs get compressed 462# @DESCRIPTION:
345 prepalldocs 463# Any documentation to install
464 [[ -n ${DOCS} ]] && dodoc ${DOCS}
346 465
347 # Don't install libtool archives for server modules 466 # Don't install libtool archives for server modules
348 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 467 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
349 find ${D}/usr/lib/xorg/modules -name '*.la' \ 468 find "${D}"/usr/$(get_libdir)/xorg/modules -name '*.la' \
350 | xargs rm -f 469 | xargs rm -f
351 fi 470 fi
352 471
353 # Don't install overlapping fonts.* files
354 # Generate them instead when possible
355 if [[ -n "${FONT}" ]]; then 472 if [[ -n "${FONT}" ]]; then
356 remove_font_metadata 473 remove_font_metadata
357 fi 474 fi
358}
359 475
476 if [[ -n "${DRIVER}" ]]; then
477 install_driver_hwdata
478 fi
479}
480
481# @FUNCTION: x-modular_pkg_preinst
482# @USAGE:
483# @DESCRIPTION:
484# This function doesn't do anything right now, but it may in the future.
360x-modular_pkg_preinst() { 485x-modular_pkg_preinst() {
361 if [[ -n "${FONT}" ]]; then 486 # We no longer do anything here, but we can't remove it from the API
362 discover_font_dirs 487 :
363 fi
364} 488}
365 489
490# @FUNCTION: x-modular_pkg_postinst
491# @USAGE:
492# @DESCRIPTION:
493# Run X-specific post-installation tasks on the live filesystem. The
494# only task right now is some setup for font packages.
366x-modular_pkg_postinst() { 495x-modular_pkg_postinst() {
367 if [[ -n "${FONT}" ]]; then 496 if [[ -n "${FONT}" ]]; then
368 setup_fonts 497 setup_fonts
369 fi 498 fi
370} 499}
371 500
501# @FUNCTION: x-modular_pkg_postrm
502# @USAGE:
503# @DESCRIPTION:
504# Run X-specific post-removal tasks on the live filesystem. The only
505# task right now is some cleanup for font packages.
372x-modular_pkg_postrm() { 506x-modular_pkg_postrm() {
373 if [[ -n "${FONT}" ]]; then 507 if [[ -n "${FONT}" ]]; then
374 cleanup_fonts 508 cleanup_fonts
509 font_pkg_postrm
375 fi 510 fi
376} 511}
377 512
513# @FUNCTION: cleanup_fonts
514# @USAGE:
515# @DESCRIPTION:
516# Get rid of font directories that only contain generated files
378cleanup_fonts() { 517cleanup_fonts() {
379 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 518 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
380 for DIR in ${FONT_DIR}; do 519 for DIR in ${FONT_DIR}; do
381 unset KEEP_FONTDIR 520 unset KEEP_FONTDIR
382 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 521 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
408 fi 547 fi
409 eend 0 548 eend 0
410 done 549 done
411} 550}
412 551
552# @FUNCTION: setup_fonts
553# @USAGE:
554# @DESCRIPTION:
555# Generates needed files for fonts and fixes font permissions
413setup_fonts() { 556setup_fonts() {
414 if [[ ! -n "${FONT_DIRS}" ]]; then 557 if [[ ! -n "${FONT_DIR}" ]]; then
415 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 558 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
416 eerror "${msg}" 559 eerror "${msg}"
417 die "${msg}" 560 die "${msg}"
418 fi 561 fi
419 562
420 create_fonts_scale 563 create_fonts_scale
421 create_fonts_dir 564 create_fonts_dir
422 fix_font_permissions
423 create_font_cache 565 create_font_cache
424} 566}
425 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().
426remove_font_metadata() { 573remove_font_metadata() {
427 local DIR 574 local DIR
428 for DIR in ${FONT_DIR}; do 575 for DIR in ${FONT_DIR}; do
429 if [[ "${DIR}" != "Speedo" ]] && \ 576 if [[ "${DIR}" != "Speedo" ]] && \
430 [[ "${DIR}" != "CID" ]] ; then 577 [[ "${DIR}" != "CID" ]] ; then
431 # Delete font metadata files 578 # Delete font metadata files
432 # fonts.scale, fonts.dir, fonts.cache-1 579 # fonts.scale, fonts.dir, fonts.cache-1
433 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}
434 fi 581 fi
435 done 582 done
436} 583}
437 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.
438discover_font_dirs() { 605discover_font_dirs() {
439 pushd ${IMAGE}/usr/share/fonts 606 FONT_DIRS="${FONT_DIR}"
440 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
441 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
442 popd
443} 607}
444 608
609# @FUNCTION: create_fonts_scale
610# @USAGE:
611# @DESCRIPTION:
612# Create fonts.scale file, used by the old server-side fonts subsystem.
445create_fonts_scale() { 613create_fonts_scale() {
446 ebegin "Creating fonts.scale files" 614 ebegin "Creating fonts.scale files"
447 local x 615 local x
448 for FONT_DIR in ${FONT_DIRS}; do 616 for DIR in ${FONT_DIR}; do
449 x=${ROOT}/usr/share/fonts/${FONT_DIR} 617 x=${ROOT}/usr/share/fonts/${DIR}
450 [[ -z "$(ls ${x}/)" ]] && continue 618 [[ -z "$(ls ${x}/)" ]] && continue
451 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 619 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
452 620
453 # Only generate .scale files if truetype, opentype or type1 621 # Only generate .scale files if truetype, opentype or type1
454 # fonts are present ... 622 # fonts are present ...
455 623
456 # First truetype (ttf,ttc)
457 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
458 # Also, there is no way to regenerate Speedo/CID fonts.scale 624 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
459 # <spyderous@gentoo.org> 2 August 2004 625 # <dberkholz@gentoo.org> 2 August 2004
460 if [[ "${x/encodings}" = "${x}" ]] \ 626 if [[ "${x/encodings}" = "${x}" ]] \
461 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
462 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
463 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
464 ${ROOT}/usr/bin/ttmkfdir -x 2 \
465 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
466 -o ${x}/fonts.scale -d ${x}
467 # ttmkfdir fails on some stuff, so try mkfontscale if it does
468 local ttmkfdir_return=$?
469 else
470 # We didn't use ttmkfdir at all
471 local ttmkfdir_return=2
472 fi
473 if [[ ${ttmkfdir_return} -ne 0 ]]; then
474 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
475 ${ROOT}/usr/bin/mkfontscale \
476 -a /usr/share/fonts/encodings/encodings.dir \
477 -- ${x}
478 fi
479 # Next type1 and opentype (pfa,pfb,otf,otc)
480 elif [[ "${x/encodings}" = "${x}" ]] \
481 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 627 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
482 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 628 mkfontscale \
483 ${ROOT}/usr/bin/mkfontscale \
484 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 629 -a "${ROOT}"/usr/share/fonts/encodings/encodings.dir \
485 -- ${x} 630 -- ${x}
486 fi 631 fi
487 done 632 done
488 eend 0 633 eend 0
489} 634}
490 635
636# @FUNCTION: create_fonts_dir
637# @USAGE:
638# @DESCRIPTION:
639# Create fonts.dir file, used by the old server-side fonts subsystem.
491create_fonts_dir() { 640create_fonts_dir() {
492 ebegin "Generating fonts.dir files" 641 ebegin "Generating fonts.dir files"
493 for FONT_DIR in ${FONT_DIRS}; do 642 for DIR in ${FONT_DIR}; do
494 x=${ROOT}/usr/share/fonts/${FONT_DIR} 643 x=${ROOT}/usr/share/fonts/${DIR}
495 [[ -z "$(ls ${x}/)" ]] && continue 644 [[ -z "$(ls ${x}/)" ]] && continue
496 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 645 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
497 646
498 if [[ "${x/encodings}" = "${x}" ]]; then 647 if [[ "${x/encodings}" = "${x}" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 648 mkfontdir \
500 ${ROOT}/usr/bin/mkfontdir \
501 -e ${ROOT}/usr/share/fonts/encodings \ 649 -e "${ROOT}"/usr/share/fonts/encodings \
502 -e ${ROOT}/usr/share/fonts/encodings/large \ 650 -e "${ROOT}"/usr/share/fonts/encodings/large \
503 -- ${x} 651 -- ${x}
504 fi 652 fi
505 done 653 done
506 eend 0 654 eend 0
507} 655}
508 656
509fix_font_permissions() { 657# @FUNCTION: create_font_cache
510 ebegin "Fixing permissions" 658# @USAGE:
511 for FONT_DIR in ${FONT_DIRS}; do 659# @DESCRIPTION:
512 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 660# Create fonts.cache-1 files, used by the new client-side fonts
513 -exec chmod 0644 {} \; 661# subsystem.
514 done
515 eend 0
516}
517
518create_font_cache() { 662create_font_cache() {
519 # danarmak found out that fc-cache should be run AFTER all the above 663 font_pkg_postinst
520 # stuff, as otherwise the cache is invalid, and has to be run again
521 # as root anyway
522 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
523 ebegin "Creating FC font cache"
524 HOME="/root" ${ROOT}/usr/bin/fc-cache
525 eend 0
526 fi
527} 664}

Legend:
Removed from v.1.68  
changed lines
  Added in v.1.114

  ViewVC Help
Powered by ViewVC 1.1.20