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

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

  ViewVC Help
Powered by ViewVC 1.1.20