/[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.23 Revision 1.57
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.23 2011/02/15 12:13:58 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.57 2012/06/11 13:02:21 mgorny Exp $
4# 4
5# @ECLASS: xorg-2.eclass 5# @ECLASS: xorg-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# x11@gentoo.org 7# x11@gentoo.org
8# @AUTHOR:
9# Author: Tomáš Chvátal <scarabeus@gentoo.org>
10# Author: Donnie Berkholz <dberkholz@gentoo.org>
8# @BLURB: Reduces code duplication in the modularized X11 ebuilds. 11# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
9# @DESCRIPTION: 12# @DESCRIPTION:
10# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, 13# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
11# and more. Many things that would normally be done in various functions 14# and more. Many things that would normally be done in various functions
12# can be accessed by setting variables instead, such as patching, 15# can be accessed by setting variables instead, such as patching,
15# All you need to do in a basic ebuild is inherit this eclass and set 18# All you need to do in a basic ebuild is inherit this eclass and set
16# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted 19# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
17# with the other X packages, you don't need to set SRC_URI. Pretty much 20# with the other X packages, you don't need to set SRC_URI. Pretty much
18# everything else should be automatic. 21# everything else should be automatic.
19 22
20# Author: Tomáš Chvátal <scarabeus@gentoo.org>
21# Author: Donnie Berkholz <dberkholz@gentoo.org>
22
23GIT_ECLASS="" 23GIT_ECLASS=""
24if [[ ${PV} == *9999* ]]; then 24if [[ ${PV} == *9999* ]]; then
25 GIT_ECLASS="git" 25 GIT_ECLASS="git-2"
26 XORG_EAUTORECONF="yes" 26 XORG_EAUTORECONF="yes"
27 SRC_URI=""
28fi 27fi
29 28
30# If we're a font package, but not the font.alias one 29# If we're a font package, but not the font.alias one
31FONT_ECLASS="" 30FONT_ECLASS=""
32if [[ ${PN} == font* \ 31if [[ ${PN} == font* \
36 # Activate font code in the rest of the eclass 35 # Activate font code in the rest of the eclass
37 FONT="yes" 36 FONT="yes"
38 FONT_ECLASS="font" 37 FONT_ECLASS="font"
39fi 38fi
40 39
41inherit eutils base libtool multilib toolchain-funcs flag-o-matic autotools \ 40# we need to inherit autotools first to get the deps
41inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
42 ${FONT_ECLASS} ${GIT_ECLASS} 42 flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
43 43
44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
45case "${EAPI:-0}" in 45case "${EAPI:-0}" in
46 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 46 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
47 *) die "EAPI-UNSUPPORTED" ;; 47 *) die "EAPI=${EAPI} is not supported" ;;
48esac 48esac
49 49
50# exports must be ALWAYS after inherit 50# exports must be ALWAYS after inherit
51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 51EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
52 52
57# @DESCRIPTION: 57# @DESCRIPTION:
58# If set to 'yes' and configure.ac exists, eautoreconf will run. Set 58# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
59# before inheriting this eclass. 59# before inheriting this eclass.
60: ${XORG_EAUTORECONF:="no"} 60: ${XORG_EAUTORECONF:="no"}
61 61
62# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI
63# @DESCRIPTION:
62# Set up SRC_URI for individual modular releases 64# Set up SRC_URI for individual modular releases. If set to an empty
65# string, no SRC_URI will be provided by the eclass.
63BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 66: ${XORG_BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"}
67
64# @ECLASS-VARIABLE: MODULE 68# @ECLASS-VARIABLE: XORG_MODULE
65# @DESCRIPTION: 69# @DESCRIPTION:
66# The subdirectory to download source from. Possible settings are app, 70# The subdirectory to download source from. Possible settings are app,
67# doc, data, util, driver, font, lib, proto, xserver. Set above the 71# doc, data, util, driver, font, lib, proto, xserver. Set above the
68# inherit to override the default autoconfigured module. 72# inherit to override the default autoconfigured module.
69if [[ -z ${MODULE} ]]; then 73if [[ -z ${XORG_MODULE} ]]; then
70 case ${CATEGORY} in 74 case ${CATEGORY} in
71 app-doc) MODULE="doc" ;; 75 app-doc) XORG_MODULE=doc/ ;;
72 media-fonts) MODULE="font" ;; 76 media-fonts) XORG_MODULE=font/ ;;
73 x11-apps|x11-wm) MODULE="app" ;; 77 x11-apps|x11-wm) XORG_MODULE=app/ ;;
74 x11-misc|x11-themes) MODULE="util" ;; 78 x11-misc|x11-themes) XORG_MODULE=util/ ;;
75 x11-drivers) MODULE="driver" ;;
76 x11-base) MODULE="xserver" ;; 79 x11-base) XORG_MODULE=xserver/ ;;
80 x11-drivers) XORG_MODULE=driver/ ;;
77 x11-proto) MODULE="proto" ;; 81 x11-proto) XORG_MODULE=proto/ ;;
78 x11-libs) MODULE="lib" ;; 82 x11-libs) XORG_MODULE=lib/ ;;
79 *) MODULE="" ;; 83 *) XORG_MODULE= ;;
80 esac 84 esac
81fi 85fi
82 86
83# @ECLASS-VARIABLE: PACKAGE_NAME 87# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
84# @DESCRIPTION: 88# @DESCRIPTION:
85# For git checkout the git repository migth differ from package name. 89# For git checkout the git repository might differ from package name.
86# This variable can be used for proper directory specification 90# This variable can be used for proper directory specification
87: ${PACKAGE_NAME:=${PN}} 91: ${XORG_PACKAGE_NAME:=${PN}}
88 92
89if [[ -n ${GIT_ECLASS} ]]; then 93if [[ -n ${GIT_ECLASS} ]]; then
90 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PACKAGE_NAME}" 94 : ${EGIT_REPO_URI:="git://anongit.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME} http://anongit.freedesktop.org/git/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"}
91else 95elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
92 SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" 96 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
93fi 97fi
94 98
95: ${SLOT:=0} 99: ${SLOT:=0}
96 100
97# Set the license for the package. This can be overridden by setting 101# Set the license for the package. This can be overridden by setting
104XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" 108XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
105EAUTORECONF_DEPEND+=" 109EAUTORECONF_DEPEND+="
106 >=sys-devel/libtool-2.2.6a 110 >=sys-devel/libtool-2.2.6a
107 sys-devel/m4" 111 sys-devel/m4"
108if [[ ${PN} != util-macros ]] ; then 112if [[ ${PN} != util-macros ]] ; then
109 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0" 113 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.17"
110 # Required even by xorg-server 114 # Required even by xorg-server
111 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 115 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
112fi 116fi
113WANT_AUTOCONF="latest" 117WANT_AUTOCONF="latest"
114WANT_AUTOMAKE="latest" 118WANT_AUTOMAKE="latest"
115for arch in ${XORG_EAUTORECONF_ARCHES}; do 119for arch in ${XORG_EAUTORECONF_ARCHES}; do
116 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" 120 EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
123if [[ ${FONT} == yes ]]; then 127if [[ ${FONT} == yes ]]; then
124 RDEPEND+=" media-fonts/encodings 128 RDEPEND+=" media-fonts/encodings
125 x11-apps/mkfontscale 129 x11-apps/mkfontscale
126 x11-apps/mkfontdir" 130 x11-apps/mkfontdir"
127 PDEPEND+=" media-fonts/font-alias" 131 PDEPEND+=" media-fonts/font-alias"
128 DEPEND+=" >=media-fonts/font-util-1.1.1-r1" 132 DEPEND+=" >=media-fonts/font-util-1.2.0"
129 133
130 # @ECLASS-VARIABLE: FONT_DIR 134 # @ECLASS-VARIABLE: FONT_DIR
131 # @DESCRIPTION: 135 # @DESCRIPTION:
132 # If you're creating a font package and the suffix of PN is not equal to 136 # If you're creating a font package and the suffix of PN is not equal to
133 # the subdirectory of /usr/share/fonts/ it should install into, set 137 # the subdirectory of /usr/share/fonts/ it should install into, set
170 && ${PN} != xorg-cf-files \ 174 && ${PN} != xorg-cf-files \
171 && ${PN/xcursor} = ${PN} ]]; then 175 && ${PN/xcursor} = ${PN} ]]; then
172 IUSE+=" static-libs" 176 IUSE+=" static-libs"
173fi 177fi
174 178
175DEPEND+=" >=dev-util/pkgconfig-0.23" 179DEPEND+=" virtual/pkgconfig"
176 180
177# Check deps on xorg-server 181# @ECLASS-VARIABLE: XORG_DRI
178has dri ${IUSE//+} && DEPEND+=" dri? ( >=x11-base/xorg-server-1.6.3.901-r2[-minimal] )" 182# @DESCRIPTION:
179[[ -n "${DRIVER}" ]] && DEPEND+=" x11-base/xorg-server[xorg]" 183# Possible values are "always" or the value of the useflag DRI capabilities
184# are required for. Default value is "no"
185#
186# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
187: ${XORG_DRI:="no"}
188
189DRI_COMMON_DEPEND="
190 x11-base/xorg-server[-minimal]
191 x11-libs/libdrm
192"
193DRI_DEPEND="
194 x11-proto/xf86driproto
195 x11-proto/glproto
196 x11-proto/dri2proto
197"
198case ${XORG_DRI} in
199 no)
200 ;;
201 always)
202 COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
203 DEPEND+=" ${DRI_DEPEND}"
204 ;;
205 *)
206 COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
207 DEPEND+=" ${XORG_DRI}? ( ${DRI_DEPEND} )"
208 IUSE+=" ${XORG_DRI}"
209 ;;
210esac
211unset DRI_DEPEND
212unset DRI_COMMONDEPEND
213
214if [[ -n "${DRIVER}" ]]; then
215 COMMON_DEPEND+="
216 x11-base/xorg-server[xorg]
217 "
218fi
219if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
220 DEPEND+="
221 x11-proto/inputproto
222 x11-proto/kbproto
223 x11-proto/xproto
224 "
225fi
226if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
227 COMMON_DEPEND+="
228 x11-libs/libpciaccess
229 "
230 # we also needs some protos and libs in all cases
231 DEPEND+="
232 x11-proto/fontsproto
233 x11-proto/randrproto
234 x11-proto/renderproto
235 x11-proto/videoproto
236 x11-proto/xextproto
237 x11-proto/xineramaproto
238 x11-proto/xproto
239 "
240fi
241
242# @ECLASS-VARIABLE: XORG_DOC
243# @DESCRIPTION:
244# Possible values are "always" or the value of the useflag doc packages
245# are required for. Default value is "no"
246#
247# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
248: ${XORG_DOC:="no"}
249
250DOC_DEPEND="
251 doc? (
252 app-text/asciidoc
253 app-text/xmlto
254 app-doc/doxygen
255 app-text/docbook-xml-dtd:4.1.2
256 app-text/docbook-xml-dtd:4.2
257 app-text/docbook-xml-dtd:4.3
258 )
259"
260case ${XORG_DOC} in
261 no)
262 ;;
263 always)
264 DEPEND+=" ${DOC_DEPEND}"
265 ;;
266 *)
267 DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
268 IUSE+=" ${XORG_DOC}"
269 ;;
270esac
271unset DOC_DEPEND
272
273DEPEND+=" ${COMMON_DEPEND}"
274RDEPEND+=" ${COMMON_DEPEND}"
275unset COMMON_DEPEND
276
277debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
278debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
279debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
180 280
181# @FUNCTION: xorg-2_pkg_setup 281# @FUNCTION: xorg-2_pkg_setup
182# @DESCRIPTION: 282# @DESCRIPTION:
183# Setup prefix compat 283# Setup prefix compat
184xorg-2_pkg_setup() { 284xorg-2_pkg_setup() {
192# Simply unpack source code. 292# Simply unpack source code.
193xorg-2_src_unpack() { 293xorg-2_src_unpack() {
194 debug-print-function ${FUNCNAME} "$@" 294 debug-print-function ${FUNCNAME} "$@"
195 295
196 if [[ -n ${GIT_ECLASS} ]]; then 296 if [[ -n ${GIT_ECLASS} ]]; then
197 git_src_unpack 297 git-2_src_unpack
198 else 298 else
199 unpack ${A} 299 unpack ${A}
200 fi 300 fi
201 301
202 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 302 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
212 # Patch directory is ${WORKDIR}/patch 312 # Patch directory is ${WORKDIR}/patch
213 # See epatch() in eutils.eclass for more documentation 313 # See epatch() in eutils.eclass for more documentation
214 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 314 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
215 315
216 [[ -d "${EPATCH_SOURCE}" ]] && epatch 316 [[ -d "${EPATCH_SOURCE}" ]] && epatch
217 base_src_prepare "$@"
218} 317}
219 318
220# @FUNCTION: xorg-2_reconf_source 319# @FUNCTION: xorg-2_reconf_source
221# @DESCRIPTION: 320# @DESCRIPTION:
222# Run eautoreconf if necessary, and run elibtoolize. 321# Run eautoreconf if necessary, and run elibtoolize.
224 debug-print-function ${FUNCNAME} "$@" 323 debug-print-function ${FUNCNAME} "$@"
225 324
226 case ${CHOST} in 325 case ${CHOST} in
227 *-interix* | *-aix* | *-winnt*) 326 *-interix* | *-aix* | *-winnt*)
228 # some hosts need full eautoreconf 327 # some hosts need full eautoreconf
229 [[ -e "./configure.ac" || -e "./configure.in" ]] && eautoreconf || ewarn "Unable to autoreconf the configure script. Things may fail." 328 [[ -e "./configure.ac" || -e "./configure.in" ]] \
329 && AUTOTOOLS_AUTORECONF=1
230 ;; 330 ;;
231 *) 331 *)
232 # elibtoolize required for BSD 332 # elibtoolize required for BSD
233 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && eautoreconf || elibtoolize 333 [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
334 && AUTOTOOLS_AUTORECONF=1
234 ;; 335 ;;
235 esac 336 esac
236} 337}
237 338
238# @FUNCTION: xorg-2_src_prepare 339# @FUNCTION: xorg-2_src_prepare
239# @DESCRIPTION: 340# @DESCRIPTION:
240# Prepare a package after unpacking, performing all X-related tasks. 341# Prepare a package after unpacking, performing all X-related tasks.
241xorg-2_src_prepare() { 342xorg-2_src_prepare() {
242 debug-print-function ${FUNCNAME} "$@" 343 debug-print-function ${FUNCNAME} "$@"
243 344
244 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
245 xorg-2_patch_source 345 xorg-2_patch_source
246 xorg-2_reconf_source 346 xorg-2_reconf_source
347 autotools-utils_src_prepare "$@"
247} 348}
248 349
249# @FUNCTION: xorg-2_font_configure 350# @FUNCTION: xorg-2_font_configure
250# @DESCRIPTION: 351# @DESCRIPTION:
251# If a font package, perform any necessary configuration steps 352# If a font package, perform any necessary configuration steps
252xorg-2_font_configure() { 353xorg-2_font_configure() {
253 debug-print-function ${FUNCNAME} "$@" 354 debug-print-function ${FUNCNAME} "$@"
254 355
255 if has nls ${IUSE//+} && ! use nls; then 356 if has nls ${IUSE//+} && ! use nls; then
357 if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
256 FONT_OPTIONS+=" 358 FONT_OPTIONS+="
359 --disable-all-encodings"
360 else
361 FONT_OPTIONS+="
257 --disable-iso8859-2 362 --disable-iso8859-2
258 --disable-iso8859-3 363 --disable-iso8859-3
259 --disable-iso8859-4 364 --disable-iso8859-4
260 --disable-iso8859-5 365 --disable-iso8859-5
261 --disable-iso8859-6 366 --disable-iso8859-6
262 --disable-iso8859-7 367 --disable-iso8859-7
263 --disable-iso8859-8 368 --disable-iso8859-8
264 --disable-iso8859-9 369 --disable-iso8859-9
265 --disable-iso8859-10 370 --disable-iso8859-10
266 --disable-iso8859-11 371 --disable-iso8859-11
267 --disable-iso8859-12 372 --disable-iso8859-12
268 --disable-iso8859-13 373 --disable-iso8859-13
269 --disable-iso8859-14 374 --disable-iso8859-14
270 --disable-iso8859-15 375 --disable-iso8859-15
271 --disable-iso8859-16 376 --disable-iso8859-16
272 --disable-jisx0201 377 --disable-jisx0201
273 --disable-koi8-r" 378 --disable-koi8-r"
379 fi
274 fi 380 fi
275} 381}
276 382
277# @FUNCTION: xorg-2_flags_setup 383# @FUNCTION: xorg-2_flags_setup
278# @DESCRIPTION: 384# @DESCRIPTION:
296# @FUNCTION: xorg-2_src_configure 402# @FUNCTION: xorg-2_src_configure
297# @DESCRIPTION: 403# @DESCRIPTION:
298# Perform any necessary pre-configuration steps, then run configure 404# Perform any necessary pre-configuration steps, then run configure
299xorg-2_src_configure() { 405xorg-2_src_configure() {
300 debug-print-function ${FUNCNAME} "$@" 406 debug-print-function ${FUNCNAME} "$@"
301 local myopts=""
302 407
303 xorg-2_flags_setup 408 xorg-2_flags_setup
409
410 # @VARIABLE: XORG_CONFIGURE_OPTIONS
411 # @DESCRIPTION:
412 # Array of an additional options to pass to configure.
413 # @DEFAULT_UNSET
414 if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
415 # fallback to CONFIGURE_OPTIONS, deprecated.
416 if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
417 eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
418 eqawarn "to preserve namespace."
419 fi
420
421 local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS})
422 else
423 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
424 fi
425
304 [[ -n "${FONT}" ]] && xorg-2_font_configure 426 [[ -n "${FONT}" ]] && xorg-2_font_configure
305 427 local myeconfargs=(
306 # @VARIABLE: CONFIGURE_OPTIONS 428 --disable-dependency-tracking
307 # @DESCRIPTION:
308 # Any options to pass to configure
309 # @DEFAULT_UNSET
310 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""}
311 if [[ -x ${ECONF_SOURCE:-.}/configure ]]; then
312 if has static-libs ${IUSE//+}; then
313 myopts+=" $(use_enable static-libs static)"
314 fi
315 econf \
316 ${FONT_OPTIONS} \ 429 ${FONT_OPTIONS}
317 ${CONFIGURE_OPTIONS} \ 430 "${xorgconfadd[@]}"
318 ${myopts} 431 )
319 fi 432
433 autotools-utils_src_configure "$@"
320} 434}
321 435
322# @FUNCTION: xorg-2_src_compile 436# @FUNCTION: xorg-2_src_compile
323# @DESCRIPTION: 437# @DESCRIPTION:
324# Compile a package, performing all X-related tasks. 438# Compile a package, performing all X-related tasks.
325xorg-2_src_compile() { 439xorg-2_src_compile() {
326 debug-print-function ${FUNCNAME} "$@" 440 debug-print-function ${FUNCNAME} "$@"
327 441
328 base_src_compile "$@" 442 autotools-utils_src_compile "$@"
329} 443}
330 444
331# @FUNCTION: xorg-2_src_install 445# @FUNCTION: xorg-2_src_install
332# @DESCRIPTION: 446# @DESCRIPTION:
333# Install a built package to ${D}, performing any necessary steps. 447# Install a built package to ${D}, performing any necessary steps.
334# Creates a ChangeLog from git if using live ebuilds. 448# Creates a ChangeLog from git if using live ebuilds.
335xorg-2_src_install() { 449xorg-2_src_install() {
336 debug-print-function ${FUNCNAME} "$@" 450 debug-print-function ${FUNCNAME} "$@"
337 451
338 if [[ ${CATEGORY} == x11-proto ]]; then 452 if [[ ${CATEGORY} == x11-proto ]]; then
339 emake \ 453 autotools-utils_src_install \
340 ${PN/proto/}docdir=${EPREFIX}/usr/share/doc/${PF} \ 454 ${PN/proto/}docdir="${EPREFIX}/usr/share/doc/${PF}" \
341 docdir=${EPREFIX}/usr/share/doc/${PF} \ 455 docdir="${EPREFIX}/usr/share/doc/${PF}"
342 DESTDIR="${D}" \
343 install || die "emake install failed"
344 else 456 else
345 emake \ 457 autotools-utils_src_install \
346 docdir=${EPREFIX}/usr/share/doc/${PF} \ 458 docdir="${EPREFIX}/usr/share/doc/${PF}"
347 DESTDIR="${D}" \
348 install || die "emake install failed"
349 fi 459 fi
350 460
351 if [[ -n ${GIT_ECLASS} ]]; then 461 if [[ -n ${GIT_ECLASS} ]]; then
352 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null 462 pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
353 git log ${EGIT_COMMIT} > "${S}"/ChangeLog 463 git log ${EGIT_COMMIT} > "${S}"/ChangeLog
355 fi 465 fi
356 466
357 if [[ -e "${S}"/ChangeLog ]]; then 467 if [[ -e "${S}"/ChangeLog ]]; then
358 dodoc "${S}"/ChangeLog || die "dodoc failed" 468 dodoc "${S}"/ChangeLog || die "dodoc failed"
359 fi 469 fi
360 # @VARIABLE: DOCS
361 # @DESCRIPTION:
362 # Any documentation to install
363 # @DEFAULT_UNSET
364 if [[ -n ${DOCS} ]]; then
365 dodoc ${DOCS} || die "dodoc failed"
366 fi
367 470
368 # Don't install libtool archives for server modules 471 # Don't install libtool archives (even for modules)
369 if [[ -e "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" ]]; then 472 prune_libtool_files --all
370 find "${D%/}${EPREFIX}/usr/$(get_libdir)/xorg/modules" -name '*.la' \
371 -exec rm -f {} ';'
372 fi
373 473
374 [[ -n ${FONT} ]] && remove_font_metadata 474 [[ -n ${FONT} ]] && remove_font_metadata
375} 475}
376 476
377# @FUNCTION: xorg-2_pkg_postinst 477# @FUNCTION: xorg-2_pkg_postinst
379# Run X-specific post-installation tasks on the live filesystem. The 479# Run X-specific post-installation tasks on the live filesystem. The
380# only task right now is some setup for font packages. 480# only task right now is some setup for font packages.
381xorg-2_pkg_postinst() { 481xorg-2_pkg_postinst() {
382 debug-print-function ${FUNCNAME} "$@" 482 debug-print-function ${FUNCNAME} "$@"
383 483
384 [[ -n ${FONT} ]] && setup_fonts "$@" 484 if [[ -n ${FONT} ]]; then
485 create_fonts_scale
486 create_fonts_dir
487 font_pkg_postinst "$@"
488 fi
385} 489}
386 490
387# @FUNCTION: xorg-2_pkg_postrm 491# @FUNCTION: xorg-2_pkg_postrm
388# @DESCRIPTION: 492# @DESCRIPTION:
389# Run X-specific post-removal tasks on the live filesystem. The only 493# Run X-specific post-removal tasks on the live filesystem. The only
390# task right now is some cleanup for font packages. 494# task right now is some cleanup for font packages.
391xorg-2_pkg_postrm() { 495xorg-2_pkg_postrm() {
392 debug-print-function ${FUNCNAME} "$@" 496 debug-print-function ${FUNCNAME} "$@"
393 497
394 [[ -n ${FONT} ]] && font_pkg_postrm "$@" 498 if [[ -n ${FONT} ]]; then
395} 499 # if we're doing an upgrade, postinst will do
396 500 if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then
397# @FUNCTION: setup_fonts
398# @DESCRIPTION:
399# Generates needed files for fonts and fixes font permissions
400setup_fonts() {
401 debug-print-function ${FUNCNAME} "$@"
402
403 create_fonts_scale 501 create_fonts_scale
404 create_fonts_dir 502 create_fonts_dir
405 font_pkg_postinst 503 font_pkg_postrm "$@"
504 fi
505 fi
406} 506}
407 507
408# @FUNCTION: remove_font_metadata 508# @FUNCTION: remove_font_metadata
409# @DESCRIPTION: 509# @DESCRIPTION:
410# Don't let the package install generated font files that may overlap 510# Don't let the package install generated font files that may overlap
423# Create fonts.scale file, used by the old server-side fonts subsystem. 523# Create fonts.scale file, used by the old server-side fonts subsystem.
424create_fonts_scale() { 524create_fonts_scale() {
425 debug-print-function ${FUNCNAME} "$@" 525 debug-print-function ${FUNCNAME} "$@"
426 526
427 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 527 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
428 ebegin "Generating font.scale" 528 ebegin "Generating fonts.scale"
429 mkfontscale \ 529 mkfontscale \
430 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 530 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
431 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 531 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
432 eend $? 532 eend $?
433 fi 533 fi

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.57

  ViewVC Help
Powered by ViewVC 1.1.20