Updated JRE

8 files changed, 13 insertions, 133 deletions

diff --git a/dev-java/ibm-jre/ChangeLog b/dev-java/ibm-jre/ChangeLog
index 52cb59bd9070..cdbb1c796116 100644
--- a/dev-java/ibm-jre/ChangeLog
+++ b/dev-java/ibm-jre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ibm-jre
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.19 2003/07/11 21:41:53 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.20 2003/11/20 04:21:44 strider Exp $
+
+*ibm-jre-1.4.1 (20 Nov 2003)
+
+  20 Nov 2003; Adrian Almenar <strider@gentoo.org> ibm-jre-1.4.1.ebuild:
+  Update JRE version
 
 *ibm-jre-1.4.0-r2 (23 Dec 2002)
 
diff --git a/dev-java/ibm-jre/Manifest b/dev-java/ibm-jre/Manifest
index dfc2373a0b6c..9531b96d0bd7 100644
--- a/dev-java/ibm-jre/Manifest
+++ b/dev-java/ibm-jre/Manifest
@@ -1,17 +1,11 @@
-MD5 4f09013dc5ff33b3cdc46431d7c81195 ibm-jre-1.4.0-r2.ebuild 1085
 MD5 1fff1680f8255c28f0a81a5717724f4e ibm-jre-1.3.0-r3.ebuild 1682
-MD5 652e76f73a1c3591cddd82162656bb84 ibm-jre-1.4.0-r1.ebuild 1317
 MD5 c937d18c5faa2e6eed7fd8874a4ed46c ibm-jre-1.3.1-r2.ebuild 1111
