cleanup

7 files changed, 9 insertions, 184 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 7012dfe44d14..56ec2f98eee0 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.55 2004/09/21 08:14:39 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.56 2004/09/21 13:58:18 axxo Exp $
+
+  21 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  -blackdown-jdk-1.3.1-r7.ebuild, blackdown-jdk-1.3.1-r8.ebuild,
+  -blackdown-jdk-1.3.1-r9.ebuild:
+  cleanup
 
   21 Sep 2004; Thomas Matthijs <axxo@gentoo.org> blackdown-jdk-1.4.1.ebuild:
   removed the gcc-2.9, since the test was done in global scope and therefor the
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index a537084b9b86..d6f3b11fb664 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,10 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5728ad4e8e9ab0a456bee7eb12e4b853 blackdown-jdk-1.3.1-r9.ebuild 2105
 MD5 ca058731eebd1a833d5fd614a4d7c31c blackdown-jdk-1.4.2_rc1.ebuild 4130
 MD5 ff947f327a828bf32e1e597cebf54bb5 blackdown-jdk-1.4.2_rc1-r1.ebuild 4234
-MD5 d587eb2cdf91e826b023cada816a3872 blackdown-jdk-1.3.1-r8.ebuild 2110
+MD5 c9ae4bc401c859251a347e4457953bfd blackdown-jdk-1.3.1-r8.ebuild 2109
 MD5 c8bc0ebf0d504284f2ebf0d6c035725f blackdown-jdk-1.3.1-r10.ebuild 2205
 MD5 1add78482506830c5cb8bef0878224c7 blackdown-jdk-1.4.1.ebuild 3479
 MD5 bdb8817f0494d3d08893e56e5009c8ee ChangeLog 9946
@@ -18,13 +14,5 @@ MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
 MD5 0a02494663d4bc5af49ce0092ba238a8 files/blackdown-jdk-1.4.2_rc1-r1 600
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r7 243
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
-MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r9 80
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1 162
 MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1 167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBT+MG/rLF9B432nYRAr4vAJ9ZlGJXsV5m8VeLBf0XWnlofeZlCgCgpoBf
-W9r5AbmauI5JhO7X7W4Bkkw=
-=LUm6
------END PGP SIGNATURE-----
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
deleted file mode 100644
index 3b1d2bff2335..000000000000
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.29 2004/07/14 01:44:43 agriffis 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 )"
-
-LICENSE="sun-bcla-java-vm"
-SLOT="1.3"
-KEYWORDS="x86 ppc sparc"
-IUSE="doc mozilla"
-
-DEPEND="virtual/libc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-PROVIDE="virtual/jdk-1.3.1
-	virtual/jre-1.3.1
-	virtual/java-scheme-2"
-
-src_unpack () {
-	if use ppc || use sparc ; then
-		tail -n +400 ${DISTDIR}/${A} | tar jxpf -
-	else
-		unpack ${A}
-	fi
-
-	if use sparc ; then
-		# Everything is owned by 1000.100, for some reason..
-		chown -R root:root .
-	fi
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-
-	cp -dpR ${S}/{bin,jre,lib,man,include,include-old} ${D}/opt/${P}
-
-	dodir /opt/${P}/share/java
-	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-
-	dodoc COPYRIGHT LICENSE README INSTALL
-	dohtml README.html
-
-	# Install mozilla plugin
-	if [ "${ARCH}" == "x86" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "ppc" ] ; then
-		PLATFORM="ppc"
-	elif [ "${ARCH}" == "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
-
-	install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
-
-	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	mv ${D}/opt/${P}/jre/lib/font.properties ${D}/opt/${P}/jre/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/jre/lib/font.properties.orig \
-		> ${D}/opt/${P}/jre/lib/font.properties
-	rm ${D}/opt/${P}/jre/lib/font.properties.orig
-
-	# install env into /etc/env.d
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default system VM if none exists
-	java_pkg_postinst
-
-	if ! use mozilla ; then
-		einfo "For instructions on installing the ${P} browser plugin for"
-		einfo "Netscape and Mozilla, see /usr/share/doc/${P}/INSTALL."
-	fi
-}
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 fc90ceb02477..28eebc786acd 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,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.15 2004/07/14 01:44:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.16 2004/09/21 13:58:18 axxo Exp $
 
 inherit java nsplugins
 
@@ -13,7 +13,7 @@ SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2sdk-${PV}-FCS-linux-
 
 LICENSE="sun-bcla-java-vm"
 SLOT="1.3"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc sparc"
 IUSE="doc"
 
 DEPEND="virtual/libc
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
deleted file mode 100644
index b9ee80438d3c..000000000000
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.13 2004/07/14 01:44:43 agriffis Exp $
-
-
-inherit java nsplugins gcc
-
-S=${WORKDIR}/j2sdk1.3.1
-DESCRIPTION="Blackdown Java Development Kit 1.3.1"
-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/libc
-	>=dev-java/java-config-0.2.5
-	doc? ( =dev-java/java-sdk-docs-1.3.1* )"
-PROVIDE="virtual/jdk-1.3.1
-	virtual/jre-1.3.1
-	virtual/java-scheme-2"
-
-src_unpack () {
-	if use ppc || use sparc ; then
-		# this is built on gcc 3.2 so only update if gcc 3.x is present
-		if [ "`gcc-major-version`" != "3" ] ; then
-			die "This is for gcc 3.x only"
-		fi
-		tail -n +400 ${DISTDIR}/${A} | tar jxpf -
-	else
-		unpack ${A}
-	fi
-
-	if use sparc ; then
-		# Everything is owned by 1000.100, for some reason..
-		chown -R root:root .
-	fi
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-
-	cp -dpR ${S}/{bin,jre,lib,man,include,include-old} ${D}/opt/${P}
-
-	dodir /opt/${P}/share/java
-	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-
-	dodoc COPYRIGHT LICENSE README INSTALL
-	dohtml README.html
-
-	# Install ns plugin
-	if [ "${ARCH}" == "x86" ] ; then
-		PLATFORM="i386"
-	elif [ "${ARCH}" == "ppc" ] ; then
-		PLATFORM="ppc"
-	elif [ "${ARCH}" == "sparc" ] ; then
-		PLATFORM="sparc"
-	fi
-
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
-
-	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	mv ${D}/opt/${P}/jre/lib/font.properties ${D}/opt/${P}/jre/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/jre/lib/font.properties.orig \
-		> ${D}/opt/${P}/jre/lib/font.properties
-	rm ${D}/opt/${P}/jre/lib/font.properties.orig
-
-	# install env into /etc/env.d
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-}
-
-pkg_postinst () {
-	# Set as default system VM if none exists
-	java_pkg_postinst
-}
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r7 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r7
deleted file mode 100644
index f718ec01a220..000000000000
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 142ddf0a54a06ad81a5df9a31e28431a j2sdk-1.3.1-FCS-linux-i386.tar.bz2 24560062
-MD5 de2f94766988c42f6197d33e1bc6eb56 j2sdk-1.3.1-02b-FCS-linux-ppc.bin 21380823
-MD5 25eda06ac225a995211ba4f28bb7260f j2sdk-1.3.1-02b-FCS-linux-sparc.bin 21154081
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r9 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r9
deleted file mode 100644
index 8f63c6b22d82..000000000000
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.3.1-r9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd11e9cb460700cbb34be1da511e182c j2sdk-1.3.1-02c-FCS-linux-ppc.bin 21708768