Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-dev] [PATCH 7/8] java-pkg-simple.eclass: Drop support for EAPI 5
Date: Sat, 23 Jul 2022 19:22:39
Message-Id: 20220723191945.29962-8-ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/8] Deprecate eutils.eclass by "Ulrich Müller"
1 Signed-off-by: Ulrich Müller <ulm@g.o>
2 ---
3 eclass/java-pkg-simple.eclass | 10 +++-------
4 1 file changed, 3 insertions(+), 7 deletions(-)
5
6 diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
7 index c0a6b4d21df9..34c044e2ba2d 100644
8 --- a/eclass/java-pkg-simple.eclass
9 +++ b/eclass/java-pkg-simple.eclass
10 @@ -6,7 +6,7 @@
11 # java@g.o
12 # @AUTHOR:
13 # Java maintainers <java@g.o>
14 -# @SUPPORTED_EAPIS: 5 6 7 8
15 +# @SUPPORTED_EAPIS: 6 7 8
16 # @BLURB: Eclass for packaging Java software with ease.
17 # @DESCRIPTION:
18 # This class is intended to build pure Java packages from Java sources
19 @@ -16,8 +16,8 @@
20 # addressed by an ebuild by putting corresponding files into the target
21 # directory before calling the src_compile function of this eclass.
22
23 -case ${EAPI:-0} in
24 - 5|6) inherit eutils ;; # eutils for eqawarn
25 +case ${EAPI} in
26 + 6) inherit eutils ;; # eutils for eqawarn
27 7|8) ;;
28 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
29 esac
30 @@ -468,10 +468,6 @@ java-pkg-simple_src_install() {
31 java-pkg_dosrc ${srcdirs}
32 fi
33
34 - if [[ ${EAPI} == 5 ]]; then
35 - # einstalldocs is only available on EAPI >= 6.
36 - return
37 - fi
38 einstalldocs
39 }
40
41 --
42 2.35.1