Added preliminary sparc support, updated SRC_URI mess.

2 files changed, 13 insertions, 41 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 7363b39e524d..1ee25d51d918 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.7 2002/08/26 16:49:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.8 2002/08/28 13:22:21 karltk Exp $
 
 *blackdown-jre-1.3.1-r7 (16 Jul 2002) 
 
+  28 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 :
+  Added sparc platform support, not entirely tested.
+
   26 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r7 :
   Now provides the jre-1.3.1 virtual package.
 
@@ -13,32 +16,23 @@
   16 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> files/blackdown-jre-1.3.1 :
   Added MANPATH to the the environment file.
 
-  27 Apr 2002; pvdabeel <pvdabeel@gentoo.org>
+  27 Apr 2002; pvdabeel <pvdabeel@gentoo.org> blackdown-jre-1.3.1-r7 :
   PPC(/sparc) compatible ebuild
 
 *blackdown-jre-1.3.1-r6 (09 Apr 2002)
 
   09 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r6.ebuild files/digest-blackdown-jre-1.3.1-r6 files/blackdown-jre-1.3.1 :
-
   Fixed JRE_HOME env var in the environment script (#1593), fixed erroneous
   font specs in font.properties (#1533).
-
   Old revisions removed.
 
 *blackdown-jre-1.3.1-r5 (18 Mar 2002)
 
   18 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> blackdown-jre-1.3.1-r5.ebuild files/digest-blackdown-jre-1.3.1-r5 files/blackdown-jre-1.3.1 :
-
   Added support for JVM switching.
-
   Removed old revisions.
 
 *blackdown-jre-1.3.1-r4 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  Added initial ChangeLog.
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
index 308f01048d57..bdda7d559f32 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
@@ -1,34 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.8 2002/08/26 16:49:25 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.9 2002/08/28 13:22:21 karltk Exp $
 
 . /usr/portage/eclass/inherit.eclass
 inherit java
 
-case `system_arch` in
-	ppc)
-		PLATFORM="ppc"
-		FCS="FCS-02b"
-		MY_P="j2re-1.3.1-02b-FCS-linux-ppc.bin"
-		;;
-
-	i386)
-		PLATFORM="i386"
-		FCS="FCS"
-		MY_P="j2re-1.3.1-FCS-linux-i386.tar.bz2"
-		;;
-
-	sparc|sparc64)
-		PLATFORM="sparc"
-		FCS="FCS-02b"
-		MY_P="j2re-1.3.1-02b-FCS-linux-sparc.bin"
-		;;
-esac
-
-
 S=${WORKDIR}/j2re1.3.1
 DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
-SRC_URI="ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/${PLATFORM}/${FCS}/${MY_P}"
+SRC_URI="x86? ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/i386/FCS/j2re-1.3.1-FCS-linux-i386.tar.bz2
+        ppc? ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/ppc/FCS-02b/j2re-1.3.1-02b-FCS-linux-ppc.bin
+        sparc? ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/sparc/FCS-02b/j2re-1.3.1-02b-FCS-linux-sparc.bin
+        sparc64? ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-1.3.1/sparc/FCS-02b/j2re-1.3.1-02b-FCS-linux-sparc.bin"
 HOMEPAGE="http://www.blackdown.org"
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.0"
@@ -40,12 +22,8 @@ LICENSE="sun-bcla"
 KEYWORDS="x86 ppc sparc sparc64"
 
 src_unpack () {
-	if [ $PLATFORM = "ppc" ]; then
-		tail +422 ${DISTDIR}/${MY_P} > j2re-1.3.1-ppc.tar.bz2
-		tar -xjf j2re-1.3.1-ppc.tar.bz2
-	elif [ $PLATFORM = "sparc" ]; then
-		tail +422 ${DISTDIR}/${MY_P} > j2re-1.3.1-sparc.tar.bz2
-		tar -xjf j2re-1.3.1-sparc.tar.bz2
+	if (use ppc) || (use sparc) || (use sparc64) ; then 
+		tail +422 ${DISTDIR}/${A} | tar xjf -
 	else
 		unpack ${MY_P}
 	fi