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