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

  ViewVC Help
Powered by ViewVC 1.1.20