dont use $CC

6 files changed, 49 insertions, 64 deletions

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
index 1f3eac9dc4e0..7946e76905aa 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
@@ -1,34 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.7 2004/01/25 08:13:12 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.8 2004/04/28 05:51:06 vapier Exp $
 
-IUSE="doc"
-
-inherit java nsplugins
+inherit java nsplugins gcc
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
-SRC_URI="ppc? http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2sdk-1.3.1-02c-FCS-linux-ppc.bin"
+HOMEPAGE="http://www.blackdown.org/"
+SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2sdk-1.3.1-02c-FCS-linux-ppc.bin )"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="1.3"
+KEYWORDS="ppc"
+IUSE="doc"
 
-HOMEPAGE="http://www.blackdown.org"
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
-SLOT="1.3"
-LICENSE="sun-bcla-java-vm"
-
-# other arches need to chase down their new updates when they become available
-KEYWORDS="ppc"
 
 src_unpack () {
 	if (use ppc) || (use sparc) ; then
 		# this is built on gcc 3.2 so only update if gcc 3.x is present
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" = "2.95" ] ; then
+		if [ "`gcc-major-version`" != "3" ] ; then
 			die "This is for gcc 3.x only"
 		fi
 		tail -n +400 ${DISTDIR}/${A} | tar jxpf -
@@ -43,7 +39,7 @@ src_unpack () {
 }
 
 
-src_install () {
+src_install() {
 
 	dodir /opt/${P}
 
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
index 8454d03d3993..1d3112eebda3 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.24 2004/01/25 08:13:12 strider Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.25 2004/04/28 05:51:06 vapier Exp $
 
 inherit java
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
+HOMEPAGE="http://www.blackdown.org"
 SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2sdk-${PV}-FCS-linux-i386.tar.bz2 )
 	ppc? ( mirror://blackdown.org/JDK-${PV}/ppc/FCS-02b/j2sdk-${PV}-02b-FCS-linux-ppc.bin )
 	sparc? ( mirror://blackdown.org/JDK-${PV}/sparc/FCS-02b/j2sdk-${PV}-02b-FCS-linux-sparc.bin )"
 
-HOMEPAGE="http://www.blackdown.org"
+LICENSE="sun-bcla-java-vm"
+SLOT="1.3"
+KEYWORDS="x86 ppc sparc"
+IUSE="doc"
+
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
-SLOT="1.3"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="x86 ppc sparc"
 
 src_unpack () {
 	if (use ppc) || (use sparc) ; then
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
index 2cb73c5e7e8c..2a389ae1fd31 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.10 2004/01/25 08:13:12 strider Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.11 2004/04/28 05:51:06 vapier Exp $
 
 inherit java nsplugins
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
+HOMEPAGE="http://www.blackdown.org"
 SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2sdk-${PV}-FCS-linux-i386.tar.bz2 )
 	ppc? ( mirror://blackdown.org/JDK-${PV}/ppc/FCS-02b/j2sdk-${PV}-02b-FCS-linux-ppc.bin )
 	sparc? ( mirror://blackdown.org/JDK-${PV}/sparc/FCS-02b/j2sdk-${PV}-02b-FCS-linux-sparc.bin )"
 
-HOMEPAGE="http://www.blackdown.org"
+LICENSE="sun-bcla-java-vm"
+SLOT="1.3"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="doc"
+
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
-SLOT="1.3"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="~x86 ~ppc ~sparc"
 
 src_unpack () {
 	if (use ppc) || (use sparc) ; then
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
index 3bcf5bc16f93..894c7ea7b869 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
@@ -1,34 +1,31 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild,v 1.8 2004/01/25 08:13:12 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild,v 1.9 2004/04/28 05:51:06 vapier Exp $
 
-IUSE="doc"
 
-inherit java nsplugins
+inherit java nsplugins gcc
 
 S=${WORKDIR}/j2sdk1.3.1
 DESCRIPTION="Blackdown Java Development Kit 1.3.1"
-SRC_URI="ppc? http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2sdk-1.3.1-02c-FCS-linux-ppc.bin"
-
 HOMEPAGE="http://www.blackdown.org"
+SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2sdk-1.3.1-02c-FCS-linux-ppc.bin )"
+
+SLOT="1.3"
+LICENSE="sun-bcla-java-vm"
+IUSE="doc"
+KEYWORDS="ppc"
+
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5
 	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-RDEPEND="$DEPEND"
 PROVIDE="virtual/jdk-1.3.1
 	virtual/jre-1.3.1
 	virtual/java-scheme-2"
-SLOT="1.3"
-LICENSE="sun-bcla-java-vm"
-
-# other arches need to chase down their new updates when they become available
-KEYWORDS="ppc"
 
 src_unpack () {
 	if (use ppc) || (use sparc) ; then
 		# this is built on gcc 3.2 so only update if gcc 3.x is present
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" = "2.95" ] ; then
+		if [ "`gcc-major-version`" != "3" ] ; then
 			die "This is for gcc 3.x only"
 		fi
 		tail -n +400 ${DISTDIR}/${A} | tar jxpf -
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
index 58bdd7694450..9b270569931b 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.15 2004/01/25 08:13:12 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.16 2004/04/28 05:51:06 vapier Exp $
 
-IUSE="doc"
 
 inherit java nsplugins
 
@@ -10,6 +9,7 @@ JREV="01"
 
 S="${WORKDIR}/j2sdk${PV}"
 DESCRIPTION="Blackdown Java Development Kit ${PV}"
+HOMEPAGE="http://www.blackdown.org"
 J_URI="ftp://ftp.gwdg.de/pub/languages/java/linux/JDK-${PV}"
 if [ "`gcc -dumpversion | cut -f1 -d.`" -eq "3" -a "`gcc -dumpversion | cut -f2 -d.`" -ge "2" ] ; then
 	SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin )
@@ -22,17 +22,15 @@ SRC_URI="${SRC_URI} sparc? ( ${J_URI}/sparc/${JREV}/j2sdk-${PV}-${JREV}-linux-sp
 # this is needed for proper operating under a PaX kernel without activated grsecurity acl
 CHPAX_CONSERVATIVE_FLAGS="pemsv"
 
-HOMEPAGE="http://www.blackdown.org"
-
-SLOT="1.4.1"
 LICENSE="sun-bcla-java-vm"
+SLOT="1.4.1"
 KEYWORDS="x86 -ppc sparc amd64"
+IUSE="doc"
 
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.6
 	doc? ( =dev-java/java-sdk-docs-1.4.1* )
 	amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
-
 PROVIDE="virtual/jdk-1.4.1
 	virtual/jre-1.4.1
 	virtual/java-scheme-2"
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
index 2aeb0fb00d37..88876b78f709 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
@@ -1,32 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.9 2004/04/13 08:54:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.10 2004/04/28 05:51:53 vapier Exp $
 
-IUSE=""
-
-inherit java nsplugins
+inherit java nsplugins gcc
 
 S=${WORKDIR}/j2re1.3.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
-SRC_URI="ppc? http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2re-1.3.1-02c-FCS-linux-ppc.bin"
-
 HOMEPAGE="http://www.blackdown.org"
+SRC_URI="ppc? ( http://distro.ibiblio.org/pub/Linux/distributions/yellowdog/software/openoffice/j2re-1.3.1-02c-FCS-linux-ppc.bin )"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="0"
+KEYWORDS="ppc"
+IUSE=""
+
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5"
-RDEPEND="$DEPEND"
 PROVIDE="virtual/jre-1.3.1
 	virtual/java-scheme-2"
-SLOT="0"
-LICENSE="sun-bcla-java-vm"
-
-# other arches will need to chase this down when its released for them
-KEYWORDS="ppc"
 
 src_unpack () {
 	if (use ppc) || (use sparc) || (use sparc64) ; then
 	# this is built on gcc 3.2 so only update if gcc 3.x is present
-	[ -z "${CC}" ] && CC=gcc
-	if [ "`${CC} -dumpversion | cut -d. -f1,2`" = "2.95" ] ; then
+	if [ "`gcc-major-version`" != "3" ] ; then
 		die "This is for gcc 3.x only"
 	fi