gentoo resync : 29.12.2022

4 files changed, 102 insertions, 35 deletions

diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index 3477c1f89276..edfdfd223eff 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,5 +1,4 @@
-DIST reflections-0.9.10-sources.jar 53049 BLAKE2B 23491098dc648206161d983148bf11a1c4523df0593c903f9dbf03672b481d85aabaed7733a5d829b7f334e51d53dadde3fd439e62f9873ceb11f49f40a2cfef SHA512 940b80ed43aa900177e6c3551980eafe10f7ea16a1e5c0d24fc8c1e29f1e0155aae83e24f60af10f9743449ed38d2d3b211f3668fafbd95a6a2cb9c5581f56bf
 DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
-EBUILD reflections-0.9.10-r1.ebuild 722 BLAKE2B 538624b2713ad75cb8ef54786e492e78eb41e422fc3c8152c58c2e179f09131801ceee214848d45a74f750c5ae57c26e98fb9de6b2b47c8c0fbefadb3ca06744 SHA512 a950aaf4c57532746fac766c12f897028d0486227e3effe5a79db71c53a283693df5ab80095a5e60d76ae11a3363357147246586594c91b9c32c8307a8933df3
-EBUILD reflections-0.9.12-r2.ebuild 3889 BLAKE2B eed33a289b430f9acfa2f756eab87bd040689bc84c5ab89788f0ad2b9bd8fdbbf22e00ceb90c8f23f0d358de0393e549d65c0035042c05b2d455522f3e1ceb3f SHA512 24cf7a49ad9e233b80a2cdf5a70ec3439f2f584f98d87d72859e70ee34e29bcd5ad8381ef6f376a2941673a2e1a71546272a13cc3c56f6820559c8908fea2ce7
+EBUILD reflections-0.9.12-r2.ebuild 3885 BLAKE2B 20409316f8cc31dee09a80882d4baa59bacd0b92356b5e434d56ece38bdccebab4cabe82749735d5f6e5bf9f1b037d733bf03664c7389dd5ef0d3fa4f272994a SHA512 c915f76e25958e775bc378976e88c5a10e09c507a5b188be2442f3aa73fa3c928e78d9f4fdce8b2ab4ad30b67a568c011be1a3b1378ebe2edd760097b33d8102
+EBUILD reflections-0.9.12-r3.ebuild 3888 BLAKE2B 93b01b5e15609df55da1513e444d15c62dd0c396a454544d9c89298a685ac4ab2bcf71d05d1971213aeea21978d11d648681b6ff703150be64a8ad2be5133ebd SHA512 99491f84d078ab37579ea2dad793d2e2b791cad0bab7e942fa9ab68cb6252bffa5e46e59bbb5e98d02dc488520f3154ff7544cb85cb9adfbb81f385da8ade9fb
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.10-r1.ebuild b/dev-java/reflections/reflections-0.9.10-r1.ebuild
deleted file mode 100644
index e51003333934..000000000000
--- a/dev-java/reflections/reflections-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java runtime metadata analysis"
-HOMEPAGE="https://github.com/ronmamo/reflections"
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/commons-vfs:2
-	dev-java/dom4j:1
-	dev-java/gson:2.6
-	dev-java/guava:20
-	dev-java/javassist:3
-	dev-java/jsr305:0
-	dev-java/slf4j-api:0
-	dev-java/tomcat-servlet-api:3.1"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}
-	app-arch/unzip"
diff --git a/dev-java/reflections/reflections-0.9.12-r2.ebuild b/dev-java/reflections/reflections-0.9.12-r2.ebuild
index 64c3642c4eff..f55973dea4e9 100644
--- a/dev-java/reflections/reflections-0.9.12-r2.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="WTFPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/reflections/reflections-0.9.12-r3.ebuild b/dev-java/reflections/reflections-0.9.12-r3.ebuild
new file mode 100644
index 000000000000..bcec9edaeaee
--- /dev/null
+++ b/dev-java/reflections/reflections-0.9.12-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/ronmamo/reflections/archive/0.9.12.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild reflections-0.9.12.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.reflections:reflections:0.9.12"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Reflections - a Java runtime metadata analysis"
+HOMEPAGE="https://github.com/ronmamo/reflections"
+SRC_URI="https://github.com/ronmamo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
+# org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+# org.slf4j:slf4j-simple:1.7.24 -> >=dev-java/slf4j-simple-1.7.30:0
+
+CP_DEPEND="
+	dev-java/dom4j:1
+	dev-java/gson:2.9
+	dev-java/javassist:3
+	dev-java/slf4j-api:0
+	dev-java/slf4j-simple:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# javax.servlet:servlet-api:2.5 -> java-virtuals/servlet-api:2.5
+# POM: pom.xml
+# test? junit:junit:4.13 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	dev-java/tomcat-servlet-api:2.5
+	>=virtual/jdk-11:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="tomcat-servlet-api-2.5"
+JAVA_SRC_DIR=( "src/main/java" )
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR=( "src/test/java" )
+JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
+JAVA_TEST_EXCLUDES=(
+	# Upstream does not run this test
+	"org.reflections.TestModel"
+	# 1) testMethodParameterNames(org.reflections.ReflectionsCollectTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsCollectTest
+	# 2) testMethodParameterNames(org.reflections.ReflectionsParallelTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsParallelTest
+	# 3) testMethodParameterNames(org.reflections.ReflectionsTest)
+	# org.reflections.ReflectionsException: Scanner MethodParameterNamesScanner was not configured
+	#         at org.reflections.Store.get(Store.java:39)
+	#         at org.reflections.Store.get(Store.java:61)
+	#         at org.reflections.Store.get(Store.java:46)
+	#         at org.reflections.Reflections.getMethodParamNames(Reflections.java:579)
+	#         at org.reflections.ReflectionsTest.testMethodParameterNames(ReflectionsTest.java:239)
+	org.reflections.ReflectionsTest
+	#
+	# https://github.com/ronmamo/reflections/issues/277#issuecomment-927152981
+	# scanner was not configured exception - this is a known issue in 0.9.12, a simple workaround is to
+	# check if the getStore() contains index for the scanner before querying. next version 0.10 fixes this.
+)
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}