/[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.78 Revision 1.87
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.78 2006/10/30 05:57:41 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.87 2007/10/14 10:12:24 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
28inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools font
29 36
30# Directory prefix to use for everything 37# Directory prefix to use for everything
31XDIR="/usr" 38XDIR="/usr"
32 39
33# Set up default patchset version(s) if necessary 40# Set up default patchset version(s) if necessary
37fi 44fi
38 45
39IUSE="" 46IUSE=""
40HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
41 48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi
54
42# Set up SRC_URI for individual modular releases 55# Set up SRC_URI for individual modular releases
43BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
44if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
45 SRC_URI="${SRC_URI} 58 MODULE="app"
46 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
47elif [[ ${CATEGORY} = app-doc ]]; then 59elif [[ ${CATEGORY} = app-doc ]]; then
48 SRC_URI="${SRC_URI} 60 MODULE="doc"
49 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
50# x11-misc contains data and util, x11-themes contains data 61# x11-misc contains data and util, x11-themes contains data
51elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
52 SRC_URI="${SRC_URI} 63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
53 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 64 MODULE="data"
54 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 65 else
66 MODULE="data"
67 fi
55elif [[ ${CATEGORY} = x11-drivers ]]; then 68elif [[ ${CATEGORY} = x11-drivers ]]; then
56 SRC_URI="${SRC_URI} 69 MODULE="driver"
57 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
58elif [[ ${CATEGORY} = media-fonts ]]; then 70elif [[ ${CATEGORY} = media-fonts ]]; then
59 SRC_URI="${SRC_URI} 71 MODULE="font"
60 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
61elif [[ ${CATEGORY} = x11-libs ]]; then 72elif [[ ${CATEGORY} = x11-libs ]]; then
62 SRC_URI="${SRC_URI} 73 MODULE="lib"
63 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
64elif [[ ${CATEGORY} = x11-proto ]]; then 74elif [[ ${CATEGORY} = x11-proto ]]; then
65 SRC_URI="${SRC_URI} 75 MODULE="proto"
66 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
67elif [[ ${CATEGORY} = x11-base ]]; then 76elif [[ ${CATEGORY} = x11-base ]]; then
68 SRC_URI="${SRC_URI} 77 MODULE="xserver"
69 ${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"
70fi 84fi
71 85
72SLOT="0" 86SLOT="0"
73 87
74# 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
77 91
78# Set up shared dependencies 92# Set up shared dependencies
79if [[ -n "${SNAPSHOT}" ]]; then 93if [[ -n "${SNAPSHOT}" ]]; then
80# FIXME: What's the minimal libtool version supporting arbitrary versioning? 94# FIXME: What's the minimal libtool version supporting arbitrary versioning?
81 DEPEND="${DEPEND} 95 DEPEND="${DEPEND}
82 >=sys-devel/autoconf-2.57
83 >=sys-devel/automake-1.7
84 >=sys-devel/libtool-1.5 96 >=sys-devel/libtool-1.5
85 >=sys-devel/m4-1.4" 97 >=sys-devel/m4-1.4"
98 WANT_AUTOCONF="latest"
99 WANT_AUTOMAKE="latest"
86fi 100fi
87 101
88# 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=""
89if [[ "${PN/#font-}" != "${PN}" ]] \ 104if [[ "${PN/#font-}" != "${PN}" ]] \
90 && [[ "${CATEGORY}" = "media-fonts" ]] \ 105 && [[ "${CATEGORY}" = "media-fonts" ]] \
91 && [[ "${PN}" != "font-alias" ]] \ 106 && [[ "${PN}" != "font-alias" ]] \
92 && [[ "${PN}" != "font-util" ]]; then 107 && [[ "${PN}" != "font-util" ]]; then
93 # Activate font code in the rest of the eclass 108 # Activate font code in the rest of the eclass
94 FONT="yes" 109 FONT="yes"
95 110
111 # Whether to inherit the font eclass
112 FONT_ECLASS="font"
113
96 RDEPEND="${RDEPEND} 114 RDEPEND="${RDEPEND}
97 media-fonts/encodings 115 media-fonts/encodings
98 x11-apps/mkfontscale 116 x11-apps/mkfontscale
99 x11-apps/mkfontdir" 117 x11-apps/mkfontdir"
100 PDEPEND="${PDEPEND} 118 PDEPEND="${PDEPEND}
131 DRIVER="yes" 149 DRIVER="yes"
132 150
133 if [[ ${XDPVER} != -1 ]]; then 151 if [[ ${XDPVER} != -1 ]]; then
134 # Add driver patchset to SRC_URI 152 # Add driver patchset to SRC_URI
135 SRC_URI="${SRC_URI} 153 SRC_URI="${SRC_URI}
136 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
137 fi 155 fi
138fi 156fi
139 157
140# Debugging -- ignore packages that can't be built with debugging 158# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 159if [[ -z "${FONT}" ]] \
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 165 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \ 166 || [[ "${PN/xcursor}" != "${PN}" ]] \
149 ; then 167 ; then
150 DEBUGGABLE="yes" 168 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug" 169 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
157fi 170fi
158 171
159DEPEND="${DEPEND} 172DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 173 >=dev-util/pkgconfig-0.18"
161 174
168RDEPEND="${RDEPEND} 181RDEPEND="${RDEPEND}
169 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 ) 182 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
170 !<=x11-base/xorg-x11-6.9" 183 !<=x11-base/xorg-x11-6.9"
171# Provides virtual/x11 for temporary use until packages are ported 184# Provides virtual/x11 for temporary use until packages are ported
172# x11-base/x11-env" 185# x11-base/x11-env"
186
187inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
188 ${FONT_ECLASS} ${GIT_ECLASS}
173 189
174x-modular_specs_check() { 190x-modular_specs_check() {
175 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 191 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
176 append-ldflags -Wl,-z,lazy 192 append-ldflags -Wl,-z,lazy
177 # (#116698) breaks loading 193 # (#116698) breaks loading
204 fi 220 fi
205 fi 221 fi
206} 222}
207 223
208x-modular_unpack_source() { 224x-modular_unpack_source() {
225 if [[ -n ${GIT_ECLASS} ]]; then
226 git_src_unpack
227 else
209 unpack ${A} 228 unpack ${A}
229 fi
210 cd ${S} 230 cd ${S}
211 231
212 if [[ -n ${FONT_OPTIONS} ]]; then 232 if [[ -n ${FONT_OPTIONS} ]]; then
213 einfo "Detected font directory: ${FONT_DIR}" 233 einfo "Detected font directory: ${FONT_DIR}"
214 fi 234 fi
309x-modular_src_configure() { 329x-modular_src_configure() {
310 x-modular_font_configure 330 x-modular_font_configure
311 x-modular_debug_setup 331 x-modular_debug_setup
312 332
313 # If prefix isn't set here, .pc files cause problems 333 # If prefix isn't set here, .pc files cause problems
314 if [[ -x ./configure ]]; then 334 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
315 econf --prefix=${XDIR} \ 335 econf --prefix=${XDIR} \
316 --datadir=${XDIR}/share \ 336 --datadir=${XDIR}/share \
317 ${FONT_OPTIONS} \ 337 ${FONT_OPTIONS} \
318 ${DRIVER_OPTIONS} \ 338 ${DRIVER_OPTIONS} \
319 ${CONFIGURE_OPTIONS} 339 ${CONFIGURE_OPTIONS}
336 install 356 install
337# Shouldn't be necessary in XDIR=/usr 357# Shouldn't be necessary in XDIR=/usr
338# einstall forces datadir, so we need to re-force it 358# einstall forces datadir, so we need to re-force it
339# datadir=${XDIR}/share \ 359# datadir=${XDIR}/share \
340# mandir=${XDIR}/share/man \ 360# mandir=${XDIR}/share/man \
361
362 if [[ -n ${GIT_ECLASS} ]]; then
363 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
364 git log ${GIT_TREE} > "${S}"/ChangeLog
365 popd
366 fi
341 367
342 if [[ -e ${S}/ChangeLog ]]; then 368 if [[ -e ${S}/ChangeLog ]]; then
343 dodoc ${S}/ChangeLog 369 dodoc ${S}/ChangeLog
344 fi 370 fi
345 371
467 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
468 494
469 # Only generate .scale files if truetype, opentype or type1 495 # Only generate .scale files if truetype, opentype or type1
470 # fonts are present ... 496 # fonts are present ...
471 497
472 # First truetype (ttf,ttc)
473 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
474 # Also, there is no way to regenerate Speedo/CID fonts.scale 498 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
475 # <spyderous@gentoo.org> 2 August 2004 499 # <dberkholz@gentoo.org> 2 August 2004
476 if [[ "${x/encodings}" = "${x}" ]] \ 500 if [[ "${x/encodings}" = "${x}" ]] \
477 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
478 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
479 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
480 ${ROOT}/usr/bin/ttmkfdir -x 2 \
481 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
482 -o ${x}/fonts.scale -d ${x}
483 # ttmkfdir fails on some stuff, so try mkfontscale if it does
484 local ttmkfdir_return=$?
485 else
486 # We didn't use ttmkfdir at all
487 local ttmkfdir_return=2
488 fi
489 if [[ ${ttmkfdir_return} -ne 0 ]]; then
490 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
491 ${ROOT}/usr/bin/mkfontscale \
492 -a /usr/share/fonts/encodings/encodings.dir \
493 -- ${x}
494 fi
495 # Next type1 and opentype (pfa,pfb,otf,otc)
496 elif [[ "${x/encodings}" = "${x}" ]] \
497 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then 501 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
498 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 502 mkfontscale \
499 ${ROOT}/usr/bin/mkfontscale \
500 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 503 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
501 -- ${x} 504 -- ${x}
502 fi 505 fi
503 done 506 done
504 eend 0 507 eend 0
510 x=${ROOT}/usr/share/fonts/${DIR} 513 x=${ROOT}/usr/share/fonts/${DIR}
511 [[ -z "$(ls ${x}/)" ]] && continue 514 [[ -z "$(ls ${x}/)" ]] && continue
512 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue 515 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
513 516
514 if [[ "${x/encodings}" = "${x}" ]]; then 517 if [[ "${x/encodings}" = "${x}" ]]; then
515 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 518 mkfontdir \
516 ${ROOT}/usr/bin/mkfontdir \
517 -e ${ROOT}/usr/share/fonts/encodings \ 519 -e ${ROOT}/usr/share/fonts/encodings \
518 -e ${ROOT}/usr/share/fonts/encodings/large \ 520 -e ${ROOT}/usr/share/fonts/encodings/large \
519 -- ${x} 521 -- ${x}
520 fi 522 fi
521 done 523 done

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.87

  ViewVC Help
Powered by ViewVC 1.1.20