Respect new gcc-config that doesn't set CC.

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 811ce7ee26230d55e8c4ff7286b4b17091545341..b4a13b61507f4349713d450e748b1f6a2474fcd8 100644 (file)
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.364 2004/10/21 01:04:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.365 2004/11/11 06:50:47 spyderous Exp $
+
+  10 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-4.3.0-r7.ebuild:
+  Respect new gcc-config that doesn't set CC.
 
   20 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r7.ebuild:
   Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree.

diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index d17edb6375af071f29d8f265639b62bb78438355..989a2c617356426739cae9293a68f44e2e0c17bc 100644 (file)
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,22 +1,22 @@
-MD5 920735623b6114d87f6c77cfd2ad35dd ChangeLog 79333
+MD5 07ceefa9210f6e502745c224578776b8 ChangeLog 79460
 MD5 3f5571ecf7696e6901d5999a8473714c metadata.xml 226
-MD5 ed3cfe6b4f69ef408908501a859e3661 xfree-4.3.0-r7.ebuild 36138
+MD5 fdaa915a186cfefacfc6f88dc0018ae8 xfree-4.3.0-r7.ebuild 35999
 MD5 530cb356359e8c56d0b9bb8801f793e8 files/digest-xfree-4.3.0-r7 2002
 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
 MD5 3949f8dacfbee7b89290bfbaf5c1446c files/4.3.0/10xfree 183
-MD5 b2e6c7bec437a8c250fedccf9189f23b files/4.3.0/chooser.sh 1566
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
-MD5 e846eae6ddbcd3bd5e4c426c80a5f687 files/4.3.0/startDM.sh 889
+MD5 b2e6c7bec437a8c250fedccf9189f23b files/4.3.0/chooser.sh 1566
 MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
-MD5 e84c45b905dcd89a9f1462a88d15aa12 files/4.3.0/xdm.start 2827
+MD5 e846eae6ddbcd3bd5e4c426c80a5f687 files/4.3.0/startDM.sh 889
 MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
+MD5 e84c45b905dcd89a9f1462a88d15aa12 files/4.3.0/xdm.start 2827
 MD5 1622d5777f1c7f058bd1f1b753636a18 files/4.3.0/xfs.conf.d 781
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
 MD5 02f77d9f6ed85a86f2bed64bd8d9eec4 files/4.3.0/xfs.start 7331
 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 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
 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-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild
index a9f33ad1f43c8aee5453ee5a474fd1c0a91712c2..6dee0c9d07a74c1534737dd2f430bbc068ac9ead 100644 (file)
--- a/x11-base/xfree/xfree-4.3.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r7.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/xfree/xfree-4.3.0-r7.ebuild,v 1.13 2004/10/21 01:04:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r7.ebuild,v 1.14 2004/11/11 06:50:47 spyderous Exp $
 
 inherit eutils flag-o-matic toolchain-funcs x11
 
@@ -168,12 +168,6 @@ 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() {
@@ -381,7 +375,7 @@ src_unpack() {
        # this is needed for ./configure and runtime linking and building not to fall into falsely believing
        # that there are some headers and functions for builtin video drivers or font libraries present
 
-       echo "#define CcCmd ${CC}" >> config/cf/host.def
+       echo "#define CcCmd $(tc-getCC)" >> config/cf/host.def
        echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
        echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def