commit:     373fd4e015e14c3c3a0a5c67bc34be86a234d540
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 17:08:51 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 17:10:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=373fd4e0

dev-java/icu4j: eapi7 and restricted compile java to 1.8 in 54.1.1-r1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../icu4j/{icu4j-54.1.1.ebuild => icu4j-54.1.1-r1.ebuild}   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild 
b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
similarity index 82%
rename from dev-java/icu4j/icu4j-54.1.1.ebuild
rename to dev-java/icu4j/icu4j-54.1.1-r1.ebuild
index e58375be105..640cdc0756f 100644
--- a/dev-java/icu4j/icu4j-54.1.1.ebuild
+++ b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 # testdata.jar, icudata.jar and icutzdata.jar do not contain *.class files
 # but *.res files. These *.res data files are needed to build the final jar.
@@ -19,12 +19,15 @@ SLOT="52"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris ~x86-solaris"
 IUSE=""
 
-# Beware of jdk version dependant code #361593
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+# the build system does not support java > 1.8
+# also the package does not compile with newer jdks because of missing classes
+DEPEND="virtual/jdk:1.8"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}"
 
+HTML_DOCS="readme.html"
+
 JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
 
 EANT_DOC_TARGET="docs"
@@ -39,7 +42,7 @@ src_install() {
        java-pkg_dojar ${PN}-charset.jar
        java-pkg_dojar ${PN}-localespi.jar
 
-       dohtml readme.html
+       einstalldocs
 
        use doc && java-pkg_dojavadoc doc
        use examples && java-pkg_doexamples demos samples

Reply via email to