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

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.60

  ViewVC Help
Powered by ViewVC 1.1.20