diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2011-12-13 14:42:39 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2011-12-13 14:42:39 +0000 |
| commit | 5ee6ed1b303f2bb9765c7ed997c95404c4a1f717 (patch) | |
| tree | c5afeab5d56a5810537ecece48f634144803dc8d /eclass/java-utils-2.eclass | |
| parent | Block sci-libs/gts with USE=tools because of file collision on /usr/bin/smoot... (diff) | |
| download | gentoo-2-5ee6ed1b303f2bb9765c7ed997c95404c4a1f717.tar.gz gentoo-2-5ee6ed1b303f2bb9765c7ed997c95404c4a1f717.tar.bz2 gentoo-2-5ee6ed1b303f2bb9765c7ed997c95404c4a1f717.zip | |
No longer require JDK for installing java binpkg. #206024
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 9 |
1 files changed, 8 insertions, 1 deletions
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 |