Revisions bump to make sure these aren\'t available to java-config-1. java-config-1 is only used for generation-1 system vm, which must be a JDK. Also deals with textrels for 1.4.1.

Package-Manager: portage-2.1.1_pre5-r3

12 files changed, 383 insertions, 30 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 6bb36b6788ab..e81b6243449d 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.78 2006/07/06 11:19:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.79 2006/08/25 17:48:28 nichoj Exp $
+
+*blackdown-jre-1.4.2.03-r12 (25 Aug 2006)
+*blackdown-jre-1.4.1-r13 (25 Aug 2006)
+*blackdown-jre-1.3.1-r21 (25 Aug 2006)
+
+  25 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +blackdown-jre-1.3.1-r21.ebuild, +blackdown-jre-1.4.1-r13.ebuild,
+  +blackdown-jre-1.4.2.03-r12.ebuild:
+  Revisions bump to make sure these aren't available to java-config-1.
+  java-config-1 is only used for generation-1 system vm, which must be a JDK.
+  Also deals with textrels for 1.4.1.
 
   06 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   blackdown-jre-1.3.1-r9.ebuild, blackdown-jre-1.3.1-r20.ebuild,
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index eec91f9fa7eb..1c03317ce231 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blackdown-jre-1.3.1 429 RMD160 459fd24d987fa8c12280d7ea58e74250b7e768d0 SHA1 c105b82906a68f2ebe9ac8186dca43e1ee92fea7 SHA256 24d88e47db81e840d4d75ae62a6db595c03821970e0133f8fc84369b6a2bc488
 MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
 RMD160 459fd24d987fa8c12280d7ea58e74250b7e768d0 files/blackdown-jre-1.3.1 429
@@ -33,9 +30,9 @@ AUX blackdown-jre-1.4.2.env 693 RMD160 05049dd43caca537afbd07006b82c39a8b60c48e
 MD5 58c1eefb3cdc2e3397c390aba891527c files/blackdown-jre-1.4.2.env 693
 RMD160 05049dd43caca537afbd07006b82c39a8b60c48e files/blackdown-jre-1.4.2.env 693
 SHA256 caf838faff1b4a4e295865dc3703d0e1ae67706a83a242db2dd178b9eee2e4fd files/blackdown-jre-1.4.2.env 693
-DIST j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
-DIST j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
-DIST j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+DIST j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226 RMD160 1fab7ff8c3b18fbfeb7de31ac658c5450454ddb3 SHA1 186f1138e4cd872bc5e92c63e0c91ec13cbbc329 SHA256 d000f262482cef63b7246cbc2d61edf36b077aa82a45b2febda5fba8ba5928be
+DIST j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579 RMD160 61468d3f2c806e212b7f95f8d6cfd416b168e5cf SHA1 4496a4c901de8ebcdc8016a467f3d40348f7a98b SHA256 4fe0a3514093d40af834e747188e02f0a8265de4e8c65e3014e1c9c17a877d13
+DIST j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166 RMD160 71c9397698ccaae0b66b55c4e7ef15a464e6555c SHA1 c4a9197383f42125213fb77247866c432988ea21 SHA256 27f80b660adbfa85296046259305584ae9068cd6a764f14a47eb5f610d997a84
 DIST j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279 RMD160 27f058db585657d19dcc19a743a000250b38885d SHA1 231583409e6bdad51290a307e65f8cff5a161e0d SHA256 a20b3be6c92935a848e2c9d4331697f1a29505c6a0b4bce051c1416eb439fd0f
 DIST j2re-1.4.2-03-linux-amd64.bin 13198020 RMD160 7ead3f8084060d689b91a65d2601d047c1ba2fb2 SHA1 f56756f992b2c7497cc3fe77aabcd37a9dc4d204 SHA256 036c8595da3e6157971efe333db7d771bbc8eabae36b691341c2199172aa9439
 DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 SHA1 30b37bc8dcb5617971d2ae95e2f7227359d39991 SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef
