Clean up ;)

8 files changed, 18 insertions, 155 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 21f5f37cb156..67b5234ebf2b 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.29 2004/03/01 07:31:31 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.30 2004/03/18 06:33:55 zx Exp $
+
+  18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> blackdown-jre-1.3.1-r7.ebuild,
+  blackdown-jre-1.3.1-r8.ebuild, blackdown-jre-1.3.1-r9.ebuild,
+  blackdown-jre-1.4.1.ebuild, blackdown-jre-1.4.2_rc1.ebuild:
+  Clean up :)
 
   01 Mar 2004; <mkennedy@gentoo.org> files/blackdown-jre-1.3.1,
   files/blackdown-jre-1.4.1, files/blackdown-jre-1.4.2_rc1:
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
deleted file mode 100644
index a26cd28e5e64..000000000000
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2003 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-r7.ebuild,v 1.28 2003/12/06 17:53:18 strider Exp $
-
-inherit java
-
-S=${WORKDIR}/j2re1.3.1
-DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
-SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2re-${PV}-FCS-linux-i386.tar.bz2 )
-	ppc? ( mirror://blackdown.org/JDK-${PV}/ppc/FCS-02b/j2re-${PV}-02b-FCS-linux-ppc.bin )
-	sparc? ( mirror://blackdown.org/JDK-${PV}/sparc/FCS-02b/j2re-${PV}-02b-FCS-linux-sparc.bin )"
-
-HOMEPAGE="http://www.blackdown.org"
-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"
-KEYWORDS="x86 ppc sparc"
-
-src_unpack () {
-	if (use ppc) || (use sparc) ; then
-		tail -n +422 ${DISTDIR}/${A} | tar xjf -
-	else
-		unpack ${A}
-	fi
-	if (use sparc) ; then
-		# The files are owned by 1000.100, for some reason.
-		chown -R root:root
-	fi
-}
-
-src_install () {
-	dodir /opt/${P}
-
-	cp -dpR ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/
-	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	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}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
-
-	mv ${D}/opt/${P}/lib/font.properties ${D}/opt/${P}/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/lib/font.properties.orig \
-		> ${D}/opt/${P}/lib/font.properties
-	rm ${D}/opt/${P}/lib/font.properties.orig
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst () {
-	java_pkg_postinst
-	if [ -z "`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-jre/blackdown-jre-1.3.1-r8.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
deleted file mode 100644
index 1463acf629d9..000000000000
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 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-r8.ebuild,v 1.11 2003/12/06 17:53:18 strider Exp $
-
-inherit java nsplugins
-
-S=${WORKDIR}/j2re1.3.1
-DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
-SRC_URI="x86? ( mirror://blackdown.org/JDK-${PV}/i386/FCS/j2re-${PV}-FCS-linux-i386.tar.bz2 )
-	ppc? ( mirror://blackdown.org/JDK-${PV}/ppc/FCS-02b/j2re-${PV}-02b-FCS-linux-ppc.bin )
-	sparc? ( mirror://blackdown.org/JDK-${PV}/sparc/FCS-02b/j2re-${PV}-02b-FCS-linux-sparc.bin )"
-
-HOMEPAGE="http://www.blackdown.org"
-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"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-src_unpack () {
-	if (use ppc) || (use sparc) ; then
-		tail -n +422 ${DISTDIR}/${A} | tar xjf -
-	else
-		unpack ${A}
-	fi
-	if (use sparc) ; then
-		# The files are owned by 1000.100, for some reason.
-		chown -R root:root
-	fi
-}
-
-src_install () {
-	dodir /opt/${P}
-
-	cp -dpR ${S}/{bin,lib,man,plugin} ${D}/opt/${P}/
-	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	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
-	inst_plugin /opt/${P}/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
-
-	mv ${D}/opt/${P}/lib/font.properties ${D}/opt/${P}/lib/font.properties.orig
-	sed "s/standard symbols l/symbol/g" \
-		< ${D}/opt/${P}/lib/font.properties.orig \
-		> ${D}/opt/${P}/lib/font.properties
-	rm ${D}/opt/${P}/lib/font.properties.orig
-
-	set_java_env ${FILESDIR}/${VMHANDLE}
-}
-
-pkg_postinst () {
-	java_pkg_postinst
-}
-
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 2eaa3cc71a46..587b8106398f 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,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.7 2003/12/06 17:53:18 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.8 2004/03/18 06:33:56 zx Exp $
 
 IUSE=""
 
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
index 37b0ce0cdd83..b8cde363c869 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4.1.ebuild,v 1.7 2003/10/15 17:50:05 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1.ebuild,v 1.8 2004/03/18 06:33:56 zx Exp $
 
 inherit java nsplugins gcc
 
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
index e14d58343e43..973fbda15774 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2_rc1.ebuild,v 1.2 2004/02/21 04:01:14 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1.ebuild,v 1.3 2004/03/18 06:33:56 zx Exp $
 
 IUSE="doc"
 
@@ -21,16 +21,16 @@ SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
 
 if [ "${ARCH}" = "amd64" ]
 then
-	A="j2re-${JV}-${JREV}-linux-amd64.bin"
+	MY_A="j2re-${JV}-${JREV}-linux-amd64.bin"
 elif [ "${ARCH}" = "x86" ]
 then
-	A="j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin"
+	MY_A="j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin"
 elif [ "${ARCH}" = "sparc" ]
 then
-	A="j2re-${JV}-${JREV}-linux-sparc.bin"
+	MY_A="j2re-${JV}-${JREV}-linux-sparc.bin"
 elif [ "${ARCH}" = "ppc" ]
 then
-	A="j2re-${JV}-${JREV}-linux-ppc.bin"
+	MY_A="j2re-${JV}-${JREV}-linux-ppc.bin"
 fi
 
 HOMEPAGE="http://www.blackdown.org"
@@ -63,15 +63,15 @@ get_offset() {
 }
 
 src_unpack () {
-	local offset="`get_offset ${DISTDIR}/${A}`"
+	local offset="`get_offset ${DISTDIR}/${MY_A}`"
 
 	if [ -z "${offset}" ] ; then
 		eerror "Failed to get offset of tarball!"
 		die "Failed to get offset of tarball!"
 	fi
 
-	echo ">>> Unpacking ${A}..."
-	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxp
+	echo ">>> Unpacking ${MY_A}..."
+	tail -n +${offset} ${DISTDIR}/${MY_A} | tar --no-same-owner -jxp
 }
 
 unpack_jars()
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r7 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r7
deleted file mode 100644
index 5e696e658259..000000000000
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 951d59730ceaf5fddf2f6ec0a74e302b j2re-1.3.1-FCS-linux-i386.tar.bz2 13246191
-MD5 f18aa1b04bac22c2ecbfa77cc5888e1b j2re-1.3.1-02b-FCS-linux-ppc.bin 11027038
-MD5 157c5055db29a745696ad5c9f7ea51bd j2re-1.3.1-02b-FCS-linux-sparc.bin 10821140
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r8 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r8
deleted file mode 100644
index 5e696e658259..000000000000
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 951d59730ceaf5fddf2f6ec0a74e302b j2re-1.3.1-FCS-linux-i386.tar.bz2 13246191
-MD5 f18aa1b04bac22c2ecbfa77cc5888e1b j2re-1.3.1-02b-FCS-linux-ppc.bin 11027038
-MD5 157c5055db29a745696ad5c9f7ea51bd j2re-1.3.1-02b-FCS-linux-sparc.bin 10821140