Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree. Make one...

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 534d818ed4fcff177d27b6721081fe5e81134788..811ce7ee26230d55e8c4ff7286b4b17091545341 100644 (file)
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # 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.363 2004/09/30 03:56:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.364 2004/10/21 01:04:37 spyderous Exp $
+
+  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.
+  Make one fix related to a hard-coded gcc. Update license syntax so I can
+  commit.
 
   29 Sep 2004; Donnie Berkholz <spyderous@gentoo.org>; -xfree-4.3.0-r5.ebuild,
   -xfree-4.3.0-r6.ebuild:

diff --git a/x11-base/xfree/xfree-4.3.0-r7.ebuild b/x11-base/xfree/xfree-4.3.0-r7.ebuild
index b97f85b550cae434083b768c38ee5fc4f769ead1..a9f33ad1f43c8aee5453ee5a474fd1c0a91712c2 100644 (file)
--- a/x11-base/xfree/xfree-4.3.0-r7.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r7.ebuild
@@ -1,8 +1,8 @@
 # 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.12 2004/10/11 13:38:28 vapier Exp $
+# $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 $
 
-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 ...
@@ -118,7 +118,7 @@ SRC_URI="${SRC_URI}
 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 MSttfEULA"
+       MIT SGI-B BSD || ( FTL GPL-2 ) MSttfEULA"
 SLOT="0"
 KEYWORDS="x86 alpha"
 
@@ -584,7 +584,7 @@ src_compile() {
        # Compile ucs2any C implementation (patch #9142)
        ebegin "Compiling ucs2any C implementation"
                cd ${S}/fonts/util
-               gcc -Wall -o ucs2any ucs2any.c
+               $(tc-getCC) -Wall -o ucs2any ucs2any.c
                [ ! -d ../../exports/bin/ ] && mkdir -p ../../exports/bin/
                mv ucs2any ../../exports/bin/
                ls ${S}/exports/bin/

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 643020911d119620f5784893007c42d36276fdd1..fa5fe6806f23a0017bfc68e662ab49f4da39c25e 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
 MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
-MD5 937920fe48d77e65d4fe48ac4579517a xorg-x11-6.8.0-r2.ebuild 43796
-MD5 ca34ddd369d94ea86b0774e029f54efb xorg-x11-6.7.0-r2.ebuild 38072
-MD5 c81b82b9a07e0975156358918886607e xorg-x11-6.8.0-r1.ebuild 41319
-MD5 1cb9ca65b018a6f68f8ccf7c5f9b357b ChangeLog 37307
+MD5 81829c5bf158b13b38f773b357d0511c xorg-x11-6.8.0-r2.ebuild 43812
+MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
+MD5 f280b087d38d42142d6437d9b3f1bf3d xorg-x11-6.8.0-r1.ebuild 41335
+MD5 a9c4d6a2aab03ff833227fd11f25d1ae ChangeLog 37563
 MD5 5f6772219f532c3baf3fb3ceecf1ab65 files/digest-xorg-x11-6.8.0-r2 906
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908