@@ -43,6 +40,10 @@ EBUILD blackdown-jre-1.3.1-r20.ebuild 1610 RMD160 ffc297f284a0e6d14d9edbb7c7a0c6
 MD5 ab3c8ba3fe81b92f75a9fe4ce69a93c8 blackdown-jre-1.3.1-r20.ebuild 1610
 RMD160 ffc297f284a0e6d14d9edbb7c7a0c6211cd015cb blackdown-jre-1.3.1-r20.ebuild 1610
 SHA256 ddca678fbf0ebe5636bc8cd6b1b0888024dbd216dfff59857d9dc108bd85ed1b blackdown-jre-1.3.1-r20.ebuild 1610
+EBUILD blackdown-jre-1.3.1-r21.ebuild 1740 RMD160 78826f5a55e4a819cc9321d714773590e79f2b82 SHA1 28993545dbdd8c4724b178dc6fbe2a565961f25d SHA256 4976006b157d75f2e1df8c6733ab8fc1ff53e15f5e1f82a240b5ea0faff3e4e0
+MD5 ebbab0fc3b8b585314c7632aac1e6494 blackdown-jre-1.3.1-r21.ebuild 1740
+RMD160 78826f5a55e4a819cc9321d714773590e79f2b82 blackdown-jre-1.3.1-r21.ebuild 1740
+SHA256 4976006b157d75f2e1df8c6733ab8fc1ff53e15f5e1f82a240b5ea0faff3e4e0 blackdown-jre-1.3.1-r21.ebuild 1740
 EBUILD blackdown-jre-1.3.1-r9.ebuild 2076 RMD160 2177bb8c434712cc3cd1ad9edaab210542a03bdd SHA1 e253a79a4394746ec42baa04da14faab98e9b8a5 SHA256 a40aa65862458a1e64ea08c9c805c2b23273ff34a993de5fd68de7f0ba00ad56
 MD5 ff353506a910c548b9635488174880b6 blackdown-jre-1.3.1-r9.ebuild 2076
 RMD160 2177bb8c434712cc3cd1ad9edaab210542a03bdd blackdown-jre-1.3.1-r9.ebuild 2076
@@ -55,10 +56,18 @@ EBUILD blackdown-jre-1.4.1-r12.ebuild 2660 RMD160 118eda1a6ff955fafb5dad77e9faa8
 MD5 68fc073e041aa13d8d0ccbd448fb708b blackdown-jre-1.4.1-r12.ebuild 2660
 RMD160 118eda1a6ff955fafb5dad77e9faa8ceb69151cc blackdown-jre-1.4.1-r12.ebuild 2660
 SHA256 974801b214f74bb6163ef692fa1ef6b74c8173e6ac4923449c21f596291540f7 blackdown-jre-1.4.1-r12.ebuild 2660
+EBUILD blackdown-jre-1.4.1-r13.ebuild 2943 RMD160 f8457753f3fde4f6ffb3bfdbd6c021b02b2efc99 SHA1 5c48401030de8b1ede93ecdb8bbe80c45e056e69 SHA256 16cc98defcf4964d88f6e07fda651efc0c04d51ea71e36a07daf9b9e6e967e02
+MD5 e967c63e524325d363a85eb169868042 blackdown-jre-1.4.1-r13.ebuild 2943
+RMD160 f8457753f3fde4f6ffb3bfdbd6c021b02b2efc99 blackdown-jre-1.4.1-r13.ebuild 2943
+SHA256 16cc98defcf4964d88f6e07fda651efc0c04d51ea71e36a07daf9b9e6e967e02 blackdown-jre-1.4.1-r13.ebuild 2943
 EBUILD blackdown-jre-1.4.2.03-r11.ebuild 3490 RMD160 63be5da0feea401356d5e2a4e1da5fbcb3e8f4e0 SHA1 aafdbbc1c3294f6754b00bbe1230172a8df2624c SHA256 c4dec4ad3059d5b03b1e9dce6ec7d30a2250c33d03e9eaacf376df0c5bb1854c
 MD5 ac7b2879409ed7595f9748c6443c1ede blackdown-jre-1.4.2.03-r11.ebuild 3490
 RMD160 63be5da0feea401356d5e2a4e1da5fbcb3e8f4e0 blackdown-jre-1.4.2.03-r11.ebuild 3490
 SHA256 c4dec4ad3059d5b03b1e9dce6ec7d30a2250c33d03e9eaacf376df0c5bb1854c blackdown-jre-1.4.2.03-r11.ebuild 3490
