Removed JAVA_VM_NO_GENERATION_1, because default behavior is not to install for generation-1

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 26 insertions, 32 deletions

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index e81b6243449d..f3ccb09af8fd 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.79 2006/08/25 17:48:28 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.80 2006/09/01 03:04:23 nichoj Exp $
+
+  01 Sep 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:
+  Removed JAVA_VM_NO_GENERATION_1, because default behavior is not to install
+  for generation-1
 
 *blackdown-jre-1.4.2.03-r12 (25 Aug 2006)
 *blackdown-jre-1.4.1-r13 (25 Aug 2006)
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 1c03317ce231..432b0b93816a 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -40,10 +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-r21.ebuild 1607 RMD160 53bb8b537c50cfe5ca27dcd2d49a404eea96b8f6 SHA1 386f2ee30ba6402f38e60e978019f99766a09bb2 SHA256 8a73c2a2ef7e6c1a0b2c9874c01b3ce0ba46b873a319bbe2a5b1d71c6fbb4e51
+MD5 b031223359f694aceebfb60735028dd6 blackdown-jre-1.3.1-r21.ebuild 1607
+RMD160 53bb8b537c50cfe5ca27dcd2d49a404eea96b8f6 blackdown-jre-1.3.1-r21.ebuild 1607
+SHA256 8a73c2a2ef7e6c1a0b2c9874c01b3ce0ba46b873a319bbe2a5b1d71c6fbb4e51 blackdown-jre-1.3.1-r21.ebuild 1607
 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
@@ -56,18 +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.1-r13.ebuild 2810 RMD160 f9f336ff2637c9982e1761229c251694ae04fd5a SHA1 14927d55c5bc492ece540ffe0bb6d39443e9c40d SHA256 3a2d39b4acce334ecabe8773364f94c0aa02611bbeb98864d358fcfbe10822ce
+MD5 a2bd61edba8da80831c80fd9e57b0e7c blackdown-jre-1.4.1-r13.ebuild 2810
+RMD160 f9f336ff2637c9982e1761229c251694ae04fd5a blackdown-jre-1.4.1-r13.ebuild 2810
+SHA256 3a2d39b4acce334ecabe8773364f94c0aa02611bbeb98864d358fcfbe10822ce blackdown-jre-1.4.1-r13.ebuild 2810
 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-r12.ebuild 3488 RMD160 025f9e2745eeb2658bc40cb50f4e5b08a7379603 SHA1 5c6f348b85e03bdc1c9251fcbcd7ec81b4983658 SHA256 bfe6bd0d3dd4046fce52bd93d86073d4d9b0fecdbee122366e9539103a324d43
+MD5 7889bb5e75e53c0b929fc24e85ca4a3f blackdown-jre-1.4.2.03-r12.ebuild 3488
+RMD160 025f9e2745eeb2658bc40cb50f4e5b08a7379603 blackdown-jre-1.4.2.03-r12.ebuild 3488
+SHA256 bfe6bd0d3dd4046fce52bd93d86073d4d9b0fecdbee122366e9539103a324d43 blackdown-jre-1.4.2.03-r12.ebuild 3488
 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
@@ -76,10 +76,10 @@ 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 13957 RMD160 6004eebbefb34c993fa92ca2e33864d9370cf0ab SHA1 c0a6a6d2c870358ab6b3b5a7f26430193f68619f SHA256 d6d4964f8080d42615cb14c9d99ea3af75589a712c297048feb66d75c7fa3b7b
-MD5 5ca73c0f7b0a60d5d6c49729c141cd26 ChangeLog 13957
-RMD160 6004eebbefb34c993fa92ca2e33864d9370cf0ab ChangeLog 13957
-SHA256 d6d4964f8080d42615cb14c9d99ea3af75589a712c297048feb66d75c7fa3b7b ChangeLog 13957
+MISC ChangeLog 14208 RMD160 1242bde076de9e12a4c020b7ee935328f5c66354 SHA1 8d6b88729d04a59a9c3ff618296728a341f7609f SHA256 5337e59b5e104c6c4035432eaed768d8d821e00db5a2c3b6163bcc4f3fdc8152
+MD5 a23a04a2223c3bafef9f144deaaf1ce3 ChangeLog 14208
+RMD160 1242bde076de9e12a4c020b7ee935328f5c66354 ChangeLog 14208
+SHA256 5337e59b5e104c6c4035432eaed768d8d821e00db5a2c3b6163bcc4f3fdc8152 ChangeLog 14208
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
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
index b13fc5269f68..a9a7f5dd71f9 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r21.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r21.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r21.ebuild,v 1.2 2006/09/01 03:04:23 nichoj Exp $
 
 inherit java-vm-2 toolchain-funcs
 
@@ -17,10 +17,6 @@ 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
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
index 76ae47e3db02..476d6eb10f71 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r13.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r13.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r13.ebuild,v 1.2 2006/09/01 03:04:23 nichoj Exp $
 
 inherit java-vm-2 toolchain-funcs
 
@@ -32,10 +32,6 @@ 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"
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
index 49b9db6a3ac2..5b43eb4ed427 100644
--- 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
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.03-r12.ebuild,v 1.2 2006/09/01 03:04:23 nichoj Exp $
 
 inherit java-vm-2 versionator
 
@@ -27,10 +27,6 @@ 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