Use toolchains-func.eclass instead of gcc.eclass

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index d9ba9b381aaec3b55dfb96b5a5fe7f8c7d74c387..04fbff9c1344c4f84fcf3dc47749f85b4bf083af 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.89 2004/11/14 10:55:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.90 2004/11/15 15:20:26 suka Exp $
+
+  15 Nov 2004; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.1-r1.ebuild, openoffice-1.1.3-r1.ebuild,
+  openoffice-1.1.3.ebuild:
+  Use toolchains-func.eclass instead of gcc.eclass
 
 *openoffice-1.1.3-r1 (14 Nov 2004)
 

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 51cd44f0237043ec1f74d9bd7d7bbd20cd20b4e1..3a9002c59c6fd0ade49175a11bcfbc86b301f1fe 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,9 +1,9 @@
 MD5 e7fff1cdeac61f986e2375f8fcb110dc openoffice-1.0.3-r2.ebuild 20531
-MD5 2390dbcad9078ad77ad55591943d06bc openoffice-1.1.1-r1.ebuild 15826
+MD5 f63e879f61fb812d064f2e524150b667 openoffice-1.1.1-r1.ebuild 15777
 MD5 028221961eab58410eac58393c7840e5 openoffice-1.1.0-r4.ebuild 20022
-MD5 f5253bf5e86eccd42ffe3aee17617d88 openoffice-1.1.3.ebuild 15755
-MD5 a9a4190f63996d9947b939565b8d66bf ChangeLog 19982
-MD5 24396b5a7d20e558dc4450695dc57fdd openoffice-1.1.3-r1.ebuild 15445
+MD5 6059dcd3469f829c72b7ce1eaaa957f9 openoffice-1.1.3.ebuild 15687
+MD5 95b894fb795556577e70d9b2306b5e15 ChangeLog 20172
+MD5 be7367c4c04dbacfa1be18b6b4441c02 openoffice-1.1.3-r1.ebuild 15376
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r2 330

diff --git a/app-office/openoffice/openoffice-1.1.1-r1.ebuild b/app-office/openoffice/openoffice-1.1.1-r1.ebuild
index 537c14a1a3355c7bc33a12d4b1c238159ec456cd..5aac8d8d4520cf31addffe01c8e7de5dde8a6adb 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.1-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1-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/app-office/openoffice/openoffice-1.1.1-r1.ebuild,v 1.11 2004/11/11 23:28:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1-r1.ebuild,v 1.12 2004/11/15 15:20:26 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -26,10 +26,7 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit flag-o-matic eutils gcc
-
-# We want gcc3 if possible!!!!
-export WANT_GCC_3="yes"
+inherit flag-o-matic eutils toolchain-funcs
 
 # Set $ECPUS to amount of processes multiprocessing build should use.
 # NOTE:  Setting this too high might cause dmake to segfault!!
@@ -201,8 +198,6 @@ oo_setup() {
        unset LANG
        unset LC_ALL
 
-       export NEW_GCC="0"
-
        if [ -x /usr/sbin/gcc-config ]
        then
                # Do we have a gcc that use the new layout and gcc-config ?
@@ -347,8 +342,8 @@ src_compile() {
        if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
        then
                # Set CCCOMP and CXXCOMP.  This is still needed for STLport
-               export CCCOMP=${CC}
-               export CXXCOMP=${CXX}
+               export CCCOMP="$(tc-getCC)"
+               export CXXCOMP="$(tc-getCXX)"
        fi
 
        einfo "Bootstrapping OpenOffice.org..."

diff --git a/app-office/openoffice/openoffice-1.1.3-r1.ebuild b/app-office/openoffice/openoffice-1.1.3-r1.ebuild
index a5c388f54af6fa0b69b2b85c14a76508c1ac1603..6ad952d7947952a9d3f4230c1321fa775d5b17e1 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.3-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.3-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/app-office/openoffice/openoffice-1.1.3-r1.ebuild,v 1.1 2004/11/14 10:55:01 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.3-r1.ebuild,v 1.2 2004/11/15 15:20:26 suka Exp $
 
 # Notes:
 #
@@ -24,7 +24,7 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit flag-o-matic eutils gcc
+inherit flag-o-matic eutils toolchain-funcs
 
 IUSE="gnome kde java curl nptl zlib"
 
@@ -174,11 +174,6 @@ oo_setup() {
        unset LANG
        unset LC_ALL
 
-       # We want gcc3 if possible!!!!
-       export WANT_GCC_3="yes"
-
-       export NEW_GCC="0"
-
        if [ -x /usr/sbin/gcc-config ]
        then
                # Do we have a gcc that use the new layout and gcc-config ?
@@ -343,8 +338,8 @@ src_compile() {
        if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
        then
                # Set CCCOMP and CXXCOMP.  This is still needed for STLport
-               export CCCOMP="$(gcc-getCC)"
-               export CXXCOMP="$(gcc-getCXX)"
+               export CCCOMP="$(tc-getCC)"
+               export CXXCOMP="$(tc-getCXX)"
        fi
 
        einfo "Bootstrapping OpenOffice.org..."

diff --git a/app-office/openoffice/openoffice-1.1.3.ebuild b/app-office/openoffice/openoffice-1.1.3.ebuild
index 1b56f688e5d8150711d6c2c40052de2587246cc9..871576508931528ddf3602e6464bec0e0c1845e7 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.3.ebuild
+++ b/app-office/openoffice/openoffice-1.1.3.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/app-office/openoffice/openoffice-1.1.3.ebuild,v 1.7 2004/11/11 23:28:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.3.ebuild,v 1.8 2004/11/15 15:20:26 suka Exp $
 
 # Notes:
 #
@@ -24,7 +24,8 @@
 #   Get support going for installing a custom language pack.  Also
 #   need to be able to install more than one language pack.
 
-inherit flag-o-matic eutils gcc
+inherit flag-o-matic eutils toolchain-funcs
+
 
 IUSE="gnome kde java curl"
 
@@ -198,11 +199,6 @@ oo_setup() {
        unset LANG
        unset LC_ALL
 
-       # We want gcc3 if possible!!!!
-       export WANT_GCC_3="yes"
-
-       export NEW_GCC="0"
-
        if [ -x /usr/sbin/gcc-config ]
        then
                # Do we have a gcc that use the new layout and gcc-config ?
@@ -354,8 +350,8 @@ src_compile() {
        if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
        then
                # Set CCCOMP and CXXCOMP.  This is still needed for STLport
-               export CCCOMP="$(gcc-getCC)"
-               export CXXCOMP="$(gcc-getCXX)"
+               export CCCOMP="$(tc-getCC)"
+               export CXXCOMP="$(tc-getCXX)"
        fi
 
        einfo "Bootstrapping OpenOffice.org..."