/[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.12 Revision 1.57
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2012 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.12 2010/08/24 08:59:56 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.57 2012/06/11 13:02:21 mgorny 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) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) DEPEND="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.8.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"
132 DEPEND+=" >=media-fonts/font-util-1.2.0"
116 133
117 # @ECLASS-VARIABLE: FONT_DIR 134 # @ECLASS-VARIABLE: FONT_DIR
118 # @DESCRIPTION: 135 # @DESCRIPTION:
119 # 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
120 # the subdirectory of /usr/share/fonts/ it should install into, set 137 # the subdirectory of /usr/share/fonts/ it should install into, set
… …
146 163
147# Add static-libs useflag where usefull. 164# Add static-libs useflag where usefull.
148if [[ ${XORG_STATIC} == yes \ 165if [[ ${XORG_STATIC} == yes \
149 && ${FONT} != yes \ 166 && ${FONT} != yes \
150 && ${CATEGORY} != app-doc \ 167 && ${CATEGORY} != app-doc \
168 && ${CATEGORY} != x11-apps \
151 && ${CATEGORY} != x11-proto \ 169 && ${CATEGORY} != x11-proto \
152 && ${CATEGORY} != x11-drivers \ 170 && ${CATEGORY} != x11-drivers \
153 && ${CATEGORY} != media-fonts \ 171 && ${CATEGORY} != media-fonts \
154 && ${PN} != util-macros \ 172 && ${PN} != util-macros \
155 && ${PN} != xbitmaps \ 173 && ${PN} != xbitmaps \
156 && ${PN} != xorg-cf-files \ 174 && ${PN} != xorg-cf-files \
157 && ${PN/xcursor} = ${PN} ]]; then 175 && ${PN/xcursor} = ${PN} ]]; then
158 IUSE+=" static-libs" 176 IUSE+=" static-libs"
159fi 177fi
160 178
161DEPEND+=" >=dev-util/pkgconfig-0.23" 179DEPEND+=" virtual/pkgconfig"
162 180
163# Check deps on xorg-server 181# @ECLASS-VARIABLE: XORG_DRI
164has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 182# @DESCRIPTION:
165[[ -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
273DEPEND+=" ${COMMON_DEPEND}"
274RDEPEND+=" ${COMMON_DEPEND}"
275unset COMMON_DEPEND
276
277debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
278debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
279debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
166 280
167# @FUNCTION: xorg-2_pkg_setup 281# @FUNCTION: xorg-2_pkg_setup
168# @DESCRIPTION: 282# @DESCRIPTION:
169# Setup prefix compat 283# Setup prefix compat
170xorg-2_pkg_setup() { 284xorg-2_pkg_setup() {
285 debug-print-function ${FUNCNAME} "$@"
286
171 [[ ${FONT} == yes ]] && font_pkg_setup 287 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
172} 288}
173 289
174# @FUNCTION: xorg-2_src_unpack 290# @FUNCTION: xorg-2_src_unpack
175# @DESCRIPTION: 291# @DESCRIPTION:
176# Simply unpack source code. 292# Simply unpack source code.
177xorg-2_src_unpack() { 293xorg-2_src_unpack() {
294 debug-print-function ${FUNCNAME} "$@"
295
178 if [[ -n ${GIT_ECLASS} ]]; then 296 if [[ -n ${GIT_ECLASS} ]]; then
179 git_src_unpack 297 git-2_src_unpack
180 else 298 else
181 unpack ${A} 299 unpack ${A}
182 fi 300 fi
183 301
184 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 302 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
… …
186 304
187# @FUNCTION: xorg-2_patch_source 305# @FUNCTION: xorg-2_patch_source
188# @DESCRIPTION: 306# @DESCRIPTION:
189# Apply all patches 307# Apply all patches
190xorg-2_patch_source() { 308xorg-2_patch_source() {
309 debug-print-function ${FUNCNAME} "$@"
310
191 # Use standardized names and locations with bulk patching 311 # Use standardized names and locations with bulk patching
192 # Patch directory is ${WORKDIR}/patch 312 # Patch directory is ${WORKDIR}/patch
193 # See epatch() in eutils.eclass for more documentation 313 # See epatch() in eutils.eclass for more documentation
194 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 314 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
195 315
196 [[ -d "${EPATCH_SOURCE}" ]] && epatch 316 [[ -d "${EPATCH_SOURCE}" ]] && epatch
197 base_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" ]] \
329 && AUTOTOOLS_AUTORECONF=1
208 ;; 330 ;;
209 *) 331 *)
210 # elibtoolize required for BSD 332 # elibtoolize required for BSD
211 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize 333 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
334 && AUTOTOOLS_AUTORECONF=1
212 ;; 335 ;;
213 esac 336 esac
214} 337}
215 338
216# @FUNCTION: xorg-2_src_prepare 339# @FUNCTION: xorg-2_src_prepare
217# @DESCRIPTION: 340# @DESCRIPTION:
218# Prepare a package after unpacking, performing all X-related tasks. 341# Prepare a package after unpacking, performing all X-related tasks.
219xorg-2_src_prepare() { 342xorg-2_src_prepare() {
220 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 343 debug-print-function ${FUNCNAME} "$@"
344
221 xorg-2_patch_source 345 xorg-2_patch_source
222 xorg-2_reconf_source 346 xorg-2_reconf_source
347 autotools-utils_src_prepare "$@"
223} 348}
224 349
225# @FUNCTION: xorg-2_font_configure 350# @FUNCTION: xorg-2_font_configure
226# @DESCRIPTION: 351# @DESCRIPTION:
227# If a font package, perform any necessary configuration steps 352# If a font package, perform any necessary configuration steps
228xorg-2_font_configure() { 353xorg-2_font_configure() {
354 debug-print-function ${FUNCNAME} "$@"
355
229 if has nls ${IUSE//+} && ! use nls; then 356 if has nls ${IUSE//+} && ! use nls; then
357 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
230 FONT_OPTIONS+=" 358 FONT_OPTIONS+="
359 --disable-all-encodings"
360 else
361 FONT_OPTIONS+="
231 --disable-iso8859-2 362 --disable-iso8859-2
232 --disable-iso8859-3 363 --disable-iso8859-3
233 --disable-iso8859-4 364 --disable-iso8859-4
234 --disable-iso8859-5 365 --disable-iso8859-5
235 --disable-iso8859-6 366 --disable-iso8859-6
236 --disable-iso8859-7 367 --disable-iso8859-7
237 --disable-iso8859-8 368 --disable-iso8859-8
238 --disable-iso8859-9 369 --disable-iso8859-9
239 --disable-iso8859-10 370 --disable-iso8859-10
240 --disable-iso8859-11 371 --disable-iso8859-11
241 --disable-iso8859-12 372 --disable-iso8859-12
242 --disable-iso8859-13 373 --disable-iso8859-13
243 --disable-iso8859-14 374 --disable-iso8859-14
244 --disable-iso8859-15 375 --disable-iso8859-15
245 --disable-iso8859-16 376 --disable-iso8859-16
246 --disable-jisx0201 377 --disable-jisx0201
247 --disable-koi8-r" 378 --disable-koi8-r"
379 fi
248 fi 380 fi
249} 381}
250 382
251# @FUNCTION: xorg-2_flags_setup 383# @FUNCTION: xorg-2_flags_setup
252# @DESCRIPTION: 384# @DESCRIPTION:
253# Set up CFLAGS for a debug build 385# Set up CFLAGS for a debug build
254xorg-2_flags_setup() { 386xorg-2_flags_setup() {
387 debug-print-function ${FUNCNAME} "$@"
388
255 # Win32 require special define 389 # Win32 require special define
256 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 390 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
257 # hardened ldflags 391 # hardened ldflags
258 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 392 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
393
394 # Quite few libraries fail on runtime without these:
395 if has static-libs ${IUSE//+}; then
396 filter-flags -Wl,-Bdirect
397 filter-ldflags -Bdirect
398 filter-ldflags -Wl,-Bdirect
399 fi
259} 400}
260 401
261# @FUNCTION: xorg-2_src_configure 402# @FUNCTION: xorg-2_src_configure
262# @DESCRIPTION: 403# @DESCRIPTION:
263# Perform any necessary pre-configuration steps, then run configure 404# Perform any necessary pre-configuration steps, then run configure
264xorg-2_src_configure() { 405xorg-2_src_configure() {
265 local myopts="" 406 debug-print-function ${FUNCNAME} "$@"
266 407
267 xorg-2_flags_setup 408 xorg-2_flags_setup
409
410 # @VARIABLE: XORG_CONFIGURE_OPTIONS
411 # @DESCRIPTION:
412 # Array of an additional options to pass to configure.
413 # @DEFAULT_UNSET
414 if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
415 # fallback to CONFIGURE_OPTIONS, deprecated.
416 if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
417 eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
418 eqawarn "to preserve namespace."
419 fi
420
421 local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS})
422 else
423 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
424 fi
425
268 [[ -n "${FONT}" ]] && xorg-2_font_configure 426 [[ -n "${FONT}" ]] && xorg-2_font_configure
269 427 local myeconfargs=(
270 # @VARIABLE: CONFIGURE_OPTIONS 428 --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} \ 429 ${FONT_OPTIONS}
281 ${CONFIGURE_OPTIONS} \ 430 "${xorgconfadd[@]}"
282 ${myopts} 431 )
283 fi 432
433 autotools-utils_src_configure "$@"
284} 434}
285 435
286# @FUNCTION: xorg-2_src_compile 436# @FUNCTION: xorg-2_src_compile
287# @DESCRIPTION: 437# @DESCRIPTION:
288# Compile a package, performing all X-related tasks. 438# Compile a package, performing all X-related tasks.
289xorg-2_src_compile() { 439xorg-2_src_compile() {
290 base_src_compile 440 debug-print-function ${FUNCNAME} "$@"
441
442 autotools-utils_src_compile "$@"
291} 443}
292 444
293# @FUNCTION: xorg-2_src_install 445# @FUNCTION: xorg-2_src_install
294# @DESCRIPTION: 446# @DESCRIPTION:
295# Install a built package to ${D}, performing any necessary steps. 447# Install a built package to ${D}, performing any necessary steps.
296# Creates a ChangeLog from git if using live ebuilds. 448# Creates a ChangeLog from git if using live ebuilds.
297xorg-2_src_install() { 449xorg-2_src_install() {
450 debug-print-function ${FUNCNAME} "$@"
451
298 if [[ ${CATEGORY} == x11-proto ]]; then 452 if [[ ${CATEGORY} == x11-proto ]]; then
299 emake \ 453 autotools-utils_src_install \
300 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 454 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
301 docdir=${EPREFIX}/usr/share/doc/${PF} \ 455 docdir="${EPREFIX}/usr/share/doc/${PF}"
302 DESTDIR="${D}" \
303 install || die "emake install failed"
304 else 456 else
305 emake \ 457 autotools-utils_src_install \
306 docdir=${EPREFIX}/usr/share/doc/${PF} \ 458 docdir="${EPREFIX}/usr/share/doc/${PF}"
307 DESTDIR="${D}" \
308 install || die "emake install failed"
309 fi 459 fi
310 460
311 if [[ -n ${GIT_ECLASS} ]]; then 461 if [[ -n ${GIT_ECLASS} ]]; then
312 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 462 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
313 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 463 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
314 popd > /dev/null 464 popd > /dev/null
315 fi 465 fi
316 466
317 if [[ -e "${S}"/ChangeLog ]]; then 467 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" 468 dodoc "${S}"/ChangeLog || die "dodoc failed"
326 fi 469 fi
327 470
328 # Don't install libtool archives for server modules 471 # Don't install libtool archives (even for modules)
329 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 472 prune_libtool_files --all
330 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
331 -exec rm -f {} ';'
332 fi
333 473
334 [[ -n ${FONT} ]] && remove_font_metadata 474 [[ -n ${FONT} ]] && remove_font_metadata
335} 475}
336 476
337# @FUNCTION: xorg-2_pkg_postinst 477# @FUNCTION: xorg-2_pkg_postinst
338# @DESCRIPTION: 478# @DESCRIPTION:
339# Run X-specific post-installation tasks on the live filesystem. The 479# Run X-specific post-installation tasks on the live filesystem. The
340# only task right now is some setup for font packages. 480# only task right now is some setup for font packages.
341xorg-2_pkg_postinst() { 481xorg-2_pkg_postinst() {
342 [[ -n ${FONT} ]] && setup_fonts 482 debug-print-function ${FUNCNAME} "$@"
483
484 if [[ -n ${FONT} ]]; then
485 create_fonts_scale
486 create_fonts_dir
487 font_pkg_postinst "$@"
488 fi
343} 489}
344 490
345# @FUNCTION: xorg-2_pkg_postrm 491# @FUNCTION: xorg-2_pkg_postrm
346# @DESCRIPTION: 492# @DESCRIPTION:
347# Run X-specific post-removal tasks on the live filesystem. The only 493# Run X-specific post-removal tasks on the live filesystem. The only
348# task right now is some cleanup for font packages. 494# task right now is some cleanup for font packages.
349xorg-2_pkg_postrm() { 495xorg-2_pkg_postrm() {
496 debug-print-function ${FUNCNAME} "$@"
497
350 if [[ -n ${FONT} ]]; then 498 if [[ -n ${FONT} ]]; then
351 font_pkg_postrm 499 # if we're doing an upgrade, postinst will do
352 fi 500 if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then
353}
354
355# @FUNCTION: setup_fonts
356# @DESCRIPTION:
357# Generates needed files for fonts and fixes font permissions
358setup_fonts() {
359 create_fonts_scale 501 create_fonts_scale
360 create_fonts_dir 502 create_fonts_dir
361 font_pkg_postinst 503 font_pkg_postrm "$@"
504 fi
505 fi
362} 506}
363 507
364# @FUNCTION: remove_font_metadata 508# @FUNCTION: remove_font_metadata
365# @DESCRIPTION: 509# @DESCRIPTION:
366# Don't let the package install generated font files that may overlap 510# Don't let the package install generated font files that may overlap
367# with other packages. Instead, they're generated in pkg_postinst(). 511# with other packages. Instead, they're generated in pkg_postinst().
368remove_font_metadata() { 512remove_font_metadata() {
513 debug-print-function ${FUNCNAME} "$@"
514
369 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 515 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
370 einfo "Removing font metadata" 516 einfo "Removing font metadata"
371 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 517 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
372 fi 518 fi
373} 519}
374 520
375# @FUNCTION: create_fonts_scale 521# @FUNCTION: create_fonts_scale
376# @DESCRIPTION: 522# @DESCRIPTION:
377# Create fonts.scale file, used by the old server-side fonts subsystem. 523# Create fonts.scale file, used by the old server-side fonts subsystem.
378create_fonts_scale() { 524create_fonts_scale() {
525 debug-print-function ${FUNCNAME} "$@"
526
379 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 527 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
380 ebegin "Generating font.scale" 528 ebegin "Generating fonts.scale"
381 mkfontscale \ 529 mkfontscale \
382 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 530 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
383 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 531 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
384 eend $? 532 eend $?
385 fi 533 fi
… …
387 535
388# @FUNCTION: create_fonts_dir 536# @FUNCTION: create_fonts_dir
389# @DESCRIPTION: 537# @DESCRIPTION:
390# Create fonts.dir file, used by the old server-side fonts subsystem. 538# Create fonts.dir file, used by the old server-side fonts subsystem.
391create_fonts_dir() { 539create_fonts_dir() {
540 debug-print-function ${FUNCNAME} "$@"
541
392 ebegin "Generating fonts.dir" 542 ebegin "Generating fonts.dir"
393 mkfontdir \ 543 mkfontdir \
394 -e "${EROOT}"/usr/share/fonts/encodings \ 544 -e "${EROOT}"/usr/share/fonts/encodings \
395 -e "${EROOT}"/usr/share/fonts/encodings/large \ 545 -e "${EROOT}"/usr/share/fonts/encodings/large \
396 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 546 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.57
  ViewVC Help
Powered by ViewVC 1.1.13