+EBUILD blackdown-jre-1.4.2.03-r12.ebuild 3621 RMD160 6d089c4ce057a120f4d68e43cba1d3f0667bfbed SHA1 6546603a22ea8a7c6ccb35b6c2cf9480dc448801 SHA256 28cd58017deb81df52a6dc718196adfd4b7d0c1d00bdcd2f7ca92bdd66a6f961
+MD5 cfee80f2eb55ef875b9d658f5431d5be blackdown-jre-1.4.2.03-r12.ebuild 3621
+RMD160 6d089c4ce057a120f4d68e43cba1d3f0667bfbed blackdown-jre-1.4.2.03-r12.ebuild 3621
+SHA256 28cd58017deb81df52a6dc718196adfd4b7d0c1d00bdcd2f7ca92bdd66a6f961 blackdown-jre-1.4.2.03-r12.ebuild 3621
 EBUILD blackdown-jre-1.4.2.03-r2.ebuild 4350 RMD160 bd56b42a625c9dbf810f5e2700a30f810318517c SHA1 4bdaf370d953c51da0a987383210c0a99128293a SHA256 6a7fc983232e13e9c4f840f000ced3bd2a13c51e58ef6dd825498811ed6e9145
 MD5 e9466777b8441b4d9c81e293ea4eef91 blackdown-jre-1.4.2.03-r2.ebuild 4350
 RMD160 bd56b42a625c9dbf810f5e2700a30f810318517c blackdown-jre-1.4.2.03-r2.ebuild 4350
@@ -67,39 +76,41 @@ EBUILD blackdown-jre-1.4.2.03.ebuild 3971 RMD160 47fbb87f9deba0f9573c0d8ae73183e
 MD5 40074b507b5abdabb141ba1b4bc280d6 blackdown-jre-1.4.2.03.ebuild 3971
 RMD160 47fbb87f9deba0f9573c0d8ae73183e662ca5de6 blackdown-jre-1.4.2.03.ebuild 3971
 SHA256 5e9ef77ebfe2ca13279ef60a0f7181e07efc2776e3897a8233c0a0099ec169da blackdown-jre-1.4.2.03.ebuild 3971
