/[gentoo-x86]/eclass/xorg-2.eclass
Gentoo

Diff of /eclass/xorg-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.11 Revision 1.44
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2010 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/xorg-2.eclass,v 1.11 2010/08/22 08:25:26 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.44 2011/05/14 16:27:50 scarabeus Exp $
4# 4#
5# @ECLASS: xorg-2.eclass 5# @ECLASS: xorg-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# x11@gentoo.org 7# x11@gentoo.org
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 8# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
20# Author: Tomáš Chvátal <scarabeus@gentoo.org> 20# Author: Tomáš Chvátal <scarabeus@gentoo.org>
21# Author: Donnie Berkholz <dberkholz@gentoo.org> 21# Author: Donnie Berkholz <dberkholz@gentoo.org>
22 22
23GIT_ECLASS="" 23GIT_ECLASS=""
24if [[ ${PV} == *9999* ]]; then 24if [[ ${PV} == *9999* ]]; then
25 GIT_ECLASS="git" 25 GIT_ECLASS="git-2"
26 XORG_EAUTORECONF="yes" 26 XORG_EAUTORECONF="yes"
27 SRC_URI=""
28fi 27fi
29 28
30# If we're a font package, but not the font.alias one 29# If we're a font package, but not the font.alias one
31FONT_ECLASS="" 30FONT_ECLASS=""
32if [[ ${PN} == font* \ 31if [[ ${PN} == font* \
36 # Activate font code in the rest of the eclass 35 # Activate font code in the rest of the eclass
37 FONT="yes" 36 FONT="yes"
38 FONT_ECLASS="font" 37 FONT_ECLASS="font"
39fi 38fi
40 39
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 40inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \
42 ${FONT_ECLASS} ${GIT_ECLASS} 41 ${FONT_ECLASS} ${GIT_ECLASS}
43 42
44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 43EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
45case "${EAPI:-0}" in 44case "${EAPI:-0}" in
46 3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 45 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) DEPEND="EAPI-UNSUPPORTED" ;; 46 *) die "EAPI=${EAPI} is not supported" ;;
48esac 47esac
49 48
50# exports must be ALWAYS after inherit 49# exports must be ALWAYS after inherit
51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 50EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
52 51
57# @DESCRIPTION: 56# @DESCRIPTION:
58# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 57# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
59# before inheriting this eclass. 58# before inheriting this eclass.
60: ${XORG_EAUTORECONF:="no"} 59: ${XORG_EAUTORECONF:="no"}
61 60
61# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI
62# @DESCRIPTION:
62# Set up SRC_URI for individual modular releases 63# Set up SRC_URI for individual modular releases. If set to an empty
64# string, no SRC_URI will be provided by the eclass.
63BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 65: ${XORG_BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
66
64# @ECLASS-VARIABLE: MODULE 67# @ECLASS-VARIABLE: XORG_MODULE
65# @DESCRIPTION: 68# @DESCRIPTION:
66# The subdirectory to download source from. Possible settings are app, 69# The subdirectory to download source from. Possible settings are app,
67# doc, data, util, driver, font, lib, proto, xserver. Set above the 70# doc, data, util, driver, font, lib, proto, xserver. Set above the
68# inherit to override the default autoconfigured module. 71# inherit to override the default autoconfigured module.
69if [[ -z ${MODULE} ]]; then 72if [[ -z ${XORG_MODULE} ]]; then
70 MODULE=""
71 case ${CATEGORY} in 73 case ${CATEGORY} in
72 app-doc) MODULE="doc" ;; 74 app-doc) XORG_MODULE=doc/ ;;
73 media-fonts) MODULE="font" ;; 75 media-fonts) XORG_MODULE=font/ ;;
74 x11-apps|x11-wm) MODULE="app" ;; 76 x11-apps|x11-wm) XORG_MODULE=app/ ;;
75 x11-misc|x11-themes) MODULE="util" ;; 77 x11-misc|x11-themes) XORG_MODULE=util/ ;;
76 x11-drivers) MODULE="driver" ;;
77 x11-base) MODULE="xserver" ;; 78 x11-base) XORG_MODULE=xserver/ ;;
79 x11-drivers) XORG_MODULE=driver/ ;;
78 x11-proto) MODULE="proto" ;; 80 x11-proto) XORG_MODULE=proto/ ;;
79 x11-libs) MODULE="lib" ;; 81 x11-libs) XORG_MODULE=lib/ ;;
82 *) XORG_MODULE= ;;
80 esac 83 esac
81fi 84fi
82 85
86# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
87# @DESCRIPTION:
88# For git checkout the git repository might differ from package name.
89# This variable can be used for proper directory specification
90: ${XORG_PACKAGE_NAME:=${PN}}
91
83if [[ -n ${GIT_ECLASS} ]]; then 92if [[ -n ${GIT_ECLASS} ]]; then
84 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" 93 : ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
85else 94elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
86 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 95 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
87fi 96fi
88 97
89: ${SLOT:=0} 98: ${SLOT:=0}
90 99
91# Set the license for the package. This can be overridden by setting 100# Set the license for the package. This can be overridden by setting
92# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages 101# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
93# are under the MIT license. (This is what Red Hat does in their rpms) 102# are under the MIT license. (This is what Red Hat does in their rpms)
94: ${LICENSE:=MIT} 103: ${LICENSE:=MIT}
95 104
96# Set up shared dependencies 105# Set up autotools shared dependencies
97if [[ ${XORG_EAUTORECONF} != no ]]; then 106# Remember that all versions here MUST be stable
98 DEPEND+=" 107XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
108EAUTORECONF_DEPEND+="
99 >=sys-devel/libtool-2.2.6a 109 >=sys-devel/libtool-2.2.6a
100 sys-devel/m4" 110 sys-devel/m4"
101 # This MUST BE STABLE
102 if [[ ${PN} != util-macros ]] ; then 111if [[ ${PN} != util-macros ]] ; then
103 DEPEND+=" >=x11-misc/util-macros-1.8.0" 112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.13.0"
104 # Required even by xorg-server 113 # Required even by xorg-server
105 [[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 114 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
106 fi 115fi
107 WANT_AUTOCONF="latest" 116WANT_AUTOCONF="latest"
108 WANT_AUTOMAKE="latest" 117WANT_AUTOMAKE="latest"
109fi 118for arch in ${XORG_EAUTORECONF_ARCHES}; do
119 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
120done
121DEPEND+=" ${EAUTORECONF_DEPENDS}"
122[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
123unset EAUTORECONF_DEPENDS
124unset EAUTORECONF_DEPEND
110 125
111if [[ ${FONT} == yes ]]; then 126if [[ ${FONT} == yes ]]; then
112 RDEPEND+=" media-fonts/encodings 127 RDEPEND+=" media-fonts/encodings
113 x11-apps/mkfontscale 128 x11-apps/mkfontscale
114 x11-apps/mkfontdir" 129 x11-apps/mkfontdir"
115 PDEPEND+=" media-fonts/font-alias" 130 PDEPEND+=" media-fonts/font-alias"
131 DEPEND+=" >=media-fonts/font-util-1.2.0"
116 132
117 # @ECLASS-VARIABLE: FONT_DIR 133 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 134 # @DESCRIPTION:
119 # If you're creating a font package and the suffix of PN is not equal to 135 # If you're creating a font package and the suffix of PN is not equal to
120 # the subdirectory of /usr/share/fonts/ it should install into, set 136 # the subdirectory of /usr/share/fonts/ it should install into, set
146 162
147# Add static-libs useflag where usefull. 163# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 164if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 165 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 166 && ${CATEGORY} != app-doc \
167 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 168 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 169 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 170 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 171 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 172 && ${PN} != xbitmaps \
158 IUSE+=" static-libs" 175 IUSE+=" static-libs"
159fi 176fi
160 177
161DEPEND+=" >=dev-util/pkgconfig-0.23" 178DEPEND+=" >=dev-util/pkgconfig-0.23"
162 179
163# Check deps on xorg-server 180# @ECLASS-VARIABLE: XORG_DRI
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 181# @DESCRIPTION:
165[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 182# Possible values are "always" or the value of the useflag DRI capabilities
183# are required for. Default value is "no"
184#
185# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
186: ${XORG_DRI:="no"}
187
188DRI_COMMON_DEPEND="
189 x11-base/xorg-server[-minimal]
190 x11-libs/libdrm
191"
192DRI_DEPEND="
193 x11-proto/xf86driproto
194 x11-proto/glproto
195 x11-proto/dri2proto
196"
197case ${XORG_DRI} in
198 no)
199 ;;
200 always)
201 COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
202 DEPEND+=" ${DRI_DEPEND}"
203 ;;
204 *)
205 COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
206 DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
207 IUSE+=" ${XORG_DRI}"
208 ;;
209esac
210unset DRI_DEPEND
211unset DRI_COMMONDEPEND
212
213if [[ -n "${DRIVER}" ]]; then
214 COMMON_DEPEND+="
215 x11-base/xorg-server[xorg]
216 "
217fi
218if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
219 DEPEND+="
220 x11-proto/inputproto
221 x11-proto/kbproto
222 x11-proto/xproto
223 "
224fi
225if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
226 COMMON_DEPEND+="
227 x11-libs/libpciaccess
228 "
229 # we also needs some protos and libs in all cases
230 DEPEND+="
231 x11-proto/fontsproto
232 x11-proto/randrproto
233 x11-proto/renderproto
234 x11-proto/videoproto
235 x11-proto/xextproto
236 x11-proto/xineramaproto
237 x11-proto/xproto
238 "
239fi
240
241# @ECLASS-VARIABLE: XORG_DOC
242# @DESCRIPTION:
243# Possible values are "always" or the value of the useflag doc packages
244# are required for. Default value is "no"
245#
246# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
247: ${XORG_DOC:="no"}
248
249DOC_DEPEND="
250 doc? (
251 app-text/asciidoc
252 app-text/xmlto
253 app-doc/doxygen
254 app-text/docbook-xml-dtd:4.1.2
255 app-text/docbook-xml-dtd:4.2
256 app-text/docbook-xml-dtd:4.3
257 )
258"
259case ${XORG_DOC} in
260 no)
261 ;;
262 always)
263 DEPEND+=" ${DOC_DEPEND}"
264 ;;
265 *)
266 DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
267 IUSE+=" ${XORG_DOC}"
268 ;;
269esac
270unset DOC_DEPEND
271
272DEPEND+=" ${COMMON_DEPEND}"
273RDEPEND+=" ${COMMON_DEPEND}"
274unset COMMON_DEPEND
275
276debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
277debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
278debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
166 279
167# @FUNCTION: xorg-2_pkg_setup 280# @FUNCTION: xorg-2_pkg_setup
168# @DESCRIPTION: 281# @DESCRIPTION:
169# Setup prefix compat 282# Setup prefix compat
170xorg-2_pkg_setup() { 283xorg-2_pkg_setup() {
284 debug-print-function ${FUNCNAME} "$@"
285
171 [[ ${FONT} == yes ]] && font_pkg_setup 286 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
172} 287}
173 288
174# @FUNCTION: xorg-2_src_unpack 289# @FUNCTION: xorg-2_src_unpack
175# @DESCRIPTION: 290# @DESCRIPTION:
176# Simply unpack source code. 291# Simply unpack source code.
177xorg-2_src_unpack() { 292xorg-2_src_unpack() {
293 debug-print-function ${FUNCNAME} "$@"
294
178 if [[ -n ${GIT_ECLASS} ]]; then 295 if [[ -n ${GIT_ECLASS} ]]; then
179 git_src_unpack 296 git-2_src_unpack
180 else 297 else
181 unpack ${A} 298 unpack ${A}
182 fi 299 fi
183 300
184 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 301 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
186 303
187# @FUNCTION: xorg-2_patch_source 304# @FUNCTION: xorg-2_patch_source
188# @DESCRIPTION: 305# @DESCRIPTION:
189# Apply all patches 306# Apply all patches
190xorg-2_patch_source() { 307xorg-2_patch_source() {
308 debug-print-function ${FUNCNAME} "$@"
309
191 # Use standardized names and locations with bulk patching 310 # Use standardized names and locations with bulk patching
192 # Patch directory is ${WORKDIR}/patch 311 # Patch directory is ${WORKDIR}/patch
193 # See epatch() in eutils.eclass for more documentation 312 # See epatch() in eutils.eclass for more documentation
194 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 313 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
195 314
196 [[ -d "${EPATCH_SOURCE}" ]] && epatch 315 [[ -d "${EPATCH_SOURCE}" ]] && epatch
197 base_src_prepare 316 autotools-utils_src_prepare "$@"
198} 317}
199 318
200# @FUNCTION: xorg-2_reconf_source 319# @FUNCTION: xorg-2_reconf_source
201# @DESCRIPTION: 320# @DESCRIPTION:
202# Run eautoreconf if necessary, and run elibtoolize. 321# Run eautoreconf if necessary, and run elibtoolize.
203xorg-2_reconf_source() { 322xorg-2_reconf_source() {
323 debug-print-function ${FUNCNAME} "$@"
324
204 case ${CHOST} in 325 case ${CHOST} in
205 *-interix* | *-aix* | *-winnt*) 326 *-interix* | *-aix* | *-winnt*)
206 # some hosts need full eautoreconf 327 # some hosts need full eautoreconf
207 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 328 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
208 ;; 329 ;;
215 336
216# @FUNCTION: xorg-2_src_prepare 337# @FUNCTION: xorg-2_src_prepare
217# @DESCRIPTION: 338# @DESCRIPTION:
218# Prepare a package after unpacking, performing all X-related tasks. 339# Prepare a package after unpacking, performing all X-related tasks.
219xorg-2_src_prepare() { 340xorg-2_src_prepare() {
220 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 341 debug-print-function ${FUNCNAME} "$@"
342
221 xorg-2_patch_source 343 xorg-2_patch_source
222 xorg-2_reconf_source 344 xorg-2_reconf_source
223} 345}
224 346
225# @FUNCTION: xorg-2_font_configure 347# @FUNCTION: xorg-2_font_configure
226# @DESCRIPTION: 348# @DESCRIPTION:
227# If a font package, perform any necessary configuration steps 349# If a font package, perform any necessary configuration steps
228xorg-2_font_configure() { 350xorg-2_font_configure() {
351 debug-print-function ${FUNCNAME} "$@"
352
229 if has nls ${IUSE//+} && ! use nls; then 353 if has nls ${IUSE//+} && ! use nls; then
354 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
230 FONT_OPTIONS+=" 355 FONT_OPTIONS+="
356 --disable-all-encodings"
357 else
358 FONT_OPTIONS+="
231 --disable-iso8859-2 359 --disable-iso8859-2
232 --disable-iso8859-3 360 --disable-iso8859-3
233 --disable-iso8859-4 361 --disable-iso8859-4
234 --disable-iso8859-5 362 --disable-iso8859-5
235 --disable-iso8859-6 363 --disable-iso8859-6
236 --disable-iso8859-7 364 --disable-iso8859-7
237 --disable-iso8859-8 365 --disable-iso8859-8
238 --disable-iso8859-9 366 --disable-iso8859-9
239 --disable-iso8859-10 367 --disable-iso8859-10
240 --disable-iso8859-11 368 --disable-iso8859-11
241 --disable-iso8859-12 369 --disable-iso8859-12
242 --disable-iso8859-13 370 --disable-iso8859-13
243 --disable-iso8859-14 371 --disable-iso8859-14
244 --disable-iso8859-15 372 --disable-iso8859-15
245 --disable-iso8859-16 373 --disable-iso8859-16
246 --disable-jisx0201 374 --disable-jisx0201
247 --disable-koi8-r" 375 --disable-koi8-r"
376 fi
248 fi 377 fi
249} 378}
250 379
251# @FUNCTION: xorg-2_flags_setup 380# @FUNCTION: xorg-2_flags_setup
252# @DESCRIPTION: 381# @DESCRIPTION:
253# Set up CFLAGS for a debug build 382# Set up CFLAGS for a debug build
254xorg-2_flags_setup() { 383xorg-2_flags_setup() {
384 debug-print-function ${FUNCNAME} "$@"
385
255 # Win32 require special define 386 # Win32 require special define
256 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 387 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
257 # hardened ldflags 388 # hardened ldflags
258 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 389 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
390
391 # Quite few libraries fail on runtime without these:
392 if has static-libs ${IUSE//+}; then
393 filter-flags -Wl,-Bdirect
394 filter-ldflags -Bdirect
395 filter-ldflags -Wl,-Bdirect
396 fi
259} 397}
260 398
261# @FUNCTION: xorg-2_src_configure 399# @FUNCTION: xorg-2_src_configure
262# @DESCRIPTION: 400# @DESCRIPTION:
263# Perform any necessary pre-configuration steps, then run configure 401# Perform any necessary pre-configuration steps, then run configure
264xorg-2_src_configure() { 402xorg-2_src_configure() {
265 local myopts="" 403 debug-print-function ${FUNCNAME} "$@"
266 404
267 xorg-2_flags_setup 405 xorg-2_flags_setup
406
407 # @VARIABLE: XORG_CONFIGURE_OPTIONS
408 # @DESCRIPTION:
409 # Array of an additional options to pass to configure.
410 # @DEFAULT_UNSET
411 if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
412 # fallback to CONFIGURE_OPTIONS, deprecated.
413 [[ -n "${CONFIGURE_OPTIONS}" ]] && \
414 ewarn "QA: CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS to preserve namespace."
415 local xorgconfadd=(${CONFIGURE_OPTIONS})
416 else
417 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
418 fi
419
268 [[ -n "${FONT}" ]] && xorg-2_font_configure 420 [[ -n "${FONT}" ]] && xorg-2_font_configure
269 421 local myeconfargs=(
270 # @VARIABLE: CONFIGURE_OPTIONS 422 --disable-dependency-tracking
271 # @DESCRIPTION:
272 # Any options to pass to configure
273 # @DEFAULT_UNSET
274 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
275 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
276 if has static-libs ${IUSE//+}; then
277 myopts+=" $(use_enable static-libs static)"
278 fi
279 econf \
280 ${FONT_OPTIONS} \ 423 ${FONT_OPTIONS}
281 ${CONFIGURE_OPTIONS} \ 424 "${xorgconfadd[@]}"
282 ${myopts} 425 )
283 fi 426
427 autotools-utils_src_configure "$@"
284} 428}
285 429
286# @FUNCTION: xorg-2_src_compile 430# @FUNCTION: xorg-2_src_compile
287# @DESCRIPTION: 431# @DESCRIPTION:
288# Compile a package, performing all X-related tasks. 432# Compile a package, performing all X-related tasks.
289xorg-2_src_compile() { 433xorg-2_src_compile() {
290 base_src_compile 434 debug-print-function ${FUNCNAME} "$@"
435
436 autotools-utils_src_compile "$@"
291} 437}
292 438
293# @FUNCTION: xorg-2_src_install 439# @FUNCTION: xorg-2_src_install
294# @DESCRIPTION: 440# @DESCRIPTION:
295# Install a built package to ${D}, performing any necessary steps. 441# Install a built package to ${D}, performing any necessary steps.
296# Creates a ChangeLog from git if using live ebuilds. 442# Creates a ChangeLog from git if using live ebuilds.
297xorg-2_src_install() { 443xorg-2_src_install() {
444 debug-print-function ${FUNCNAME} "$@"
445
298 if [[ ${CATEGORY} == x11-proto ]]; then 446 if [[ ${CATEGORY} == x11-proto ]]; then
299 emake \ 447 autotools-utils_src_install \
300 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 448 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
301 docdir=${EPREFIX}/usr/share/doc/${PF} \ 449 docdir="${EPREFIX}/usr/share/doc/${PF}"
302 DESTDIR="${D}" \
303 install || die "emake install failed"
304 else 450 else
305 emake \ 451 autotools-utils_src_install \
306 docdir=${EPREFIX}/usr/share/doc/${PF} \ 452 docdir="${EPREFIX}/usr/share/doc/${PF}"
307 DESTDIR="${D}" \
308 install || die "emake install failed"
309 fi 453 fi
310 454
311 if [[ -n ${GIT_ECLASS} ]]; then 455 if [[ -n ${GIT_ECLASS} ]]; then
312 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 456 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
313 git log ${GIT_TREE} > "${S}"/ChangeLog 457 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
314 popd > /dev/null 458 popd > /dev/null
315 fi 459 fi
316 460
317 if [[ -e "${S}"/ChangeLog ]]; then 461 if [[ -e "${S}"/ChangeLog ]]; then
318 dodoc "${S}"/ChangeLog
319 fi
320 # @VARIABLE: DOCS
321 # @DESCRIPTION:
322 # Any documentation to install
323 # @DEFAULT_UNSET
324 if [[ -n ${DOCS} ]]; then
325 dodoc ${DOCS} || die "dodoc failed" 462 dodoc "${S}"/ChangeLog || die "dodoc failed"
326 fi 463 fi
327 464
328 # Don't install libtool archives for server modules 465 # Don't install libtool archives (even with static-libs)
329 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 466 remove_libtool_files all
330 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
331 -exec rm -f {} ';'
332 fi
333 467
334 [[ -n ${FONT} ]] && remove_font_metadata 468 [[ -n ${FONT} ]] && remove_font_metadata
335} 469}
336 470
337# @FUNCTION: xorg-2_pkg_postinst 471# @FUNCTION: xorg-2_pkg_postinst
338# @DESCRIPTION: 472# @DESCRIPTION:
339# Run X-specific post-installation tasks on the live filesystem. The 473# Run X-specific post-installation tasks on the live filesystem. The
340# only task right now is some setup for font packages. 474# only task right now is some setup for font packages.
341xorg-2_pkg_postinst() { 475xorg-2_pkg_postinst() {
476 debug-print-function ${FUNCNAME} "$@"
477
342 [[ -n ${FONT} ]] && setup_fonts 478 [[ -n ${FONT} ]] && setup_fonts "$@"
343} 479}
344 480
345# @FUNCTION: xorg-2_pkg_postrm 481# @FUNCTION: xorg-2_pkg_postrm
346# @DESCRIPTION: 482# @DESCRIPTION:
347# Run X-specific post-removal tasks on the live filesystem. The only 483# Run X-specific post-removal tasks on the live filesystem. The only
348# task right now is some cleanup for font packages. 484# task right now is some cleanup for font packages.
349xorg-2_pkg_postrm() { 485xorg-2_pkg_postrm() {
350 if [[ -n ${FONT} ]]; then 486 debug-print-function ${FUNCNAME} "$@"
351 font_pkg_postrm 487
352 fi 488 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
353} 489}
354 490
355# @FUNCTION: setup_fonts 491# @FUNCTION: setup_fonts
356# @DESCRIPTION: 492# @DESCRIPTION:
357# Generates needed files for fonts and fixes font permissions 493# Generates needed files for fonts and fixes font permissions
358setup_fonts() { 494setup_fonts() {
495 debug-print-function ${FUNCNAME} "$@"
496
359 create_fonts_scale 497 create_fonts_scale
360 create_fonts_dir 498 create_fonts_dir
361 font_pkg_postinst 499 font_pkg_postinst
362} 500}
363 501
364# @FUNCTION: remove_font_metadata 502# @FUNCTION: remove_font_metadata
365# @DESCRIPTION: 503# @DESCRIPTION:
366# Don't let the package install generated font files that may overlap 504# Don't let the package install generated font files that may overlap
367# with other packages. Instead, they're generated in pkg_postinst(). 505# with other packages. Instead, they're generated in pkg_postinst().
368remove_font_metadata() { 506remove_font_metadata() {
507 debug-print-function ${FUNCNAME} "$@"
508
369 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 509 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
370 einfo "Removing font metadata" 510 einfo "Removing font metadata"
371 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 511 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
372 fi 512 fi
373} 513}
374 514
375# @FUNCTION: create_fonts_scale 515# @FUNCTION: create_fonts_scale
376# @DESCRIPTION: 516# @DESCRIPTION:
377# Create fonts.scale file, used by the old server-side fonts subsystem. 517# Create fonts.scale file, used by the old server-side fonts subsystem.
378create_fonts_scale() { 518create_fonts_scale() {
519 debug-print-function ${FUNCNAME} "$@"
520
379 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 521 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
380 ebegin "Generating font.scale" 522 ebegin "Generating font.scale"
381 mkfontscale \ 523 mkfontscale \
382 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 524 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
383 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 525 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
387 529
388# @FUNCTION: create_fonts_dir 530# @FUNCTION: create_fonts_dir
389# @DESCRIPTION: 531# @DESCRIPTION:
390# Create fonts.dir file, used by the old server-side fonts subsystem. 532# Create fonts.dir file, used by the old server-side fonts subsystem.
391create_fonts_dir() { 533create_fonts_dir() {
534 debug-print-function ${FUNCNAME} "$@"
535
392 ebegin "Generating fonts.dir" 536 ebegin "Generating fonts.dir"
393 mkfontdir \ 537 mkfontdir \
394 -e "${EROOT}"/usr/share/fonts/encodings \ 538 -e "${EROOT}"/usr/share/fonts/encodings \
395 -e "${EROOT}"/usr/share/fonts/encodings/large \ 539 -e "${EROOT}"/usr/share/fonts/encodings/large \
396 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 540 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.44

  ViewVC Help
Powered by ViewVC 1.1.20