/[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.40 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.40 2011/04/17 20:46:05 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"
27fi 27fi
28 28
29# 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
30FONT_ECLASS="" 30FONT_ECLASS=""
80 x11-proto) XORG_MODULE=proto/ ;; 80 x11-proto) XORG_MODULE=proto/ ;;
81 x11-libs) XORG_MODULE=lib/ ;; 81 x11-libs) XORG_MODULE=lib/ ;;
82 *) XORG_MODULE= ;; 82 *) XORG_MODULE= ;;
83 esac 83 esac
84fi 84fi
85
86# backcompat, remove when everything in main tree fixed
87[[ -n ${MODULE} ]] && XORG_MODULE=${MODULE} && ewarn "$CATEGORY/$P is using MODULE variable, please migrate to XORG_MODULE to preserve namespace."
88 85
89# @ECLASS-VARIABLE: XORG_PACKAGE_NAME 86# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
90# @DESCRIPTION: 87# @DESCRIPTION:
91# For git checkout the git repository might differ from package name. 88# For git checkout the git repository might differ from package name.
92# This variable can be used for proper directory specification 89# This variable can be used for proper directory specification
287# Simply unpack source code. 284# Simply unpack source code.
288xorg-2_src_unpack() { 285xorg-2_src_unpack() {
289 debug-print-function ${FUNCNAME} "$@" 286 debug-print-function ${FUNCNAME} "$@"
290 287
291 if [[ -n ${GIT_ECLASS} ]]; then 288 if [[ -n ${GIT_ECLASS} ]]; then
292 git_src_unpack 289 git-2_src_unpack
293 else 290 else
294 unpack ${A} 291 unpack ${A}
295 fi 292 fi
296 293
297 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}" 294 [[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
334# @DESCRIPTION: 331# @DESCRIPTION:
335# Prepare a package after unpacking, performing all X-related tasks. 332# Prepare a package after unpacking, performing all X-related tasks.
336xorg-2_src_prepare() { 333xorg-2_src_prepare() {
337 debug-print-function ${FUNCNAME} "$@" 334 debug-print-function ${FUNCNAME} "$@"
338 335
339 [[ -n ${GIT_ECLASS} ]] && git_src_prepare
340 xorg-2_patch_source 336 xorg-2_patch_source
341 xorg-2_reconf_source 337 xorg-2_reconf_source
342} 338}
343 339
344# @FUNCTION: xorg-2_font_configure 340# @FUNCTION: xorg-2_font_configure
399xorg-2_src_configure() { 395xorg-2_src_configure() {
400 debug-print-function ${FUNCNAME} "$@" 396 debug-print-function ${FUNCNAME} "$@"
401 397
402 xorg-2_flags_setup 398 xorg-2_flags_setup
403 399
404 # @VARIABLE: CONFIGURE_OPTIONS 400 # @VARIABLE: XORG_CONFIGURE_OPTIONS
405 # @DESCRIPTION: 401 # @DESCRIPTION:
406 # Any options to pass to configure 402 # Array of an additional options to pass to configure.
407 # @DEFAULT_UNSET 403 # @DEFAULT_UNSET
408 CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:=""} 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
409 412
410 [[ -n "${FONT}" ]] && xorg-2_font_configure 413 [[ -n "${FONT}" ]] && xorg-2_font_configure
411 local myeconfargs=( 414 local myeconfargs=(
412 --disable-dependency-tracking 415 --disable-dependency-tracking
413 ${CONFIGURE_OPTIONS}
414 ${FONT_OPTIONS} 416 ${FONT_OPTIONS}
417 "${xorgconfadd[@]}"
415 ) 418 )
416 419
417 autotools-utils_src_configure "$@" 420 autotools-utils_src_configure "$@"
418} 421}
419 422

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

  ViewVC Help
Powered by ViewVC 1.1.20