From ba2cf02ea7592c754301e3754de43e1422e88c2d Mon Sep 17 00:00:00 2001
From: Petteri Räty <betelgeuse@gentoo.org>
Date: Mon, 26 Nov 2007 20:38:26 +0000
Subject: Use export VAR= instead of unset because Portage does not preserve
 unsetting across functions.

---
 eclass/java-utils-2.eclass | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'eclass')

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index fdf7b6be6455..b98e12956862 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -6,7 +6,7 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.96 2007/11/25 07:51:41 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -2049,6 +2049,7 @@ use_doc() {
 #
 # -----------------------------------------------------------------------------
 java-pkg_init() {
+	debug-print-function ${FUNCNAME} $*
 	unset JAVAC
 	unset JAVA_HOME
 
@@ -2066,7 +2067,7 @@ java-pkg_init() {
 	fi
 
 	if [[ -z ${accept} ]]; then
-		unset _JAVA_OPTIONS
+		export _JAVA_OPTIONS=
 		# phase hooks make this run many times without this
 		I_WANT_GLOBAL_JAVA_OPTIONS="true"
 	fi
@@ -2084,15 +2085,18 @@ java-pkg_init() {
 	# Do some QA checks
 	java-pkg_check-jikes
 
+	# Can't use unset here because Portage does not save the unset
+	# see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
+
 	# When users have crazy classpaths some packages can fail to compile.
 	# and everything should work with empty CLASSPATH.
 	# This also helps prevent unexpected dependencies on random things
 	# from the CLASSPATH.
-	unset CLASSPATH
+	export CLASSPATH=
 
 	# Unset external ANT_ stuff
-	unset ANT_TASKS
-	unset ANT_OPTS
+	export ANT_TASKS=
+	export ANT_OPTS=
 }
 
 # ------------------------------------------------------------------------------
-- 
cgit v1.2.3-65-gdbad