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

Legend:
Removed from v.1.57  
changed lines
  Added in v.1.95

  ViewVC Help
Powered by ViewVC 1.1.20