/[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.20 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.20 2010/11/09 18:25:00 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 *) 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
83# @ECLASS-VARIABLE: PACKAGE_NAME 86# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
84# @DESCRIPTION: 87# @DESCRIPTION:
85# For git checkout git repository migth differ from package name 88# For git checkout the git repository might differ from package name.
86# so it can be overriden via this variable. 89# This variable can be used for proper directory specification
87: ${PACKAGE_NAME:=${PN}} 90: ${XORG_PACKAGE_NAME:=${PN}}
88 91
89if [[ -n ${GIT_ECLASS} ]]; then 92if [[ -n ${GIT_ECLASS} ]]; then
90 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}" 93 : ${EGIT_REPO_URI:="git://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
91else 94elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
92 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 95 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
93fi 96fi
94 97
95: ${SLOT:=0} 98: ${SLOT:=0}
96 99
97# 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
104XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" 107XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
105EAUTORECONF_DEPEND+=" 108EAUTORECONF_DEPEND+="
106 >=sys-devel/libtool-2.2.6a 109 >=sys-devel/libtool-2.2.6a
107 sys-devel/m4" 110 sys-devel/m4"
108if [[ ${PN} != util-macros ]] ; then 111if [[ ${PN} != util-macros ]] ; then
109 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0" 112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.13.0"
110 # Required even by xorg-server 113 # Required even by xorg-server
111 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 114 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
112fi 115fi
113WANT_AUTOCONF="latest" 116WANT_AUTOCONF="latest"
114WANT_AUTOMAKE="latest" 117WANT_AUTOMAKE="latest"
115for arch in ${XORG_EAUTORECONF_ARCHES}; do 118for arch in ${XORG_EAUTORECONF_ARCHES}; do
116 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" 119 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
123if [[ ${FONT} == yes ]]; then 126if [[ ${FONT} == yes ]]; then
124 RDEPEND+=" media-fonts/encodings 127 RDEPEND+=" media-fonts/encodings
125 x11-apps/mkfontscale 128 x11-apps/mkfontscale
126 x11-apps/mkfontdir" 129 x11-apps/mkfontdir"
127 PDEPEND+=" media-fonts/font-alias" 130 PDEPEND+=" media-fonts/font-alias"
128 DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 131 DEPEND+=" >=media-fonts/font-util-1.2.0"
129 132
130 # @ECLASS-VARIABLE: FONT_DIR 133 # @ECLASS-VARIABLE: FONT_DIR
131 # @DESCRIPTION: 134 # @DESCRIPTION:
132 # 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
133 # the subdirectory of /usr/share/fonts/ it should install into, set 136 # the subdirectory of /usr/share/fonts/ it should install into, set
172 IUSE+=" static-libs" 175 IUSE+=" static-libs"
173fi 176fi
174 177
175DEPEND+=" >=dev-util/pkgconfig-0.23" 178DEPEND+=" >=dev-util/pkgconfig-0.23"
176 179
177# Check deps on xorg-server 180# @ECLASS-VARIABLE: XORG_DRI
178has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 181# @DESCRIPTION:
179[[ -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}"
180 272
181# @FUNCTION: xorg-2_pkg_setup 273# @FUNCTION: xorg-2_pkg_setup
182# @DESCRIPTION: 274# @DESCRIPTION:
183# Setup prefix compat 275# Setup prefix compat
184xorg-2_pkg_setup() { 276xorg-2_pkg_setup() {
277 debug-print-function ${FUNCNAME} "$@"
278
185 [[ ${FONT} == yes ]] && font_pkg_setup 279 [[ ${FONT} == yes ]] && font_pkg_setup "$@"
186} 280}
187 281
188# @FUNCTION: xorg-2_src_unpack 282# @FUNCTION: xorg-2_src_unpack
189# @DESCRIPTION: 283# @DESCRIPTION:
190# Simply unpack source code. 284# Simply unpack source code.
191xorg-2_src_unpack() { 285xorg-2_src_unpack() {
286 debug-print-function ${FUNCNAME} "$@"
287
192 if [[ -n ${GIT_ECLASS} ]]; then 288 if [[ -n ${GIT_ECLASS} ]]; then
193 git_src_unpack 289 git-2_src_unpack
194 else 290 else
195 unpack ${A} 291 unpack ${A}
196 fi 292 fi
197 293
198 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 294 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
200 296
201# @FUNCTION: xorg-2_patch_source 297# @FUNCTION: xorg-2_patch_source
202# @DESCRIPTION: 298# @DESCRIPTION:
203# Apply all patches 299# Apply all patches
204xorg-2_patch_source() { 300xorg-2_patch_source() {
301 debug-print-function ${FUNCNAME} "$@"
302
205 # Use standardized names and locations with bulk patching 303 # Use standardized names and locations with bulk patching
206 # Patch directory is ${WORKDIR}/patch 304 # Patch directory is ${WORKDIR}/patch
207 # See epatch() in eutils.eclass for more documentation 305 # See epatch() in eutils.eclass for more documentation
208 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 306 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
209 307
210 [[ -d "${EPATCH_SOURCE}" ]] && epatch 308 [[ -d "${EPATCH_SOURCE}" ]] && epatch
211 base_src_prepare 309 autotools-utils_src_prepare "$@"
212} 310}
213 311
214# @FUNCTION: xorg-2_reconf_source 312# @FUNCTION: xorg-2_reconf_source
215# @DESCRIPTION: 313# @DESCRIPTION:
216# Run eautoreconf if necessary, and run elibtoolize. 314# Run eautoreconf if necessary, and run elibtoolize.
217xorg-2_reconf_source() { 315xorg-2_reconf_source() {
316 debug-print-function ${FUNCNAME} "$@"
317
218 case ${CHOST} in 318 case ${CHOST} in
219 *-interix* | *-aix* | *-winnt*) 319 *-interix* | *-aix* | *-winnt*)
220 # some hosts need full eautoreconf 320 # some hosts need full eautoreconf
221 [[ -e "./configure.ac" || -e "./configure.in" ]] && 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."
222 ;; 322 ;;
229 329
230# @FUNCTION: xorg-2_src_prepare 330# @FUNCTION: xorg-2_src_prepare
231# @DESCRIPTION: 331# @DESCRIPTION:
232# Prepare a package after unpacking, performing all X-related tasks. 332# Prepare a package after unpacking, performing all X-related tasks.
233xorg-2_src_prepare() { 333xorg-2_src_prepare() {
234 [[ -n ${GIT_ECLASS} ]] && git_src_prepare 334 debug-print-function ${FUNCNAME} "$@"
335
235 xorg-2_patch_source 336 xorg-2_patch_source
236 xorg-2_reconf_source 337 xorg-2_reconf_source
237} 338}
238 339
239# @FUNCTION: xorg-2_font_configure 340# @FUNCTION: xorg-2_font_configure
240# @DESCRIPTION: 341# @DESCRIPTION:
241# If a font package, perform any necessary configuration steps 342# If a font package, perform any necessary configuration steps
242xorg-2_font_configure() { 343xorg-2_font_configure() {
344 debug-print-function ${FUNCNAME} "$@"
345
243 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
244 FONT_OPTIONS+=" 348 FONT_OPTIONS+="
349 --disable-all-encodings"
350 else
351 FONT_OPTIONS+="
245 --disable-iso8859-2 352 --disable-iso8859-2
246 --disable-iso8859-3 353 --disable-iso8859-3
247 --disable-iso8859-4 354 --disable-iso8859-4
248 --disable-iso8859-5 355 --disable-iso8859-5
249 --disable-iso8859-6 356 --disable-iso8859-6
250 --disable-iso8859-7 357 --disable-iso8859-7
251 --disable-iso8859-8 358 --disable-iso8859-8
252 --disable-iso8859-9 359 --disable-iso8859-9
253 --disable-iso8859-10 360 --disable-iso8859-10
254 --disable-iso8859-11 361 --disable-iso8859-11
255 --disable-iso8859-12 362 --disable-iso8859-12
256 --disable-iso8859-13 363 --disable-iso8859-13
257 --disable-iso8859-14 364 --disable-iso8859-14
258 --disable-iso8859-15 365 --disable-iso8859-15
259 --disable-iso8859-16 366 --disable-iso8859-16
260 --disable-jisx0201 367 --disable-jisx0201
261 --disable-koi8-r" 368 --disable-koi8-r"
369 fi
262 fi 370 fi
263} 371}
264 372
265# @FUNCTION: xorg-2_flags_setup 373# @FUNCTION: xorg-2_flags_setup
266# @DESCRIPTION: 374# @DESCRIPTION:
267# Set up CFLAGS for a debug build 375# Set up CFLAGS for a debug build
268xorg-2_flags_setup() { 376xorg-2_flags_setup() {
377 debug-print-function ${FUNCNAME} "$@"
378
269 # Win32 require special define 379 # Win32 require special define
270 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ 380 [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
271 # hardened ldflags 381 # hardened ldflags
272 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy 382 [[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
273 383
281 391
282# @FUNCTION: xorg-2_src_configure 392# @FUNCTION: xorg-2_src_configure
283# @DESCRIPTION: 393# @DESCRIPTION:
284# Perform any necessary pre-configuration steps, then run configure 394# Perform any necessary pre-configuration steps, then run configure
285xorg-2_src_configure() { 395xorg-2_src_configure() {
286 local myopts="" 396 debug-print-function ${FUNCNAME} "$@"
287 397
288 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
289 [[ -n "${FONT}" ]] && xorg-2_font_configure 413 [[ -n "${FONT}" ]] && xorg-2_font_configure
290 414 local myeconfargs=(
291 # @VARIABLE: CONFIGURE_OPTIONS 415 --disable-dependency-tracking
292 # @DESCRIPTION:
293 # Any options to pass to configure
294 # @DEFAULT_UNSET
295 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
296 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
297 if has static-libs ${IUSE//+}; then
298 myopts+=" $(use_enable static-libs static)"
299 fi
300 econf \
301 ${FONT_OPTIONS} \ 416 ${FONT_OPTIONS}
302 ${CONFIGURE_OPTIONS} \ 417 "${xorgconfadd[@]}"
303 ${myopts} 418 )
304 fi 419
420 autotools-utils_src_configure "$@"
305} 421}
306 422
307# @FUNCTION: xorg-2_src_compile 423# @FUNCTION: xorg-2_src_compile
308# @DESCRIPTION: 424# @DESCRIPTION:
309# Compile a package, performing all X-related tasks. 425# Compile a package, performing all X-related tasks.
310xorg-2_src_compile() { 426xorg-2_src_compile() {
311 base_src_compile 427 debug-print-function ${FUNCNAME} "$@"
428
429 autotools-utils_src_compile "$@"
312} 430}
313 431
314# @FUNCTION: xorg-2_src_install 432# @FUNCTION: xorg-2_src_install
315# @DESCRIPTION: 433# @DESCRIPTION:
316# Install a built package to ${D}, performing any necessary steps. 434# Install a built package to ${D}, performing any necessary steps.
317# Creates a ChangeLog from git if using live ebuilds. 435# Creates a ChangeLog from git if using live ebuilds.
318xorg-2_src_install() { 436xorg-2_src_install() {
437 debug-print-function ${FUNCNAME} "$@"
438
319 if [[ ${CATEGORY} == x11-proto ]]; then 439 if [[ ${CATEGORY} == x11-proto ]]; then
320 emake \ 440 autotools-utils_src_install \
321 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 441 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
322 docdir=${EPREFIX}/usr/share/doc/${PF} \ 442 docdir="${EPREFIX}/usr/share/doc/${PF}"
323 DESTDIR="${D}" \
324 install || die "emake install failed"
325 else 443 else
326 emake \ 444 autotools-utils_src_install \
327 docdir=${EPREFIX}/usr/share/doc/${PF} \ 445 docdir="${EPREFIX}/usr/share/doc/${PF}"
328 DESTDIR="${D}" \
329 install || die "emake install failed"
330 fi 446 fi
331 447
332 if [[ -n ${GIT_ECLASS} ]]; then 448 if [[ -n ${GIT_ECLASS} ]]; then
333 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 449 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
334 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 450 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
335 popd > /dev/null 451 popd > /dev/null
336 fi 452 fi
337 453
338 if [[ -e "${S}"/ChangeLog ]]; then 454 if [[ -e "${S}"/ChangeLog ]]; then
339 dodoc "${S}"/ChangeLog
340 fi
341 # @VARIABLE: DOCS
342 # @DESCRIPTION:
343 # Any documentation to install
344 # @DEFAULT_UNSET
345 if [[ -n ${DOCS} ]]; then
346 dodoc ${DOCS} || die "dodoc failed" 455 dodoc "${S}"/ChangeLog || die "dodoc failed"
347 fi 456 fi
348 457
349 # Don't install libtool archives for server modules 458 # Don't install libtool archives (even with static-libs)
350 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 459 remove_libtool_files all
351 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
352 -exec rm -f {} ';'
353 fi
354 460
355 [[ -n ${FONT} ]] && remove_font_metadata 461 [[ -n ${FONT} ]] && remove_font_metadata
356} 462}
357 463
358# @FUNCTION: xorg-2_pkg_postinst 464# @FUNCTION: xorg-2_pkg_postinst
359# @DESCRIPTION: 465# @DESCRIPTION:
360# Run X-specific post-installation tasks on the live filesystem. The 466# Run X-specific post-installation tasks on the live filesystem. The
361# only task right now is some setup for font packages. 467# only task right now is some setup for font packages.
362xorg-2_pkg_postinst() { 468xorg-2_pkg_postinst() {
469 debug-print-function ${FUNCNAME} "$@"
470
363 [[ -n ${FONT} ]] && setup_fonts 471 [[ -n ${FONT} ]] && setup_fonts "$@"
364} 472}
365 473
366# @FUNCTION: xorg-2_pkg_postrm 474# @FUNCTION: xorg-2_pkg_postrm
367# @DESCRIPTION: 475# @DESCRIPTION:
368# 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
369# task right now is some cleanup for font packages. 477# task right now is some cleanup for font packages.
370xorg-2_pkg_postrm() { 478xorg-2_pkg_postrm() {
371 if [[ -n ${FONT} ]]; then 479 debug-print-function ${FUNCNAME} "$@"
372 font_pkg_postrm 480
373 fi 481 [[ -n ${FONT} ]] && font_pkg_postrm "$@"
374} 482}
375 483
376# @FUNCTION: setup_fonts 484# @FUNCTION: setup_fonts
377# @DESCRIPTION: 485# @DESCRIPTION:
378# Generates needed files for fonts and fixes font permissions 486# Generates needed files for fonts and fixes font permissions
379setup_fonts() { 487setup_fonts() {
488 debug-print-function ${FUNCNAME} "$@"
489
380 create_fonts_scale 490 create_fonts_scale
381 create_fonts_dir 491 create_fonts_dir
382 font_pkg_postinst 492 font_pkg_postinst
383} 493}
384 494
385# @FUNCTION: remove_font_metadata 495# @FUNCTION: remove_font_metadata
386# @DESCRIPTION: 496# @DESCRIPTION:
387# 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
388# with other packages. Instead, they're generated in pkg_postinst(). 498# with other packages. Instead, they're generated in pkg_postinst().
389remove_font_metadata() { 499remove_font_metadata() {
500 debug-print-function ${FUNCNAME} "$@"
501
390 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 502 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
391 einfo "Removing font metadata" 503 einfo "Removing font metadata"
392 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}
393 fi 505 fi
394} 506}
395 507
396# @FUNCTION: create_fonts_scale 508# @FUNCTION: create_fonts_scale
397# @DESCRIPTION: 509# @DESCRIPTION:
398# 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.
399create_fonts_scale() { 511create_fonts_scale() {
512 debug-print-function ${FUNCNAME} "$@"
513
400 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 514 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
401 ebegin "Generating font.scale" 515 ebegin "Generating font.scale"
402 mkfontscale \ 516 mkfontscale \
403 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 517 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
404 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 518 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
408 522
409# @FUNCTION: create_fonts_dir 523# @FUNCTION: create_fonts_dir
410# @DESCRIPTION: 524# @DESCRIPTION:
411# 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.
412create_fonts_dir() { 526create_fonts_dir() {
527 debug-print-function ${FUNCNAME} "$@"
528
413 ebegin "Generating fonts.dir" 529 ebegin "Generating fonts.dir"
414 mkfontdir \ 530 mkfontdir \
415 -e "${EROOT}"/usr/share/fonts/encodings \ 531 -e "${EROOT}"/usr/share/fonts/encodings \
416 -e "${EROOT}"/usr/share/fonts/encodings/large \ 532 -e "${EROOT}"/usr/share/fonts/encodings/large \
417 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 533 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"

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

  ViewVC Help
Powered by ViewVC 1.1.20