/[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.26 Revision 1.48
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.26 2005/12/07 22:10:45 joshuabaergen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.48 2006/03/21 00:31:11 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 if ! has splitdebug ${FEATURES}; then
157 RESTRICT="${RESTRICT} nostrip"
158 fi
159 fi
80fi 160fi
81 161
82DEPEND="${DEPEND} 162DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 163 >=dev-util/pkgconfig-0.18"
164
165if [[ "${PN/util-macros}" = "${PN}" ]]; then
166 DEPEND="${DEPEND}
84 >=x11-misc/util-macros-0.99.2" 167 >=x11-misc/util-macros-0.99.2"
168fi
85 169
86# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories 170# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
87RDEPEND="${RDEPEND} 171RDEPEND="${RDEPEND}
88 !<=x11-base/xorg-x11-6.9 172 !<=x11-base/xorg-x11-6.9
89 >=sys-apps/man-1.6b-r2" 173 >=sys-apps/man-1.6b-r2"
92 176
93x-modular_unpack_source() { 177x-modular_unpack_source() {
94 unpack ${A} 178 unpack ${A}
95 cd ${S} 179 cd ${S}
96 180
97 # Joshua Baergen - October 23, 2005
98 # Fix shared lib issues on MIPS, FBSD, etc etc
99 elibtoolize
100
101 if [[ -n ${FONT_OPTIONS} ]]; then 181 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 182 einfo "Detected font directory: ${FONT_DIR}"
103 fi 183 fi
104} 184}
105 185
106x-modular_patch_source() { 186x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 187 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 188 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 189 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 190 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 191 EPATCH_SUFFIX="patch"
112 fi 192 fi
113 193
194 # If this is a driver package we need to fix man page install location.
195 # Running autoreconf will use the patched util-macros to make the
196 # change for us, so we only need to patch if it is not going to run.
197 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
198 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
199 fi
200
114 # For specific list of patches 201 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 202 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 203 for PATCH in ${PATCHES}
117 do 204 do
118 epatch ${PATCH} 205 epatch ${PATCH}
119 done 206 done
120 # For non-default directory bulk patching 207 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 208 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 209 epatch ${PATCH_LOC}
123 # For standard bulk patching 210 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 211 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 212 epatch
126 fi 213 fi
127} 214}
128 215
129x-modular_reconf_source() { 216x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 217 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 218 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 219 then
133 # If possible, generate configure if it doesn't exist 220 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 221 if [ -f "${S}/configure.ac" ]
135 then 222 then
136 einfo "Running autoreconf..." 223 einfo "Running autoreconf..."
139 fi 226 fi
140 227
141} 228}
142 229
143x-modular_src_unpack() { 230x-modular_src_unpack() {
144 for x in xorg-server xf86-video- xf86-input- ; do 231 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
145 if [[ ${PN:0:11} = $x ]] && gcc-specs-now; then 232 if gcc-specs-now; then
146 msg="Do not emerge ${PN} without vanilla gcc!" 233 msg="Do not emerge ${PN} without vanilla gcc specs!"
147 eerror "$msg" 234 eerror "$msg"
148 die "$msg" 235 die "$msg"
149 fi 236 fi
150 done 237 fi
151 238
152 x-modular_unpack_source 239 x-modular_unpack_source
153 x-modular_patch_source 240 x-modular_patch_source
154 x-modular_reconf_source 241 x-modular_reconf_source
242
243 # Joshua Baergen - October 23, 2005
244 # Fix shared lib issues on MIPS, FBSD, etc etc
245 elibtoolize
155} 246}
156 247
157x-modular_font_configure() { 248x-modular_font_configure() {
158 if [[ -n "${FONT}" ]]; then 249 if [[ -n "${FONT}" ]]; then
159 # Might be worth adding an option to configure your desired font 250 # Might be worth adding an option to configure your desired font
179 --disable-koi8-r" 270 --disable-koi8-r"
180 fi 271 fi
181 fi 272 fi
182} 273}
183 274
275x-modular_debug_setup() {
276 if [[ -n "${DEBUGGABLE}" ]]; then
277 if use debug; then
278 strip-flags
279 append-flags -g
280 fi
281 fi
282}
283
184x-modular_src_configure() { 284x-modular_src_configure() {
185 x-modular_font_configure 285 x-modular_font_configure
286 x-modular_debug_setup
186 287
187 # If prefix isn't set here, .pc files cause problems 288 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 289 if [[ -x ./configure ]]; then
189 econf --prefix=${XDIR} \ 290 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 291 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 292 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 293 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 294 ${CONFIGURE_OPTIONS}
215 316
216 # Don't install libtool archives for server modules 317 # Don't install libtool archives for server modules
217 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 318 if [[ -e ${D}/usr/lib/xorg/modules ]]; then
218 find ${D}/usr/lib/xorg/modules -name '*.la' \ 319 find ${D}/usr/lib/xorg/modules -name '*.la' \
219 | xargs rm -f 320 | xargs rm -f
321 fi
322
323 # Don't install overlapping fonts.* files
324 # Generate them instead when possible
325 if [[ -n "${FONT}" ]]; then
326 remove_font_metadata
220 fi 327 fi
221} 328}
222 329
223x-modular_pkg_preinst() { 330x-modular_pkg_preinst() {
224 if [[ -n "${FONT}" ]]; then 331 if [[ -n "${FONT}" ]]; then
284 create_fonts_dir 391 create_fonts_dir
285 fix_font_permissions 392 fix_font_permissions
286 create_font_cache 393 create_font_cache
287} 394}
288 395
396remove_font_metadata() {
397 local DIR
398 for DIR in ${FONT_DIR}; do
399 if [[ "${DIR}" != "Speedo" ]] && \
400 [[ "${DIR}" != "CID" ]] ; then
401 # Delete font metadata files
402 # fonts.scale, fonts.dir, fonts.cache-1
403 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
404 fi
405 done
406}
407
289discover_font_dirs() { 408discover_font_dirs() {
290 pushd ${IMAGE}/usr/share/fonts 409 pushd ${IMAGE}/usr/share/fonts
291 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 410 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
292 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')" 411 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
293 popd 412 popd
296create_fonts_scale() { 415create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 416 ebegin "Creating fonts.scale files"
298 local x 417 local x
299 for FONT_DIR in ${FONT_DIRS}; do 418 for FONT_DIR in ${FONT_DIRS}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 419 x=${ROOT}/usr/share/fonts/${FONT_DIR}
301 [ -z "$(ls ${x}/)" ] && continue 420 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 421 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 422
304 # Only generate .scale files if truetype, opentype or type1 423 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 424 # fonts are present ...
306 425
307 # First truetype (ttf,ttc) 426 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 427 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 428 # Also, there is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 429 # <spyderous@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 430 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 431 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 432 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 433 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 434 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 435 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x} 436 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does 437 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$? 438 local ttmkfdir_return=$?
320 else 439 else
321 # We didn't use ttmkfdir at all 440 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2 441 local ttmkfdir_return=2
323 fi 442 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then 443 if [[ ${ttmkfdir_return} -ne 0 ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 444 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 445 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \ 446 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 447 -- ${x}
329 fi 448 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc) 449 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \ 450 elif [[ "${x/encodings}" = "${x}" ]] \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 451 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 452 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
334 ${ROOT}/usr/bin/mkfontscale \ 453 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 454 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 455 -- ${x}
337 fi 456 fi
341 460
342create_fonts_dir() { 461create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 462 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 463 for FONT_DIR in ${FONT_DIRS}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 464 x=${ROOT}/usr/share/fonts/${FONT_DIR}
346 [ -z "$(ls ${x}/)" ] && continue 465 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 466 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 467
349 if [ "${x/encodings}" = "${x}" ]; then 468 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 469 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
351 ${ROOT}/usr/bin/mkfontdir \ 470 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 471 -e ${ROOT}/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 472 -e ${ROOT}/usr/share/fonts/encodings/large \
354 -- ${x} 473 -- ${x}
368 487
369create_font_cache() { 488create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 489 # 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 490 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway 491 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 492 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
374 ebegin "Creating FC font cache" 493 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache 494 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0 495 eend 0
377 fi 496 fi
378} 497}

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.48

  ViewVC Help
Powered by ViewVC 1.1.20