diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2017-08-07 15:18:20 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2017-08-07 15:23:57 +0300 |
| commit | 6f31bf5705bf6d67def94f2356f097504d31465b (patch) | |
| tree | 90b209bf35d4671a860b57b9cf4d5775229a3a67 /eclass/java-pkg-opt-2.eclass | |
| parent | dev-python/vertex: fix HOMEPAGE. (diff) | |
| download | gentoo-6f31bf5705bf6d67def94f2356f097504d31465b.tar.gz gentoo-6f31bf5705bf6d67def94f2356f097504d31465b.tar.bz2 gentoo-6f31bf5705bf6d67def94f2356f097504d31465b.zip | |
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+.
Diffstat (limited to 'eclass/java-pkg-opt-2.eclass')
| -rw-r--r-- | eclass/java-pkg-opt-2.eclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass index 16c9f8fcbf2a..fa72421a0d77 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 } |