No longer exports CLASSPATH globally (bug #107777).

(Portage version: 2.1_pre1)

5 files changed, 202 insertions, 13 deletions

diff --git a/dev-java/sun-j2ee/ChangeLog b/dev-java/sun-j2ee/ChangeLog
index 89ac541e9a36..190fcbeef6da 100644
--- a/dev-java/sun-j2ee/ChangeLog
+++ b/dev-java/sun-j2ee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-j2ee
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.19 2005/08/26 13:20:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/ChangeLog,v 1.20 2005/12/26 23:53:13 nichoj Exp $
+
+*sun-j2ee-1.3.1-r3 (26 Dec 2005)
+
+  26 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/sun-j2ee-1.3.1-scripts.patch, +sun-j2ee-1.3.1-r3.ebuild:
+  No longer exports CLASSPATH globally (bug #107777).
 
   26 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
   sun-j2ee-1.3.1-r2.ebuild:
diff --git a/dev-java/sun-j2ee/Manifest b/dev-java/sun-j2ee/Manifest
index f4c45dcf901d..5565b4a14249 100644
--- a/dev-java/sun-j2ee/Manifest
+++ b/dev-java/sun-j2ee/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e93ed1d9e291a79938a19a3f46abc5c6 ChangeLog 2526
-MD5 ea28f93154f04347a70fe369eefbaf70 sun-j2ee-1.3.1-r2.ebuild 1355
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 64bb5dfcbe16b1714d009dceabdadc43 files/digest-sun-j2ee-1.3.1-r2 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDxckj5H05b2HAEkRAmxsAJ49sqSRHpbzusHBg7VFEPeAaAU8xACcDAwG
-jZ7k0V62/LDqg5w0pcBzBAY=
-=J0mz
------END PGP SIGNATURE-----
+MD5 64bb5dfcbe16b1714d009dceabdadc43 files/digest-sun-j2ee-1.3.1-r3 73
+MD5 0e746d96b6bd83a7b3f23659bc73331d files/sun-j2ee-1.3.1-scripts.patch 5202
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 ea28f93154f04347a70fe369eefbaf70 sun-j2ee-1.3.1-r2.ebuild 1355
+MD5 92a150becd163d9cecbc04fde7325800 sun-j2ee-1.3.1-r3.ebuild 1435
diff --git a/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r3 b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r3
new file mode 100644
index 000000000000..97ab3d022f05
--- /dev/null
+++ b/dev-java/sun-j2ee/files/digest-sun-j2ee-1.3.1-r3
@@ -0,0 +1 @@
+MD5 deb95389621b79e1c72c843ba0c46a54 j2sdkee-1_3_1-linux.tar.gz 14863533
diff --git a/dev-java/sun-j2ee/files/sun-j2ee-1.3.1-scripts.patch b/dev-java/sun-j2ee/files/sun-j2ee-1.3.1-scripts.patch
new file mode 100644
index 000000000000..0ee1a83f5c7e
--- /dev/null
+++ b/dev-java/sun-j2ee/files/sun-j2ee-1.3.1-scripts.patch
@@ -0,0 +1,131 @@
+diff -ru j2sdkee1.3.1/bin/cleanup j2sdkee1.3.1-patched/bin/cleanup
+--- j2sdkee1.3.1/bin/cleanup	2002-01-17 06:48:29.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/cleanup	2005-12-26 18:21:37.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ PROPS=" -Dcom.sun.enterprise.home=$J2EE_HOME "
+ CPATH=$J2EE_HOME/lib/classes:$CPATH
+ 
+diff -ru j2sdkee1.3.1/bin/cloudscape j2sdkee1.3.1-patched/bin/cloudscape
+--- j2sdkee1.3.1/bin/cloudscape	2002-01-17 06:48:29.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/cloudscape	2005-12-26 18:21:51.000000000 -0500
+@@ -8,6 +8,9 @@
+ # Environment variables needed to run...
+ BINDIR=`dirname $0`
+ . $BINDIR/userconfig.sh
++
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ if [ -n "$BINDIR" ]
+ then
+     J2EE_HOME=`cd $BINDIR/.. > /dev/null 2>&1 && pwd`
+diff -ru j2sdkee1.3.1/bin/deploytool j2sdkee1.3.1-patched/bin/deploytool
+--- j2sdkee1.3.1/bin/deploytool	2002-01-17 06:48:28.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/deploytool	2005-12-26 18:21:59.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ SYSTEM_PROPERTIES="-Dcom.sun.enterprise.home=$J2EE_HOME"
+ 
+ DH_LIB=$LIBDIR/../help/DeployTool
+diff -ru j2sdkee1.3.1/bin/j2ee j2sdkee1.3.1-patched/bin/j2ee
+--- j2sdkee1.3.1/bin/j2ee	2002-01-17 06:48:28.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/j2ee	2005-12-26 18:22:02.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ SAX_PROPS=" -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter -Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl"
+ PROPS=" $LISTEN_OPTIONS -Dcom.sun.enterprise.home=$J2EE_HOME  -Djms.home=$JMS_HOME -Dcom.sun.jms.service.jdbc.dbpath=$JMS_DB_PATH -Djms.properties=$J2EE_HOME/config/jms_service.properties -Djava.security.policy==$J2EE_HOME/lib/security/server.policy -Djava.security.auth.login.config=$J2EE_HOME/lib/security/serverlogin.config"
+ 
+diff -ru j2sdkee1.3.1/bin/j2eeadmin j2sdkee1.3.1-patched/bin/j2eeadmin
+--- j2sdkee1.3.1/bin/j2eeadmin	2002-01-17 06:48:29.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/j2eeadmin	2005-12-26 18:22:06.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ OPTIONS="-Dcom.sun.enterprise.home=$J2EE_HOME"
+ 
+ $JAVA_HOME/bin/java $OPTIONS -classpath "$CPATH" com.sun.enterprise.tools.admin.AdminTool "$@"
+diff -ru j2sdkee1.3.1/bin/keytool j2sdkee1.3.1-patched/bin/keytool
+--- j2sdkee1.3.1/bin/keytool	2002-01-17 06:48:29.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/keytool	2005-12-26 18:22:10.000000000 -0500
+@@ -8,4 +8,6 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ $JAVACMD -classpath "$CPATH" com.sun.enterprise.security.KeyTool "$@"
+diff -ru j2sdkee1.3.1/bin/packager j2sdkee1.3.1-patched/bin/packager
+--- j2sdkee1.3.1/bin/packager	2002-01-17 06:48:28.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/packager	2005-12-26 18:22:18.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ SYSTEM_PROPERTIES="-Dcom.sun.enterprise.home=$J2EE_HOME"
+ 
+ $JAVACMD -classpath "$CPATH" $SYSTEM_PROPERTIES com.sun.enterprise.tools.packager.Main "$@"
+diff -ru j2sdkee1.3.1/bin/realmtool j2sdkee1.3.1-patched/bin/realmtool
+--- j2sdkee1.3.1/bin/realmtool	2002-01-17 06:48:28.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/realmtool	2005-12-26 18:22:22.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ OPTIONS="-Dcom.sun.enterprise.home=$J2EE_HOME"
+ 
+ $JAVACMD $OPTIONS -classpath "$CPATH" com.sun.enterprise.tools.admin.RealmTool "$@"
+diff -ru j2sdkee1.3.1/bin/runclient j2sdkee1.3.1-patched/bin/runclient
+--- j2sdkee1.3.1/bin/runclient	2002-01-17 06:48:29.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/runclient	2005-12-26 18:22:25.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ ACTIVATION=" -Dcom.sun.enterprise.home=$J2EE_HOME -Djms.home=$JMS_HOME -Djms.properties=$J2EE_HOME/config/jms_client.properties -Djava.security.policy=$J2EE_HOME/lib/security/client.policy -Djava.security.auth.login.config=$J2EE_HOME/lib/security/clientlogin.config "
+ 
+ $JAVACMD $ACTIVATION $VMARGS -classpath "$CPATH:$APPCPATH" com.sun.enterprise.appclient.Main "$@"
+diff -ru j2sdkee1.3.1/bin/setenv.sh j2sdkee1.3.1-patched/bin/setenv.sh
+--- j2sdkee1.3.1/bin/setenv.sh	2002-01-17 06:48:28.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/setenv.sh	2005-12-26 18:22:28.000000000 -0500
+@@ -10,6 +10,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/userconfig.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ HOSTNAME=`uname -n`
+ 
+ if [ -n "$BINDIR" ]
+diff -ru j2sdkee1.3.1/bin/verifier j2sdkee1.3.1-patched/bin/verifier
+--- j2sdkee1.3.1/bin/verifier	2002-01-17 06:48:28.000000000 -0500
++++ j2sdkee1.3.1-patched/bin/verifier	2005-12-26 18:22:34.000000000 -0500
+@@ -8,6 +8,8 @@
+ BINDIR=`dirname $0`
+ . $BINDIR/setenv.sh
+ 
++source /etc/env.d/java/22sun-j2ee-1.3.1
++
+ DH_LIB=$LIBDIR/../help/DeployTool
+ 
+ JAVA_HELP=$LIBDIR/jh.jar
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r3.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..ffd8116008ab
--- /dev/null
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# 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-r3.ebuild,v 1.1 2005/12/26 23:53:13 nichoj Exp $
+
+inherit java-pkg eutils
+
+MY_PN="j2sdkee"
+
+DESCRIPTION="Sun's Java 2 Enterprise Edition Development Kit"
+SRC_URI="${MY_PN}-1_3_1-linux.tar.gz"
+HOMEPAGE="http://java.sun.com/j2ee/download.html#sdk"
+DEPEND="virtual/libc
+		>=sys-libs/lib-compat-1.1"
+RDEPEND=">=virtual/jre-1.3.1"
+PROVIDE="virtual/j2ee"
+LICENSE="sun-bcla-j2ee"
+RESTRICT="fetch"
+SLOT="0"
+KEYWORDS="~x86 -ppc"
+IUSE="doc"
+
+S=${WORKDIR}/${MY_PN}${PV}
+
+pkg_nofetch() {
+	die "Please download ${SRC_URI} from ${HOMEPAGE} to ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-scripts.patch
+}
+
+src_install() {
+	local dirs="bin lib conf config cloudscape lib images nativelib repository public_html logs help images xsl"
+
+	dodir /opt/${P}
+	for i in $dirs ; do
+		cp -pPR $i ${D}/opt/${P}/
+	done
+
+	dodir /etc/env.d/java
+	local j2eeenv=${D}/etc/env.d/java/22${P}
+	cat > $j2eeenv <<-END
+CLASSPATH=/opt/${P}/lib/j2ee.jar
+PATH=\${PATH}:/opt/${P}/bin
+J2EE_HOME=/opt/${P}
+END
+
+	dodoc LICENSE README
+
+	use doc && java-pkg_dohtml -r doc/*
+}
+
+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"
+}