gentoo auto-resync : 01:09:2022 - 19:24:10

7 files changed, 2 insertions, 166 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index bf121cbfdbc8..de9b4c48dff5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index bc9ddc9d5f92..ef988e058175 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,4 +1,3 @@
 DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
-EBUILD gson-2.9.0-r1.ebuild 2095 BLAKE2B 71415fd6ec715372eddec83dd7ee27e84ba2bbf06d9e0cd206d3ebbccbcd8c90ea310befb4730da41a495609903049aef94bbd0d24125a6c0cc3e7f37b31f34a SHA512 217c6663d07526a44e9c23ffee344c3fd87653da8c14b359f7bb927eb78e564071c7678e55bf28c6b6baf4f019c2046365fffa1041d022c67af1814b71b98436
 EBUILD gson-2.9.0-r2.ebuild 2056 BLAKE2B 7e7f9c4f49c6a38f22aa071b0a79adc7e8b995833707d0aebe019f7e200ef9f2de245cb848307460bcf50ea391b044b75e0e53496ce058ac188aafd873c8e20b SHA512 b6bda86b5b96bcd96e9b9260916b01f01895cfd04e835ff96c8cb66c2b1e9740601e5eea5f62b7eb9b30b943eba5e626697de66f3ab2f6352f23f280ce5951ed
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.9.0-r1.ebuild b/dev-java/gson/gson-2.9.0-r1.ebuild
deleted file mode 100644
index b6821636dfbf..000000000000
--- a/dev-java/gson/gson-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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/google/gson/archive/gson-parent-2.9.0.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:2.9.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Gson JSON library"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/${PN}/archive/${PN}-parent-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	virtual/jdk:11
-"
-
-# Set to jre-11:* since jre-1.8:* causes errors:
-# error: Invalid SafeVarargs annotation. Instance method <T>assertIterationOrder(Iterable<T>,T...) is not final.
-# in src/test/java/com/google/gson/internal/LinkedTreeMapTest.java:164:
-RDEPEND="
-	>=virtual/jre-11:*
-"
-
-S="${WORKDIR}/${PN}-${PN}-parent-${PV}/${PN}"
-
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/java-templates"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-
-JAVA_TEST_EXCLUDES=(
-	# requires the test class to be obfuscated using proguard which we do not have atm
-	"com.google.gson.functional.EnumWithObfuscatedTest"
-	# FAILURES!!!
-	# Tests run: 1090,  Failures: 3
-	# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
-	# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
-	"com.google.gson.regression.OSGiTest"
-	# testSerializeInternalImplementationObject(com.google.gson.functional.ReflectionAccessTest)
-	# java.lang.IllegalStateException: Expected BEGIN_ARRAY but was BEGIN_OBJECT at line 1 column 2 path $
-	"com.google.gson.functional.ReflectionAccessTest"
-)
-
-src_prepare() {
-	default
-	sed -i "s/\${project.version}/${PV}/g" src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java || die "Failed to set version"
-}
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 37c46d7f4584..047f9c65978c 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -2,5 +2,5 @@ AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d
 DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3
 DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a
 EBUILD htmlcleaner-2.25.ebuild 1675 BLAKE2B 2ed817e854b0746fe0b8156d83f1734a4cefdcfc05b8fdcd49e88f0f1d710575e1f1d25857a1ab56728eed3769b5f7a03d8f9899f554e3d7c3bd8f78bfab3356 SHA512 7ca56d5346233f3bbb8d997affa47d38411916fb178118b658441436b2be598252414b8b7cef609b3334cd72207a36c6d9d5f54410568eb65421e372636801a8
-EBUILD htmlcleaner-2.26.ebuild 1168 BLAKE2B d7262396d14fc58ba40db3c85cbe7ef5e66e5cdd5200bc2647fc4ab544a92a0d32d0cd1c2f370c1ea521a21d9bcc548dce0b65f90e7a5d3652b90ba91fdbb3f6 SHA512 85bcc4be8eaf6dd232630f038d1733b0501819a96e0c90020a8d3745833950481666e61c908a3a046a1862731a294510497caebd7df62ad00ae33b362937ef1b
+EBUILD htmlcleaner-2.26.ebuild 1166 BLAKE2B 3a47cb454c26c29ba25b8e03d698f0e19cc381ec6609d30275aa9146416ba2dc5edd7cf77b64ffc7c2c3c07dd4ebaa229af07603ae0c6ec76236bbebdca24be5 SHA512 a473317d619edb39df2b19bb9cd653c0252d5de110855dd481630271777763c91cf67dd5aabe0a2869d1d0b8b50ca8b9976597b4af1f42321db18f34fef8fb48
 MISC metadata.xml 957 BLAKE2B b3efa9952daa1c7027db845d6a7f8c079240c2128d8bb454490990722f2cf66c0f6ebfca4795bd0d166d45e6b4dc764c0ad6bdb53b95945043cf864b6e9d0f22 SHA512 b804e88d45556cddf4a6e2da621a8eb971935370b82c875a9e0dda0772bb23b94a874214d1727335b3ca358f5d10bd363723ba8629413f9169dbf28dd0ef588d
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
index 2bb65af8d069..11ae5880fbc2 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jdom:2"
 
diff --git a/dev-java/reflections/Manifest b/dev-java/reflections/Manifest
index a98e19f0a8a7..9f9b865f30ce 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,4 +1,3 @@
 DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
-EBUILD reflections-0.9.12-r2.ebuild 3885 BLAKE2B 20409316f8cc31dee09a80882d4baa59bacd0b92356b5e434d56ece38bdccebab4cabe82749735d5f6e5bf9f1b037d733bf03664c7389dd5ef0d3fa4f272994a SHA512 c915f76e25958e775bc378976e88c5a10e09c507a5b188be2442f3aa73fa3c928e78d9f4fdce8b2ab4ad30b67a568c011be1a3b1378ebe2edd760097b33d8102
 EBUILD reflections-0.9.12-r4.ebuild 3795 BLAKE2B a601a07600dc3a69158f7614e53ecdd1af1213042031fcf747320f5673e769f0d93ee8f1eb8f3c9cb00245e776a948bf3e9f8acaa1b614c58c888124f9965647 SHA512 f2c52934f7abff3dbdef4f22afec72dbcf2397e8b97817e8c9ceab0a6a3280da767d737add076ff74cd21c66bed18cb0493281e4e8dc1da533adb007012a8796
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
diff --git a/dev-java/reflections/reflections-0.9.12-r2.ebuild b/dev-java/reflections/reflections-0.9.12-r2.ebuild
deleted file mode 100644
index f55973dea4e9..000000000000
--- a/dev-java/reflections/reflections-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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-1.8:*
-	${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
-}