[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andrew Savchenko]

commit:     6f31bf5705bf6d67def94f2356f097504d31465b
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  7 12:18:20 2017 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Aug  7 12:23:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f31bf57

java-pkg-opt-2.eclass: fix EAPI 6 support in java-pkg-opt-2_src_prepare

For EAPI 6+ java-pkg-opt-2_src_prepare() has eapply_user call via
java-utils-2_src_prepare() from java-utils-2.eclass. But
java-utils-2_src_prepare() call is conditional and in case when
package is build with USE=-java java-utils-2_src_prepare() is not
called, hence eapply_user is not called in src_prepare phase and
ebuild fails.

This problem is fixed by calling eapply_user if java USE is
disabled _and_ EAPI is 6+.

 eclass/java-pkg-opt-2.eclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 16c9f8fcbf2..fa72421a0d7 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -44,6 +44,10 @@ java-pkg-opt-2_pkg_setup() {
 
 java-pkg-opt-2_src_prepare() {
 	use ${JAVA_PKG_OPT_USE} && java-utils-2_src_prepare
+	case "${EAPI:-0}" in
+		[0-5]) ;;
+		*) use ${JAVA_PKG_OPT_USE} || eapply_user ;;
+	esac
 }