/[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.3 Revision 1.41
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.3 2010/04/22 18:27:43 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.41 2011/04/20 12:48:38 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# @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.5.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-video-* ]]; then
219 COMMON_DEPEND+="
220 x11-libs/libpciaccess
221 "
222 # we also needs some protos and libs in all cases
223 DEPEND+="
224 x11-proto/fontsproto
225 x11-proto/randrproto
226 x11-proto/renderproto
227 x11-proto/videoproto
228 x11-proto/xextproto
229 x11-proto/xineramaproto
230 x11-proto/xproto
231 "
232fi
233
234# @ECLASS-VARIABLE: XORG_DOC
235# @DESCRIPTION:
236# Possible values are "always" or the value of the useflag doc packages
237# are required for. Default value is "no"
238#
239# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
240: ${XORG_DOC:="no"}
241
242DOC_DEPEND="
243 doc? (
244 app-text/asciidoc
245 app-text/xmlto
246 app-doc/doxygen
247 app-text/docbook-xml-dtd:4.1.2
248 app-text/docbook-xml-dtd:4.2
249 app-text/docbook-xml-dtd:4.3
250 )
251"
252case ${XORG_DOC} in
253 no)
254 ;;
255 always)
256 DEPEND+=" ${DOC_DEPEND}"
257 ;;
258 *)
259 DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
260 IUSE+=" ${XORG_DOC}"
261 ;;
262esac
263unset DOC_DEPEND
264
265DEPEND+=" ${COMMON_DEPEND}"
266RDEPEND+=" ${COMMON_DEPEND}"
267unset COMMON_DEPEND
268
269debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
270debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
271debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
166 272
167# @FUNCTION: xorg-2_pkg_setup 273# @FUNCTION: xorg-2_pkg_setup
168# @USAGE:
169# @DESCRIPTION: 274# @DESCRIPTION:
170# Setup prefix compat 275# Setup prefix compat
171xorg-2_pkg_setup() { 276xorg-2_pkg_setup() {
277 debug-print-function ${FUNCNAME} "$@"
278
172 [[ ${FONT} == yes ]] && font_pkg_setup 279 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
173} 280}
174 281
175# @FUNCTION: xorg-2_src_unpack 282# @FUNCTION: xorg-2_src_unpack
176# @USAGE:
177# @DESCRIPTION: 283# @DESCRIPTION:
178# Simply unpack source code. 284# Simply unpack source code.
179xorg-2_src_unpack() { 285xorg-2_src_unpack() {
286 debug-print-function ${FUNCNAME} "$@"
287
180 if [[ -n ${GIT_ECLASS} ]]; then 288 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 289 git-2_src_unpack
182 else 290 else
183 unpack ${A} 291 unpack ${A}
184 fi 292 fi
185 293
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 294 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
187} 295}
188 296
189# @FUNCTION: xorg-2_patch_source 297# @FUNCTION: xorg-2_patch_source
190# @USAGE:
191# @DESCRIPTION: 298# @DESCRIPTION:
192# Apply all patches 299# Apply all patches
193xorg-2_patch_source() { 300xorg-2_patch_source() {
301 debug-print-function ${FUNCNAME} "$@"
302
194 # Use standardized names and locations with bulk patching 303 # Use standardized names and locations with bulk patching
195 # Patch directory is ${WORKDIR}/patch 304 # Patch directory is ${WORKDIR}/patch
196 # See epatch() in eutils.eclass for more documentation 305 # See epatch() in eutils.eclass for more documentation
197 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 306 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
198 307
199 [[ -d "${EPATCH_SOURCE}" ]] && epatch 308 [[ -d "${EPATCH_SOURCE}" ]] && epatch
200 base_src_prepare 309 autotools-utils_src_prepare "$@"
201} 310}
202 311
203# @FUNCTION: xorg-2_reconf_source 312# @FUNCTION: xorg-2_reconf_source
204# @USAGE:
205# @DESCRIPTION: 313# @DESCRIPTION:
206# Run eautoreconf if necessary, and run elibtoolize. 314# Run eautoreconf if necessary, and run elibtoolize.
207xorg-2_reconf_source() { 315xorg-2_reconf_source() {
316 debug-print-function ${FUNCNAME} "$@"
317
208 case ${CHOST} in 318 case ${CHOST} in
209 *-interix* | *-aix* | *-winnt*) 319 *-interix* | *-aix* | *-winnt*)
210 # some hosts need full eautoreconf 320 # some hosts need full eautoreconf
211 [[ -e "./configure.ac" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 321 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail."
212 ;; 322 ;;
213 *) 323 *)
214 # elibtoolize required for BSD 324 # elibtoolize required for BSD
215 [[ ${XORG_EAUTORECONF} != no && -e "./configure.ac" ]] && eautoreconf || elibtoolize 325 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize
216 ;; 326 ;;
217 esac 327 esac
218} 328}
219 329
220# @FUNCTION: xorg-2_src_prepare 330# @FUNCTION: xorg-2_src_prepare
221# @USAGE:
222# @DESCRIPTION: 331# @DESCRIPTION:
223# Prepare a package after unpacking, performing all X-related tasks. 332# Prepare a package after unpacking, performing all X-related tasks.
224xorg-2_src_prepare() { 333xorg-2_src_prepare() {
225 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 334 debug-print-function ${FUNCNAME} "$@"
335
226 xorg-2_patch_source 336 xorg-2_patch_source
227 xorg-2_reconf_source 337 xorg-2_reconf_source
228} 338}
229 339
230# @FUNCTION: xorg-2_font_configure 340# @FUNCTION: xorg-2_font_configure
231# @USAGE:
232# @DESCRIPTION: 341# @DESCRIPTION:
233# If a font package, perform any necessary configuration steps 342# If a font package, perform any necessary configuration steps
234xorg-2_font_configure() { 343xorg-2_font_configure() {
344 debug-print-function ${FUNCNAME} "$@"
345
235 if has nls ${IUSE//+} && ! use nls; then 346 if has nls ${IUSE//+} && ! use nls; then
347 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
236 FONT_OPTIONS+=" 348 FONT_OPTIONS+="
349 --disable-all-encodings"
350 else
351 FONT_OPTIONS+="
237 --disable-iso8859-2 352 --disable-iso8859-2
238 --disable-iso8859-3 353 --disable-iso8859-3
239 --disable-iso8859-4 354 --disable-iso8859-4
240 --disable-iso8859-5 355 --disable-iso8859-5
241 --disable-iso8859-6 356 --disable-iso8859-6
242 --disable-iso8859-7 357 --disable-iso8859-7
243 --disable-iso8859-8 358 --disable-iso8859-8
244 --disable-iso8859-9 359 --disable-iso8859-9
245 --disable-iso8859-10 360 --disable-iso8859-10
246 --disable-iso8859-11 361 --disable-iso8859-11
247 --disable-iso8859-12 362 --disable-iso8859-12
248 --disable-iso8859-13 363 --disable-iso8859-13
249 --disable-iso8859-14 364 --disable-iso8859-14
250 --disable-iso8859-15 365 --disable-iso8859-15
251 --disable-iso8859-16 366 --disable-iso8859-16
252 --disable-jisx0201 367 --disable-jisx0201
253 --disable-koi8-r" 368 --disable-koi8-r"
254 fi 369 fi
370 fi
255} 371}
256 372
257# @FUNCTION: x-modular_flags_setup 373# @FUNCTION: xorg-2_flags_setup
258# @USAGE:
259# @DESCRIPTION: 374# @DESCRIPTION:
260# Set up CFLAGS for a debug build 375# Set up CFLAGS for a debug build
261xorg-2_flags_setup() { 376xorg-2_flags_setup() {
377 debug-print-function ${FUNCNAME} "$@"
378
262 # Win32 require special define 379 # Win32 require special define
263 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 380 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
264 # hardened ldflags 381 # hardened ldflags
265 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 382 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
383
384 # Quite few libraries fail on runtime without these:
385 if has static-libs ${IUSE//+}; then
386 filter-flags -Wl,-Bdirect
387 filter-ldflags -Bdirect
388 filter-ldflags -Wl,-Bdirect
389 fi
266} 390}
267 391
268# @FUNCTION: xorg-2_src_configure 392# @FUNCTION: xorg-2_src_configure
269# @USAGE:
270# @DESCRIPTION: 393# @DESCRIPTION:
271# Perform any necessary pre-configuration steps, then run configure 394# Perform any necessary pre-configuration steps, then run configure
272xorg-2_src_configure() { 395xorg-2_src_configure() {
273 local myopts="" 396 debug-print-function ${FUNCNAME} "$@"
274 397
275 xorg-2_flags_setup 398 xorg-2_flags_setup
399
400 # @VARIABLE: XORG_CONFIGURE_OPTIONS
401 # @DESCRIPTION:
402 # Array of an additional options to pass to configure.
403 # @DEFAULT_UNSET
404 if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
405 # fallback to CONFIGURE_OPTIONS, deprecated.
406 [[ -n "${CONFIGURE_OPTIONS}" ]] && \
407 ewarn "QA: CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS to preserve namespace."
408 local xorgconfadd=(${CONFIGURE_OPTIONS})
409 else
410 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
411 fi
412
276 [[ -n "${FONT}" ]] && xorg-2_font_configure 413 [[ -n "${FONT}" ]] && xorg-2_font_configure
277 414 local myeconfargs=(
278# @VARIABLE: CONFIGURE_OPTIONS 415 --disable-dependency-tracking
279# @DESCRIPTION:
280# Any options to pass to configure
281 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
282 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
283 if has static-libs ${IUSE//+}; then
284 myopts+=" $(use_enable static-libs static)"
285 fi
286 econf \
287 ${FONT_OPTIONS} \ 416 ${FONT_OPTIONS}
288 ${CONFIGURE_OPTIONS} \ 417 "${xorgconfadd[@]}"
289 ${myopts} 418 )
290 fi 419
420 autotools-utils_src_configure "$@"
291} 421}
292 422
293# @FUNCTION: xorg-2_src_compile 423# @FUNCTION: xorg-2_src_compile
294# @USAGE:
295# @DESCRIPTION: 424# @DESCRIPTION:
296# Compile a package, performing all X-related tasks. 425# Compile a package, performing all X-related tasks.
297xorg-2_src_compile() { 426xorg-2_src_compile() {
298 base_src_compile 427 debug-print-function ${FUNCNAME} "$@"
428
429 autotools-utils_src_compile "$@"
299} 430}
300 431
301# @FUNCTION: xorg-2_src_install 432# @FUNCTION: xorg-2_src_install
302# @USAGE:
303# @DESCRIPTION: 433# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 434# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 435# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 436xorg-2_src_install() {
437 debug-print-function ${FUNCNAME} "$@"
438
307 if [[ ${CATEGORY} == x11-proto ]]; then 439 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 440 autotools-utils_src_install \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 441 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
310 DESTDIR="${D}" \ 442 docdir="${EPREFIX}/usr/share/doc/${PF}"
311 install || die "emake install failed"
312 else 443 else
313 emake \ 444 autotools-utils_src_install \
314 docdir=${EPREFIX}/usr/share/doc/${PF} \ 445 docdir="${EPREFIX}/usr/share/doc/${PF}"
315 DESTDIR="${D}" \
316 install || die "emake install failed"
317 fi 446 fi
318 447
319 if [[ -n ${GIT_ECLASS} ]]; then 448 if [[ -n ${GIT_ECLASS} ]]; then
320 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 449 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
321 git log ${GIT_TREE} > "${S}"/ChangeLog 450 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
322 popd > /dev/null 451 popd > /dev/null
323 fi 452 fi
324 453
325 if [[ -e "${S}"/ChangeLog ]]; then 454 if [[ -e "${S}"/ChangeLog ]]; then
326 dodoc "${S}"/ChangeLog
327 fi
328# @VARIABLE: DOCS
329# @DESCRIPTION:
330# Any documentation to install
331 if [[ -n ${DOCS} ]]; then
332 dodoc ${DOCS} || die "dodoc failed" 455 dodoc "${S}"/ChangeLog || die "dodoc failed"
333 fi 456 fi
334 457
335 # Don't install libtool archives for server modules 458 # Don't install libtool archives (even with static-libs)
336 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 459 remove_libtool_files all
337 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
338 -exec rm -f {} ';'
339 fi
340 460
341 [[ -n ${FONT} ]] && remove_font_metadata 461 [[ -n ${FONT} ]] && remove_font_metadata
342} 462}
343 463
344# @FUNCTION: xorg-2_pkg_postinst 464# @FUNCTION: xorg-2_pkg_postinst
345# @USAGE:
346# @DESCRIPTION: 465# @DESCRIPTION:
347# Run X-specific post-installation tasks on the live filesystem. The 466# Run X-specific post-installation tasks on the live filesystem. The
348# only task right now is some setup for font packages. 467# only task right now is some setup for font packages.
349xorg-2_pkg_postinst() { 468xorg-2_pkg_postinst() {
469 debug-print-function ${FUNCNAME} "$@"
470
350 [[ -n ${FONT} ]] && setup_fonts 471 [[ -n ${FONT} ]] && setup_fonts "$@"
351} 472}
352 473
353# @FUNCTION: xorg-2_pkg_postrm 474# @FUNCTION: xorg-2_pkg_postrm
354# @USAGE:
355# @DESCRIPTION: 475# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 476# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 477# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 478xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 479 debug-print-function ${FUNCNAME} "$@"
360 cleanup_fonts
361 font_pkg_postrm
362 fi
363}
364 480
365# @FUNCTION: cleanup_fonts 481 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
366# @USAGE:
367# @DESCRIPTION:
368# Get rid of font directories that only contain generated files
369cleanup_fonts() {
370 local allowed_files="encodings.dir fonts.alias fonts.cache-1 fonts.dir fonts.scale"
371 local real_dir=${EROOT}usr/share/fonts/${FONT_DIR}
372 local fle allowed_file
373
374 unset KEEP_FONTDIR
375
376 einfo "Checking ${real_dir} for useless files"
377 pushd ${real_dir} &> /dev/null
378 for fle in *; do
379 unset MATCH
380 for allowed_file in ${allowed_files}; do
381 if [[ ${fle} = ${allowed_file} ]]; then
382 # If it's allowed, then move on to the next file
383 MATCH="yes"
384 break
385 fi
386 done
387 # If we found a match in allowed files, move on to the next file
388 [[ -n ${MATCH} ]] && continue
389 # If we get this far, there wasn't a match in the allowed files
390 KEEP_FONTDIR="yes"
391 # We don't need to check more files if we're already keeping it
392 break
393 done
394 popd &> /dev/null
395 # If there are no files worth keeping, then get rid of the dir
396 [[ -z "${KEEP_FONTDIR}" ]] && rm -rf ${real_dir}
397} 482}
398 483
399# @FUNCTION: setup_fonts 484# @FUNCTION: setup_fonts
400# @USAGE:
401# @DESCRIPTION: 485# @DESCRIPTION:
402# Generates needed files for fonts and fixes font permissions 486# Generates needed files for fonts and fixes font permissions
403setup_fonts() { 487setup_fonts() {
488 debug-print-function ${FUNCNAME} "$@"
489
404 create_fonts_scale 490 create_fonts_scale
405 create_fonts_dir 491 create_fonts_dir
406 font_pkg_postinst 492 font_pkg_postinst
407} 493}
408 494
409# @FUNCTION: remove_font_metadata 495# @FUNCTION: remove_font_metadata
410# @USAGE:
411# @DESCRIPTION: 496# @DESCRIPTION:
412# Don't let the package install generated font files that may overlap 497# Don't let the package install generated font files that may overlap
413# with other packages. Instead, they're generated in pkg_postinst(). 498# with other packages. Instead, they're generated in pkg_postinst().
414remove_font_metadata() { 499remove_font_metadata() {
500 debug-print-function ${FUNCNAME} "$@"
501
415 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 502 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
416 einfo "Removing font metadata" 503 einfo "Removing font metadata"
417 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 504 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
418 fi 505 fi
419} 506}
420 507
421# @FUNCTION: create_fonts_scale 508# @FUNCTION: create_fonts_scale
422# @USAGE:
423# @DESCRIPTION: 509# @DESCRIPTION:
424# Create fonts.scale file, used by the old server-side fonts subsystem. 510# Create fonts.scale file, used by the old server-side fonts subsystem.
425create_fonts_scale() { 511create_fonts_scale() {
512 debug-print-function ${FUNCNAME} "$@"
513
426 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 514 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
427 ebegin "Generating font.scale" 515 ebegin "Generating font.scale"
428 mkfontscale \ 516 mkfontscale \
429 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 517 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
430 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 518 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
431 eend $? 519 eend $?
432 fi 520 fi
433} 521}
434 522
435# @FUNCTION: create_fonts_dir 523# @FUNCTION: create_fonts_dir
436# @USAGE:
437# @DESCRIPTION: 524# @DESCRIPTION:
438# Create fonts.dir file, used by the old server-side fonts subsystem. 525# Create fonts.dir file, used by the old server-side fonts subsystem.
439create_fonts_dir() { 526create_fonts_dir() {
527 debug-print-function ${FUNCNAME} "$@"
528
440 ebegin "Generating fonts.dir" 529 ebegin "Generating fonts.dir"
441 mkfontdir \ 530 mkfontdir \
442 -e "${EROOT}"/usr/share/fonts/encodings \ 531 -e "${EROOT}"/usr/share/fonts/encodings \
443 -e "${EROOT}"/usr/share/fonts/encodings/large \ 532 -e "${EROOT}"/usr/share/fonts/encodings/large \
444 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 533 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.41

  ViewVC Help
Powered by ViewVC 1.1.20