Update ebuild to reflect that gcc-getCC no longer exports CC.

4 files changed, 12 insertions, 16 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 8bb7d1563a49..cd5f4c68f3b8 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.158 2004/10/14 00:44:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.159 2004/10/14 14:48:46 spyderous Exp $
+
+  14 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild,
+  xorg-x11-6.8.0-r2.ebuild:
+  Update ebuild to reflect that gcc-getCC no longer exports CC.
 
   13 Oct 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
   stable on amd64
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index 890dd64cc04e..85b214c3d308 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.28 2004/10/11 13:38:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.29 2004/10/14 14:48:46 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -150,9 +150,6 @@ pkg_setup() {
 	# Set up CFLAG-related things
 	cflag_setup
 
-	# Set up CC variable, we use it later
-	gcc-getCC
-
 	# See bug #35468, circular pam-X11 dep
 	if use pam && [ "`best_version x11-base/${PN}`" ]
 	then
@@ -260,7 +257,7 @@ host_def_setup() {
 			echo "#define HasLinuxInput YES" >> config/cf/host.def
 		fi
 
-		echo "#define CcCmd ${CC}" >> config/cf/host.def
+		echo "#define CcCmd $(gcc-getCC)" >> config/cf/host.def
 		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> config/cf/host.def
 		echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> config/cf/host.def
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
index 6192c68e64f3..8914e545e85e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.25 2004/10/14 00:44:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.26 2004/10/14 14:48:46 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -167,9 +167,6 @@ pkg_setup() {
 	# Set up CFLAG-related things
 	cflag_setup
 
-	# Set up CC variable, we use it later
-	gcc-getCC
-
 	# See bug #35468, circular pam-X11 dep
 	if use pam && best_version x11-base/${PN}
 	then
@@ -314,7 +311,7 @@ host_def_setup() {
 			echo "#define HasLinuxInput YES" >> ${HOSTCONF}
 		fi
 
-		echo "#define CcCmd ${CC}" >> ${HOSTCONF}
+		echo "#define CcCmd $(gcc-getCC)" >> ${HOSTCONF}
 		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
 		echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
 
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index 753dafa07045..fe212d75fc18 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.16 2004/10/14 00:44:13 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.17 2004/10/14 14:48:46 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -181,9 +181,6 @@ pkg_setup() {
 	# Set up CFLAG-related things
 	cflag_setup
 
-	# Set up CC variable, we use it later
-	gcc-getCC
-
 	# See bug #35468, circular pam-X11 dep
 	if use pam && best_version x11-base/${PN}
 	then
@@ -328,7 +325,7 @@ host_def_setup() {
 			echo "#define HasLinuxInput YES" >> ${HOSTCONF}
 		fi
 
-		echo "#define CcCmd ${CC}" >> ${HOSTCONF}
+		echo "#define CcCmd $(gcc-getCC)" >> ${HOSTCONF}
 		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
 		echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}