-MISC ChangeLog 13494 RMD160 199eae975c9b74fa4bb2e13272994b8f555e6f0a SHA1 c234db85ac36578bf2a5a7edcc3602b2d8591f13 SHA256 2f3c87bca54271db619bc248d407a14e52f09f539e3b0b6585ae4609db96124b
-MD5 373fbe163aade1b14fa01f9510c047ec ChangeLog 13494
-RMD160 199eae975c9b74fa4bb2e13272994b8f555e6f0a ChangeLog 13494
-SHA256 2f3c87bca54271db619bc248d407a14e52f09f539e3b0b6585ae4609db96124b ChangeLog 13494
+MISC ChangeLog 13957 RMD160 6004eebbefb34c993fa92ca2e33864d9370cf0ab SHA1 c0a6a6d2c870358ab6b3b5a7f26430193f68619f SHA256 d6d4964f8080d42615cb14c9d99ea3af75589a712c297048feb66d75c7fa3b7b
+MD5 5ca73c0f7b0a60d5d6c49729c141cd26 ChangeLog 13957
+RMD160 6004eebbefb34c993fa92ca2e33864d9370cf0ab ChangeLog 13957
+SHA256 d6d4964f8080d42615cb14c9d99ea3af75589a712c297048feb66d75c7fa3b7b ChangeLog 13957
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r20 79
-RMD160 4314234d9dd5204a9b775ae7f774070af89b0a24 files/digest-blackdown-jre-1.3.1-r20 79
-SHA256 e868161a39a98ab80bdf2a017615a645542a684dd0a43e533ea0bdf04bcb6ee5 files/digest-blackdown-jre-1.3.1-r20 79
-MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
-RMD160 4314234d9dd5204a9b775ae7f774070af89b0a24 files/digest-blackdown-jre-1.3.1-r9 79
-SHA256 e868161a39a98ab80bdf2a017615a645542a684dd0a43e533ea0bdf04bcb6ee5 files/digest-blackdown-jre-1.3.1-r9 79
-MD5 a63a0f7f95b399e2e8cc5d741efdca46 files/digest-blackdown-jre-1.4.1-r1 460
-RMD160 a6076144bcc8bbb6e339197d7a1a9577a3c154fc files/digest-blackdown-jre-1.4.1-r1 460
-SHA256 9192852803e226a3b8a3acb19ca75928be5700bb6108323fe2291907604a7b7b files/digest-blackdown-jre-1.4.1-r1 460
-MD5 a63a0f7f95b399e2e8cc5d741efdca46 files/digest-blackdown-jre-1.4.1-r12 460
-RMD160 a6076144bcc8bbb6e339197d7a1a9577a3c154fc files/digest-blackdown-jre-1.4.1-r12 460
-SHA256 9192852803e226a3b8a3acb19ca75928be5700bb6108323fe2291907604a7b7b files/digest-blackdown-jre-1.4.1-r12 460
+MD5 c9d5662ac26f73a0e608a1725250bfe8 files/digest-blackdown-jre-1.3.1-r20 283
+RMD160 b97fd672f9b3bd87ee879aaea6e1b64461d45316 files/digest-blackdown-jre-1.3.1-r20 283
+SHA256 8f0d880350114a42775806f535aacd85c0ce6962d75b605209bb475cfe44a387 files/digest-blackdown-jre-1.3.1-r20 283
+MD5 c9d5662ac26f73a0e608a1725250bfe8 files/digest-blackdown-jre-1.3.1-r21 283
+RMD160 b97fd672f9b3bd87ee879aaea6e1b64461d45316 files/digest-blackdown-jre-1.3.1-r21 283
+SHA256 8f0d880350114a42775806f535aacd85c0ce6962d75b605209bb475cfe44a387 files/digest-blackdown-jre-1.3.1-r21 283
+MD5 c9d5662ac26f73a0e608a1725250bfe8 files/digest-blackdown-jre-1.3.1-r9 283
+RMD160 b97fd672f9b3bd87ee879aaea6e1b64461d45316 files/digest-blackdown-jre-1.3.1-r9 283
+SHA256 8f0d880350114a42775806f535aacd85c0ce6962d75b605209bb475cfe44a387 files/digest-blackdown-jre-1.3.1-r9 283
+MD5 e752edb3ace17eb9531767bb45173ac0 files/digest-blackdown-jre-1.4.1-r1 882
+RMD160 ace1505118aba0c37ba66f78230bc86197e07da3 files/digest-blackdown-jre-1.4.1-r1 882
+SHA256 e2da2d3efbfb904df24983f9241e44263fe7bab38bd3388b07869cbfb6f58a00 files/digest-blackdown-jre-1.4.1-r1 882
+MD5 e752edb3ace17eb9531767bb45173ac0 files/digest-blackdown-jre-1.4.1-r12 882
+RMD160 ace1505118aba0c37ba66f78230bc86197e07da3 files/digest-blackdown-jre-1.4.1-r12 882
+SHA256 e2da2d3efbfb904df24983f9241e44263fe7bab38bd3388b07869cbfb6f58a00 files/digest-blackdown-jre-1.4.1-r12 882
+MD5 e752edb3ace17eb9531767bb45173ac0 files/digest-blackdown-jre-1.4.1-r13 882
+RMD160 ace1505118aba0c37ba66f78230bc86197e07da3 files/digest-blackdown-jre-1.4.1-r13 882
+SHA256 e2da2d3efbfb904df24983f9241e44263fe7bab38bd3388b07869cbfb6f58a00 files/digest-blackdown-jre-1.4.1-r13 882
 MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03 545
 RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03 545
 SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03 545
 MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03-r11 545
 RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03-r11 545
 SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03-r11 545
+MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03-r12 545
+RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03-r12 545
+SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03-r12 545
 MD5 a4edfa2e2a6a20f2d7ed848170936fbd files/digest-blackdown-jre-1.4.2.03-r2 545
 RMD160 e1330992f66c365579792dee8b34907c422815dc files/digest-blackdown-jre-1.4.2.03-r2 545
 SHA256 21bf4f2b62747876401ef3bcf50f15d0ba8d371cf9ed04e2528591c934282da8 files/digest-blackdown-jre-1.4.2.03-r2 545
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFErPHpgo/w9rxVVVERAme3AJ4qY+daWcg3x/0MTLjkQFhp6AZMfQCaA9D6
-VS+aqBtNOiTiWSQVnsa3NZ4=
-=tpXv
------END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r21.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r21.ebuild
new file mode 100644
index 000000000000..b13fc5269f68
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r21.ebuild
@@ -0,0 +1,66 @@
+# Copyrigh 1999-2006 Gentoo Foundation
+# 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-r21.ebuild,v 1.1 2006/08/25 17:48:28 nichoj Exp $
+
+inherit java-vm-2 toolchain-funcs
+
+S=${WORKDIR}/j2re1.3.1
+DESCRIPTION="Blackdown Java Runtime Environment 1.3.1"
+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="1.3"
+KEYWORDS="~ppc -*"
+IUSE="nsplugin"
+
+DEPEND=">=sys-apps/sed-4
+	>=sys-devel/gcc-3.2"
+
+# Don't install env files for generation-1, because generation-1 system vm
+# always needs to be a JDK
+JAVA_VM_NO_GENERATION1="true"
+
+src_unpack() {
+	for a in ${A}; do
+		if [[ ${a} == *.bin ]]; then
+			echo ">>> Unpacking ${a}..."
+			tail -n +422 ${DISTDIR}/${a} | tar xjf - || die
+		else
+			# Handle files (none right now) that don't have a gcc
+			# version dependency
+			unpack ${a}
+		fi
+	done
+
+	# On sparc the files are owned by 1000:100 for some reason
+	if use sparc; then
+		# The files are owned by 1000.100, for some reason.
+		chown -R root:root
+	fi
+}
+
+src_install() {
+	typeset platform
+
+	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
+
+	if use nsplugin; then
+		case ${ARCH} in
+			amd64|x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+		esac
+		install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+	fi
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
+
+	set_java_env
+}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r13.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r13.ebuild
new file mode 100644
index 000000000000..76ae47e3db02
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r13.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# 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-r13.ebuild,v 1.1 2006/08/25 17:48:28 nichoj Exp $
+
+inherit java-vm-2 toolchain-funcs
+
+S=${WORKDIR}/j2re1.4.1
+DESCRIPTION="Blackdown Java Runtime Environment 1.4.1"
+
+SRC_URI="
+	x86? (
+		ftp://ftp.uk.linux.org/pub/linux/java//JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+		ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc2.95.bin
+	)
+	amd64? (
+		ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/i386/01/j2re-1.4.1-01-linux-i586-gcc3.2.bin
+	)
+	sparc? (
+		ftp://ftp.uk.linux.org/pub/linux/java/JDK-1.4.1/sparc/01/j2re-1.4.1-01-linux-sparc-gcc3.2.bin
+	)"
+HOMEPAGE="http://www.blackdown.org"
+DEPEND="
+	emul-linux-x86? ( >=app-emulation/emul-linux-x86-baselibs-1 )
+	>=dev-java/java-config-0.2.5
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+	sparc? ( >=sys-devel/gcc-3.2 )
+	amd64? ( >=sys-devel/gcc-3.2 )"
+JAVA_PROVIDE="jdbc-stdext"
+SLOT="1.4.1"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="~x86 ~sparc ~amd64 -*"
+IUSE="emul-linux-x86 nsplugin"
+
+# Don't install env files for generation-1, because generation-1 system vm
+# always needs to be a JDK
+JAVA_VM_NO_GENERATION1="true"
+
+# Take care of some QA warnings which we can't do anything about
+QA_TEXTRELS_x86="opt/${P}/lib/i386/libawt.so
+	opt/${P}/lib/i386/libjavaplugin_jni.so"
+
+src_unpack () {
+	typeset a want_gcc_ver
+
+	if [[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -ge 2 ]]; then
+		want_gcc_ver=3.2
+	else
+		want_gcc_ver=2.95
+	fi
+
+	for a in ${A}; do
+		if [[ ${a} == *gcc*.bin ]]; then
+			if [[ ${a} == *-gcc${want_gcc_ver}.bin ]]; then
+				echo ">>> Unpacking ${a}..."
+				tail -n +461 ${DISTDIR}/${a} | tar xjf - || die
+			fi
+		else
+			# Handle files (none right now) that don't have a gcc
+			# version dependency
+			unpack ${a}
+		fi
+	done
+}
+
+src_install() {
+	typeset platform
+
+	dodir /opt/${P}
+
+	cp -a ${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
+	# do not install plugins, security vulnerability   #72221
+	rm -rf ${D}/opt/${P}/plugin/
+	#if use nsplugin; then
+	#	case ${ARCH} in
+	#		amd64|x86) platform="i386" ;;
+	#		ppc) platform="ppc" ;;
+	#		sparc*) platform="sparc" ;;
+	#	esac
+	#	install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/javaplugin_oji.so
+	#fi
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
+
+	set_java_env
+
+	# Fix for bug #26629.
+	if [[ "${PROFILE_ARCH}" == "sparc64" ]]; then
+		sed -i -e 's/\/\//\/sparc\//g' \
+			${D}/etc/env.d/java/20blackdown-jre-1.4.1
+	fi
+}
+
+pkg_postinst() {
+	java-vm-2_pkg_postinst
+
+	if use nsplugin; then
+		echo
+		einfo "mozilla plugin NOT installed"
+		einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt"
+	fi
+}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r12.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r12.ebuild
new file mode 100644
index 000000000000..49b9db6a3ac2
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r12.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2006 Gentoo Foundation
+# 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.03-r12.ebuild,v 1.1 2006/08/25 17:48:28 nichoj Exp $
+
+inherit java-vm-2 versionator
+
+JREV=$(get_version_component_range 4- )
+JV=$(get_version_component_range 1-3 )
+J_URI="mirror://blackdown.org/JDK-${JV}"
+
+DESCRIPTION="Blackdown Java Runtime Environment"
+SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
+	x86? ( ${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586.bin )"
+#	sparc? ( ${J_URI}/sparc/${JREV}/j2re-${JV}-${JREV}-linux-sparc.bin )"
+#	ppc? ( ${J_URI}/ppc/${JREV}j2re-${JV}-${JREV}-linux-ppc.bin )"
+
+HOMEPAGE="http://www.blackdown.org"
+
+SLOT="1.4.2"
+LICENSE="sun-bcla-java-vm"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="nsplugin"
+DEPEND=">=sys-apps/sed-4"
+JAVA_PROVIDE="jdbc-stdext"
+
+S="${WORKDIR}/j2re${JV}"
+
+JAVAHOME="${D}/opt/${P}"
+
+# Don't install env files for generation-1, because generation-1 system vm
+# always needs to be a JDK
+JAVA_VM_NO_GENERATION1="true"
+
+# Extract the 'skip' value (offset of tarball) we should pass to tail
+get_offset() {
+	[ ! -f "$1" ] && return
+
+	local offset="`gawk '
+		/^[[:space:]]*skip[[:space:]]*=/ {
+
+			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
+			SKIP = $0
+		}
+
+		END { print SKIP }
+	' $1`"
+
+	eval echo $offset
+}
+
+src_unpack () {
+	local offset="`get_offset ${DISTDIR}/${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 -jxpf -
+}
+
+unpack_jars() {
+	# New to 1.4.2
+	local PACKED_JARS="lib/tools.jar lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
+	local UNPACK_CMD=""
+	if [ -f "$JAVAHOME/lib/unpack" ]; then
+		UNPACK_CMD="$JAVAHOME/lib/unpack"
+		chmod +x "$UNPACK_CMD"
+		#packerror=""
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
+		for i in $PACKED_JARS; do
+			if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then
+				einfo "Creating ${JAVAHOME}/${i}\n"
+				"$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" "$JAVAHOME/$i"
+				if [ ! -f "$JAVAHOME/$i" ]; then
+					die "Failed to unpack jar files ${i}." # Please refer\n"
+					#ewarn "to the Troubleshooting section of the Installation\n"
+					#ewarn "Instructions on the download page for more information.n"
+					#packerror="1"
+				fi
+				rm -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack"
+			fi
+		done
+	fi
+	rm -f "$UNPACK_CMD"
+}
+
+src_install() {
+	typeset platform
+
+	dodir /opt/${P}
+
+	cp -pPR ${S}/{bin,lib,man,plugin} ${JAVAHOME} || die "failed to copy"
+
+	newicon ${JAVAHOME}/plugin/desktop/sun_java.png ${PN}-${SLOT}.png || die "failed to install icon"
+	rm -fr ${JAVAHOME}/plugin/desktop
+	make_desktop_entry "ControlPanel" "Java Control Panel" "${PN}-${SLOT}.png" "Settings" \
+		|| die "failed to make desktop entry"
+
+	dodoc COPYRIGHT README
+
+	# Install mozilla plugin
+	if use nsplugin; then
+		case ${ARCH} in
+			x86) platform="i386" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+			amd64) platform="amd64" ;;
+		esac
+		install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
+
+	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
+
+	find ${JAVAHOME} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	# install env into /etc/env.d
+	set_java_env
+
+	# Fix for bug 26629
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		dosym /opt/${P}/lib/sparc /opt/${P}/lib/sparc64
+	fi
+
+	unpack_jars
+}
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r20 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r20
index 6628e5243791..706b96aad578 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r20
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r20
@@ -1 +1,3 @@
 MD5 7451bcf1baa111ceeead07a453f18135 j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
