Version bumps, plus support for new Java system.

(Portage version: 2.1.1_pre1)

8 files changed, 198 insertions, 1 deletions

diff --git a/dev-java/jrockit-jdk-bin/ChangeLog b/dev-java/jrockit-jdk-bin/ChangeLog
index c08d52208507..d3508e185ad6 100644
--- a/dev-java/jrockit-jdk-bin/ChangeLog
+++ b/dev-java/jrockit-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jrockit-jdk-bin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.18 2006/02/21 15:27:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.19 2006/06/25 19:40:38 nichoj Exp $
+
+  25 Jun 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/jrockit-jdk-bin-1.4.env, +files/jrockit-jdk-bin-1.5.env:
+  Version bumps, plus support for new Java system.
 
   21 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   jrockit-jdk-bin-1.4.2.08.ebuild, jrockit-jdk-bin-1.5.0.03.ebuild:
diff --git a/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.08 b/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.08
index 179f82b3e7e6..fd9a2f53fe98 100644
--- a/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.08
+++ b/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.08
@@ -1,2 +1,4 @@
 MD5 906900e47002183edd49bfb4e6597dc4 jrockit-24.5.0-j2sdk1.4.2_08-linux-ia32.bin 32200340
+RMD160 d8ee89bbde34d33ec681b2495ab98dc460c7cac7 jrockit-24.5.0-j2sdk1.4.2_08-linux-ia32.bin 32200340
+SHA256 7c93bfe0bff648e5bdff9e9a5079e37dd0a825a1a9ca0d308a4ec913d2970bda jrockit-24.5.0-j2sdk1.4.2_08-linux-ia32.bin 32200340
 MD5 8a3eefdc10aca0cd00ad6f222d9b0238 jrockit-24.5.0-j2sdk1.4.2_08-linux-ipf.bin 32881863
