No longer require JDK for installing java binpkg. #206024

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 6b50c988cbecdce5664572eb361edf52a53d2626..c5d10983ede031af002bd58e0d1c3bb1e908e9d6 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.38 2011/12/10 17:28:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.39 2011/12/13 14:42:39 sera Exp $
+
+  13 Dec 2011; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
+  No longer require JDK for installing java binpkg. #206024
 
   10 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Handle sparc64-* in arch configuration.

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index f61e5022a1087340d23f34fa099e0ebbabfa5205..4d9014a819aa06fc88dc40f9fd8601d4b61eda5d 100644 (file)
--- 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.147 2011/10/29 14:05:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.148 2011/12/13 14:42:39 sera Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -2137,6 +2137,13 @@ use_doc() {
 # -----------------------------------------------------------------------------
 java-pkg_init() {
        debug-print-function ${FUNCNAME} $*
+
+       # Don't set up build environment if installing from binary. #206024 #258423
+       [[ "${MERGE_TYPE}" == "binary" ]] && return
+       # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
+       # work nothing is lost.
+       has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
+
        unset JAVAC
        unset JAVA_HOME