+RMD160 1fab7ff8c3b18fbfeb7de31ac658c5450454ddb3 j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
+SHA256 d000f262482cef63b7246cbc2d61edf36b077aa82a45b2febda5fba8ba5928be j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r21 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r21
new file mode 100644
index 000000000000..706b96aad578
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r21
@@ -0,0 +1,3 @@
+MD5 7451bcf1baa111ceeead07a453f18135 j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
+RMD160 1fab7ff8c3b18fbfeb7de31ac658c5450454ddb3 j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
+SHA256 d000f262482cef63b7246cbc2d61edf36b077aa82a45b2febda5fba8ba5928be j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r9 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r9
index 6628e5243791..706b96aad578 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r9
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.3.1-r9
@@ -1 +1,3 @@
 MD5 7451bcf1baa111ceeead07a453f18135 j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
+RMD160 1fab7ff8c3b18fbfeb7de31ac658c5450454ddb3 j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
+SHA256 d000f262482cef63b7246cbc2d61edf36b077aa82a45b2febda5fba8ba5928be j2re-1.3.1-02c-FCS-linux-ppc.bin 11274226
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1
index 831c160183fd..c5f072f9094c 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r1
@@ -1,5 +1,9 @@
 MD5 3857975cd3b7ebcbe544ba0a46308e0c j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+RMD160 61468d3f2c806e212b7f95f8d6cfd416b168e5cf j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+SHA256 4fe0a3514093d40af834e747188e02f0a8265de4e8c65e3014e1c9c17a877d13 j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
 MD5 bea9c5869c084815bee026d466094995 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+RMD160 71c9397698ccaae0b66b55c4e7ef15a464e6555c j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+SHA256 27f80b660adbfa85296046259305584ae9068cd6a764f14a47eb5f610d997a84 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
 MD5 29f856a10aae9f296a09a3f9deaf01b7 j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
 RMD160 27f058db585657d19dcc19a743a000250b38885d j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
 SHA256 a20b3be6c92935a848e2c9d4331697f1a29505c6a0b4bce051c1416eb439fd0f j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r12 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r12
