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

7 files changed, 8 insertions, 67 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4b8fdbddaede..758562fa0792 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index f6f8cbdda86e..30eb18de587f 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -3,5 +3,5 @@ AUX fec-1.0.4-libfec8path.patch 1091 BLAKE2B 4e19c8615b20694f26d3ee5bd83e33ec342
 AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030d12709c12d15adb2462c40da5ab896806e4dc8b572fc6d952b6b09c550f1ba4511a84b9a75306804b67526ee34fac33d2f3d4bf453c807f9 SHA512 592cfd6502a000cc1ac02e534e5436cb3d621855cc682a4588a5fd6f17c8d7f4811743fa9dbcd30851221ba55ab2adb188f6dc9e32f8735651edd28e032803a6
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
-EBUILD fec-1.0.4-r4.ebuild 1531 BLAKE2B 90116c24f74df8f73ea3d8eab5299d25ee5e414b94c3e74239aa6e060e3a02b22f364f8b428da10417df20559da7323062895731f61223751775e99c23d0211d SHA512 9cc893e1b7183fd62d654b5c4da084f0e41edae9b4cd280add147c74f8992b5f1ae605a48bbe95278219d923f963be9c5a485b07ff37cb2a816ee88e596f94d1
-MISC metadata.xml 354 BLAKE2B 4f8e98f361320eebf410ee6724cf73016585ab2736fa9bd55c8e1b0067b231df81cc9112b7e2480de5b07a429b39c97098693e95e2bbc7bf226e74467fc3cbf1 SHA512 57a36f5db74544720c9a899af7720db5f234a1c93967145c3394c466ad4516440702b45db4c4191a57acc4393fb2d7fca2d5d697d563ac67fcd8032dc51e8375
+EBUILD fec-1.0.4-r4.ebuild 1545 BLAKE2B a79eb3864e6a6af9ec3d80314d246b4d06a040f6d08ffaa5ad5cf539a928320bd7dd55caefd598744078b74fe01406648405b8e16fc083d5ec67a7826703154f SHA512 53b032dfe28bddce60b3af59a9c41e6241478574f40820cfcbe2f4ecacf8bcf0de00c9fec4d3f83b70843d4bc189853304960e3d98e84384cb216112633b092b
+MISC metadata.xml 435 BLAKE2B 87e1c55b6bfd53f5f1b1df088a7c0c0e4d27ffda7a004f8acfae2c8e60d1c2d88c3534fa9f5afe0837236d6bb9449977d97446c7714bc272b9b9c0bfbb578edd SHA512 3b1c9b3f908f2b6660d028b24feedaee97a314eca1a9e49e9dabdc0e8c8b3d795cb455164fea5263901b145af2b04e03df8f3b1af8a9bcad70758a0b4651f106
diff --git a/dev-java/fec/fec-1.0.4-r4.ebuild b/dev-java/fec/fec-1.0.4-r4.ebuild
index 68586153e3a6..62b81cfdee9d 100644
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
 
 DESCRIPTION="Forward Error Correction library in Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://github.com/hyphanet/contrib/blob/master/README"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
index 9ec6a4a58c78..8d5bfef17028 100644
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@@ -9,4 +9,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hyphanet/contrib</remote-id>
+	</upstream>
 </pkgmetadata>
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
-}