Fix env vars, clean up. Closes #10855

5 files changed, 18 insertions, 48 deletions

diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index 7a3f8dea9361..4c3886e59bda 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.8 2003/05/24 05:36:32 absinthe Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.9 2004/03/18 04:37:02 zx Exp $
+
+  17 Mar 2004; Chris Aniszczyk <zx@gentoo.org> sun-j2ee-1.3.1-r1.ebuild:
+  Properly set up env vars. Closes #10855. Thanks Michael Smith
+  <masst181@pitt.edu>
 
   24 May 2003; Dylan Carlson <absinthe@gentoo.org> sun-j2ee-1.3.1-r1.ebuild,
   sun-j2ee-1.3.1.ebuild:
diff --git a/dev-java/sun-j2ee/Manifest b/dev-java/sun-j2ee/Manifest
index 7119eb2e6d3e..ee43c197b846 100644
--- a/dev-java/sun-j2ee/Manifest
+++ b/dev-java/sun-j2ee/Manifest
@@ -1,6 +1,4 @@
-MD5 01ce69bbae5f223d26e9b3f0b0d1fe0a ChangeLog 1446
-MD5 6943f884ceb5fb78bdd89c6da9d90a90 sun-j2ee-1.3.1-r1.ebuild 1188
-MD5 3ca109063d944f2c8b4cbdb4157644fa sun-j2ee-1.3.1.ebuild 1121
+MD5 a54b248afa333bee1d4b0ad9b582d244 sun-j2ee-1.3.1-r1.ebuild 1386
+MD5 3b12264bc398fd6263bfb68658260c7e ChangeLog 1599
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1-r1 0
diff --git a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1 b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1
+++ /dev/null
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
index b1c999c19c60..ed45291fa7b8 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.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/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild,v 1.5 2004/03/18 04:37:03 zx Exp $
 
 At=j2sdkee-1_3_1-linux.tar.gz
 S=${WORKDIR}/j2sdkee1.3.1
@@ -31,13 +31,20 @@ src_install () {
 		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 [ -n "`use doc`" ] ; then
 		dohtml -r doc/*
 	fi
 }
 
-src_postinst() {
+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"
 }
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
deleted file mode 100644
index 43cde9a61844..000000000000
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
+++ /dev/null
@@ -1,39 +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/sun-j2ee/sun-j2ee-1.3.1.ebuild,v 1.10 2003/09/06 22:26:46 msterret Exp $
-
-At=j2sdkee-1_3_1-linux.tar.gz
-S=${WORKDIR}/j2sdkee1.3.1
-DESCRIPTION="Sun's Java 2 Enterprise Edition Development Kit"
-SRC_URI=""
-HOMEPAGE="http://java.sun.com/j2ee/download.html#sdk"
-DEPEND="virtual/glibc"
-RDEPEND=">=virtual/jre-1.3.1"
-PROVIDE="virtual/j2ee-1.3.1"
-LICENSE="sun-bcla-j2ee"
-SLOT="0"
-KEYWORDS="x86 -ppc"
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		die "Please download ${At} from ${HOMEPAGE} to ${DISTDIR}"
-	fi
-	unpack ${At}
-}
-
-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
-
-	dodoc LICENSE README
-	dohtml -r doc/*
-}
-
-src_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"
-}