/[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.49
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2011 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.49 2011/10/09 07:45:53 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 \ 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 *) die "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} http://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.11.0" 112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.14.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"
116 DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 131 DEPEND+=" >=media-fonts/font-util-1.2.0"
117 132
118 # @ECLASS-VARIABLE: FONT_DIR 133 # @ECLASS-VARIABLE: FONT_DIR
119 # @DESCRIPTION: 134 # @DESCRIPTION:
120 # 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
121 # the subdirectory of /usr/share/fonts/ it should install into, set 136 # the subdirectory of /usr/share/fonts/ it should install into, set
160 IUSE+=" static-libs" 175 IUSE+=" static-libs"
161fi 176fi
162 177
163DEPEND+=" >=dev-util/pkgconfig-0.23" 178DEPEND+=" >=dev-util/pkgconfig-0.23"
164 179
165# Check deps on xorg-server 180# @ECLASS-VARIABLE: XORG_DRI
166has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 181# @DESCRIPTION:
167[[ -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}"
168 279
169# @FUNCTION: xorg-2_pkg_setup 280# @FUNCTION: xorg-2_pkg_setup
170# @DESCRIPTION: 281# @DESCRIPTION:
171# Setup prefix compat 282# Setup prefix compat
172xorg-2_pkg_setup() { 283xorg-2_pkg_setup() {
284 debug-print-function ${FUNCNAME} "$@"
285
173 [[ ${FONT} == yes ]] && font_pkg_setup 286 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
174} 287}
175 288
176# @FUNCTION: xorg-2_src_unpack 289# @FUNCTION: xorg-2_src_unpack
177# @DESCRIPTION: 290# @DESCRIPTION:
178# Simply unpack source code. 291# Simply unpack source code.
179xorg-2_src_unpack() { 292xorg-2_src_unpack() {
293 debug-print-function ${FUNCNAME} "$@"
294
180 if [[ -n ${GIT_ECLASS} ]]; then 295 if [[ -n ${GIT_ECLASS} ]]; then
181 git_src_unpack 296 git-2_src_unpack
182 else 297 else
183 unpack ${A} 298 unpack ${A}
184 fi 299 fi
185 300
186 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 301 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
188 303
189# @FUNCTION: xorg-2_patch_source 304# @FUNCTION: xorg-2_patch_source
190# @DESCRIPTION: 305# @DESCRIPTION:
191# Apply all patches 306# Apply all patches
192xorg-2_patch_source() { 307xorg-2_patch_source() {
308 debug-print-function ${FUNCNAME} "$@"
309
193 # Use standardized names and locations with bulk patching 310 # Use standardized names and locations with bulk patching
194 # Patch directory is ${WORKDIR}/patch 311 # Patch directory is ${WORKDIR}/patch
195 # See epatch() in eutils.eclass for more documentation 312 # See epatch() in eutils.eclass for more documentation
196 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 313 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
197 314
198 [[ -d "${EPATCH_SOURCE}" ]] && epatch 315 [[ -d "${EPATCH_SOURCE}" ]] && epatch
199 base_src_prepare 316 autotools-utils_src_prepare "$@"
200} 317}
201 318
202# @FUNCTION: xorg-2_reconf_source 319# @FUNCTION: xorg-2_reconf_source
203# @DESCRIPTION: 320# @DESCRIPTION:
204# Run eautoreconf if necessary, and run elibtoolize. 321# Run eautoreconf if necessary, and run elibtoolize.
205xorg-2_reconf_source() { 322xorg-2_reconf_source() {
323 debug-print-function ${FUNCNAME} "$@"
324
206 case ${CHOST} in 325 case ${CHOST} in
207 *-interix* | *-aix* | *-winnt*) 326 *-interix* | *-aix* | *-winnt*)
208 # some hosts need full eautoreconf 327 # some hosts need full eautoreconf
209 [[ -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."
210 ;; 329 ;;
217 336
218# @FUNCTION: xorg-2_src_prepare 337# @FUNCTION: xorg-2_src_prepare
219# @DESCRIPTION: 338# @DESCRIPTION:
220# Prepare a package after unpacking, performing all X-related tasks. 339# Prepare a package after unpacking, performing all X-related tasks.
221xorg-2_src_prepare() { 340xorg-2_src_prepare() {
222 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 341 debug-print-function ${FUNCNAME} "$@"
342
223 xorg-2_patch_source 343 xorg-2_patch_source
224 xorg-2_reconf_source 344 xorg-2_reconf_source
225} 345}
226 346
227# @FUNCTION: xorg-2_font_configure 347# @FUNCTION: xorg-2_font_configure
228# @DESCRIPTION: 348# @DESCRIPTION:
229# If a font package, perform any necessary configuration steps 349# If a font package, perform any necessary configuration steps
230xorg-2_font_configure() { 350xorg-2_font_configure() {
351 debug-print-function ${FUNCNAME} "$@"
352
231 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
232 FONT_OPTIONS+=" 355 FONT_OPTIONS+="
356 --disable-all-encodings"
357 else
358 FONT_OPTIONS+="
233 --disable-iso8859-2 359 --disable-iso8859-2
234 --disable-iso8859-3 360 --disable-iso8859-3
235 --disable-iso8859-4 361 --disable-iso8859-4
236 --disable-iso8859-5 362 --disable-iso8859-5
237 --disable-iso8859-6 363 --disable-iso8859-6
238 --disable-iso8859-7 364 --disable-iso8859-7
239 --disable-iso8859-8 365 --disable-iso8859-8
240 --disable-iso8859-9 366 --disable-iso8859-9
241 --disable-iso8859-10 367 --disable-iso8859-10
242 --disable-iso8859-11 368 --disable-iso8859-11
243 --disable-iso8859-12 369 --disable-iso8859-12
244 --disable-iso8859-13 370 --disable-iso8859-13
245 --disable-iso8859-14 371 --disable-iso8859-14
246 --disable-iso8859-15 372 --disable-iso8859-15
247 --disable-iso8859-16 373 --disable-iso8859-16
248 --disable-jisx0201 374 --disable-jisx0201
249 --disable-koi8-r" 375 --disable-koi8-r"
376 fi
250 fi 377 fi
251} 378}
252 379
253# @FUNCTION: xorg-2_flags_setup 380# @FUNCTION: xorg-2_flags_setup
254# @DESCRIPTION: 381# @DESCRIPTION:
255# Set up CFLAGS for a debug build 382# Set up CFLAGS for a debug build
256xorg-2_flags_setup() { 383xorg-2_flags_setup() {
384 debug-print-function ${FUNCNAME} "$@"
385
257 # Win32 require special define 386 # Win32 require special define
258 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 387 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
259 # hardened ldflags 388 # hardened ldflags
260 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 389 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
261 390
269 398
270# @FUNCTION: xorg-2_src_configure 399# @FUNCTION: xorg-2_src_configure
271# @DESCRIPTION: 400# @DESCRIPTION:
272# Perform any necessary pre-configuration steps, then run configure 401# Perform any necessary pre-configuration steps, then run configure
273xorg-2_src_configure() { 402xorg-2_src_configure() {
274 local myopts="" 403 debug-print-function ${FUNCNAME} "$@"
275 404
276 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 if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
414 eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
415 eqawarn "to preserve namespace."
416 fi
417
418 local xorgconfadd=(${CONFIGURE_OPTIONS})
419 else
420 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
421 fi
422
277 [[ -n "${FONT}" ]] && xorg-2_font_configure 423 [[ -n "${FONT}" ]] && xorg-2_font_configure
278 424 local myeconfargs=(
279 # @VARIABLE: CONFIGURE_OPTIONS 425 --disable-dependency-tracking
280 # @DESCRIPTION:
281 # Any options to pass to configure
282 # @DEFAULT_UNSET
283 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
284 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
285 if has static-libs ${IUSE//+}; then
286 myopts+=" $(use_enable static-libs static)"
287 fi
288 econf \
289 ${FONT_OPTIONS} \ 426 ${FONT_OPTIONS}
290 ${CONFIGURE_OPTIONS} \ 427 "${xorgconfadd[@]}"
291 ${myopts} 428 )
292 fi 429
430 autotools-utils_src_configure "$@"
293} 431}
294 432
295# @FUNCTION: xorg-2_src_compile 433# @FUNCTION: xorg-2_src_compile
296# @DESCRIPTION: 434# @DESCRIPTION:
297# Compile a package, performing all X-related tasks. 435# Compile a package, performing all X-related tasks.
298xorg-2_src_compile() { 436xorg-2_src_compile() {
299 base_src_compile 437 debug-print-function ${FUNCNAME} "$@"
438
439 autotools-utils_src_compile "$@"
300} 440}
301 441
302# @FUNCTION: xorg-2_src_install 442# @FUNCTION: xorg-2_src_install
303# @DESCRIPTION: 443# @DESCRIPTION:
304# Install a built package to ${D}, performing any necessary steps. 444# Install a built package to ${D}, performing any necessary steps.
305# Creates a ChangeLog from git if using live ebuilds. 445# Creates a ChangeLog from git if using live ebuilds.
306xorg-2_src_install() { 446xorg-2_src_install() {
447 debug-print-function ${FUNCNAME} "$@"
448
307 if [[ ${CATEGORY} == x11-proto ]]; then 449 if [[ ${CATEGORY} == x11-proto ]]; then
308 emake \ 450 autotools-utils_src_install \
309 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 451 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
310 docdir=${EPREFIX}/usr/share/doc/${PF} \ 452 docdir="${EPREFIX}/usr/share/doc/${PF}"
311 DESTDIR="${D}" \
312 install || die "emake install failed"
313 else 453 else
314 emake \ 454 autotools-utils_src_install \
315 docdir=${EPREFIX}/usr/share/doc/${PF} \ 455 docdir="${EPREFIX}/usr/share/doc/${PF}"
316 DESTDIR="${D}" \
317 install || die "emake install failed"
318 fi 456 fi
319 457
320 if [[ -n ${GIT_ECLASS} ]]; then 458 if [[ -n ${GIT_ECLASS} ]]; then
321 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 459 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
322 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 460 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
323 popd > /dev/null 461 popd > /dev/null
324 fi 462 fi
325 463
326 if [[ -e "${S}"/ChangeLog ]]; then 464 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" 465 dodoc "${S}"/ChangeLog || die "dodoc failed"
335 fi 466 fi
336 467
337 # Don't install libtool archives for server modules 468 # Don't install libtool archives (even with static-libs)
338 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 469 remove_libtool_files all
339 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
340 -exec rm -f {} ';'
341 fi
342 470
343 [[ -n ${FONT} ]] && remove_font_metadata 471 [[ -n ${FONT} ]] && remove_font_metadata
344} 472}
345 473
346# @FUNCTION: xorg-2_pkg_postinst 474# @FUNCTION: xorg-2_pkg_postinst
347# @DESCRIPTION: 475# @DESCRIPTION:
348# Run X-specific post-installation tasks on the live filesystem. The 476# Run X-specific post-installation tasks on the live filesystem. The
349# only task right now is some setup for font packages. 477# only task right now is some setup for font packages.
350xorg-2_pkg_postinst() { 478xorg-2_pkg_postinst() {
479 debug-print-function ${FUNCNAME} "$@"
480
351 [[ -n ${FONT} ]] && setup_fonts 481 [[ -n ${FONT} ]] && setup_fonts "$@"
352} 482}
353 483
354# @FUNCTION: xorg-2_pkg_postrm 484# @FUNCTION: xorg-2_pkg_postrm
355# @DESCRIPTION: 485# @DESCRIPTION:
356# Run X-specific post-removal tasks on the live filesystem. The only 486# Run X-specific post-removal tasks on the live filesystem. The only
357# task right now is some cleanup for font packages. 487# task right now is some cleanup for font packages.
358xorg-2_pkg_postrm() { 488xorg-2_pkg_postrm() {
359 if [[ -n ${FONT} ]]; then 489 debug-print-function ${FUNCNAME} "$@"
360 font_pkg_postrm 490
361 fi 491 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
362} 492}
363 493
364# @FUNCTION: setup_fonts 494# @FUNCTION: setup_fonts
365# @DESCRIPTION: 495# @DESCRIPTION:
366# Generates needed files for fonts and fixes font permissions 496# Generates needed files for fonts and fixes font permissions
367setup_fonts() { 497setup_fonts() {
498 debug-print-function ${FUNCNAME} "$@"
499
368 create_fonts_scale 500 create_fonts_scale
369 create_fonts_dir 501 create_fonts_dir
370 font_pkg_postinst 502 font_pkg_postinst
371} 503}
372 504
373# @FUNCTION: remove_font_metadata 505# @FUNCTION: remove_font_metadata
374# @DESCRIPTION: 506# @DESCRIPTION:
375# Don't let the package install generated font files that may overlap 507# Don't let the package install generated font files that may overlap
376# with other packages. Instead, they're generated in pkg_postinst(). 508# with other packages. Instead, they're generated in pkg_postinst().
377remove_font_metadata() { 509remove_font_metadata() {
510 debug-print-function ${FUNCNAME} "$@"
511
378 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 512 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
379 einfo "Removing font metadata" 513 einfo "Removing font metadata"
380 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1} 514 rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
381 fi 515 fi
382} 516}
383 517
384# @FUNCTION: create_fonts_scale 518# @FUNCTION: create_fonts_scale
385# @DESCRIPTION: 519# @DESCRIPTION:
386# Create fonts.scale file, used by the old server-side fonts subsystem. 520# Create fonts.scale file, used by the old server-side fonts subsystem.
387create_fonts_scale() { 521create_fonts_scale() {
522 debug-print-function ${FUNCNAME} "$@"
523
388 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 524 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
389 ebegin "Generating font.scale" 525 ebegin "Generating fonts.scale"
390 mkfontscale \ 526 mkfontscale \
391 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 527 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
392 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 528 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
393 eend $? 529 eend $?
394 fi 530 fi
396 532
397# @FUNCTION: create_fonts_dir 533# @FUNCTION: create_fonts_dir
398# @DESCRIPTION: 534# @DESCRIPTION:
399# Create fonts.dir file, used by the old server-side fonts subsystem. 535# Create fonts.dir file, used by the old server-side fonts subsystem.
400create_fonts_dir() { 536create_fonts_dir() {
537 debug-print-function ${FUNCNAME} "$@"
538
401 ebegin "Generating fonts.dir" 539 ebegin "Generating fonts.dir"
402 mkfontdir \ 540 mkfontdir \
403 -e "${EROOT}"/usr/share/fonts/encodings \ 541 -e "${EROOT}"/usr/share/fonts/encodings \
404 -e "${EROOT}"/usr/share/fonts/encodings/large \ 542 -e "${EROOT}"/usr/share/fonts/encodings/large \
405 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 543 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

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

  ViewVC Help
Powered by ViewVC 1.1.20