[gentoo-commits] gentoo-x86 commit in eclass: xorg-2.eclass

["Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>]

scarabeus    10/11/05 12:11:55

  Modified:             xorg-2.eclass
  Log:
  Append eautoreconf depstring to archs where it is mandatory to run eautoreconf. (this is required for cache)

Revision  Changes    Path
1.19                 eclass/xorg-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/xorg-2.eclass?r1=1.18&r2=1.19

Index: xorg-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-2.eclass	1 Nov 2010 12:37:58 -0000	1.18
+++ xorg-2.eclass	5 Nov 2010 12:11:55 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.18 2010/11/01 12:37:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.19 2010/11/05 12:11:55 scarabeus Exp $
 #
 # @ECLASS: xorg-2.eclass
 # @MAINTAINER:
@@ -93,20 +93,26 @@
 # are under the MIT license. (This is what Red Hat does in their rpms)
 : ${LICENSE:=MIT}
 
-# Set up shared dependencies
-if [[ ${XORG_EAUTORECONF} != no ]]; then
-	DEPEND+="
-		>=sys-devel/libtool-2.2.6a
-		sys-devel/m4"
-	# This MUST BE STABLE
-	if [[ ${PN} != util-macros ]] ; then
-		DEPEND+=" >=x11-misc/util-macros-1.11.0"
-		# Required even by xorg-server
-		[[ ${PN} == "font-util" ]] || DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
-	fi
-	WANT_AUTOCONF="latest"
-	WANT_AUTOMAKE="latest"
+# Set up autotools shared dependencies
+# Remember that all versions here MUST be stable
+XORG_EAUTORECONF_ARCHES="x86-interix ppc-aix x86-winnt"
+EAUTORECONF_DEPEND+="
+	>=sys-devel/libtool-2.2.6a
+	sys-devel/m4"
+if [[ ${PN} != util-macros ]] ; then
+	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.11.0"
+	# Required even by xorg-server
+	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.1.1-r1"
 fi
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+for arch in ${XORG_EAUTORECONF_ARCHES}; do
+	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
+done
+DEPEND+=" ${EAUTORECONF_DEPENDS}"
+[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
+unset EAUTORECONF_DEPENDS
+unset EAUTORECONF_DEPEND
 
 if [[ ${FONT} == yes ]]; then
 	RDEPEND+=" media-fonts/encodings