/[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.59 Revision 1.93
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.59 2006/05/16 06:23:43 exg Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.93 2008/03/06 04:42:26 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="data"
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
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
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.
198x-modular_unpack_source() { 247x-modular_unpack_source() {
248 if [[ -n ${GIT_ECLASS} ]]; then
249 git_src_unpack
250 else
199 unpack ${A} 251 unpack ${A}
252 fi
200 cd ${S} 253 cd ${S}
201 254
202 if [[ -n ${FONT_OPTIONS} ]]; then 255 if [[ -n ${FONT_OPTIONS} ]]; then
203 einfo "Detected font directory: ${FONT_DIR}" 256 einfo "Detected font directory: ${FONT_DIR}"
204 fi 257 fi
205} 258}
206 259
260# @FUNCTION: x-modular_patch_source
261# @USAGE:
262# @DESCRIPTION:
263# Apply all patches
207x-modular_patch_source() { 264x-modular_patch_source() {
208 # Use standardized names and locations with bulk patching 265 # Use standardized names and locations with bulk patching
209 # Patch directory is ${WORKDIR}/patch 266 # Patch directory is ${WORKDIR}/patch
210 # See epatch() in eutils.eclass for more documentation 267 # See epatch() in eutils.eclass for more documentation
211 if [[ -z "${EPATCH_SUFFIX}" ]] ; then 268 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
213 fi 270 fi
214 271
215 # 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.
216 # Running autoreconf will use the patched util-macros to make the 273 # Running autoreconf will use the patched util-macros to make the
217 # 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.
218 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 275 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
276 && [[ ${XDPVER} != -1 ]]; then
219 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 277 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
220 fi 278 fi
221 279
222 # 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.
223 if [[ -n "${PATCHES}" ]] ; then 285 if [[ -n "${PATCHES}" ]] ; then
224 for PATCH in ${PATCHES} 286 for PATCH in ${PATCHES}
225 do 287 do
226 epatch ${PATCH} 288 epatch ${PATCH}
227 done 289 done
232 elif [[ -d "${EPATCH_SOURCE}" ]] ; then 294 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
233 epatch 295 epatch
234 fi 296 fi
235} 297}
236 298
299# @FUNCTION: x-modular_reconf_source
300# @USAGE:
301# @DESCRIPTION:
302# Run eautoreconf if necessary, and run elibtoolize.
237x-modular_reconf_source() { 303x-modular_reconf_source() {
238 # Run autoreconf for CVS snapshots only
239 if [[ "${SNAPSHOT}" = "yes" ]] 304 if [[ "${SNAPSHOT}" = "yes" ]]
240 then 305 then
241 # If possible, generate configure if it doesn't exist 306 # If possible, generate configure if it doesn't exist
242 if [ -f "${S}/configure.ac" ] 307 if [ -f "./configure.ac" ]
243 then 308 then
244 eautoreconf 309 eautoreconf
245 fi 310 fi
246 fi 311 fi
247 312
248 # Joshua Baergen - October 23, 2005 313 # Joshua Baergen - October 23, 2005
249 # Fix shared lib issues on MIPS, FBSD, etc etc 314 # Fix shared lib issues on MIPS, FBSD, etc etc
250 elibtoolize 315 elibtoolize
251} 316}
252 317
318# @FUNCTION: x-modular_src_unpack
319# @USAGE:
320# @DESCRIPTION:
321# Unpack a package, performing all X-related tasks.
253x-modular_src_unpack() { 322x-modular_src_unpack() {
254 x-modular_specs_check 323 x-modular_specs_check
324 x-modular_server_supports_drivers_check
255 x-modular_dri_check 325 x-modular_dri_check
256 x-modular_unpack_source 326 x-modular_unpack_source
257 x-modular_patch_source 327 x-modular_patch_source
258 x-modular_reconf_source 328 x-modular_reconf_source
259} 329}
260 330
331# @FUNCTION: x-modular_font_configure
332# @USAGE:
333# @DESCRIPTION:
334# If a font package, perform any necessary configuration steps
261x-modular_font_configure() { 335x-modular_font_configure() {
262 if [[ -n "${FONT}" ]]; then 336 if [[ -n "${FONT}" ]]; then
263 # Might be worth adding an option to configure your desired font 337 # Might be worth adding an option to configure your desired font
264 # and exclude all others. Also, should this USE be nls or minimal? 338 # and exclude all others. Also, should this USE be nls or minimal?
265 if ! use nls; then 339 if ! use nls; then
283 --disable-koi8-r" 357 --disable-koi8-r"
284 fi 358 fi
285 fi 359 fi
286} 360}
287 361
362# @FUNCTION: x-modular_debug_setup
363# @USAGE:
364# @DESCRIPTION:
365# Set up CFLAGS for a debug build
288x-modular_debug_setup() { 366x-modular_debug_setup() {
289 if [[ -n "${DEBUGGABLE}" ]]; then 367 if [[ -n "${DEBUGGABLE}" ]]; then
290 if use debug; then 368 if use debug; then
291 strip-flags 369 strip-flags
292 append-flags -g 370 append-flags -g
293 fi 371 fi
294 fi 372 fi
295} 373}
296 374
375# @FUNCTION: x-modular_src_configure
376# @USAGE:
377# @DESCRIPTION:
378# Perform any necessary pre-configuration steps, then run configure
297x-modular_src_configure() { 379x-modular_src_configure() {
298 x-modular_font_configure 380 x-modular_font_configure
299 x-modular_debug_setup 381 x-modular_debug_setup
300 382
383# @VARIABLE: CONFIGURE_OPTIONS
384# @DESCRIPTION:
385# Any options to pass to configure
386[[ -n ${CONFIGURE_OPTIONTS} ]]
387
301 # If prefix isn't set here, .pc files cause problems 388 # If prefix isn't set here, .pc files cause problems
302 if [[ -x ./configure ]]; then 389 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
303 econf --prefix=${XDIR} \ 390 econf --prefix=${XDIR} \
304 --datadir=${XDIR}/share \ 391 --datadir=${XDIR}/share \
305 ${FONT_OPTIONS} \ 392 ${FONT_OPTIONS} \
306 ${DRIVER_OPTIONS} \ 393 ${DRIVER_OPTIONS} \
307 ${CONFIGURE_OPTIONS} 394 ${CONFIGURE_OPTIONS}
308 fi 395 fi
309} 396}
310 397
398# @FUNCTION: x-modular_src_make
399# @USAGE:
400# @DESCRIPTION:
401# Run make.
311x-modular_src_make() { 402x-modular_src_make() {
312 emake || die "emake failed" 403 emake || die "emake failed"
313} 404}
314 405
406# @FUNCTION: x-modular_src_configure
407# @USAGE:
408# @DESCRIPTION:
409# Compile a package, performing all X-related tasks.
315x-modular_src_compile() { 410x-modular_src_compile() {
316 x-modular_src_configure 411 x-modular_src_configure
317 x-modular_src_make 412 x-modular_src_make
318} 413}
319 414
415# @FUNCTION: x-modular_src_install
416# @USAGE:
417# @DESCRIPTION:
418# Install a built package to ${D}, performing any necessary steps.
419# Creates a ChangeLog from git if using live ebuilds.
320x-modular_src_install() { 420x-modular_src_install() {
321 # Install everything to ${XDIR} 421 # Install everything to ${XDIR}
322 make \ 422 make \
323 DESTDIR="${D}" \ 423 DESTDIR="${D}" \
324 install 424 install
325# Shouldn't be necessary in XDIR=/usr 425# Shouldn't be necessary in XDIR=/usr
326# einstall forces datadir, so we need to re-force it 426# einstall forces datadir, so we need to re-force it
327# datadir=${XDIR}/share \ 427# datadir=${XDIR}/share \
328# mandir=${XDIR}/share/man \ 428# mandir=${XDIR}/share/man \
329 429
430 if [[ -n ${GIT_ECLASS} ]]; then
431 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
432 git log ${GIT_TREE} > "${S}"/ChangeLog
433 popd
434 fi
435
436 if [[ -e ${S}/ChangeLog ]]; then
437 dodoc ${S}/ChangeLog
438 fi
439# @VARIABLE: DOCS
440# @DESCRIPTION:
441# Any documentation to install
442 [[ -n ${DOCS} ]] && dodoc ${DOCS}
443
330 # Make sure docs get compressed 444 # Make sure docs get compressed
331 prepalldocs 445 prepalldocs
332 446
333 # Don't install libtool archives for server modules 447 # Don't install libtool archives for server modules
334 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 448 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
335 find ${D}/usr/lib/xorg/modules -name '*.la' \ 449 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
336 | xargs rm -f 450 | xargs rm -f
337 fi 451 fi
338 452
339 # Don't install overlapping fonts.* files
340 # Generate them instead when possible
341 if [[ -n "${FONT}" ]]; then 453 if [[ -n "${FONT}" ]]; then
342 remove_font_metadata 454 remove_font_metadata
343 fi 455 fi
344}
345 456
457 if [[ -n "${DRIVER}" ]]; then
458 install_driver_hwdata
459 fi
460}
461
462# @FUNCTION: x-modular_pkg_preinst
463# @USAGE:
464# @DESCRIPTION:
465# This function doesn't do anything right now, but it may in the future.
346x-modular_pkg_preinst() { 466x-modular_pkg_preinst() {
347 if [[ -n "${FONT}" ]]; then 467 # We no longer do anything here, but we can't remove it from the API
348 discover_font_dirs 468 :
349 fi
350} 469}
351 470
471# @FUNCTION: x-modular_pkg_postinst
472# @USAGE:
473# @DESCRIPTION:
474# Run X-specific post-installation tasks on the live filesystem. The
475# only task right now is some setup for font packages.
352x-modular_pkg_postinst() { 476x-modular_pkg_postinst() {
353 if [[ -n "${FONT}" ]]; then 477 if [[ -n "${FONT}" ]]; then
354 setup_fonts 478 setup_fonts
355 fi 479 fi
356} 480}
357 481
482# @FUNCTION: x-modular_pkg_postrm
483# @USAGE:
484# @DESCRIPTION:
485# Run X-specific post-removal tasks on the live filesystem. The only
486# task right now is some cleanup for font packages.
358x-modular_pkg_postrm() { 487x-modular_pkg_postrm() {
359 if [[ -n "${FONT}" ]]; then 488 if [[ -n "${FONT}" ]]; then
360 cleanup_fonts 489 cleanup_fonts
490 font_pkg_postrm
361 fi 491 fi
362} 492}
363 493
494# @FUNCTION: cleanup_fonts
495# @USAGE:
496# @DESCRIPTION:
497# Get rid of font directories that only contain generated files
364cleanup_fonts() { 498cleanup_fonts() {
365 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 499 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
366 for DIR in ${FONT_DIR}; do 500 for DIR in ${FONT_DIR}; do
367 unset KEEP_FONTDIR 501 unset KEEP_FONTDIR
368 REAL_DIR=${ROOT}usr/share/fonts/${DIR} 502 REAL_DIR=${ROOT}usr/share/fonts/${DIR}
394 fi 528 fi
395 eend 0 529 eend 0
396 done 530 done
397} 531}
398 532
533# @FUNCTION: setup_fonts
534# @USAGE:
535# @DESCRIPTION:
536# Generates needed files for fonts and fixes font permissions
399setup_fonts() { 537setup_fonts() {
400 if [[ ! -n "${FONT_DIRS}" ]]; then 538 if [[ ! -n "${FONT_DIR}" ]]; then
401 msg="FONT_DIRS is empty. The ebuild should set it to at least one subdir of /usr/share/fonts." 539 msg="FONT_DIR is empty. The ebuild should set it to at least one subdir of /usr/share/fonts."
402 eerror "${msg}" 540 eerror "${msg}"
403 die "${msg}" 541 die "${msg}"
404 fi 542 fi
405 543
406 create_fonts_scale 544 create_fonts_scale
407 create_fonts_dir 545 create_fonts_dir
408 fix_font_permissions 546 fix_font_permissions
409 create_font_cache 547 create_font_cache
410} 548}
411 549
550# @FUNCTION: remove_font_metadata
551# @USAGE:
552# @DESCRIPTION:
553# Don't let the package install generated font files that may overlap
554# with other packages. Instead, they're generated in pkg_postinst().
412remove_font_metadata() { 555remove_font_metadata() {
413 local DIR 556 local DIR
414 for DIR in ${FONT_DIR}; do 557 for DIR in ${FONT_DIR}; do
415 if [[ "${DIR}" != "Speedo" ]] && \ 558 if [[ "${DIR}" != "Speedo" ]] && \
416 [[ "${DIR}" != "CID" ]] ; then 559 [[ "${DIR}" != "CID" ]] ; then
419 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 562 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
420 fi 563 fi
421 done 564 done
422} 565}
423 566
567# @FUNCTION: install_driver_hwdata
568# @USAGE:
569# @DESCRIPTION:
570# Installs device-to-driver mappings for system-config-display and
571# anything else that uses hwdata.
572install_driver_hwdata() {
573 insinto /usr/share/hwdata/videoaliases
574 for i in "${FILESDIR}"/*.xinf; do
575 # We need this for the case when none exist,
576 # so *.xinf doesn't expand
577 if [[ -e $i ]]; then
578 doins $i
579 fi
580 done
581}
582
583# @FUNCTION: discover_font_dirs
584# @USAGE:
585# @DESCRIPTION:
586# Deprecated. Sets up the now-unused FONT_DIRS variable.
424discover_font_dirs() { 587discover_font_dirs() {
425 pushd ${IMAGE}/usr/share/fonts 588 FONT_DIRS="${FONT_DIR}"
426 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
427 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
428 popd
429} 589}
430 590
591# @FUNCTION: create_fonts_scale
592# @USAGE:
593# @DESCRIPTION:
594# Create fonts.scale file, used by the old server-side fonts subsystem.
431create_fonts_scale() { 595create_fonts_scale() {
432 ebegin "Creating fonts.scale files" 596 ebegin "Creating fonts.scale files"
433 local x 597 local x
434 for FONT_DIR in ${FONT_DIRS}; do 598 for DIR in ${FONT_DIR}; do
435 x=${ROOT}/usr/share/fonts/${FONT_DIR} 599 x=${ROOT}/usr/share/fonts/${DIR}
436 [[ -z "$(ls ${x}/)" ]] && continue 600 [[ -z "$(ls ${x}/)" ]] && continue
437 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 601 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
438 602
439 # Only generate .scale files if truetype, opentype or type1 603 # Only generate .scale files if truetype, opentype or type1
440 # fonts are present ... 604 # fonts are present ...
441 605
442 # First truetype (ttf,ttc)
443 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
444 # Also, there is no way to regenerate Speedo/CID fonts.scale 606 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
445 # <spyderous@gentoo.org> 2 August 2004 607 # <dberkholz@gentoo.org> 2 August 2004
446 if [[ "${x/encodings}" = "${x}" ]] \ 608 if [[ "${x/encodings}" = "${x}" ]] \
447 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
448 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
449 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
450 ${ROOT}/usr/bin/ttmkfdir -x 2 \
451 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
452 -o ${x}/fonts.scale -d ${x}
453 # ttmkfdir fails on some stuff, so try mkfontscale if it does
454 local ttmkfdir_return=$?
455 else
456 # We didn't use ttmkfdir at all
457 local ttmkfdir_return=2
458 fi
459 if [[ ${ttmkfdir_return} -ne 0 ]]; then
460 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
461 ${ROOT}/usr/bin/mkfontscale \
462 -a /usr/share/fonts/encodings/encodings.dir \
463 -- ${x}
464 fi
465 # Next type1 and opentype (pfa,pfb,otf,otc)
466 elif [[ "${x/encodings}" = "${x}" ]] \
467 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 609 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
468 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 610 mkfontscale \
469 ${ROOT}/usr/bin/mkfontscale \
470 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 611 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
471 -- ${x} 612 -- ${x}
472 fi 613 fi
473 done 614 done
474 eend 0 615 eend 0
475} 616}
476 617
618# @FUNCTION: create_fonts_dir
619# @USAGE:
620# @DESCRIPTION:
621# Create fonts.dir file, used by the old server-side fonts subsystem.
477create_fonts_dir() { 622create_fonts_dir() {
478 ebegin "Generating fonts.dir files" 623 ebegin "Generating fonts.dir files"
479 for FONT_DIR in ${FONT_DIRS}; do 624 for DIR in ${FONT_DIR}; do
480 x=${ROOT}/usr/share/fonts/${FONT_DIR} 625 x=${ROOT}/usr/share/fonts/${DIR}
481 [[ -z "$(ls ${x}/)" ]] && continue 626 [[ -z "$(ls ${x}/)" ]] && continue
482 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 627 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
483 628
484 if [[ "${x/encodings}" = "${x}" ]]; then 629 if [[ "${x/encodings}" = "${x}" ]]; then
485 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 630 mkfontdir \
486 ${ROOT}/usr/bin/mkfontdir \
487 -e ${ROOT}/usr/share/fonts/encodings \ 631 -e ${ROOT}/usr/share/fonts/encodings \
488 -e ${ROOT}/usr/share/fonts/encodings/large \ 632 -e ${ROOT}/usr/share/fonts/encodings/large \
489 -- ${x} 633 -- ${x}
490 fi 634 fi
491 done 635 done
492 eend 0 636 eend 0
493} 637}
494 638
639# @FUNCTION: fix_font_permissions
640# @USAGE:
641# @DESCRIPTION:
642# Font files should have 644 permissions. Ensure this is the case.
495fix_font_permissions() { 643fix_font_permissions() {
496 ebegin "Fixing permissions" 644 ebegin "Fixing permissions"
497 for FONT_DIR in ${FONT_DIRS}; do 645 for DIR in ${FONT_DIR}; do
498 find ${ROOT}/usr/share/fonts/${FONT_DIR} -type f -name 'font.*' \ 646 find ${ROOT}/usr/share/fonts/${DIR} -type f -name 'font.*' \
499 -exec chmod 0644 {} \; 647 -exec chmod 0644 {} \;
500 done 648 done
501 eend 0 649 eend 0
502} 650}
503 651
652# @FUNCTION: create_font_cache
653# @USAGE:
654# @DESCRIPTION:
655# Create fonts.cache-1 files, used by the new client-side fonts
656# subsystem.
504create_font_cache() { 657create_font_cache() {
505 # danarmak found out that fc-cache should be run AFTER all the above 658 font_pkg_postinst
506 # stuff, as otherwise the cache is invalid, and has to be run again
507 # as root anyway
508 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
509 ebegin "Creating FC font cache"
510 HOME="/root" ${ROOT}/usr/bin/fc-cache
511 eend 0
512 fi
513} 659}
660
661EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm

Legend:
Removed from v.1.59  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20