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

[Miroslav Šulc]

commit:     5f32171c981e5d65ab8b39706e67db5d4fb5c222
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 11:06:31 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 11:08:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f32171c

java-pkg-opt-2.eclass: partly reverted conditional eapply_user, restricted to 
eapi 6-8

Closes: https://bugs.gentoo.org/895106
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

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

diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 8e69e6c0253f..3a4b25ec2f0c 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -49,6 +49,9 @@ 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
+               [678]) use ${JAVA_PKG_OPT_USE} || eapply_user ;;
+       esac
 }