gentoo auto-resync : 28:04:2023 - 11:12:20

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 70771e7d0697..1e940c570417 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,3 @@
 DIST gson-parent-2.10.1.tar.gz 394777 BLAKE2B e118a7c39b17c4119b4140f3c105fef4c3cb07580dbc530d9bfd59edc4f152f62ac5ff93db1a3861c73758e369ecef4f8ed4e94d556869291469764ea848bbbd SHA512 074f40f7f9aa48daf5b5a3ec371713db02f6f8fceb959b01e8a16732862645d2350f3276ab7ff8021d48082f890b53c6e80d992af6af4b74e4646f85494b8e70
-DIST gson-parent-2.9.1.tar.gz 359012 BLAKE2B e0a0d6e517e7323a508d7aa6cb26e39aad4a3c479b479ae7b075d3cb47c0312294eb074ed52f1fbbec5de301341dac7f5d742913498205f0544a53da0c0eb1a1 SHA512 928a17491efc9866271f08d4ec0fc22b96b4b6f4827d86679cd4a9085e91fbf6b1b4d6618d380ff63e7a9922d9cf0ec7ba9cd073862e7e212eb31c0140c6b6ad
-EBUILD gson-2.10.1.ebuild 1685 BLAKE2B b9b7355e4f5e1314ee2db3a930d71ca40fac0829de4e6da1abc1e64f77f3cc693777c6e2c28218346efa8f55b41602c576d2b57acd2959e39ecbe22224f64b47 SHA512 8e5c726dc34d95b07ca0753c372fbf5f25bcdbdabcc494fdb63159f33f7b7a3729c59b53a3bbc8189c02dc7934d785b522cbd9c34f569dc94c135c2637275c8e
-EBUILD gson-2.9.1.ebuild 2036 BLAKE2B ce35963381acb903e4a885374c63e1e3e06214019202223397955cac07831b0b6c0841f04bca4f2f09afb79c0cb35d963b89c9148f858be3dced3e4dc96f9b8d SHA512 e42d29e71002d5285433f2f4c26cad4ea7cf21dd6c135aafbc4dc8deffd528249a1a8acbf8e03c0e9b54eb51be14f6ab119aee2946a06465d419c5f27b001391
+EBUILD gson-2.10.1.ebuild 1681 BLAKE2B 0e91cb624f1883f43f20551f30f17195456678f089d5d89f436b9459b5155ab94f48f17a61ee57de82954e05251110eb567fa541b2b2ee3c7dba1fb994769512 SHA512 b8748b2a22a6c25e7bb22cc6ba8ed048f09b8ff92a26c2783c91d818bd5c3af05cb2ea8fb46584d34c606f16f957443658c23b04427a18864ffa8135709784db
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.10.1.ebuild b/dev-java/gson/gson-2.10.1.ebuild
index 64fb2721c56e..96e7d452fb78 100644
--- a/dev-java/gson/gson-2.10.1.ebuild
+++ b/dev-java/gson/gson-2.10.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/gson-gson-parent-${PV}/gson"
 
 LICENSE="Apache-2.0"
 SLOT="2.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-17:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/gson/gson-2.9.1.ebuild b/dev-java/gson/gson-2.9.1.ebuild
deleted file mode 100644
index d04adf324bd7..000000000000
--- a/dev-java/gson/gson-2.9.1.ebuild
+++ /dev/null
@@ -1,60 +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.1.tar.gz --slot 2.6 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild gson-2.9.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:2.9.1"
-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/gson/archive/gson-parent-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/gson-gson-parent-${PV}/gson"
-
-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: 1135,  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 -e "s/\${project.version}/${PV}/g" \
-		-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
-			|| die "Failed to set version"
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXCLUDES+=( "com.google.gson.internal.bind.DefaultDateTypeAdapterTest" )
-	fi
-}