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

  ViewVC Help
Powered by ViewVC 1.1.20