Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree. Update license syntax so I can commit.

4 files changed, 19 insertions, 13 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index bd6e7a32ff31..d3b1ec4b0986 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # 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.170 2004/10/20 02:43:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.171 2004/10/21 01:09:21 spyderous Exp $
+
+  20 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 inherit to toolchain-funcs instead of gcc and x11 instead of xfree.
+  Update license syntax so I can commit.
 
   19 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r2.ebuild:
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 85b214c3d308..81aa0962cf97 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.29 2004/10/14 14:48:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.30 2004/10/21 01:09:22 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,
@@ -12,7 +12,7 @@
 #   TARGET: patchset 1.3
 #		Nothing yet =)
 
-inherit eutils flag-o-matic gcc xfree
+inherit eutils flag-o-matic toolchain-funcs x11
 
 # 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 ...
@@ -64,7 +64,7 @@ SRC_URI="mirror://gentoo/eurofonts-X11.tar.bz2
 LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
-	MIT SGI-B BSD FTL | GPL-2"
+	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
 KEYWORDS="arm alpha amd64 hppa ia64 mips ppc ppc64 ~sparc x86"
 
@@ -257,7 +257,7 @@ host_def_setup() {
 			echo "#define HasLinuxInput YES" >> config/cf/host.def
 		fi
 
-		echo "#define CcCmd $(gcc-getCC)" >> config/cf/host.def
+		echo "#define CcCmd $(tc-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 d91e7e5f7969..fcfbf2abb0fe 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.29 2004/10/19 06:13:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r1.ebuild,v 1.30 2004/10/21 01:09:22 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -15,7 +15,7 @@
 #   TARGET: patchset 0.2
 #		Nothing yet =)
 
-inherit eutils flag-o-matic gcc xfree
+inherit eutils flag-o-matic toolchain-funcs x11
 
 # 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 ...
@@ -71,7 +71,7 @@ SRC_URI="mirror://gentoo/eurofonts-X11.tar.bz2
 LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
-	MIT SGI-B BSD FTL GPL-2"
+	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
 KEYWORDS="arm ~alpha amd64 hppa ~ia64 mips ~ppc sparc x86"
 
@@ -308,7 +308,7 @@ host_def_setup() {
 			echo "#define HasLinuxInput YES" >> ${HOSTCONF}
 		fi
 
-		echo "#define CcCmd $(gcc-getCC)" >> ${HOSTCONF}
+		echo "#define CcCmd $(tc-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 bce898604921..92a77db50e40 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.27 2004/10/20 02:43:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.28 2004/10/21 01:09:22 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -27,7 +27,7 @@
 #   TARGET: 6.8.0-r4
 #		Same for /usr/X11R6/bin
 
-inherit eutils flag-o-matic gcc xfree
+inherit eutils flag-o-matic toolchain-funcs x11
 
 # 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 ...
@@ -84,7 +84,7 @@ SRC_URI="mirror://gentoo/eurofonts-X11.tar.bz2
 LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
 	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
 	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
-	MIT SGI-B BSD FTL GPL-2"
+	MIT SGI-B BSD || ( FTL GPL-2 )"
 SLOT="0"
 KEYWORDS="~x86"
 
@@ -342,7 +342,7 @@ host_def_setup() {
 			echo "#define HasLinuxInput YES" >> ${HOSTCONF}
 		fi
 
-		echo "#define CcCmd $(gcc-getCC)" >> ${HOSTCONF}
+		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
 		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
 		echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}