/[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.25 Revision 1.30
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.25 2005/12/07 11:19:47 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.30 2005/12/10 21:49:07 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.
10# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to 10# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to
11# the subdirectories within /usr/share/fonts to which it installs fonts. 11# the subdirectories within /usr/share/fonts to which it installs fonts.
12 12
13EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 13EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
14 14
15inherit eutils libtool 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
20# Set up default patchset version(s) if necessary
21# x11-driver-patches
22if [[ -z "${XDPVER}" ]]; then
23 XDPVER="1"
24fi
19 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
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
43 # Activate font code in the rest of the eclass 49 # Activate font code in the rest of the eclass
44 FONT="yes" 50 FONT="yes"
45 51
46 RDEPEND="${RDEPEND} 52 RDEPEND="${RDEPEND}
47 media-fonts/encodings" 53 media-fonts/encodings"
54 DEPEND="${DEPEND}
55 x11-apps/mkfontscale
56 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 57 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 58 media-fonts/font-alias"
50 59
51 # Starting with 7.0RC3, we can specify the font directory 60 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 61 # But oddly, we can't do the same for encodings or font-alias
75 84
76# If we're a driver package 85# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 86if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 87 # Don't build static driver modules
79 DRIVER_OPTIONS="--disable-static" 88 DRIVER_OPTIONS="--disable-static"
89
90 # Enable driver code in the rest of the eclass
91 DRIVER="yes"
92
93 # Add driver patchset to SRC_URI
94 SRC_URI="${SRC_URI}
95 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
80fi 96fi
81 97
82DEPEND="${DEPEND} 98DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 99 >=dev-util/pkgconfig-0.18
84 >=x11-misc/util-macros-0.99.2" 100 >=x11-misc/util-macros-0.99.2"
92 108
93x-modular_unpack_source() { 109x-modular_unpack_source() {
94 unpack ${A} 110 unpack ${A}
95 cd ${S} 111 cd ${S}
96 112
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 113 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 114 einfo "Detected font directory: ${FONT_DIR}"
103 fi 115 fi
104} 116}
105 117
106x-modular_patch_source() { 118x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 119 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 120 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 121 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 122 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 123 EPATCH_SUFFIX="patch"
112 fi 124 fi
113 125
126 # If this is a driver package we need to fix man page install location.
127 # Running autoreconf will use the patched util-macros to make the
128 # change for us, so we only need to patch if it is not going to run.
129 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
130 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
131 fi
132
114 # For specific list of patches 133 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 134 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 135 for PATCH in ${PATCHES}
117 do 136 do
118 epatch ${PATCH} 137 epatch ${PATCH}
119 done 138 done
120 # For non-default directory bulk patching 139 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 140 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 141 epatch ${PATCH_LOC}
123 # For standard bulk patching 142 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 143 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 144 epatch
126 fi 145 fi
127} 146}
128 147
129x-modular_reconf_source() { 148x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 149 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 150 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 151 then
133 # If possible, generate configure if it doesn't exist 152 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 153 if [ -f "${S}/configure.ac" ]
135 then 154 then
136 einfo "Running autoreconf..." 155 einfo "Running autoreconf..."
139 fi 158 fi
140 159
141} 160}
142 161
143x-modular_src_unpack() { 162x-modular_src_unpack() {
163 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
164 if gcc-specs-now; then
165 msg="Do not emerge ${PN} without vanilla gcc!"
166 eerror "$msg"
167 die "$msg"
168 fi
169 fi
170
144 x-modular_unpack_source 171 x-modular_unpack_source
145 x-modular_patch_source 172 x-modular_patch_source
146 x-modular_reconf_source 173 x-modular_reconf_source
174
175 # Joshua Baergen - October 23, 2005
176 # Fix shared lib issues on MIPS, FBSD, etc etc
177 elibtoolize
147} 178}
148 179
149x-modular_font_configure() { 180x-modular_font_configure() {
150 if [[ -n "${FONT}" ]]; then 181 if [[ -n "${FONT}" ]]; then
151 # Might be worth adding an option to configure your desired font 182 # Might be worth adding an option to configure your desired font
175 206
176x-modular_src_configure() { 207x-modular_src_configure() {
177 x-modular_font_configure 208 x-modular_font_configure
178 209
179 # If prefix isn't set here, .pc files cause problems 210 # If prefix isn't set here, .pc files cause problems
180 if [ -x ./configure ]; then 211 if [[ -x ./configure ]]; then
181 econf --prefix=${XDIR} \ 212 econf --prefix=${XDIR} \
182 --datadir=${XDIR}/share \ 213 --datadir=${XDIR}/share \
183 ${FONT_OPTIONS} \ 214 ${FONT_OPTIONS} \
184 ${DRIVER_OPTIONS} \ 215 ${DRIVER_OPTIONS} \
185 ${CONFIGURE_OPTIONS} 216 ${CONFIGURE_OPTIONS}
288create_fonts_scale() { 319create_fonts_scale() {
289 ebegin "Creating fonts.scale files" 320 ebegin "Creating fonts.scale files"
290 local x 321 local x
291 for FONT_DIR in ${FONT_DIRS}; do 322 for FONT_DIR in ${FONT_DIRS}; do
292 x=${ROOT}/usr/share/fonts/${FONT_DIR} 323 x=${ROOT}/usr/share/fonts/${FONT_DIR}
293 [ -z "$(ls ${x}/)" ] && continue 324 [[ -z "$(ls ${x}/)" ]] && continue
294 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 325 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
295 326
296 # Only generate .scale files if truetype, opentype or type1 327 # Only generate .scale files if truetype, opentype or type1
297 # fonts are present ... 328 # fonts are present ...
298 329
299 # First truetype (ttf,ttc) 330 # First truetype (ttf,ttc)
300 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 331 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
301 # Also, there is no way to regenerate Speedo/CID fonts.scale 332 # Also, there is no way to regenerate Speedo/CID fonts.scale
302 # <spyderous@gentoo.org> 2 August 2004 333 # <spyderous@gentoo.org> 2 August 2004
303 if [ "${x/encodings}" = "${x}" -a \ 334 if [[ "${x/encodings}" = "${x}" ]] \
304 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 335 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
305 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 336 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
306 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 337 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
307 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 338 ${ROOT}/usr/bin/ttmkfdir -x 2 \
308 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 339 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
309 -o ${x}/fonts.scale -d ${x} 340 -o ${x}/fonts.scale -d ${x}
310 # ttmkfdir fails on some stuff, so try mkfontscale if it does 341 # ttmkfdir fails on some stuff, so try mkfontscale if it does
311 local ttmkfdir_return=$? 342 local ttmkfdir_return=$?
312 else 343 else
313 # We didn't use ttmkfdir at all 344 # We didn't use ttmkfdir at all
314 local ttmkfdir_return=2 345 local ttmkfdir_return=2
315 fi 346 fi
316 if [ ${ttmkfdir_return} -ne 0 ]; then 347 if [[ ${ttmkfdir_return} -ne 0 ]]; then
317 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 348 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
318 ${ROOT}/usr/bin/mkfontscale \ 349 ${ROOT}/usr/bin/mkfontscale \
319 -a /usr/share/fonts/encodings/encodings.dir \ 350 -a /usr/share/fonts/encodings/encodings.dir \
320 -- ${x} 351 -- ${x}
321 fi 352 fi
322 # Next type1 and opentype (pfa,pfb,otf,otc) 353 # Next type1 and opentype (pfa,pfb,otf,otc)
323 elif [ "${x/encodings}" = "${x}" -a \ 354 elif [[ "${x/encodings}" = "${x}" ]] \
324 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 355 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 356 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 357 ${ROOT}/usr/bin/mkfontscale \
327 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 358 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 359 -- ${x}
329 fi 360 fi
333 364
334create_fonts_dir() { 365create_fonts_dir() {
335 ebegin "Generating fonts.dir files" 366 ebegin "Generating fonts.dir files"
336 for FONT_DIR in ${FONT_DIRS}; do 367 for FONT_DIR in ${FONT_DIRS}; do
337 x=${ROOT}/usr/share/fonts/${FONT_DIR} 368 x=${ROOT}/usr/share/fonts/${FONT_DIR}
338 [ -z "$(ls ${x}/)" ] && continue 369 [[ -z "$(ls ${x}/)" ]] && continue
339 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 370 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
340 371
341 if [ "${x/encodings}" = "${x}" ]; then 372 if [[ "${x/encodings}" = "${x}" ]]; then
342 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 373 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
343 ${ROOT}/usr/bin/mkfontdir \ 374 ${ROOT}/usr/bin/mkfontdir \
344 -e ${ROOT}/usr/share/fonts/encodings \ 375 -e ${ROOT}/usr/share/fonts/encodings \
345 -e ${ROOT}/usr/share/fonts/encodings/large \ 376 -e ${ROOT}/usr/share/fonts/encodings/large \
346 -- ${x} 377 -- ${x}
360 391
361create_font_cache() { 392create_font_cache() {
362 # danarmak found out that fc-cache should be run AFTER all the above 393 # danarmak found out that fc-cache should be run AFTER all the above
363 # stuff, as otherwise the cache is invalid, and has to be run again 394 # stuff, as otherwise the cache is invalid, and has to be run again
364 # as root anyway 395 # as root anyway
365 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 396 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
366 ebegin "Creating FC font cache" 397 ebegin "Creating FC font cache"
367 HOME="/root" ${ROOT}/usr/bin/fc-cache 398 HOME="/root" ${ROOT}/usr/bin/fc-cache
368 eend 0 399 eend 0
369 fi 400 fi
370} 401}

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.30

  ViewVC Help
Powered by ViewVC 1.1.20