From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Iwkj3-00008t-1g for garchives@archives.gentoo.org; Mon, 26 Nov 2007 20:38:41 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lAQKcT7k027722; Mon, 26 Nov 2007 20:38:29 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lAQKcSYr027715 for ; Mon, 26 Nov 2007 20:38:29 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 5F7A7655E2 for ; Mon, 26 Nov 2007 20:38:28 +0000 (UTC) Received: from betelgeuse by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1Iwkip-0001YX-Ar for gentoo-commits@lists.gentoo.org; Mon, 26 Nov 2007 20:38:27 +0000 From: "Petteri Raty (betelgeuse)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, betelgeuse@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: java-utils-2.eclass X-VCS-Directories: eclass X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Raty Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Petteri Raty Date: Mon, 26 Nov 2007 20:38:27 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: fcda28c0-a89f-4ed0-8627-67c29b27a5c9 X-Archives-Hash: f401e797078b34043fbd731c777292da betelgeuse 07/11/26 20:38:27 Modified: java-utils-2.eclass Log: Use export VAR= instead of unset because Portage does not preserve unsetting across functions. Revision Changes Path 1.97 eclass/java-utils-2.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.97&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.97&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.96&r2=1.97 Index: java-utils-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- java-utils-2.eclass 25 Nov 2007 07:51:41 -0000 1.96 +++ java-utils-2.eclass 26 Nov 2007 20:38:26 -0000 1.97 @@ -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 @@ # # ----------------------------------------------------------------------------- java-pkg_init() { + debug-print-function ${FUNCNAME} $* unset JAVAC unset JAVA_HOME @@ -2066,7 +2067,7 @@ 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 @@ # 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= } # ------------------------------------------------------------------------------ -- gentoo-commits@gentoo.org mailing list