gentoo resync : 13.11.2021

3 files changed, 9 insertions, 55 deletions

diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest
index 4bd37b410436..fd66d7445a1b 100644
--- a/dev-java/icu4j/Manifest
+++ b/dev-java/icu4j/Manifest
@@ -1,7 +1,5 @@
 DIST icu4j-54_1_1.tgz 23457651 BLAKE2B f200d170c32065d2f678247d595085283446e401da2c2433b426466fc5c6f93f5ce629bce23d1114cad7d360aa4d127060750d380da8cc3e7fa1e529b454bae9 SHA512 c41f7f9fb0819767da48ac21c4883a628da8397e0ad5b0d75e51d9185b5511608c9a635933c4ae2e0c8911b2cdecf47bc661050935bbae2ba58abfb5ad04dadf
 DIST icu4j-55_1.tgz 23617640 BLAKE2B fe22524761e0c6be4ea440f90ffe5fba8a2f34484207248762ab127c3bb7e4328ced3502a336edd7d3a1026804381cd2b8738b15cd1745af0cee813dc60d7893 SHA512 706daed61d9d3722a0813d175fa66b24570abba492c32704d4df924861e5d2592a4a5ff40fdec2bd3fb662c3679dbc9addd580966c3cc69470d14e3fce27a054
-DIST icu4j-56_1.tgz 23189284 BLAKE2B d53aa869d6cde8cc9c83e66b55986b61736fbaf7a890e3c7bacab5abb23623ec64b5a23fd740dca8e51fd2336ced5e79546b4c08edca25beced22e6560f7814d SHA512 9ecc36c03a6713dbfb909e109b5e982525958b6137bd7006c93ff3b8578d816c59fa331555b43c94248f392ba9b456b1adb37be74e02e9ea818c8a9a7c669f4a
-EBUILD icu4j-54.1.1.ebuild 1199 BLAKE2B 7612a378d369776fe5582968a77af47c36d8c01b98d8f536191e426db0cbb1f2fe8feabaffb53e89466126269ad7161ee4e9f4881665bb8b87677b2d66670c76 SHA512 ca85754e65904369431f23759bdc3af849294a746f0c02cb4f4fb427bc586ead07a513556e67b2bd362ff0e3b02398a80855ac3af844c625f4128da2cb1a763a
+EBUILD icu4j-54.1.1-r1.ebuild 1295 BLAKE2B f2bacdbc333dcf7e25503cca563ac8eac94d470a348feaa71b3053f99d246b83ff104cef218b53aa2a22cf3b67e069c2973904ea1d42afb8fe7900b41cf7f4e6 SHA512 e98b2308eb5a8ce3eebede4ce91668978e2551938141af3951683a2088efe7b837e0b3a0fbb7ae8689e4c19a8f1b1d0fb3e5825c6dc291de8fea2f45a57eff69
 EBUILD icu4j-55.1.ebuild 1122 BLAKE2B 8e4bbd842f673a1618f95d1dcad6d96379d58aa265fb06aa7c0e7bfb46f9bab940a7e3b8c169a1f2751289e29c16e700d87d01c860f0688d726b47620741228e SHA512 b8426a6b8103c2cb107f4c216b27cc10609004f6624246773ffacb202a595437b3e10e2567d834b754bd96d74465627897047cd0f794264d0e809f58b116eaf4
-EBUILD icu4j-56.1.ebuild 1074 BLAKE2B 99d5c953645ffb08a744b74f865fe9d068f7949c09f4e7d9d9757a665337703b8f450a7bf1ea841115b093a73c7762c9c0a78dc957724432f22e65a1ba7c3778 SHA512 c475b899d49043fb3929a49f9ac1aff4e42ab8bf1ce2a8cd906930d04e8f9b700e224cc3e44f3c078739680440f00074907dd96796bd0ab5c00c998f68aff36b
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/icu4j/icu4j-54.1.1.ebuild b/dev-java/icu4j/icu4j-54.1.1-r1.ebuild
index e58375be105d..640cdc0756f7 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
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
deleted file mode 100644
index 870e9f7a2de0..000000000000
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A set of Java libraries providing Unicode and Globalization support"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
-
-LICENSE="icu"
-SLOT="56"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX_NAME+=" common-targets.xml"
-
-EANT_DOC_TARGET="docs"
-EANT_TEST_TARGET="check"
-
-JAVA_RM_FILES=(
-	tools/build/src/com/ibm/icu/dev/tool/docs/ICUTaglet.java
-)
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	java-pkg_dojar ${PN}-charset.jar
-	java-pkg_dojar ${PN}-localespi.jar
-
-	dodoc readme.html
-
-	use doc && java-pkg_dojavadoc doc
-	use examples && java-pkg_doexamples demos samples
-	use source && java-pkg_dosrc main/classes/*/src/com
-}