/[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.27 Revision 1.45
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.27 2005/12/09 16:13:54 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.45 2006/02/15 21:33:15 spyderous Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
9# 9#
10# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to 10# Using this eclass:
11# the subdirectories within /usr/share/fonts to which it installs fonts. 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.
12 27
13EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
14 29
15inherit eutils libtool toolchain-funcs 30inherit eutils libtool toolchain-funcs flag-o-matic
16 31
17# Directory prefix to use for everything 32# Directory prefix to use for everything
18XDIR="/usr" 33XDIR="/usr"
19 34
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then
38 XDPVER="1"
39fi
40
20IUSE="" 41IUSE=""
21HOMEPAGE="http://xorg.freedesktop.org/" 42HOMEPAGE="http://xorg.freedesktop.org/"
22SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 43
23 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 44# Set up SRC_URI for individual modular releases
24 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then
47 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI}
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
57elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI}
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI}
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI}
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI}
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi
73
74# SRC_URI for full releases
75SRC_URI="${SRC_URI}
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2"
26LICENSE="X11" 77
27SLOT="0" 78SLOT="0"
28 79
80# Set the license for the package. This can be overridden by setting
81# LICENSE after the inherit.
82LICENSE=${PN}
83
29# Set up shared dependencies 84# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 85if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 86# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 87 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 88 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 89 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 90 >=sys-devel/libtool-1.5
42 && [[ "${PN}" != "font-util" ]]; then 97 && [[ "${PN}" != "font-util" ]]; then
43 # Activate font code in the rest of the eclass 98 # Activate font code in the rest of the eclass
44 FONT="yes" 99 FONT="yes"
45 100
46 RDEPEND="${RDEPEND} 101 RDEPEND="${RDEPEND}
47 media-fonts/encodings" 102 media-fonts/encodings
103 x11-apps/mkfontscale
104 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 105 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 106 media-fonts/font-alias"
50 107
51 # Starting with 7.0RC3, we can specify the font directory 108 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 109 # But oddly, we can't do the same for encodings or font-alias
73 fi 130 fi
74fi 131fi
75 132
76# If we're a driver package 133# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 134if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 135 # Enable driver code in the rest of the eclass
79 DRIVER_OPTIONS="--disable-static" 136 DRIVER="yes"
137
138 # Add driver patchset to SRC_URI
139 SRC_URI="${SRC_URI}
140 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
141fi
142
143# Debugging -- ignore packages that can't be built with debugging
144if [[ -z "${FONT}" ]] \
145 || [[ "${PN/app-doc}" != "${PN}" ]] \
146 || [[ "${PN/x11-proto}" != "${PN}" ]] \
147 || [[ "${PN/util-macros}" != "${PN}" ]] \
148 || [[ "${PN/xbitmaps}" != "${PN}" ]] \
149 || [[ "${PN/xkbdata}" != "${PN}" ]] \
150 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
151 || [[ "${PN/xcursor}" != "${PN}" ]] \
152 ; then
153 DEBUGGABLE="yes"
154 IUSE="${IUSE} debug"
155 if use debug; then
156 RESTRICT="${RESTRICT} nostrip"
157 fi
80fi 158fi
81 159
82DEPEND="${DEPEND} 160DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 161 >=dev-util/pkgconfig-0.18"
162
163if [[ "${PN/util-macros}" = "${PN}" ]]; then
164 DEPEND="${DEPEND}
84 >=x11-misc/util-macros-0.99.2" 165 >=x11-misc/util-macros-0.99.2"
166fi
85 167
86# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories 168# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
87RDEPEND="${RDEPEND} 169RDEPEND="${RDEPEND}
88 !<=x11-base/xorg-x11-6.9 170 !<=x11-base/xorg-x11-6.9
89 >=sys-apps/man-1.6b-r2" 171 >=sys-apps/man-1.6b-r2"
101 183
102x-modular_patch_source() { 184x-modular_patch_source() {
103 # Use standardized names and locations with bulk patching 185 # Use standardized names and locations with bulk patching
104 # Patch directory is ${WORKDIR}/patch 186 # Patch directory is ${WORKDIR}/patch
105 # See epatch() in eutils.eclass for more documentation 187 # See epatch() in eutils.eclass for more documentation
106 if [ -z "${EPATCH_SUFFIX}" ] ; then 188 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
107 EPATCH_SUFFIX="patch" 189 EPATCH_SUFFIX="patch"
108 fi 190 fi
109 191
192 # If this is a driver package we need to fix man page install location.
193 # Running autoreconf will use the patched util-macros to make the
194 # change for us, so we only need to patch if it is not going to run.
195 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
196 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
197 fi
198
110 # For specific list of patches 199 # For specific list of patches
111 if [ -n "${PATCHES}" ] ; then 200 if [[ -n "${PATCHES}" ]] ; then
112 for PATCH in ${PATCHES} 201 for PATCH in ${PATCHES}
113 do 202 do
114 epatch ${PATCH} 203 epatch ${PATCH}
115 done 204 done
116 # For non-default directory bulk patching 205 # For non-default directory bulk patching
117 elif [ -n "${PATCH_LOC}" ] ; then 206 elif [[ -n "${PATCH_LOC}" ]] ; then
118 epatch ${PATCH_LOC} 207 epatch ${PATCH_LOC}
119 # For standard bulk patching 208 # For standard bulk patching
120 elif [ -d "${EPATCH_SOURCE}" ] ; then 209 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
121 epatch 210 epatch
122 fi 211 fi
123} 212}
124 213
125x-modular_reconf_source() { 214x-modular_reconf_source() {
126 # Run autoreconf for CVS snapshots only 215 # Run autoreconf for CVS snapshots only
127 if [ "${SNAPSHOT}" = "yes" ] 216 if [[ "${SNAPSHOT}" = "yes" ]]
128 then 217 then
129 # If possible, generate configure if it doesn't exist 218 # If possible, generate configure if it doesn't exist
130 if [ -f "${S}/configure.ac" ] 219 if [ -f "${S}/configure.ac" ]
131 then 220 then
132 einfo "Running autoreconf..." 221 einfo "Running autoreconf..."
135 fi 224 fi
136 225
137} 226}
138 227
139x-modular_src_unpack() { 228x-modular_src_unpack() {
140 for x in xorg-server xf86-video- xf86-input- ; do 229 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
141 if [[ ${PN:0:11} = $x ]] && gcc-specs-now; then 230 if gcc-specs-now; then
142 msg="Do not emerge ${PN} without vanilla gcc!" 231 msg="Do not emerge ${PN} without vanilla gcc!"
143 eerror "$msg" 232 eerror "$msg"
144 die "$msg" 233 die "$msg"
145 fi 234 fi
146 done 235 fi
147 236
148 x-modular_unpack_source 237 x-modular_unpack_source
149 x-modular_patch_source 238 x-modular_patch_source
150 x-modular_reconf_source 239 x-modular_reconf_source
151 240
179 --disable-koi8-r" 268 --disable-koi8-r"
180 fi 269 fi
181 fi 270 fi
182} 271}
183 272
273x-modular_debug_setup() {
274 if [[ -n "${DEBUGGABLE}" ]]; then
275 if use debug; then
276 strip-flags
277 append-flags -g
278 fi
279 fi
280}
281
184x-modular_src_configure() { 282x-modular_src_configure() {
185 x-modular_font_configure 283 x-modular_font_configure
284 x-modular_debug_setup
186 285
187 # If prefix isn't set here, .pc files cause problems 286 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 287 if [[ -x ./configure ]]; then
189 econf --prefix=${XDIR} \ 288 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 289 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 290 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 291 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 292 ${CONFIGURE_OPTIONS}
296create_fonts_scale() { 395create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 396 ebegin "Creating fonts.scale files"
298 local x 397 local x
299 for FONT_DIR in ${FONT_DIRS}; do 398 for FONT_DIR in ${FONT_DIRS}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 399 x=${ROOT}/usr/share/fonts/${FONT_DIR}
301 [ -z "$(ls ${x}/)" ] && continue 400 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 401 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 402
304 # Only generate .scale files if truetype, opentype or type1 403 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 404 # fonts are present ...
306 405
307 # First truetype (ttf,ttc) 406 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 407 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 408 # Also, there is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 409 # <spyderous@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 410 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 411 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 412 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 413 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 414 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 415 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x} 416 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does 417 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$? 418 local ttmkfdir_return=$?
320 else 419 else
321 # We didn't use ttmkfdir at all 420 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2 421 local ttmkfdir_return=2
323 fi 422 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then 423 if [[ ${ttmkfdir_return} -ne 0 ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 424 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 425 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \ 426 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 427 -- ${x}
329 fi 428 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc) 429 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \ 430 elif [[ "${x/encodings}" = "${x}" ]] \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 431 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 432 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
334 ${ROOT}/usr/bin/mkfontscale \ 433 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 434 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 435 -- ${x}
337 fi 436 fi
341 440
342create_fonts_dir() { 441create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 442 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 443 for FONT_DIR in ${FONT_DIRS}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 444 x=${ROOT}/usr/share/fonts/${FONT_DIR}
346 [ -z "$(ls ${x}/)" ] && continue 445 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 446 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 447
349 if [ "${x/encodings}" = "${x}" ]; then 448 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 449 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
351 ${ROOT}/usr/bin/mkfontdir \ 450 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 451 -e ${ROOT}/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 452 -e ${ROOT}/usr/share/fonts/encodings/large \
354 -- ${x} 453 -- ${x}
368 467
369create_font_cache() { 468create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 469 # danarmak found out that fc-cache should be run AFTER all the above
371 # stuff, as otherwise the cache is invalid, and has to be run again 470 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway 471 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 472 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
374 ebegin "Creating FC font cache" 473 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache 474 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0 475 eend 0
377 fi 476 fi
378} 477}

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20