Fixes #54181.

5 files changed, 13 insertions, 62 deletions

diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index b763b493f38d..3c97cca76f87 100644
--- a/dev-java/sun-j2ee/ChangeLog
+++ b/dev-java/sun-j2ee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-j2ee
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.12 2004/06/12 18:43:57 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.13 2004/06/19 23:58:30 karltk Exp $
+
+  20 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sun-j2ee-1.3.1-r2.ebuild, sun-j2ee-1.3.1-r1.ebuild: Removed -r1, and updated
+  digest for -r2, fixes #54181.
 
 *sun-j2ee-1.3.1-r2 (12 Jun 2004)
 
@@ -29,26 +33,20 @@
 
 *sun-j2ee-1.3.1 (19 August 2002)
 
-  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, sun-j2ee-1.3.1.ebuild :
-
+  19 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog,
+  sun-j2ee-1.3.1.ebuild :
   Added -ppc to the keywords.
 
 *sun-j2ee-1.3.1 (16 Jun 2002)
 
   16 Jun 2002; Doug Goldstein (Cardoe) <dougg@ufl.edu> sun-j2ee-1.3.1.ebuild:
-  
   Corrected ebuild with lintool and a quick version bump
 
 *sun-j2ee-1.3 (1 Feb 2002)
 
-  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-j2ee-1.3.ebuild files/digest-sun-j2ee-1.3 :
-
+  01 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> sun-j2ee-1.3.ebuild
+  files/digest-sun-j2ee-1.3 :
   Removed.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  Added initial ChangeLog.
diff --git a/dev-java/sun-j2ee/Manifest b/dev-java/sun-j2ee/Manifest
index 0d5a43faeee2..6305fbbaaa7b 100644
--- a/dev-java/sun-j2ee/Manifest
+++ b/dev-java/sun-j2ee/Manifest
@@ -1,6 +1,6 @@
-MD5 b884d33a81b7bfce7a93736ace39e490 ChangeLog 2031
+MD5 28c0480bb29c1506531121438eb64798 ChangeLog 1848
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 0be795243718f3d39480b9a169549268 sun-j2ee-1.3.1-r2.ebuild 1347
 MD5 02041ecbdb04bda7e5c108f6a0c7fd95 sun-j2ee-1.3.1-r1.ebuild 1345
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1-r2 0
+MD5 64bb5dfcbe16b1714d009dceabdadc43 files/digest-sun-j2ee-1.3.1-r2 73
diff --git a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r1 b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r1
+++ /dev/null
diff --git a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r2 b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r2
index e69de29bb2d1..97ab3d022f05 100644
--- a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r2
+++ b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r2
@@ -0,0 +1 @@
+MD5 deb95389621b79e1c72c843ba0c46a54 j2sdkee-1_3_1-linux.tar.gz 14863533
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild
deleted file mode 100644
index 7b08c126ea78..000000000000
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild,v 1.7 2004/06/03 03:22:41 agriffis Exp $
-
-DESCRIPTION="Sun's Java 2 Enterprise Edition Development Kit"
-SRC_URI="j2sdkee-1_3_1-linux.tar.gz"
-HOMEPAGE="http://java.sun.com/j2ee/download.html#sdk"
-DEPEND="virtual/glibc
-		>=lib-compat-1.1"
-RDEPEND=">=virtual/jre-1.3.1"
-PROVIDE="virtual/j2ee-1.3.1"
-LICENSE="sun-bcla-j2ee"
-RESTRICT="fetch"
-SLOT="0"
-KEYWORDS="x86 -ppc"
-IUSE="doc"
-
-S=${WORKDIR}/j2sdkee1.3.1
-
-pkg_nofetch() {
-	die "Please download ${SRC_URI} from ${HOMEPAGE} to ${DISTDIR}"
-}
-
-src_install () {
-	local dirs="bin lib conf config cloudscape lib images nativelib repository public_html logs help images"
-
-	dodir /opt/${P}
-	for i in $dirs ; do
-		cp -a $i ${D}/opt/${P}/
-	done
-
-	# Setup env vars
-	addwrite /etc/env.d/29${P}
-	j2eeenv=/etc/env.d/29${P}
-	echo "CLASSPATH=/opt/${P}/lib/j2ee.jar" > $j2eeenv
-	echo "PATH=/opt/${P}/bin" >> $j2eeenv
-	echo "J2EE_HOME=/opt/${P}" >> $j2eeenv
-	dodoc LICENSE README
-
-	if use doc ; then
-		dohtml -r doc/*
-	fi
-}
-
-pkg_postinst() {
-	einfo "Remember to set JAVA_HOME before running /opt/${P}/bin/j2ee"
-	einfo "A set of sample configuration files (that work) can be found in /opt/${P}/conf and /opt/${P}/config"
-}