gentoo resync : 25.03.2022

4 files changed, 25 insertions, 75 deletions

diff --git a/dev-java/rome/Manifest b/dev-java/rome/Manifest
index 851bfefe5037..0ec8f5cd4adb 100644
--- a/dev-java/rome/Manifest
+++ b/dev-java/rome/Manifest
@@ -1,5 +1,3 @@
-AUX rome-0.9-build.xml-test-upstream.patch 527 BLAKE2B 5c5d4f057298071912472b4a7bdfd7a8a184a78bc45bdb75e892497dd297771ff4a633f0ff9904545fdb12d43f1c0364fa55598670ea8d56e06cd1863b53c36c SHA512 bdbe4232e443228cb64be2f108ec021a9e8654e28c1c9a50f2bf453cb62d090cbfa47df1a0df14e01780c8b8c460331b45a4a974e121ac3d4ee93b82beca0781
 DIST rome-0.9.zip 248755 BLAKE2B dcd19b49a9c5aa9849f5807508e4d10c7effaa9ec9247ffd5039cda7a08afb525a095ac7bbb72d0443566d08a0ebf75919b3dae018aba8957a94c4389d7df82d SHA512 d4bc9945e2b77bdc38eca609ec353379c279cd700d8d85220a1723d1b019da2c18bd93ff98b062e519e7d87f2d2b6853f373fc7178cec0f83b34af45fce5f3ff
-EBUILD rome-0.9-r3.ebuild 953 BLAKE2B 39bf7d53a8e6b5a2182e978a52e8c8e4df74748a5074881a7c19d3dd657f921ee000a596afe5997bdaf62deeb8fe45e28636a4a7f9187087223c8ddfd6bd498d SHA512 3ce722cac645508e768c9c6788d26ee8032e6b5710fd0bd363bbc4d45dfe67614e7dd86171b2fe03596dbfc2bc6896b24ea948997be0c651e053d7cd7a15587b
-EBUILD rome-0.9-r4.ebuild 1191 BLAKE2B e8c53b8d1bbe024ac9fb4c8576669a78a6cfcf417b44cb124a71902842ce931a7660045c72a02ffb03e0f765e9b4df17376db7b41a5f862e6dc436c834c7dc5d SHA512 0f6124d5f02b252d6d195198f3579623f98c9cb9cd85a6ad522e3a0e73444cbad4824a17c2c36cf3a5d49e6fcf636a4c4a5e9aab8fed6a761128d31314d55aec
+EBUILD rome-0.9-r4.ebuild 2221 BLAKE2B 6975178cf1db3547939aa05488e79bd21e712c28f6fc19c3d628608d6ae7b1948855b700bc51e82596d7d79c11952c5f7d59b32397f7182e5a26f177529658d1 SHA512 cbc2d03c2c751e6ef613aa89092ea0555718497d4a971c66db95b2e9207b8ac12eeef3fdca622ecd030d8a49daed93d255676ff532bbc1e00e2e1f3f0ea16e56
 MISC metadata.xml 296 BLAKE2B 01dcba6c8b28c78d2e690f04b22002ffe6585a213667574be6168d84734ce2210993dafde1b93f464590273dfe72218f3d61bd8f0748ba15617228ca43d713d2 SHA512 0e447adc03a21da5afb4a929a8341c99a01b553517012035dd1f0b2dedff583d2ae1746d59a38417d16979bd3ad9ee627c65e9954bbf36bf0ab838daddb3bb47
diff --git a/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch b/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch
deleted file mode 100644
index 95e53f4f7f73..000000000000
--- a/dev-java/rome/files/rome-0.9-build.xml-test-upstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /opt/sourcecast/data/ccvs/repository/rome/build.xml,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -r1.14 -r1.15
---- rome/build.xml	2006/12/04 21:47:37	1.14
-+++ rome/build.xml	2006/12/26 14:35:46	1.15
-@@ -131,6 +131,9 @@
-       <fileset dir="src/data">
-         <include name="**/*.xml" />
-       </fileset>
-+      <fileset dir="src/test">
-+        <include name="**/*.properties" />
-+      </fileset>
-     </copy>    
-   </target>
-   
diff --git a/dev-java/rome/rome-0.9-r3.ebuild b/dev-java/rome/rome-0.9-r3.ebuild
deleted file mode 100644
index 15f76e221046..000000000000
--- a/dev-java/rome/rome-0.9-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java framework for RSS and Atom feeds"
-HOMEPAGE="https://rometools.github.io/rome/"
-SRC_URI="mirror://gentoo/${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jdom:0"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-EANT_GENTOO_CLASSPATH="jdom"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-java_prepare() {
-	# Patch build.xml so the tests pass
-	epatch "${FILESDIR}/${P}-build.xml-test-upstream.patch"
-
-	# Keep Ant happy.
-	mkdir -p target/lib || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/rome/rome-0.9-r4.ebuild b/dev-java/rome/rome-0.9-r4.ebuild
index c92d79f20e09..58f961d200e5 100644
--- a/dev-java/rome/rome-0.9-r4.ebuild
+++ b/dev-java/rome/rome-0.9-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -14,14 +14,13 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jdom:0"
 
 DEPEND="
 	${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
+	>=virtual/jdk-1.8:*"
 
 RDEPEND="
 	${CP_DEPEND}
@@ -32,8 +31,28 @@ BDEPEND="app-arch/unzip"
 JAVA_ENCODING="ISO-8859-1"
 JAVA_SRC_DIR="src/java"
 JAVA_RESOURCE_DIRS="res/java"
+
 JAVA_TEST_SRC_DIRS="src/test"
-JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_RESOURCE_DIRS="src/data"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+JAVA_TEST_EXCLUDES=(
+	# 1) testParse(com.sun.syndication.unittest.TestDateParser)
+	# junit.framework.AssertionFailedError
+	com.sun.syndication.unittest.TestDateParser
+	# 2) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: Class com.sun.syndication.unittest.FeedOpsTest has no public constructor TestCase(String name) or TestCase()
+	# 	at junit.framework.Assert.fail(Assert.java:57)
+	com.sun.syndication.unittest.FeedOpsTest
+	# 3) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: Class com.sun.syndication.unittest.FeedTest has no public constructor TestCase(String name) or TestCase()
+	# 	at junit.framework.Assert.fail(Assert.java:57)
+	com.sun.syndication.unittest.FeedTest
+	# 4) warning(junit.framework.TestSuite$1)
+	# junit.framework.AssertionFailedError: Class com.sun.syndication.unittest.SyndFeedTest has no public constructor TestCase(String name) or TestCase()
+	# 	at junit.framework.Assert.fail(Assert.java:57)
+	com.sun.syndication.unittest.SyndFeedTest
+)
 
 S="${WORKDIR}/${P}"