No longer exports CLASSPATH as per bug #50306.

(Portage version: 2.1_pre3-r1)

3 files changed, 26 insertions, 31 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index ebda2b312a34..c96a593c4458 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for dev-java/ant-core
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.35 2005/12/21 20:45:29 betelgeuse Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.36 2006/01/20 04:42:53 nichoj Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  20 Jan 2006; Joshua Nichols <nichoj@gentoo.org> ant-core-1.5.4-r2.ebuild:
+  No longer exports CLASSPATH as per bug #50306.
+
   21 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> files/1.6.5-ant:
   Fixed a quoting problem in the error message which is shown when JAVA_HOME
   is not defined.
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 21d29a26608a..1a44b50ea2fe 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 41e761293ae8fec4640a2bc8e0b79241 ChangeLog 19202
-MD5 8a460466542e1596853795633ba2cd35 ant-core-1.5.4-r2.ebuild 3113
+MD5 aa712b08154cd2af6fa74194b5d4c4b3 ant-core-1.5.4-r2.ebuild 3028
 MD5 6faae273dea0a4f931058e09fefe3dae ant-core-1.6.2-r5.ebuild 2084
 MD5 274bb7b92120e8eecafb2bcf01f31db7 ant-core-1.6.5-r2.ebuild 1999
 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
@@ -15,10 +12,3 @@ MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r5 74
 MD5 181609c8f2d789fc7abf5cd39a027130 files/digest-ant-core-1.6.5-r2 74
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDqb8KQiJ/wx066S4RAs34AKCSWkDtY1U2xW/9bjemKUQ9e6wvjACfSUW0
-lyTFDNgcdt1cmhYZjxOgx8s=
-=2i+l
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
index f55598e2d21f..e0a8f842a711 100644
--- a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.5 2005/09/10 15:00:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.6 2006/01/20 04:42:53 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -36,10 +36,11 @@ src_unpack() {
 
 src_compile() {
 	addwrite "/proc/self/maps"
+	local myclasspath deps
 
 	[ -z ${JDK_HOME} ] && einfo "JDK_HOME not set, please check with java-config" && die
 
-	export JAVA_HOME=${JDK_HOME}
+	JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
 		# We're compiling _ON_ PPC
 		export THREADS_FLAG="green"
@@ -47,45 +48,46 @@ src_compile() {
 
 	# Make sure junit tasks get built if we have junit
 	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
-		export CLASSPATH="/usr/share/junit/lib/junit.jar"
-		export DEP_APPEND="junit"
+		myclasspath="/usr/share/junit/lib/junit.jar"
+		deps="junit"
 		if [ -f "/usr/share/xalan/lib/xalan.jar" ] ; then
-			export CLASSPATH="${CLASSPATH}:/usr/share/xalan/lib/xalan.jar"
-			export DEP_APPEND="${DEP_APPEND} xalan"
+			myclasspath="${myclasspath}:/usr/share/xalan/lib/xalan.jar"
+			deps="${deps} xalan"
 		fi
 	fi
 
 	# Add Xerces in if we have it
 	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
-		export DEP_APPEND="${DEP_APPEND} xerces"
+		myclasspath="${myclasspath}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
+		deps="${deps} xerces"
 	fi
 
 	# Add oro in if we have it
 	if [ -f "/usr/share/oro/lib/oro.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
-		export DEP_APPEND="${DEP_APPEND} oro"
+		myclasspath="${myclasspath}:/usr/share/oro/lib/oro.jar"
+		deps="${deps} oro"
 	fi
 
 	# Add beanutils if we have it
 	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
-		export DEP_APPEND="${DEP_APPEND} commons-beanutils"
+		myclasspath="${myclasspath}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
+		deps="${deps} commons-beanutils"
 	fi
 
 	# add antlr if we have it
 	if [ -f "/usr/share/antlr/lib/antlr.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
-		export DEP_APPEND="${DEP_APPEND} antlr"
+		myclasspath="${myclasspath}:/usr/share/antlr/lib/antlr.jar"
+		deps="${deps} antlr"
 	fi
 
 	# add bcel if we have it
 	if [ -f "/usr/share/bcel/lib/bcel.jar" ] ; then
-		export CLASSPATH="${CLASSPATH}:/usr/share/bcel/lib/bcel.jar"
-		export DEP_APPEND="${DEP_APPEND} bcel"
+		myclasspath="${myclasspath}:/usr/share/bcel/lib/bcel.jar"
+		deps="${deps} bcel"
 	fi
 
-	./build.sh -Ddist.dir=${D}/usr/share/${PN} || die
+	DEP_APPEND=${deps} CLASSPATH=${myclasspath} \
+		./build.sh -Ddist.dir=${D}/usr/share/${PN} || die
 }
 
 src_install() {