/[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.28
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.28 2005/12/09 19:21:28 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.
… …
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2"
26LICENSE="X11" 26LICENSE="X11"
27SLOT="0" 27SLOT="0"
28 28
29# Set up shared dependencies 29# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 30if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 31# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 32 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 33 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 34 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 35 >=sys-devel/libtool-1.5
… …
92 92
93x-modular_unpack_source() { 93x-modular_unpack_source() {
94 unpack ${A} 94 unpack ${A}
95 cd ${S} 95 cd ${S}
96 96
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 97 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 98 einfo "Detected font directory: ${FONT_DIR}"
103 fi 99 fi
104} 100}
105 101
106x-modular_patch_source() { 102x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 103 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 104 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 105 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 106 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 107 EPATCH_SUFFIX="patch"
112 fi 108 fi
113 109
114 # For specific list of patches 110 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 111 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 112 for PATCH in ${PATCHES}
117 do 113 do
118 epatch ${PATCH} 114 epatch ${PATCH}
119 done 115 done
120 # For non-default directory bulk patching 116 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 117 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 118 epatch ${PATCH_LOC}
123 # For standard bulk patching 119 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 120 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 121 epatch
126 fi 122 fi
127} 123}
128 124
129x-modular_reconf_source() { 125x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 126 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 127 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 128 then
133 # If possible, generate configure if it doesn't exist 129 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 130 if [ -f "${S}/configure.ac" ]
135 then 131 then
136 einfo "Running autoreconf..." 132 einfo "Running autoreconf..."
… …
150 done 146 done
151 147
152 x-modular_unpack_source 148 x-modular_unpack_source
153 x-modular_patch_source 149 x-modular_patch_source
154 x-modular_reconf_source 150 x-modular_reconf_source
151
152 # Joshua Baergen - October 23, 2005
153 # Fix shared lib issues on MIPS, FBSD, etc etc
154 elibtoolize
155} 155}
156 156
157x-modular_font_configure() { 157x-modular_font_configure() {
158 if [[ -n "${FONT}" ]]; then 158 if [[ -n "${FONT}" ]]; then
159 # Might be worth adding an option to configure your desired font 159 # Might be worth adding an option to configure your desired font
… …
183 183
184x-modular_src_configure() { 184x-modular_src_configure() {
185 x-modular_font_configure 185 x-modular_font_configure
186 186
187 # If prefix isn't set here, .pc files cause problems 187 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 188 if [[ -x ./configure ]]; then
189 econf --prefix=${XDIR} \ 189 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 190 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 191 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 192 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 193 ${CONFIGURE_OPTIONS}
… …
296create_fonts_scale() { 296create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 297 ebegin "Creating fonts.scale files"
298 local x 298 local x
299 for FONT_DIR in ${FONT_DIRS}; do 299 for FONT_DIR in ${FONT_DIRS}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 300 x=${ROOT}/usr/share/fonts/${FONT_DIR}
301 [ -z "$(ls ${x}/)" ] && continue 301 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 302 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 303
304 # Only generate .scale files if truetype, opentype or type1 304 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 305 # fonts are present ...
306 306
307 # First truetype (ttf,ttc) 307 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 309 # Also, there is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 310 # <spyderous@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 311 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 312 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 313 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 315 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x} 317 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does 318 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$? 319 local ttmkfdir_return=$?
320 else 320 else
321 # We didn't use ttmkfdir at all 321 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2 322 local ttmkfdir_return=2
323 fi 323 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then 324 if [[ ${ttmkfdir_return} -ne 0 ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 326 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \ 327 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 328 -- ${x}
329 fi 329 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc) 330 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \ 331 elif [[ "${x/encodings}" = "${x}" ]] \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 332 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
334 ${ROOT}/usr/bin/mkfontscale \ 334 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 336 -- ${x}
337 fi 337 fi
… …
341 341
342create_fonts_dir() { 342create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 343 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 344 for FONT_DIR in ${FONT_DIRS}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 345 x=${ROOT}/usr/share/fonts/${FONT_DIR}
346 [ -z "$(ls ${x}/)" ] && continue 346 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 347 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 348
349 if [ "${x/encodings}" = "${x}" ]; then 349 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
351 ${ROOT}/usr/bin/mkfontdir \ 351 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 352 -e ${ROOT}/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 353 -e ${ROOT}/usr/share/fonts/encodings/large \
354 -- ${x} 354 -- ${x}
… …
368 368
369create_font_cache() { 369create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 370 # 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 371 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway 372 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 373 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
374 ebegin "Creating FC font cache" 374 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache 375 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0 376 eend 0
377 fi 377 fi
378} 378}
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.28
  ViewVC Help
Powered by ViewVC 1.1.20