/[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.29
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.29 2005/12/09 23:32: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.
… …
15inherit eutils libtool toolchain-funcs 15inherit eutils libtool toolchain-funcs
16 16
17# Directory prefix to use for everything 17# Directory prefix to use for everything
18XDIR="/usr" 18XDIR="/usr"
19 19
20# Set up default patchset version(s) if necessary
21# x11-driver-patches
22if [[ -z "${XDPVER}" ]]; then
23 XDPVER="1"
24fi
25
20IUSE="" 26IUSE=""
21HOMEPAGE="http://xorg.freedesktop.org/" 27HOMEPAGE="http://xorg.freedesktop.org/"
22SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 28SRC_URI="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 29 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 30 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" 31 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
26LICENSE="X11" 32LICENSE="X11"
27SLOT="0" 33SLOT="0"
28 34
29# Set up shared dependencies 35# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 36if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 37# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 38 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 39 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 40 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 41 >=sys-devel/libtool-1.5
… …
75 81
76# If we're a driver package 82# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 83if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 84 # Don't build static driver modules
79 DRIVER_OPTIONS="--disable-static" 85 DRIVER_OPTIONS="--disable-static"
86
87 # Enable driver code in the rest of the eclass
88 DRIVER="yes"
89
90 # Add driver patchset to SRC_URI
91 SRC_URI="${SRC_URI}
92 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
80fi 93fi
81 94
82DEPEND="${DEPEND} 95DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 96 >=dev-util/pkgconfig-0.18
84 >=x11-misc/util-macros-0.99.2" 97 >=x11-misc/util-macros-0.99.2"
… …
92 105
93x-modular_unpack_source() { 106x-modular_unpack_source() {
94 unpack ${A} 107 unpack ${A}
95 cd ${S} 108 cd ${S}
96 109
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 110 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 111 einfo "Detected font directory: ${FONT_DIR}"
103 fi 112 fi
104} 113}
105 114
106x-modular_patch_source() { 115x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 116 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 117 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 118 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 119 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 120 EPATCH_SUFFIX="patch"
112 fi 121 fi
113 122
123 # If this is a driver package we need to fix man page install location.
124 # Running autoreconf will use the patched util-macros to make the
125 # change for us, so we only need to patch if it is not going to run.
126 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
127 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
128 fi
129
114 # For specific list of patches 130 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 131 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 132 for PATCH in ${PATCHES}
117 do 133 do
118 epatch ${PATCH} 134 epatch ${PATCH}
119 done 135 done
120 # For non-default directory bulk patching 136 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 137 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 138 epatch ${PATCH_LOC}
123 # For standard bulk patching 139 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 140 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 141 epatch
126 fi 142 fi
127} 143}
128 144
129x-modular_reconf_source() { 145x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 146 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 147 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 148 then
133 # If possible, generate configure if it doesn't exist 149 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 150 if [ -f "${S}/configure.ac" ]
135 then 151 then
136 einfo "Running autoreconf..." 152 einfo "Running autoreconf..."
… …
139 fi 155 fi
140 156
141} 157}
142 158
143x-modular_src_unpack() { 159x-modular_src_unpack() {
144 for x in xorg-server xf86-video- xf86-input- ; do 160 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
145 if [[ ${PN:0:11} = $x ]] && gcc-specs-now; then 161 if gcc-specs-now; then
146 msg="Do not emerge ${PN} without vanilla gcc!" 162 msg="Do not emerge ${PN} without vanilla gcc!"
147 eerror "$msg" 163 eerror "$msg"
148 die "$msg" 164 die "$msg"
149 fi 165 fi
150 done 166 fi
151 167
152 x-modular_unpack_source 168 x-modular_unpack_source
153 x-modular_patch_source 169 x-modular_patch_source
154 x-modular_reconf_source 170 x-modular_reconf_source
171
172 # Joshua Baergen - October 23, 2005
173 # Fix shared lib issues on MIPS, FBSD, etc etc
174 elibtoolize
155} 175}
156 176
157x-modular_font_configure() { 177x-modular_font_configure() {
158 if [[ -n "${FONT}" ]]; then 178 if [[ -n "${FONT}" ]]; then
159 # Might be worth adding an option to configure your desired font 179 # Might be worth adding an option to configure your desired font
… …
183 203
184x-modular_src_configure() { 204x-modular_src_configure() {
185 x-modular_font_configure 205 x-modular_font_configure
186 206
187 # If prefix isn't set here, .pc files cause problems 207 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 208 if [[ -x ./configure ]]; then
189 econf --prefix=${XDIR} \ 209 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 210 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 211 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 212 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 213 ${CONFIGURE_OPTIONS}
… …
296create_fonts_scale() { 316create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 317 ebegin "Creating fonts.scale files"
298 local x 318 local x
299 for FONT_DIR in ${FONT_DIRS}; do 319 for FONT_DIR in ${FONT_DIRS}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 320 x=${ROOT}/usr/share/fonts/${FONT_DIR}
301 [ -z "$(ls ${x}/)" ] && continue 321 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 322 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 323
304 # Only generate .scale files if truetype, opentype or type1 324 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 325 # fonts are present ...
306 326
307 # First truetype (ttf,ttc) 327 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 328 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 329 # Also, there is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 330 # <spyderous@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 331 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 332 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 333 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 334 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 335 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 336 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x} 337 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does 338 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$? 339 local ttmkfdir_return=$?
320 else 340 else
321 # We didn't use ttmkfdir at all 341 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2 342 local ttmkfdir_return=2
323 fi 343 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then 344 if [[ ${ttmkfdir_return} -ne 0 ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 345 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 346 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \ 347 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 348 -- ${x}
329 fi 349 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc) 350 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \ 351 elif [[ "${x/encodings}" = "${x}" ]] \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 352 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 353 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
334 ${ROOT}/usr/bin/mkfontscale \ 354 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 355 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 356 -- ${x}
337 fi 357 fi
… …
341 361
342create_fonts_dir() { 362create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 363 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 364 for FONT_DIR in ${FONT_DIRS}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 365 x=${ROOT}/usr/share/fonts/${FONT_DIR}
346 [ -z "$(ls ${x}/)" ] && continue 366 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 367 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 368
349 if [ "${x/encodings}" = "${x}" ]; then 369 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 370 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
351 ${ROOT}/usr/bin/mkfontdir \ 371 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 372 -e ${ROOT}/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 373 -e ${ROOT}/usr/share/fonts/encodings/large \
354 -- ${x} 374 -- ${x}
… …
368 388
369create_font_cache() { 389create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 390 # 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 391 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway 392 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 393 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
374 ebegin "Creating FC font cache" 394 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache 395 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0 396 eend 0
377 fi 397 fi
378} 398}
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.29
  ViewVC Help
Powered by ViewVC 1.1.13