/[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.82 Revision 1.90
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.82 2007/05/02 07:10:02 dberkholz Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.90 2008/02/21 22:50:51 cardoe 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:
… …
44fi 44fi
45 45
46IUSE="" 46IUSE=""
47HOMEPAGE="http://xorg.freedesktop.org/" 47HOMEPAGE="http://xorg.freedesktop.org/"
48 48
49if [[ ${PV} = 9999* ]]; then
50 GIT_ECLASS="git"
51 SNAPSHOT="yes"
52 SRC_URI=""
53fi
54
49# Set up SRC_URI for individual modular releases 55# Set up SRC_URI for individual modular releases
50BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 56BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
51if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then 57if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
52 SRC_URI="${SRC_URI} 58 MODULE="app"
53 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
54elif [[ ${CATEGORY} = app-doc ]]; then 59elif [[ ${CATEGORY} = app-doc ]]; then
55 SRC_URI="${SRC_URI} 60 MODULE="doc"
56 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
57# x11-misc contains data and util, x11-themes contains data 61# x11-misc contains data and util, x11-themes contains data
58elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then 62elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
59 SRC_URI="${SRC_URI} 63 if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then
60 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2 64 MODULE="data"
61 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2" 65 else
66 MODULE="data"
67 fi
62elif [[ ${CATEGORY} = x11-drivers ]]; then 68elif [[ ${CATEGORY} = x11-drivers ]]; then
63 SRC_URI="${SRC_URI} 69 MODULE="driver"
64 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
65elif [[ ${CATEGORY} = media-fonts ]]; then 70elif [[ ${CATEGORY} = media-fonts ]]; then
66 SRC_URI="${SRC_URI} 71 MODULE="font"
67 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
68elif [[ ${CATEGORY} = x11-libs ]]; then 72elif [[ ${CATEGORY} = x11-libs ]]; then
69 SRC_URI="${SRC_URI} 73 MODULE="lib"
70 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
71elif [[ ${CATEGORY} = x11-proto ]]; then 74elif [[ ${CATEGORY} = x11-proto ]]; then
72 SRC_URI="${SRC_URI} 75 MODULE="proto"
73 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
74elif [[ ${CATEGORY} = x11-base ]]; then 76elif [[ ${CATEGORY} = x11-base ]]; then
75 SRC_URI="${SRC_URI} 77 MODULE="xserver"
76 ${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"
77fi 84fi
78 85
79SLOT="0" 86SLOT="0"
80 87
81# 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
… …
142 DRIVER="yes" 149 DRIVER="yes"
143 150
144 if [[ ${XDPVER} != -1 ]]; then 151 if [[ ${XDPVER} != -1 ]]; then
145 # Add driver patchset to SRC_URI 152 # Add driver patchset to SRC_URI
146 SRC_URI="${SRC_URI} 153 SRC_URI="${SRC_URI}
147 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 154 mirror://gentoo/x11-driver-patches-${XDPVER}.tar.bz2"
148 fi 155 fi
149fi 156fi
150 157
151# Debugging -- ignore packages that can't be built with debugging 158# Debugging -- ignore packages that can't be built with debugging
152if [[ -z "${FONT}" ]] \ 159if [[ -z "${FONT}" ]] \
153 || [[ "${PN/app-doc}" != "${PN}" ]] \ 160 && [[ "${CATEGORY/app-doc}" = "${CATEGORY}" ]] \
154 || [[ "${PN/x11-proto}" != "${PN}" ]] \ 161 && [[ "${CATEGORY/x11-proto}" = "${CATEGORY}" ]] \
155 || [[ "${PN/util-macros}" != "${PN}" ]] \ 162 && [[ "${PN/util-macros}" = "${PN}" ]] \
156 || [[ "${PN/xbitmaps}" != "${PN}" ]] \ 163 && [[ "${PN/xbitmaps}" = "${PN}" ]] \
157 || [[ "${PN/xkbdata}" != "${PN}" ]] \ 164 && [[ "${PN/xkbdata}" = "${PN}" ]] \
158 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \ 165 && [[ "${PN/xorg-cf-files}" = "${PN}" ]] \
159 || [[ "${PN/xcursor}" != "${PN}" ]] \ 166 && [[ "${PN/xcursor}" = "${PN}" ]] \
160 ; then 167 ; then
161 DEBUGGABLE="yes" 168 DEBUGGABLE="yes"
162 IUSE="${IUSE} debug" 169 IUSE="${IUSE} debug"
163 if use debug; then
164 if ! has splitdebug ${FEATURES}; then
165 RESTRICT="${RESTRICT} nostrip"
166 fi
167 fi
168fi 170fi
169 171
170DEPEND="${DEPEND} 172DEPEND="${DEPEND}
171 >=dev-util/pkgconfig-0.18" 173 >=dev-util/pkgconfig-0.18"
172 174
… …
175 >=x11-misc/util-macros-0.99.2 177 >=x11-misc/util-macros-0.99.2
176 >=sys-devel/binutils-2.16.1-r3" 178 >=sys-devel/binutils-2.16.1-r3"
177fi 179fi
178 180
179RDEPEND="${RDEPEND} 181RDEPEND="${RDEPEND}
180 || ( >=sys-apps/man-1.6b-r2 >=sys-apps/man-db-2.4.3-r1 )
181 !<=x11-base/xorg-x11-6.9" 182 !<=x11-base/xorg-x11-6.9"
182# Provides virtual/x11 for temporary use until packages are ported 183# Provides virtual/x11 for temporary use until packages are ported
183# x11-base/x11-env" 184# x11-base/x11-env"
184 185
185inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools ${FONT_ECLASS} 186inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools \
187 ${FONT_ECLASS} ${GIT_ECLASS}
186 188
187x-modular_specs_check() { 189x-modular_specs_check() {
188 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 190 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
189 append-ldflags -Wl,-z,lazy 191 append-ldflags -Wl,-z,lazy
190 # (#116698) breaks loading 192 # (#116698) breaks loading
… …
217 fi 219 fi
218 fi 220 fi
219} 221}
220 222
221x-modular_unpack_source() { 223x-modular_unpack_source() {
224 if [[ -n ${GIT_ECLASS} ]]; then
225 git_src_unpack
226 else
222 unpack ${A} 227 unpack ${A}
228 fi
223 cd ${S} 229 cd ${S}
224 230
225 if [[ -n ${FONT_OPTIONS} ]]; then 231 if [[ -n ${FONT_OPTIONS} ]]; then
226 einfo "Detected font directory: ${FONT_DIR}" 232 einfo "Detected font directory: ${FONT_DIR}"
227 fi 233 fi
… …
322x-modular_src_configure() { 328x-modular_src_configure() {
323 x-modular_font_configure 329 x-modular_font_configure
324 x-modular_debug_setup 330 x-modular_debug_setup
325 331
326 # If prefix isn't set here, .pc files cause problems 332 # If prefix isn't set here, .pc files cause problems
327 if [[ -x ./configure ]]; then 333 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
328 econf --prefix=${XDIR} \ 334 econf --prefix=${XDIR} \
329 --datadir=${XDIR}/share \ 335 --datadir=${XDIR}/share \
330 ${FONT_OPTIONS} \ 336 ${FONT_OPTIONS} \
331 ${DRIVER_OPTIONS} \ 337 ${DRIVER_OPTIONS} \
332 ${CONFIGURE_OPTIONS} 338 ${CONFIGURE_OPTIONS}
… …
350# Shouldn't be necessary in XDIR=/usr 356# Shouldn't be necessary in XDIR=/usr
351# einstall forces datadir, so we need to re-force it 357# einstall forces datadir, so we need to re-force it
352# datadir=${XDIR}/share \ 358# datadir=${XDIR}/share \
353# mandir=${XDIR}/share/man \ 359# mandir=${XDIR}/share/man \
354 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
355 if [[ -e ${S}/ChangeLog ]]; then 367 if [[ -e ${S}/ChangeLog ]]; then
356 dodoc ${S}/ChangeLog 368 dodoc ${S}/ChangeLog
357 fi 369 fi
370 [[ -n $DOCS ]] && dodoc $DOCS
358 371
359 # Make sure docs get compressed 372 # Make sure docs get compressed
360 prepalldocs 373 prepalldocs
361 374
362 # Don't install libtool archives for server modules 375 # Don't install libtool archives for server modules
… …
481 494
482 # Only generate .scale files if truetype, opentype or type1 495 # Only generate .scale files if truetype, opentype or type1
483 # fonts are present ... 496 # fonts are present ...
484 497
485 # NOTE: There is no way to regenerate Speedo/CID fonts.scale 498 # NOTE: There is no way to regenerate Speedo/CID fonts.scale
486 # <spyderous@gentoo.org> 2 August 2004 499 # <dberkholz@gentoo.org> 2 August 2004
487 if [[ "${x/encodings}" = "${x}" ]] \ 500 if [[ "${x/encodings}" = "${x}" ]] \
488 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then 501 && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then
489 mkfontscale \ 502 mkfontscale \
490 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 503 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
491 -- ${x} 504 -- ${x}
Legend:
Removed from v.1.82  
changed lines
  Added in v.1.90
  ViewVC Help
Powered by ViewVC 1.1.20