/[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.39
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.39 2006/01/13 18:47:52 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
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 43SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2
44 http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/${P}.tar.bz2
45 http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2
23 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 46 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2
24 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 47 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 48 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
26LICENSE="X11" 49LICENSE="X11"
27SLOT="0" 50SLOT="0"
28 51
29# Set up shared dependencies 52# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 53if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 54# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 55 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 56 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 57 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 58 >=sys-devel/libtool-1.5
… …
42 && [[ "${PN}" != "font-util" ]]; then 65 && [[ "${PN}" != "font-util" ]]; then
43 # Activate font code in the rest of the eclass 66 # Activate font code in the rest of the eclass
44 FONT="yes" 67 FONT="yes"
45 68
46 RDEPEND="${RDEPEND} 69 RDEPEND="${RDEPEND}
47 media-fonts/encodings" 70 media-fonts/encodings
71 x11-apps/mkfontscale
72 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 73 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 74 media-fonts/font-alias"
50 75
51 # Starting with 7.0RC3, we can specify the font directory 76 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 77 # But oddly, we can't do the same for encodings or font-alias
… …
73 fi 98 fi
74fi 99fi
75 100
76# If we're a driver package 101# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 102if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 103 # Enable driver code in the rest of the eclass
79 DRIVER_OPTIONS="--disable-static" 104 DRIVER="yes"
105
106 # Add driver patchset to SRC_URI
107 SRC_URI="${SRC_URI}
108 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
80fi 109fi
81 110
82DEPEND="${DEPEND} 111DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 112 >=dev-util/pkgconfig-0.18"
113
114if [[ "${PN/util-macros}" != "${PN}" ]]; then
115 DEPEND="${DEPEND}
84 >=x11-misc/util-macros-0.99.2" 116 >=x11-misc/util-macros-0.99.2"
117fi
85 118
86# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories 119# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
87RDEPEND="${RDEPEND} 120RDEPEND="${RDEPEND}
88 !<=x11-base/xorg-x11-6.9 121 !<=x11-base/xorg-x11-6.9
89 >=sys-apps/man-1.6b-r2" 122 >=sys-apps/man-1.6b-r2"
… …
101 134
102x-modular_patch_source() { 135x-modular_patch_source() {
103 # Use standardized names and locations with bulk patching 136 # Use standardized names and locations with bulk patching
104 # Patch directory is ${WORKDIR}/patch 137 # Patch directory is ${WORKDIR}/patch
105 # See epatch() in eutils.eclass for more documentation 138 # See epatch() in eutils.eclass for more documentation
106 if [ -z "${EPATCH_SUFFIX}" ] ; then 139 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
107 EPATCH_SUFFIX="patch" 140 EPATCH_SUFFIX="patch"
108 fi 141 fi
109 142
143 # If this is a driver package we need to fix man page install location.
144 # Running autoreconf will use the patched util-macros to make the
145 # change for us, so we only need to patch if it is not going to run.
146 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
147 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi
149
110 # For specific list of patches 150 # For specific list of patches
111 if [ -n "${PATCHES}" ] ; then 151 if [[ -n "${PATCHES}" ]] ; then
112 for PATCH in ${PATCHES} 152 for PATCH in ${PATCHES}
113 do 153 do
114 epatch ${PATCH} 154 epatch ${PATCH}
115 done 155 done
116 # For non-default directory bulk patching 156 # For non-default directory bulk patching
117 elif [ -n "${PATCH_LOC}" ] ; then 157 elif [[ -n "${PATCH_LOC}" ]] ; then
118 epatch ${PATCH_LOC} 158 epatch ${PATCH_LOC}
119 # For standard bulk patching 159 # For standard bulk patching
120 elif [ -d "${EPATCH_SOURCE}" ] ; then 160 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
121 epatch 161 epatch
122 fi 162 fi
123} 163}
124 164
125x-modular_reconf_source() { 165x-modular_reconf_source() {
126 # Run autoreconf for CVS snapshots only 166 # Run autoreconf for CVS snapshots only
127 if [ "${SNAPSHOT}" = "yes" ] 167 if [[ "${SNAPSHOT}" = "yes" ]]
128 then 168 then
129 # If possible, generate configure if it doesn't exist 169 # If possible, generate configure if it doesn't exist
130 if [ -f "${S}/configure.ac" ] 170 if [ -f "${S}/configure.ac" ]
131 then 171 then
132 einfo "Running autoreconf..." 172 einfo "Running autoreconf..."
… …
135 fi 175 fi
136 176
137} 177}
138 178
139x-modular_src_unpack() { 179x-modular_src_unpack() {
140 for x in xorg-server xf86-video- xf86-input- ; do 180 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
141 if [[ ${PN:0:11} = $x ]] && gcc-specs-now; then 181 if gcc-specs-now; then
142 msg="Do not emerge ${PN} without vanilla gcc!" 182 msg="Do not emerge ${PN} without vanilla gcc!"
143 eerror "$msg" 183 eerror "$msg"
144 die "$msg" 184 die "$msg"
145 fi 185 fi
146 done 186 fi
147 187
148 x-modular_unpack_source 188 x-modular_unpack_source
149 x-modular_patch_source 189 x-modular_patch_source
150 x-modular_reconf_source 190 x-modular_reconf_source
151 191
… …
183 223
184x-modular_src_configure() { 224x-modular_src_configure() {
185 x-modular_font_configure 225 x-modular_font_configure
186 226
187 # If prefix isn't set here, .pc files cause problems 227 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 228 if [[ -x ./configure ]]; then
189 econf --prefix=${XDIR} \ 229 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 230 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 231 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 232 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 233 ${CONFIGURE_OPTIONS}
… …
296create_fonts_scale() { 336create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 337 ebegin "Creating fonts.scale files"
298 local x 338 local x
299 for FONT_DIR in ${FONT_DIRS}; do 339 for FONT_DIR in ${FONT_DIRS}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 340 x=${ROOT}/usr/share/fonts/${FONT_DIR}
301 [ -z "$(ls ${x}/)" ] && continue 341 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 342 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 343
304 # Only generate .scale files if truetype, opentype or type1 344 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 345 # fonts are present ...
306 346
307 # First truetype (ttf,ttc) 347 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 348 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 349 # Also, there is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 350 # <spyderous@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 351 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 352 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 353 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 354 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 355 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 356 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x} 357 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does 358 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$? 359 local ttmkfdir_return=$?
320 else 360 else
321 # We didn't use ttmkfdir at all 361 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2 362 local ttmkfdir_return=2
323 fi 363 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then 364 if [[ ${ttmkfdir_return} -ne 0 ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 365 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 366 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \ 367 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 368 -- ${x}
329 fi 369 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc) 370 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \ 371 elif [[ "${x/encodings}" = "${x}" ]] \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 372 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 373 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
334 ${ROOT}/usr/bin/mkfontscale \ 374 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 375 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 376 -- ${x}
337 fi 377 fi
… …
341 381
342create_fonts_dir() { 382create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 383 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 384 for FONT_DIR in ${FONT_DIRS}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 385 x=${ROOT}/usr/share/fonts/${FONT_DIR}
346 [ -z "$(ls ${x}/)" ] && continue 386 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 387 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 388
349 if [ "${x/encodings}" = "${x}" ]; then 389 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 390 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
351 ${ROOT}/usr/bin/mkfontdir \ 391 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 392 -e ${ROOT}/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 393 -e ${ROOT}/usr/share/fonts/encodings/large \
354 -- ${x} 394 -- ${x}
… …
368 408
369create_font_cache() { 409create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 410 # 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 411 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway 412 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 413 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
374 ebegin "Creating FC font cache" 414 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache 415 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0 416 eend 0
377 fi 417 fi
378} 418}
Legend:
Removed from v.1.27  
changed lines
  Added in v.1.39
  ViewVC Help
Powered by ViewVC 1.1.13