-MD5 ccd29fc31befc3b13bb52e6cee0de39b ibm-jre-1.4.1.ebuild 1087
-MD5 755c57b3d3044635dd9fd6a1634580e3 ChangeLog 3641
-MD5 53c05925a23e333c7817e85e2e4fa06f ibm-jre-1.3.1-r1.ebuild 1691
+MD5 9b9bd16b55d2b413b1929c4825d6096c ibm-jre-1.4.1.ebuild 1085
+MD5 4c118bf32f50ba84ab4a9ba3900b84fd ChangeLog 3769
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.1 0
 MD5 a73a7fe7c8d1fdc4b889de313c038fa5 files/ibm-jre-1.3.0 524
 MD5 9d2bb8d0966243d813fa88c5d0563a6c files/ibm-jre-1.3.1 524
 MD5 37b5c01aa155b0159af97cb802ea6167 files/ibm-jre-1.4.0 771
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.0-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.1-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.0-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.0-r2 0
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.4.0-r1 b/dev-java/ibm-jre/files/digest-ibm-jre-1.4.0-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.4.0-r1
+++ /dev/null
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.4.0-r2 b/dev-java/ibm-jre/files/digest-ibm-jre-1.4.0-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.4.0-r2
+++ /dev/null
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.1-r1 b/dev-java/ibm-jre/files/digest-ibm-jre-1.4.1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.1-r1
+++ b/dev-java/ibm-jre/files/digest-ibm-jre-1.4.1
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
deleted file mode 100644
index 601befefb117..000000000000
--- a/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,64 +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/ibm-jre/ibm-jre-1.3.1-r1.ebuild,v 1.11 2003/09/06 22:26:46 msterret Exp $
-
-At=IBMJava2-JRE-131.tgz
-S=${WORKDIR}/IBMJava2-131
-DESCRIPTION="IBM JRE 1.3.1"
-SRC_URI=""
-HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
-
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/java-scheme-2"
-LICENSE="IBM-ILNWP"
-SLOT="1.3"
-KEYWORDS="x86 -ppc -sparc "
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-	cp -dpR jre/* ${D}/opt/${P}/
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	# Plugin as been disabled as it crashes all the time
-#	if [ "`use mozilla`" ] ; then
-#		dodir /usr/lib/mozilla/plugins
-#		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
-#	fi
-
-	dodir /etc/env.d/java
-	sed \
-		-e "s/@P@/${P}/g" \
-		-e "s/@PV@/${PV}/g" \
-		-e "s/@PF@/${PF}/g" \
-		< ${FILESDIR}/ibm-jre-${PV} \
-		> ${D}/etc/env.d/java/20ibm-jre-${PV}
-}
-
-src_postinst() {
-#	if [ -e /opt/netscape/plugins ] ; then
-#		ln -sf /opt/${P}/bin/javaplugin.so /opt/netscape/plugins/
-#		einfo "Netscape 4.x Java plugin installed"
-#	fi
-
-#	if [ "`use mozilla`" ] ; then
-#                einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-#        else
-#                einfo "To install the browser plugin manually, do:"
-#		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-#        fi
-	true
-}
diff --git a/dev-java/ibm-jre/ibm-jre-1.4.0-r1.ebuild b/dev-java/ibm-jre/ibm-jre-1.4.0-r1.ebuild
deleted file mode 100644
index e1b3c183e92c..000000000000
--- a/dev-java/ibm-jre/ibm-jre-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,55 +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/ibm-jre/ibm-jre-1.4.0-r1.ebuild,v 1.4 2003/07/11 21:41:53 aliz Exp $
-
-inherit nsplugins
-
-At="IBMJava2-JRE-14.tgz"
-S="${WORKDIR}/IBMJava2-14"
-DESCRIPTION="IBM JRE 1.4.0"
-SRC_URI=""
-HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
-IUSE=""
-DEPEND="virtual/glibc
-	>=dev-java/java-config-0.2.5"
-RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
-	virtual/java-scheme-2"
-LICENSE="IBM-ILNWP"
-SLOT="1.4"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
-}
-
-
-src_install () {
-
-	dodir /opt/${P}
-	cp -dpR jre/* ${D}/opt/${P}/
-
-	dohtml -a html,htm,HTML -r docs
-	dodoc docs/COPYRIGHT
-
-	dodir /etc/env.d/java
-	sed \
-		-e "s/@P@/${P}/g" \
-		-e "s/@PV@/${PV}/g" \
-		-e "s/@PF@/${PF}/g" \
-		< ${FILESDIR}/ibm-jre-${PV} \
-		> ${D}/etc/env.d/java/20ibm-jre-${PV}
-}
-
-src_postinst() {
-	if [ "`use mozilla`" ] ; then
-		einfo "The Mozilla browser plugin has been installed as /usr/lib/mozilla/plugins/javaplugin_oji.so"
-	else
-		einfo "To install the browser plugin manually, do:"
-		einfo "ln -sf /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/"
-	fi
-	true
-}
diff --git a/dev-java/ibm-jre/ibm-jre-1.4.0-r2.ebuild b/dev-java/ibm-jre/ibm-jre-1.4.1.ebuild
index 3d3ca9fe3295..c24a84ff717b 100644
--- a/dev-java/ibm-jre/ibm-jre-1.4.0-r2.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.4.1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.4.0-r2.ebuild,v 1.2 2003/02/13 10:10:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.4.1.ebuild,v 1.1 2003/11/20 04:21:44 strider Exp $
 
 inherit nsplugins
 
-At="IBMJava2-JRE-14.tgz"
-S="${WORKDIR}/IBMJava2-14"
-DESCRIPTION="IBM JRE 1.4.0"
+At="IBMJava2-JRE-141.tgz"
+S="${WORKDIR}/IBMJava2-141"
+DESCRIPTION="IBM JRE 1.4.1"
 SRC_URI=""
 HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
 IUSE=""
 DEPEND="virtual/glibc
 	>=dev-java/java-config-0.2.5"
 RDEPEND="$DEPEND"
-PROVIDE="virtual/jre-1.3.1
+PROVIDE="virtual/jre-1.4.1
 	virtual/java-scheme-2"
 LICENSE="IBM-ILNWP"
 SLOT="1.4"