summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-09-01 03:09:34 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-09-01 03:09:34 +0000
commit6796d29d3747d3d7b123d690b737fac7ec894494 (patch)
tree8fc23faff23147cbbc6ffc9d47b6a4d7362f650a /dev-java
parentRemoved JAVA_VM_NO_GENERATION_1, because default behavior is not to install f... (diff)
downloadgentoo-2-6796d29d3747d3d7b123d690b737fac7ec894494.tar.gz
gentoo-2-6796d29d3747d3d7b123d690b737fac7ec894494.tar.bz2
gentoo-2-6796d29d3747d3d7b123d690b737fac7ec894494.zip
Removed JAVA_VM_NO_GENERATION1, because default behavior now is not to install for generation-1
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/sun-jre-bin/ChangeLog7
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild6
-rw-r--r--dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild6
3 files changed, 8 insertions, 11 deletions
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 3dadf9cc8301..c19407254a5b 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/sun-jre-bin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.54 2006/08/25 16:37:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.55 2006/09/01 03:09:34 nichoj Exp $
+
+ 01 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+ sun-jre-bin-1.4.2.12-r1.ebuild, sun-jre-bin-1.5.0.08-r1.ebuild:
+ Removed JAVA_VM_NO_GENERATION1, because default behavior now is not to
+ install for generation-1
*sun-jre-bin-1.5.0.08-r1 (25 Aug 2006)
*sun-jre-bin-1.4.2.12-r1 (25 Aug 2006)
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild
index ff61be71b48d..31bdedc01ac9 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.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/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild,v 1.1 2006/08/25 16:37:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.12-r1.ebuild,v 1.2 2006/09/01 03:09:34 nichoj Exp $
inherit java-vm-2 eutils
@@ -43,10 +43,6 @@ CHPAX_CONSERVATIVE_FLAGS="pemsv"
DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2re-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg"
-# Don't install env files for generation-1, because generation-1 system vm
-# always needs to be a JDK
-JAVA_VM_NO_GENERATION1="true"
-
pkg_nofetch() {
einfo "Please download ${At} from:"
einfo ${DOWNLOAD_URL}
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
index ea2faece19d9..12b890e77636 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.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/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild,v 1.1 2006/08/25 16:37:02 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.08-r1.ebuild,v 1.2 2006/09/01 03:09:34 nichoj Exp $
inherit java-vm-2 eutils
@@ -51,10 +51,6 @@ PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib
# this is needed for proper operating under a PaX kernel without activated grsecurity acl
CHPAX_CONSERVATIVE_FLAGS="pemsv"
-# 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() {
if [ ! -r ${DISTDIR}/${At} ]; then
die "cannot read ${At}. Please check the permission and try again."