gentoo auto-resync : 18:09:2022 - 17:20:12

5 files changed, 66 insertions, 14 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 35103adcc738..74e902436d50 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index ef988e058175..e4579ff74059 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,5 @@
 DIST gson-2.9.0.tar.gz 350309 BLAKE2B f17f7a7410744b14cb79c979b35c7f3c46a3d9e922722c41893b872013319a1bd06d81526e8380055aafa47524bfcc50e02629d1c5994e1f9f81df4391a9c651 SHA512 25e57f0e3cbff7e4d33070d250ba4ecf1c659380bce07863c52a3b30edd0ba88c923e55b0f38098b5ce3827a74a21c4d41f9de02f6a84da771ae39fd823667d3
+DIST gson-parent-2.9.1.tar.gz 359012 BLAKE2B e0a0d6e517e7323a508d7aa6cb26e39aad4a3c479b479ae7b075d3cb47c0312294eb074ed52f1fbbec5de301341dac7f5d742913498205f0544a53da0c0eb1a1 SHA512 928a17491efc9866271f08d4ec0fc22b96b4b6f4827d86679cd4a9085e91fbf6b1b4d6618d380ff63e7a9922d9cf0ec7ba9cd073862e7e212eb31c0140c6b6ad
 EBUILD gson-2.9.0-r2.ebuild 2056 BLAKE2B 7e7f9c4f49c6a38f22aa071b0a79adc7e8b995833707d0aebe019f7e200ef9f2de245cb848307460bcf50ea391b044b75e0e53496ce058ac188aafd873c8e20b SHA512 b6bda86b5b96bcd96e9b9260916b01f01895cfd04e835ff96c8cb66c2b1e9740601e5eea5f62b7eb9b30b943eba5e626697de66f3ab2f6352f23f280ce5951ed
+EBUILD gson-2.9.1.ebuild 2040 BLAKE2B ee59a52d3b3f19cc1a655fb0d5096a037bb337f5591eec2dff8e647a11824cf764f0d2197cbb2f6f023abc77a613d5246a5a1c5dbc732bc158028db968a17010 SHA512 36f3e4226cb1236ed728c09158fc8c4685e125ff09d2ac7ea2431da1a2f18a4e7d686c5683aaf0fb04e87960edc4cf05318a8d92d38086677889df1961fc4253
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
diff --git a/dev-java/gson/gson-2.9.1.ebuild b/dev-java/gson/gson-2.9.1.ebuild
new file mode 100644
index 000000000000..db9194478d17
--- /dev/null
+++ b/dev-java/gson/gson-2.9.1.ebuild
@@ -0,0 +1,60 @@
+# 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
+}
diff --git a/dev-java/jakarta-json-api/Manifest b/dev-java/jakarta-json-api/Manifest
index a55631f89e11..dbdc0a6bf170 100644
--- a/dev-java/jakarta-json-api/Manifest
+++ b/dev-java/jakarta-json-api/Manifest
@@ -1,3 +1,3 @@
 DIST jakarta-json-api-1.1.6.tar.gz 205455 BLAKE2B d928c0fbf65da992670eea0ad5a010b536ba6619b2d981a7fb02cf4cd05f00120f84dc0e19bbb4ee415de06d0c715a1e6736d11f2e1d3d8cc262f496319e389e SHA512 107fd6e48a3b3693a3019726cbe398ff7640896ffc7eac05bccee168f45be2c91baa1b673684006a3147716c274b11f1e44314b4d8fe89fbf124117fde26da1a
-EBUILD jakarta-json-api-1.1.6.ebuild 916 BLAKE2B d0c576304b863523e215ad88bd9a6d58def633093afdf65fad1b9252b016edf37d500534afc5f12d6c78d61d8a5c226a161b1dc468940230f38399b3a2c06b0c SHA512 5338612b055fd695b1e82e134daa63a69e087acdf4a04398227b05a26b11dbc5f214ef9b09a261b8a80183f9fbcec90b2f4198199cf78e2d1949754cdccacab4
+EBUILD jakarta-json-api-1.1.6-r1.ebuild 803 BLAKE2B 9c3a651f08fc3ed2d97bb22992b66c2244ad67538ab380b4ae0383c44814f5d379d8a6c3c34bbd28017d29262e79f4f49f704283f5b6a465c2358cfca7020b78 SHA512 6ae0cb7747ee871e2092c8aee10478619042015a9c592937cb7b75922f3b818d249adaec8ed87f98f12f802e2c821e3c0f9e47b84ddfdf65672a9e8ebb559726
 MISC metadata.xml 320 BLAKE2B 7122c677970180a1bf5faa715f1a4887df4692673cb4dfb0df9538e36f645e89b64fb3374a854cad50e2d2a0965ee97eaaafbc20f6526397a035e9182979ac19 SHA512 3fc26e2503653efab9e6724b7947fc01ec8d23934f3c9455dc55e731f88546844cd7aebdcd696c7bdf62bd3f05094fb35aad03c38078a1824c6031f26877a240
diff --git a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
index d8ca5b27516a..81ff7a0206e8 100644
--- a/dev-java/jakarta-json-api/jakarta-json-api-1.1.6.ebuild
+++ b/dev-java/jakarta-json-api/jakarta-json-api-1.1.6-r1.ebuild
@@ -14,28 +14,18 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="JSR 374 (JSON Processing) API"
 HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jsonp"
-SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/eclipse-ee4j/jsonp/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( EPL-2.0 GPL-2-with-classpath-exception )"
 # Since version 2.0.0, the namespace has changed to jakarta.json
 SLOT="1"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
 S="${WORKDIR}/${MY_P}"
 
 JAVA_SRC_DIR="api/src/main"
 
 DOCS=( CONTRIBUTING.md NOTICE.md README.md )
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}