index 831c160183fd..c5f072f9094c 100644
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r12
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r12
@@ -1,5 +1,9 @@
 MD5 3857975cd3b7ebcbe544ba0a46308e0c j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+RMD160 61468d3f2c806e212b7f95f8d6cfd416b168e5cf j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+SHA256 4fe0a3514093d40af834e747188e02f0a8265de4e8c65e3014e1c9c17a877d13 j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
 MD5 bea9c5869c084815bee026d466094995 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+RMD160 71c9397698ccaae0b66b55c4e7ef15a464e6555c j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+SHA256 27f80b660adbfa85296046259305584ae9068cd6a764f14a47eb5f610d997a84 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
 MD5 29f856a10aae9f296a09a3f9deaf01b7 j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
 RMD160 27f058db585657d19dcc19a743a000250b38885d j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
 SHA256 a20b3be6c92935a848e2c9d4331697f1a29505c6a0b4bce051c1416eb439fd0f j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r13 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r13
new file mode 100644
index 000000000000..c5f072f9094c
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.1-r13
@@ -0,0 +1,9 @@
+MD5 3857975cd3b7ebcbe544ba0a46308e0c j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+RMD160 61468d3f2c806e212b7f95f8d6cfd416b168e5cf j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+SHA256 4fe0a3514093d40af834e747188e02f0a8265de4e8c65e3014e1c9c17a877d13 j2re-1.4.1-01-linux-i586-gcc2.95.bin 20470579
+MD5 bea9c5869c084815bee026d466094995 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+RMD160 71c9397698ccaae0b66b55c4e7ef15a464e6555c j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+SHA256 27f80b660adbfa85296046259305584ae9068cd6a764f14a47eb5f610d997a84 j2re-1.4.1-01-linux-i586-gcc3.2.bin 20661166
+MD5 29f856a10aae9f296a09a3f9deaf01b7 j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
+RMD160 27f058db585657d19dcc19a743a000250b38885d j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
+SHA256 a20b3be6c92935a848e2c9d4331697f1a29505c6a0b4bce051c1416eb439fd0f j2re-1.4.1-01-linux-sparc-gcc3.2.bin 22057279
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r12 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r12
new file mode 100644
index 000000000000..3359453bf0ac
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.03-r12
@@ -0,0 +1,6 @@
+MD5 0785ca638962dc85a31dd8a6dc40007a j2re-1.4.2-03-linux-amd64.bin 13198020
+RMD160 7ead3f8084060d689b91a65d2601d047c1ba2fb2 j2re-1.4.2-03-linux-amd64.bin 13198020
+SHA256 036c8595da3e6157971efe333db7d771bbc8eabae36b691341c2199172aa9439 j2re-1.4.2-03-linux-amd64.bin 13198020
+MD5 cf4f3c8c86f64fd532f074943b432285 j2re-1.4.2-03-linux-i586.bin 13541431
+RMD160 82c707956dc65e9640fda97587ac7426e4f7be98 j2re-1.4.2-03-linux-i586.bin 13541431
+SHA256 636c414583f22d7d9f12f56855bfcb84227cec100ed0108a2b8f0e5f6b7025ef j2re-1.4.2-03-linux-i586.bin 13541431