diff --git a/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.10 b/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.10
new file mode 100644
index 000000000000..1e08b25ef988
--- /dev/null
+++ b/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.4.2.10
@@ -0,0 +1,6 @@
+MD5 4a4ab12c3a05e18b8982fda0e8c68320 jrockit-R26.3.0-jdk1.4.2_10-linux-ia32.bin 48543363
+RMD160 69449749d2903e02dcc5ff9bd848ab7bf855ff25 jrockit-R26.3.0-jdk1.4.2_10-linux-ia32.bin 48543363
+SHA256 b947976f97eeef65786ce765c7dad1944989059f4cf88494bf34fa3ddd583785 jrockit-R26.3.0-jdk1.4.2_10-linux-ia32.bin 48543363
+MD5 1807d0e3a5967355353f77024bb54aec jrockit-R26.3.0-jdk1.4.2_10-linux-ipf.bin 52624225
+RMD160 7801c895acac1ca76e3e24825f52ccc3c80d5c91 jrockit-R26.3.0-jdk1.4.2_10-linux-ipf.bin 52624225
+SHA256 4802d824b33919e8c9bff6f0aa577a7fd4faefe52ea7dda0d90a694a39160bfd jrockit-R26.3.0-jdk1.4.2_10-linux-ipf.bin 52624225
diff --git a/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.5.0.06 b/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.5.0.06
new file mode 100644
index 000000000000..9bee7dcb7fc9
--- /dev/null
+++ b/dev-java/jrockit-jdk-bin/files/digest-jrockit-jdk-bin-1.5.0.06
@@ -0,0 +1,6 @@
+MD5 a3c7117a4e741b30f84287d3f829749c jrockit-R26.3.0-jdk1.5.0_06-linux-ia32.bin 79200420
+RMD160 7a7cfe91eec5856e951d7ad3d8b664818872da17 jrockit-R26.3.0-jdk1.5.0_06-linux-ia32.bin 79200420
+SHA256 c2b0c46234de413afaa5fb87f30f6a6a183e6842c434a6a9388fa2ed7394d347 jrockit-R26.3.0-jdk1.5.0_06-linux-ia32.bin 79200420
+MD5 e22aef9f628fb34b4ca393a2d206ee9b jrockit-R26.3.0-jdk1.5.0_06-linux-x64.bin 79845210
+RMD160 e949c6d8892022c7ae03eecec3321eb888c39ed4 jrockit-R26.3.0-jdk1.5.0_06-linux-x64.bin 79845210
+SHA256 791d6a15ecf28d286a13a45dd44d4a070c9b24f3cee21906dd90c6786ee9b8b2 jrockit-R26.3.0-jdk1.5.0_06-linux-x64.bin 79845210
diff --git a/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.4.env b/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.4.env
new file mode 100644
index 000000000000..cb87acef740c
--- /dev/null
+++ b/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.4.env
@@ -0,0 +1,13 @@
+VERSION="WebLogic JRockit @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="/opt/@P@/jre/lib"
+MANPATH="/opt/@P@/man/"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.4"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/managementapi.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.5.env b/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.5.env
new file mode 100644
index 000000000000..acf04428a4f8
--- /dev/null
+++ b/dev-java/jrockit-jdk-bin/files/jrockit-jdk-bin-1.5.env
@@ -0,0 +1,13 @@
+VERSION="WebLogic JRockit @PV@"
+JAVA_HOME=/opt/@P@
+JDK_HOME=/opt/@P@
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="/opt/@P@/jre/lib"
+MANPATH="/opt/@P@/man/"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.5"
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/jrockit.jar:${JAVA_HOME}/jre/lib/managementapi.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.10.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.10.ebuild
new file mode 100644
index 000000000000..449a574ab1c1
--- /dev/null
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.10.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.10.ebuild,v 1.1 2006/06/25 19:40:38 nichoj Exp $
+
+IUSE=""
+
+# WARNING: This is the default VM on ia64, so treat this ebuild
+# with proper care.
+
+# The stripping of symbols seems to mess up the BEA code. Not sure why.
+RESTRICT="nostrip fetch"
+
+inherit java-vm-2 versionator
+
+PV_MAJOR="$(get_version_component_range 1-3 ${PV})"
+PV_EXTRA="$(get_version_component_range 4 ${PV})"
+HOMEPAGE_PV="$(delete_all_version_separators ${PV_MAJOR})_${PV_EXTRA}"
+UPSTREAM_RELEASE="26.3.0"
+
+SRC_URI_BASE="jrockit-R${UPSTREAM_RELEASE}-jdk${PV_MAJOR}_${PV_EXTRA}-linux-"
+SRC_URI="ia64? ( ${SRC_URI_BASE}ipf.bin )
+		x86? ( ${SRC_URI_BASE}ia32.bin )
+		amd64? ( ${SRC_URI_BASE}ia32.bin )"
+DESCRIPTION="BEA WebLogic's J2SE Development Kit, R${UPSTREAM_RELEASE}"
+
+HOMEPAGE="http://www.bea.com/framework.jsp?CNT=index.htm&FP=/content/products/jrockit/"
+FETCH_URI="http://commerce.bea.com/products/weblogicjrockit/accept_terms142.jsp"
+LICENSE="jrockit"
+SLOT="1.4"
+KEYWORDS="~x86 ~ia64 ~amd64"
+DEPEND="virtual/libc
+	>=dev-java/java-config-0.2.5
+	>=app-arch/unzip-5.50-r1"
+
+PROVIDE="virtual/jre
+	virtual/jdk"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from:"
+	einfo ${FETCH_URI}
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+
+	mkdir ${S}
+	unzip ${DISTDIR}/${A} -d ${S} || die "Failed to unpack ${A}"
+
+	cd ${S}
+	for z in *.zip ; do
+		unzip $z || die
+		rm $z
+	done
+}
+
+src_install() {
+	local dirs="bin console include jre lib"
+	dodir /opt/${P}
+
+	for i in ${dirs} ; do
+		cp -R $i ${D}/opt/${P}/ || die
+	done
+
+	newdoc README.TXT README
+	newdoc LICENSE LICENSE
+
+	set_java_env ${FILESDIR}/${VMHANDLE}
+}
+
+pkg_postinst () {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+	einfo "Please review the license agreement in /usr/share/doc/${PF}/LICENSE"
+	einfo "If you do not agree to the terms of this license, please uninstall this package"
+}
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06.ebuild
new file mode 100644
index 000000000000..ef131af8456f
--- /dev/null
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.06.ebuild,v 1.1 2006/06/25 19:40:38 nichoj Exp $
+
+# WARNING: This is the default VM on ia64, so treat this ebuild
+# with proper care.
+
+# The stripping of symbols seems to mess up the BEA code. Not sure why.
+RESTRICT="nostrip fetch"
+
+inherit java-vm-2 versionator
+
+PV_MAJOR="$(get_version_component_range 1-3 ${PV})"
+PV_EXTRA="$(get_version_component_range 4 ${PV})"
+HOMEPAGE_PV="$(delete_all_version_separators ${PV_MAJOR})_${PV_EXTRA}"
+UPSTREAM_RELEASE="26.3.0"
+
+SRC_URI_BASE="jrockit-R${UPSTREAM_RELEASE}-jdk${PV_MAJOR}_${PV_EXTRA}-linux-"
+SRC_URI="x86? ( ${SRC_URI_BASE}ia32.bin )
+		amd64? ( ${SRC_URI_BASE}x64.bin )"
+DESCRIPTION="BEA WebLogic's J2SE Development Kit, R${UPSTREAM_RELEASE}"
+
+HOMEPAGE="http://www.bea.com/framework.jsp?CNT=index.htm&FP=/content/products/jrockit/"
+FETCH_URI="http://commerce.bea.com/products/weblogicjrockit/accept_terms50.jsp"
+
+LICENSE="jrockit"
+SLOT="1.5"
+# ia64 not provided yet
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=app-arch/unzip-5.50-r1"
+PROVIDE="virtual/jre
+	virtual/jdk"
+JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
+
+JAVA_VM_NO_GENERATION1=true
+
+pkg_nofetch() {
+	einfo "Please download ${A} from:"
+	einfo ${FETCH_URI}
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+
+	mkdir ${S}
+	unzip ${DISTDIR}/${A} -d ${S} || die "Failed to unpack ${A}"
+
+	cd ${S}
+	for z in *.zip ; do
+		unzip $z || die
+		rm $z
+	done
+}
+
+src_install() {
+	#no man in this version
+	local dirs="bin console include jre lib"
+	dodir /opt/${P}
+
+	for i in ${dirs} ; do
+		cp -R $i ${D}/opt/${P}/ || die
+	done
+
+	newdoc README.TXT README
+	newdoc LICENSE LICENSE
+
+	set_java_env
+}
+
+pkg_postinst () {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+	einfo "Please review the license agreement in /usr/share/doc/${PF}/LICENSE"
+	einfo "If you do not agree to the terms of this license, please uninstall this package"
+}