/[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.48 Revision 1.57
1# Copyright 1999-2011 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.48 2011/09/12 13:50:57 mgorny 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: 8# @AUTHOR:
… …
35 # Activate font code in the rest of the eclass 35 # Activate font code in the rest of the eclass
36 FONT="yes" 36 FONT="yes"
37 FONT_ECLASS="font" 37 FONT_ECLASS="font"
38fi 38fi
39 39
40# we need to inherit autotools first to get the deps
40inherit autotools-utils eutils libtool multilib toolchain-funcs flag-o-matic autotools \ 41inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
41 ${FONT_ECLASS} ${GIT_ECLASS} 42 flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
42 43
43EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" 44EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
44case "${EAPI:-0}" in 45case "${EAPI:-0}" in
45 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; 46 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
46 *) die "EAPI=${EAPI} is not supported" ;; 47 *) die "EAPI=${EAPI} is not supported" ;;
… …
88# For git checkout the git repository might differ from package name. 89# For git checkout the git repository might differ from package name.
89# This variable can be used for proper directory specification 90# This variable can be used for proper directory specification
90: ${XORG_PACKAGE_NAME:=${PN}} 91: ${XORG_PACKAGE_NAME:=${PN}}
91 92
92if [[ -n ${GIT_ECLASS} ]]; then 93if [[ -n ${GIT_ECLASS} ]]; then
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}"} 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}"}
94elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then 95elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
95 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2" 96 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
96fi 97fi
97 98
98: ${SLOT:=0} 99: ${SLOT:=0}
… …
107XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt" 108XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
108EAUTORECONF_DEPEND+=" 109EAUTORECONF_DEPEND+="
109 >=sys-devel/libtool-2.2.6a 110 >=sys-devel/libtool-2.2.6a
110 sys-devel/m4" 111 sys-devel/m4"
111if [[ ${PN} != util-macros ]] ; then 112if [[ ${PN} != util-macros ]] ; then
112 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.14.0" 113 EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.17"
113 # Required even by xorg-server 114 # Required even by xorg-server
114 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" 115 [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
115fi 116fi
116WANT_AUTOCONF="latest" 117WANT_AUTOCONF="latest"
117WANT_AUTOMAKE="latest" 118WANT_AUTOMAKE="latest"
… …
173 && ${PN} != xorg-cf-files \ 174 && ${PN} != xorg-cf-files \
174 && ${PN/xcursor} = ${PN} ]]; then 175 && ${PN/xcursor} = ${PN} ]]; then
175 IUSE+=" static-libs" 176 IUSE+=" static-libs"
176fi 177fi
177 178
178DEPEND+=" >=dev-util/pkgconfig-0.23" 179DEPEND+=" virtual/pkgconfig"
179 180
180# @ECLASS-VARIABLE: XORG_DRI 181# @ECLASS-VARIABLE: XORG_DRI
181# @DESCRIPTION: 182# @DESCRIPTION:
182# Possible values are "always" or the value of the useflag DRI capabilities 183# Possible values are "always" or the value of the useflag DRI capabilities
183# are required for. Default value is "no" 184# are required for. Default value is "no"
… …
311 # Patch directory is ${WORKDIR}/patch 312 # Patch directory is ${WORKDIR}/patch
312 # See epatch() in eutils.eclass for more documentation 313 # See epatch() in eutils.eclass for more documentation
313 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch} 314 EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
314 315
315 [[ -d "${EPATCH_SOURCE}" ]] && epatch 316 [[ -d "${EPATCH_SOURCE}" ]] && epatch
316 autotools-utils_src_prepare "$@"
317} 317}
318 318
319# @FUNCTION: xorg-2_reconf_source 319# @FUNCTION: xorg-2_reconf_source
320# @DESCRIPTION: 320# @DESCRIPTION:
321# Run eautoreconf if necessary, and run elibtoolize. 321# Run eautoreconf if necessary, and run elibtoolize.
… …
323 debug-print-function ${FUNCNAME} "$@" 323 debug-print-function ${FUNCNAME} "$@"
324 324
325 case ${CHOST} in 325 case ${CHOST} in
326 *-interix* | *-aix* | *-winnt*) 326 *-interix* | *-aix* | *-winnt*)
327 # some hosts need full eautoreconf 327 # some hosts need full eautoreconf
328 [[ -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
329 ;; 330 ;;
330 *) 331 *)
331 # elibtoolize required for BSD 332 # elibtoolize required for BSD
332 [[ ${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
333 ;; 335 ;;
334 esac 336 esac
335} 337}
336 338
337# @FUNCTION: xorg-2_src_prepare 339# @FUNCTION: xorg-2_src_prepare
… …
340xorg-2_src_prepare() { 342xorg-2_src_prepare() {
341 debug-print-function ${FUNCNAME} "$@" 343 debug-print-function ${FUNCNAME} "$@"
342 344
343 xorg-2_patch_source 345 xorg-2_patch_source
344 xorg-2_reconf_source 346 xorg-2_reconf_source
347 autotools-utils_src_prepare "$@"
345} 348}
346 349
347# @FUNCTION: xorg-2_font_configure 350# @FUNCTION: xorg-2_font_configure
348# @DESCRIPTION: 351# @DESCRIPTION:
349# If a font package, perform any necessary configuration steps 352# If a font package, perform any necessary configuration steps
… …
413 if [[ -n "${CONFIGURE_OPTIONS}" ]]; then 416 if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
414 eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS" 417 eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
415 eqawarn "to preserve namespace." 418 eqawarn "to preserve namespace."
416 fi 419 fi
417 420
418 local xorgconfadd=(${CONFIGURE_OPTIONS}) 421 local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS})
419 else 422 else
420 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}") 423 local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
421 fi 424 fi
422 425
423 [[ -n "${FONT}" ]] && xorg-2_font_configure 426 [[ -n "${FONT}" ]] && xorg-2_font_configure
… …
463 466
464 if [[ -e "${S}"/ChangeLog ]]; then 467 if [[ -e "${S}"/ChangeLog ]]; then
465 dodoc "${S}"/ChangeLog || die "dodoc failed" 468 dodoc "${S}"/ChangeLog || die "dodoc failed"
466 fi 469 fi
467 470
468 # Don't install libtool archives (even with static-libs) 471 # Don't install libtool archives (even for modules)
469 remove_libtool_files all 472 prune_libtool_files --all
470 473
471 [[ -n ${FONT} ]] && remove_font_metadata 474 [[ -n ${FONT} ]] && remove_font_metadata
472} 475}
473 476
474# @FUNCTION: xorg-2_pkg_postinst 477# @FUNCTION: xorg-2_pkg_postinst
… …
476# Run X-specific post-installation tasks on the live filesystem. The 479# Run X-specific post-installation tasks on the live filesystem. The
477# only task right now is some setup for font packages. 480# only task right now is some setup for font packages.
478xorg-2_pkg_postinst() { 481xorg-2_pkg_postinst() {
479 debug-print-function ${FUNCNAME} "$@" 482 debug-print-function ${FUNCNAME} "$@"
480 483
481 [[ -n ${FONT} ]] && setup_fonts "$@" 484 if [[ -n ${FONT} ]]; then
485 create_fonts_scale
486 create_fonts_dir
487 font_pkg_postinst "$@"
488 fi
482} 489}
483 490
484# @FUNCTION: xorg-2_pkg_postrm 491# @FUNCTION: xorg-2_pkg_postrm
485# @DESCRIPTION: 492# @DESCRIPTION:
486# 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
487# task right now is some cleanup for font packages. 494# task right now is some cleanup for font packages.
488xorg-2_pkg_postrm() { 495xorg-2_pkg_postrm() {
489 debug-print-function ${FUNCNAME} "$@" 496 debug-print-function ${FUNCNAME} "$@"
490 497
491 [[ -n ${FONT} ]] && font_pkg_postrm "$@" 498 if [[ -n ${FONT} ]]; then
492} 499 # if we're doing an upgrade, postinst will do
493 500 if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then
494# @FUNCTION: setup_fonts
495# @DESCRIPTION:
496# Generates needed files for fonts and fixes font permissions
497setup_fonts() {
498 debug-print-function ${FUNCNAME} "$@"
499
500 create_fonts_scale 501 create_fonts_scale
501 create_fonts_dir 502 create_fonts_dir
502 font_pkg_postinst 503 font_pkg_postrm "$@"
504 fi
505 fi
503} 506}
504 507
505# @FUNCTION: remove_font_metadata 508# @FUNCTION: remove_font_metadata
506# @DESCRIPTION: 509# @DESCRIPTION:
507# 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
… …
520# 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.
521create_fonts_scale() { 524create_fonts_scale() {
522 debug-print-function ${FUNCNAME} "$@" 525 debug-print-function ${FUNCNAME} "$@"
523 526
524 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then 527 if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
525 ebegin "Generating font.scale" 528 ebegin "Generating fonts.scale"
526 mkfontscale \ 529 mkfontscale \
527 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \ 530 -a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
528 -- "${EROOT}/usr/share/fonts/${FONT_DIR}" 531 -- "${EROOT}/usr/share/fonts/${FONT_DIR}"
529 eend $? 532 eend $?
530 fi 533 fi
Legend:
Removed from v.1.48  
changed lines
  Added in v.1.57
  ViewVC Help
Powered by ViewVC 1.1.13