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

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.34

  ViewVC Help
Powered by ViewVC 1.1.20