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

Legend:
Removed from v.1.51  
changed lines
  Added in v.1.119

  ViewVC Help
Powered by ViewVC 1.1.20