/[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.77 Revision 1.89
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.77 2006/10/30 05:44:33 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.89 2007/11/13 22:50:04 dberkholz Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <dberkholz@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# Using this eclass: 10# Using this eclass:
… …
19# 19#
20# If you're creating a font package and the suffix of PN is not equal to the 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 21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories. 22# directory or directories.
23# 23#
24# If you want to change the auto-application of the driver patchset or prevent
25# it from applying, edit XDPVER in the ebuild. Set it to -1 to prevent patch
26# application or positive integers for that patch version.
27#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit. 28# IMPORTANT: SNAPSHOT, FONT_DIR and XDPVER must be set _before_ the inherit.
29#
30# If you want to install to a non-default prefix (e.g., /opt/xorg), change
31# XDIR. This has not been recently tested. You may need to uncomment the
32# setting of datadir and mandir in x-modular_src_install() or add it back in if
33# it's no longer there. You may also want to change the SLOT.
25# 34#
26# Pretty much everything else should be automatic. 35# Pretty much everything else should be automatic.
27
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29
30inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31 36
32# Directory prefix to use for everything 37# Directory prefix to use for everything
33XDIR="/usr" 38XDIR="/usr"
34 39
35# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
… …
39fi 44fi
40 45
41IUSE="" 46IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
43 48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi
54
44# Set up SRC_URI for individual modular releases 55# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 58 MODULE="app"
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 59elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 60 MODULE="doc"
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data 61# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI} 63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 64 MODULE="data"
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 65 else
66 MODULE="data"
67 fi
57elif [[ ${CATEGORY} = x11-drivers ]]; then 68elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI} 69 MODULE="driver"
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then 70elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI} 71 MODULE="font"
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then 72elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI} 73 MODULE="lib"
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then 74elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI} 75 MODULE="proto"
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 76elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 77 MODULE="xserver"
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 78fi
79
80if [[ -n ${GIT_ECLASS} ]]; then
81 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}"
82else
83 SRC_URI="${SRC_URI} ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2"
72fi 84fi
73 85
74SLOT="0" 86SLOT="0"
75 87
76# Set the license for the package. This can be overridden by setting 88# Set the license for the package. This can be overridden by setting
… …
79 91
80# Set up shared dependencies 92# Set up shared dependencies
81if [[ -n "${SNAPSHOT}" ]]; then 93if [[ -n "${SNAPSHOT}" ]]; then
82# FIXME: What's the minimal libtool version supporting arbitrary versioning? 94# FIXME: What's the minimal libtool version supporting arbitrary versioning?
83 DEPEND="${DEPEND} 95 DEPEND="${DEPEND}
84 >=sys-devel/autoconf-2.57
85 >=sys-devel/automake-1.7
86 >=sys-devel/libtool-1.5 96 >=sys-devel/libtool-1.5
87 >=sys-devel/m4-1.4" 97 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest"
88fi 100fi
89 101
90# If we're a font package, but not the font.alias one 102# If we're a font package, but not the font.alias one
103FONT_ECLASS=""
91if [[ "${PN/#font-}" != "${PN}" ]] \ 104if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \ 105 && [[ "${CATEGORY}" = "media-fonts" ]] \
93 && [[ "${PN}" != "font-alias" ]] \ 106 && [[ "${PN}" != "font-alias" ]] \
94 && [[ "${PN}" != "font-util" ]]; then 107 && [[ "${PN}" != "font-util" ]]; then
95 # Activate font code in the rest of the eclass 108 # Activate font code in the rest of the eclass
96 FONT="yes" 109 FONT="yes"
97 110
111 # Whether to inherit the font eclass
112 FONT_ECLASS="font"
113
98 RDEPEND="${RDEPEND} 114 RDEPEND="${RDEPEND}
99 media-fonts/encodings 115 media-fonts/encodings
100 x11-apps/mkfontscale 116 x11-apps/mkfontscale
101 x11-apps/mkfontdir" 117 x11-apps/mkfontdir"
102 PDEPEND="${PDEPEND} 118 PDEPEND="${PDEPEND}
… …
133 DRIVER="yes" 149 DRIVER="yes"
134 150
135 if [[ ${XDPVER} != -1 ]]; then 151 if [[ ${XDPVER} != -1 ]]; then
136 # Add driver patchset to SRC_URI 152 # Add driver patchset to SRC_URI
137 SRC_URI="${SRC_URI} 153 SRC_URI="${SRC_URI}
138 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
139 fi 155 fi
140fi 156fi
141 157
142# Debugging -- ignore packages that can't be built with debugging 158# Debugging -- ignore packages that can't be built with debugging
143if [[ -z "${FONT}" ]] \ 159if [[ -z "${FONT}" ]] \
144 || [[ "${PN/app-doc}" != "${PN}" ]] \ 160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
145 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 161 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
146 || [[ "${PN/util-macros}" != "${PN}" ]] \ 162 && [[ "${PN/util-macros}" = "${PN}" ]] \
147 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 163 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
148 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 164 && [[ "${PN/xkbdata}" = "${PN}" ]] \
149 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 165 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
150 || [[ "${PN/xcursor}" != "${PN}" ]] \ 166 && [[ "${PN/xcursor}" = "${PN}" ]] \
151 ; then 167 ; then
152 DEBUGGABLE="yes" 168 DEBUGGABLE="yes"
153 IUSE="${IUSE} debug" 169 IUSE="${IUSE} debug"
154 if use debug; then
155 if ! has splitdebug ${FEATURES}; then
156 RESTRICT="${RESTRICT} nostrip"
157 fi
158 fi
159fi 170fi
160 171
161DEPEND="${DEPEND} 172DEPEND="${DEPEND}
162 >=dev-util/pkgconfig-0.18" 173 >=dev-util/pkgconfig-0.18"
163 174
… …
166 >=x11-misc/util-macros-0.99.2 177 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3" 178 >=sys-devel/binutils-2.16.1-r3"
168fi 179fi
169 180
170RDEPEND="${RDEPEND} 181RDEPEND="${RDEPEND}
171 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
172 !<=x11-base/xorg-x11-6.9" 182 !<=x11-base/xorg-x11-6.9"
173# Provides virtual/x11 for temporary use until packages are ported 183# Provides virtual/x11 for temporary use until packages are ported
174# x11-base/x11-env" 184# x11-base/x11-env"
185
186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
187 ${FONT_ECLASS} ${GIT_ECLASS}
175 188
176x-modular_specs_check() { 189x-modular_specs_check() {
177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
178 append-ldflags -Wl,-z,lazy 191 append-ldflags -Wl,-z,lazy
179 # (#116698) breaks loading 192 # (#116698) breaks loading
… …
206 fi 219 fi
207 fi 220 fi
208} 221}
209 222
210x-modular_unpack_source() { 223x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack
226 else
211 unpack ${A} 227 unpack ${A}
228 fi
212 cd ${S} 229 cd ${S}
213 230
214 if [[ -n ${FONT_OPTIONS} ]]; then 231 if [[ -n ${FONT_OPTIONS} ]]; then
215 einfo "Detected font directory: ${FONT_DIR}" 232 einfo "Detected font directory: ${FONT_DIR}"
216 fi 233 fi
… …
311x-modular_src_configure() { 328x-modular_src_configure() {
312 x-modular_font_configure 329 x-modular_font_configure
313 x-modular_debug_setup 330 x-modular_debug_setup
314 331
315 # If prefix isn't set here, .pc files cause problems 332 # If prefix isn't set here, .pc files cause problems
316 if [[ -x ./configure ]]; then 333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
317 econf --prefix=${XDIR} \ 334 econf --prefix=${XDIR} \
318 --datadir=${XDIR}/share \ 335 --datadir=${XDIR}/share \
319 ${FONT_OPTIONS} \ 336 ${FONT_OPTIONS} \
320 ${DRIVER_OPTIONS} \ 337 ${DRIVER_OPTIONS} \
321 ${CONFIGURE_OPTIONS} 338 ${CONFIGURE_OPTIONS}
… …
339# Shouldn't be necessary in XDIR=/usr 356# Shouldn't be necessary in XDIR=/usr
340# einstall forces datadir, so we need to re-force it 357# einstall forces datadir, so we need to re-force it
341# datadir=${XDIR}/share \ 358# datadir=${XDIR}/share \
342# mandir=${XDIR}/share/man \ 359# mandir=${XDIR}/share/man \
343 360
361 if [[ -n ${GIT_ECLASS} ]]; then
362 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
363 git log ${GIT_TREE} > "${S}"/ChangeLog
364 popd
365 fi
366
344 if [[ -e ${S}/ChangeLog ]]; then 367 if [[ -e ${S}/ChangeLog ]]; then
345 dodoc ${S}/ChangeLog 368 dodoc ${S}/ChangeLog
346 fi 369 fi
347 370
348 # Make sure docs get compressed 371 # Make sure docs get compressed
… …
377} 400}
378 401
379x-modular_pkg_postrm() { 402x-modular_pkg_postrm() {
380 if [[ -n "${FONT}" ]]; then 403 if [[ -n "${FONT}" ]]; then
381 cleanup_fonts 404 cleanup_fonts
405 font_pkg_postrm
382 fi 406 fi
383} 407}
384 408
385cleanup_fonts() { 409cleanup_fonts() {
386 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale" 410 local ALLOWED_FILES="encodings.dir fonts.cache-1 fonts.dir fonts.scale"
… …
468 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 492 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
469 493
470 # Only generate .scale files if truetype, opentype or type1 494 # Only generate .scale files if truetype, opentype or type1
471 # fonts are present ... 495 # fonts are present ...
472 496
473 # First truetype (ttf,ttc)
474 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
475 # Also, there is no way to regenerate Speedo/CID fonts.scale 497 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
476 # <spyderous@gentoo.org> 2 August 2004 498 # <dberkholz@gentoo.org> 2 August 2004
477 if [[ "${x/encodings}" = "${x}" ]] \ 499 if [[ "${x/encodings}" = "${x}" ]] \
478 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
479 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
480 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
481 ${ROOT}/usr/bin/ttmkfdir -x 2 \
482 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
483 -o ${x}/fonts.scale -d ${x}
484 # ttmkfdir fails on some stuff, so try mkfontscale if it does
485 local ttmkfdir_return=$?
486 else
487 # We didn't use ttmkfdir at all
488 local ttmkfdir_return=2
489 fi
490 if [[ ${ttmkfdir_return} -ne 0 ]]; then
491 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
492 ${ROOT}/usr/bin/mkfontscale \
493 -a /usr/share/fonts/encodings/encodings.dir \
494 -- ${x}
495 fi
496 # Next type1 and opentype (pfa,pfb,otf,otc)
497 elif [[ "${x/encodings}" = "${x}" ]] \
498 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 500 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
499 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 501 mkfontscale \
500 ${ROOT}/usr/bin/mkfontscale \
501 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 502 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
502 -- ${x} 503 -- ${x}
503 fi 504 fi
504 done 505 done
505 eend 0 506 eend 0
… …
511 x=${ROOT}/usr/share/fonts/${DIR} 512 x=${ROOT}/usr/share/fonts/${DIR}
512 [[ -z "$(ls ${x}/)" ]] && continue 513 [[ -z "$(ls ${x}/)" ]] && continue
513 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 514 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
514 515
515 if [[ "${x/encodings}" = "${x}" ]]; then 516 if [[ "${x/encodings}" = "${x}" ]]; then
516 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 517 mkfontdir \
517 ${ROOT}/usr/bin/mkfontdir \
518 -e ${ROOT}/usr/share/fonts/encodings \ 518 -e ${ROOT}/usr/share/fonts/encodings \
519 -e ${ROOT}/usr/share/fonts/encodings/large \ 519 -e ${ROOT}/usr/share/fonts/encodings/large \
520 -- ${x} 520 -- ${x}
521 fi 521 fi
522 done 522 done
… …
531 done 531 done
532 eend 0 532 eend 0
533} 533}
534 534
535create_font_cache() { 535create_font_cache() {
536 # danarmak found out that fc-cache should be run AFTER all the above 536 font_pkg_postinst
537 # stuff, as otherwise the cache is invalid, and has to be run again
538 # as root anyway
539 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
540 ebegin "Creating FC font cache"
541 HOME="/root" ${ROOT}/usr/bin/fc-cache
542 eend 0
543 fi
544} 537}
538
539EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
Legend:
Removed from v.1.77  
changed lines
  Added in v.1.89
  ViewVC Help
Powered by ViewVC 1.1.13