/[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.35
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.35 2005/12/23 08:28:00 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 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
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 DEPEND="${DEPEND}
72 x11-apps/mkfontscale
73 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 74 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 75 media-fonts/font-alias"
50 76
51 # Starting with 7.0RC3, we can specify the font directory 77 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 78 # But oddly, we can't do the same for encodings or font-alias
75 101
76# If we're a driver package 102# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 103if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 104 # Don't build static driver modules
79 DRIVER_OPTIONS="--disable-static" 105 DRIVER_OPTIONS="--disable-static"
106
107 # Enable driver code in the rest of the eclass
108 DRIVER="yes"
109
110 # Add driver patchset to SRC_URI
111 SRC_URI="${SRC_URI}
112 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
80fi 113fi
81 114
82DEPEND="${DEPEND} 115DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 116 >=dev-util/pkgconfig-0.18
84 >=x11-misc/util-macros-0.99.2" 117 >=x11-misc/util-macros-0.99.2"
92 125
93x-modular_unpack_source() { 126x-modular_unpack_source() {
94 unpack ${A} 127 unpack ${A}
95 cd ${S} 128 cd ${S}
96 129
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 130 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 131 einfo "Detected font directory: ${FONT_DIR}"
103 fi 132 fi
104} 133}
105 134
106x-modular_patch_source() { 135x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 136 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 137 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 138 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 139 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 140 EPATCH_SUFFIX="patch"
112 fi 141 fi
113 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
114 # For specific list of patches 150 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 151 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 152 for PATCH in ${PATCHES}
117 do 153 do
118 epatch ${PATCH} 154 epatch ${PATCH}
119 done 155 done
120 # For non-default directory bulk patching 156 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 157 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 158 epatch ${PATCH_LOC}
123 # For standard bulk patching 159 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 160 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 161 epatch
126 fi 162 fi
127} 163}
128 164
129x-modular_reconf_source() { 165x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 166 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 167 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 168 then
133 # If possible, generate configure if it doesn't exist 169 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 170 if [ -f "${S}/configure.ac" ]
135 then 171 then
136 einfo "Running autoreconf..." 172 einfo "Running autoreconf..."
139 fi 175 fi
140 176
141} 177}
142 178
143x-modular_src_unpack() { 179x-modular_src_unpack() {
180 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
181 if gcc-specs-now; then
182 msg="Do not emerge ${PN} without vanilla gcc!"
183 eerror "$msg"
184 die "$msg"
185 fi
186 fi
187
144 x-modular_unpack_source 188 x-modular_unpack_source
145 x-modular_patch_source 189 x-modular_patch_source
146 x-modular_reconf_source 190 x-modular_reconf_source
191
192 # Joshua Baergen - October 23, 2005
193 # Fix shared lib issues on MIPS, FBSD, etc etc
194 elibtoolize
147} 195}
148 196
149x-modular_font_configure() { 197x-modular_font_configure() {
150 if [[ -n "${FONT}" ]]; then 198 if [[ -n "${FONT}" ]]; then
151 # Might be worth adding an option to configure your desired font 199 # Might be worth adding an option to configure your desired font
175 223
176x-modular_src_configure() { 224x-modular_src_configure() {
177 x-modular_font_configure 225 x-modular_font_configure
178 226
179 # If prefix isn't set here, .pc files cause problems 227 # If prefix isn't set here, .pc files cause problems
180 if [ -x ./configure ]; then 228 if [[ -x ./configure ]]; then
181 econf --prefix=${XDIR} \ 229 econf --prefix=${XDIR} \
182 --datadir=${XDIR}/share \ 230 --datadir=${XDIR}/share \
183 ${FONT_OPTIONS} \ 231 ${FONT_OPTIONS} \
184 ${DRIVER_OPTIONS} \ 232 ${DRIVER_OPTIONS} \
185 ${CONFIGURE_OPTIONS} 233 ${CONFIGURE_OPTIONS}
288create_fonts_scale() { 336create_fonts_scale() {
289 ebegin "Creating fonts.scale files" 337 ebegin "Creating fonts.scale files"
290 local x 338 local x
291 for FONT_DIR in ${FONT_DIRS}; do 339 for FONT_DIR in ${FONT_DIRS}; do
292 x=${ROOT}/usr/share/fonts/${FONT_DIR} 340 x=${ROOT}/usr/share/fonts/${FONT_DIR}
293 [ -z "$(ls ${x}/)" ] && continue 341 [[ -z "$(ls ${x}/)" ]] && continue
294 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 342 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
295 343
296 # Only generate .scale files if truetype, opentype or type1 344 # Only generate .scale files if truetype, opentype or type1
297 # fonts are present ... 345 # fonts are present ...
298 346
299 # First truetype (ttf,ttc) 347 # First truetype (ttf,ttc)
300 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 348 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
301 # Also, there is no way to regenerate Speedo/CID fonts.scale 349 # Also, there is no way to regenerate Speedo/CID fonts.scale
302 # <spyderous@gentoo.org> 2 August 2004 350 # <spyderous@gentoo.org> 2 August 2004
303 if [ "${x/encodings}" = "${x}" -a \ 351 if [[ "${x/encodings}" = "${x}" ]] \
304 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 352 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
305 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 353 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
306 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 354 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
307 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 355 ${ROOT}/usr/bin/ttmkfdir -x 2 \
308 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 356 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
309 -o ${x}/fonts.scale -d ${x} 357 -o ${x}/fonts.scale -d ${x}
310 # ttmkfdir fails on some stuff, so try mkfontscale if it does 358 # ttmkfdir fails on some stuff, so try mkfontscale if it does
311 local ttmkfdir_return=$? 359 local ttmkfdir_return=$?
312 else 360 else
313 # We didn't use ttmkfdir at all 361 # We didn't use ttmkfdir at all
314 local ttmkfdir_return=2 362 local ttmkfdir_return=2
315 fi 363 fi
316 if [ ${ttmkfdir_return} -ne 0 ]; then 364 if [[ ${ttmkfdir_return} -ne 0 ]]; then
317 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 365 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
318 ${ROOT}/usr/bin/mkfontscale \ 366 ${ROOT}/usr/bin/mkfontscale \
319 -a /usr/share/fonts/encodings/encodings.dir \ 367 -a /usr/share/fonts/encodings/encodings.dir \
320 -- ${x} 368 -- ${x}
321 fi 369 fi
322 # Next type1 and opentype (pfa,pfb,otf,otc) 370 # Next type1 and opentype (pfa,pfb,otf,otc)
323 elif [ "${x/encodings}" = "${x}" -a \ 371 elif [[ "${x/encodings}" = "${x}" ]] \
324 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 372 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 373 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 374 ${ROOT}/usr/bin/mkfontscale \
327 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 375 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 376 -- ${x}
329 fi 377 fi
333 381
334create_fonts_dir() { 382create_fonts_dir() {
335 ebegin "Generating fonts.dir files" 383 ebegin "Generating fonts.dir files"
336 for FONT_DIR in ${FONT_DIRS}; do 384 for FONT_DIR in ${FONT_DIRS}; do
337 x=${ROOT}/usr/share/fonts/${FONT_DIR} 385 x=${ROOT}/usr/share/fonts/${FONT_DIR}
338 [ -z "$(ls ${x}/)" ] && continue 386 [[ -z "$(ls ${x}/)" ]] && continue
339 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 387 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
340 388
341 if [ "${x/encodings}" = "${x}" ]; then 389 if [[ "${x/encodings}" = "${x}" ]]; then
342 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 390 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
343 ${ROOT}/usr/bin/mkfontdir \ 391 ${ROOT}/usr/bin/mkfontdir \
344 -e ${ROOT}/usr/share/fonts/encodings \ 392 -e ${ROOT}/usr/share/fonts/encodings \
345 -e ${ROOT}/usr/share/fonts/encodings/large \ 393 -e ${ROOT}/usr/share/fonts/encodings/large \
346 -- ${x} 394 -- ${x}
360 408
361create_font_cache() { 409create_font_cache() {
362 # 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
363 # 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
364 # as root anyway 412 # as root anyway
365 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 413 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
366 ebegin "Creating FC font cache" 414 ebegin "Creating FC font cache"
367 HOME="/root" ${ROOT}/usr/bin/fc-cache 415 HOME="/root" ${ROOT}/usr/bin/fc-cache
368 eend 0 416 eend 0
369 fi 417 fi
370} 418}

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

  ViewVC Help
Powered by ViewVC 1.1.20