Clean up and digest fixes...

7 files changed, 20 insertions, 134 deletions

diff --git a/dev-java/ibm-jre/ChangeLog b/dev-java/ibm-jre/ChangeLog
index 7da28a8e365c..8268dbd73849 100644
--- a/dev-java/ibm-jre/ChangeLog
+++ b/dev-java/ibm-jre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jre
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.25 2004/03/01 07:16:53 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ChangeLog,v 1.26 2004/03/18 06:42:20 zx Exp $
+
+  18 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ibm-jre-1.3.0-r3.ebuild,
+  ibm-jre-1.3.1-r2.ebuild, ibm-jre-1.4.1-r2.ebuild, ibm-jre-1.4.1.ebuild:
+  Clean up :) + digest fixes
 
   01 Mar 2004; <mkennedy@gentoo.org> files/ibm-jre-1.3.0, files/ibm-jre-1.3.1:
   Remove CLASSPATH from environment variable list.
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r3 b/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.3.0-r3
+++ /dev/null
diff --git a/dev-java/ibm-jre/files/digest-ibm-jre-1.4.1 b/dev-java/ibm-jre/files/digest-ibm-jre-1.4.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/ibm-jre/files/digest-ibm-jre-1.4.1
+++ /dev/null
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
deleted file mode 100644
index 87a9276d9ad8..000000000000
--- a/dev-java/ibm-jre/ibm-jre-1.3.0-r3.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.0-r3.ebuild,v 1.11 2004/02/22 19:50:50 agriffis Exp $
-
-At=IBMJava2-JRE-13.tgz
-S=${WORKDIR}/IBMJava2-13
-DESCRIPTION="IBM JRE 1.3.0"
-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
-	virtual/java-scheme-2"
-SLOT="1.3"
-LICENSE="IBM-ILNWP"
-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 is 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.3.1-r2.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.1-r2.ebuild
index 35d347fac087..3cabd7033935 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.1-r2.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.1-r2.ebuild
@@ -1,35 +1,31 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r2.ebuild,v 1.3 2003/02/10 14:02:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.1-r2.ebuild,v 1.4 2004/03/18 06:42:20 zx Exp $
 
 inherit nsplugins
 
-IUSE=""
-
 At=IBMJava2-JRE-131.tgz
-S=${WORKDIR}/IBMJava2-131
 DESCRIPTION="IBM JRE 1.3.1"
-SRC_URI=""
+SRC_URI="${At}"
 HOMEPAGE="http://www6.software.ibm.com/dl/dklx130/dklx130-p"
-
 DEPEND=">=dev-java/java-config-0.2.5"
-
 PROVIDE="virtual/jre-1.3.1
-	virtual/java-scheme-2"
-
+		virtual/java-scheme-2"
 SLOT="1.3"
+IUSE=""
+RESTRICT="fetch"
 LICENSE="IBM-ILNWP"
 KEYWORDS="x86 -ppc -sparc"
 
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE}"
-	fi
-	unpack ${At} || die
+S=${WORKDIR}/IBMJava2-131
+
+pkg_nofetch() {
+	die "Please download ${At} from ${HOMEPAGE}"
 }
 
+src_compile() { :; }
 
-src_install () {
+src_install() {
 
 	dodir /opt/${P}
 	cp -dpR jre/* ${D}/opt/${P}/
diff --git a/dev-java/ibm-jre/ibm-jre-1.4.1-r2.ebuild b/dev-java/ibm-jre/ibm-jre-1.4.1-r2.ebuild
index 2a204990015f..763a09f245eb 100644
--- a/dev-java/ibm-jre/ibm-jre-1.4.1-r2.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.1-r2.ebuild,v 1.1 2004/01/09 09:24:34 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.4.1-r2.ebuild,v 1.2 2004/03/18 06:42:20 zx Exp $
 
 inherit nsplugins
 
@@ -9,13 +9,13 @@ DESCRIPTION="IBM JRE 1.4.1"
 SRC_URI="IBMJava2-JRE-141.tgz"
 HOMEPAGE="https://www6.software.ibm.com/dl/lxdk/lxdk-p"
 RESTRICT="fetch"
-IUSE=""
 DEPEND="virtual/glibc
 	  >=dev-java/java-config-0.2.5"
 RDEPEND="${DEPEND}"
 PROVIDE="virtual/jre-1.4.1
 		 virtual/java-scheme-2"
 LICENSE="IBM-ILNWP"
+IUSE=""
 SLOT="1.4"
 KEYWORDS="x86 -ppc -sparc -alpha"
 
diff --git a/dev-java/ibm-jre/ibm-jre-1.4.1.ebuild b/dev-java/ibm-jre/ibm-jre-1.4.1.ebuild
deleted file mode 100644
index c24a84ff717b..000000000000
--- a/dev-java/ibm-jre/ibm-jre-1.4.1.ebuild
+++ /dev/null
@@ -1,50 +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.1.ebuild,v 1.1 2003/11/20 04:21:44 strider Exp $
-
-inherit nsplugins
-
-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.4.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() {
-	inst_plugin /opt/${P}/bin/javaplugin.so
-	true
-}