From: Ralph Sennhauser Date: Tue, 13 Dec 2011 14:42:39 +0000 (+0000) Subject: No longer require JDK for installing java binpkg. #206024 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2407f4b99abddb70b81e704c689676b22d2bae0d;p=gentoo.git No longer require JDK for installing java binpkg. #206024 --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6b50c988cbec..c5d10983ede0 100644 --- 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 java-utils-2.eclass: + No longer require JDK for installing java binpkg. #206024 10 Dec 2011; Davide Pesavento qt4-build.eclass: Handle sparc64-* in arch configuration. diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index f61e5022a108..4d9014a819aa 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.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