Check for existence of CC variable, since some old gcc versions didn't supply a proper env.d file.

4 files changed, 35 insertions, 16 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 86a1c264f858..554ce4be1c4f 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.290 2004/02/29 14:45:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.291 2004/03/01 04:52:45 spyderous Exp $
+
+  29 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild,
+  xfree-4.3.99.902-r2.ebuild:
+  Check for existence of CC variable, since some old gcc versions didn't supply
+  a proper env.d file.
 
   23 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild:
   Add bindist support for binary distribution in GRP sets.
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 422fd5cdf2e2..35232ac9a5be 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,26 +1,26 @@
-MD5 9bc42976811527cb43d08c00541f8460 xfree-4.3.0-r5.ebuild 34798
-MD5 e1f367211ef51667347fa209071ef859 xfree-4.3.99.902-r2.ebuild 31191
-MD5 1ca25d3c84da5d3bf5fece0aeb176595 ChangeLog 64859
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
+MD5 1b9d0217c75bb05c0d961bee6a3e1648 ChangeLog 65076
 MD5 612aaaeec51b7e755cefb96a875ceca8 xfree-4.2.1-r4.ebuild 23723
+MD5 f555e785ad164279ec56b33b18f8e13c xfree-4.3.0-r5.ebuild 34943
+MD5 f134063154c8cdb7621d4b7bbc8a8b6f xfree-4.3.99.902-r2.ebuild 31352
 MD5 cc52e1577d984cd2a2bbb05148291095 files/digest-xfree-4.2.1-r4 1342
 MD5 a80dd36e88ff79e9019049017fee8cd6 files/digest-xfree-4.3.0-r5 2002
 MD5 2308a80167b398e266fc7a711c8014c6 files/digest-xfree-4.3.99.902-r2 1254
-MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
+MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
+MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
 MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
+MD5 605199b87a6477a337d57269fccc6faa files/4.3.0/startDM.sh 909
 MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
+MD5 43ac558897008a3dabff6cc4fa1e0e05 files/4.3.0/xdm.start 2847
 MD5 fbc03cfe0d80be07ad487d9ec7d9952e files/4.3.0/xfs.conf.d 801
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 7b0aac9992e53a3da3ecfef90b81b528 files/4.3.0/chooser.sh 1584
-MD5 605199b87a6477a337d57269fccc6faa files/4.3.0/startDM.sh 909
-MD5 43ac558897008a3dabff6cc4fa1e0e05 files/4.3.0/xdm.start 2847
 MD5 a29418c10f780d4bfebbd346be495c43 files/4.3.0/xfs.start 6661
-MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
-MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
-MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
+MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
+MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
+MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index c779ee022451..4a35c2f634d6 100644
--- a/x11-base/xfree/xfree-4.3.0-r5.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.3 2004/02/23 19:45:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.4 2004/03/01 04:52:45 spyderous Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -164,6 +164,12 @@ pkg_setup() {
 			die "The static USE flag is incompatible with the sdk USE flag."
 		fi
 	fi
+
+	# Check for existence of $CC, we use it later
+	if [ -z "${CC}" ]
+	then
+		die "Please set the CC variable to your compiler. export CC=gcc."
+	fi
 }
 
 src_unpack() {
diff --git a/x11-base/xfree/xfree-4.3.99.902-r2.ebuild b/x11-base/xfree/xfree-4.3.99.902-r2.ebuild
index 51552509f141..ca37c70a48f9 100644
--- a/x11-base/xfree/xfree-4.3.99.902-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.902-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902-r2.ebuild,v 1.2 2004/02/17 22:51:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902-r2.ebuild,v 1.3 2004/03/01 04:52:45 spyderous Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -136,6 +136,14 @@ inherit eutils flag-o-matic gcc xfree
 
 DESCRIPTION="Xfree86: famous and free X server"
 
+pkg_setup() {
+	# Check for existence of $CC, we use it later
+	if [ -z "${CC}" ]
+	then
+		die "Please set the CC variable to your compiler. export CC=gcc."
+	fi
+}
+
 src_unpack() {
 
 	# Unpack source and patches