gentoo auto-resync : 06:09:2023 - 10:25:44

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-java/guava/Manifest b/dev-java/guava/Manifest
index 072148a1e783..1ab6a0d801e1 100644
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@@ -1,5 +1,3 @@
-DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
 DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
-EBUILD guava-31.1.ebuild 1661 BLAKE2B 827e4095f2dac42147b1941e26cbd75a53cad90a3fc2b7ab24e67f9cb5aef96a47363860348e36eb05835ace4342633370da0c78f6f5f3ba64fa140931a86811 SHA512 f631348ea551d6e4f69e366caa59d7cd67a15d4c165b0dfbfabd85bdb5a65b11bd372fb4516cff289b8ae52690d66c7619a7a670a70353afeb09a6dd351e73ef
-EBUILD guava-32.1.2.ebuild 825 BLAKE2B 6a4aed091fa674276eec0bc71113e2037dacd2c487fac95ab1b55415d37deb59430e110b30a44853eb811bd0e8e27ce66fe5f63d71cbb49d33abfdccf3e181dc SHA512 7f499854d905d8fe32ce741d60cacae32d4d8f22c0b273e1ffbb8bcadbf01dcacf75b595f9a50bfb51e278bf8ef91632b8f28ac38db3539933e5c1ade940c2ab
+EBUILD guava-32.1.2.ebuild 821 BLAKE2B 2a793a3d8acf9458b36694889a0b472a17c3eba01cc334e8e86167c1a96481d0404398892b869e504eef48d370d36c34702b6147e9d63e11123ecd3efa8b55fc SHA512 8c47f402d17a9ee50c17bd7a45f95e7a934ff325f3db629c9b734970be8e6135b2dfbbc15c305fffe081859a14aae7392d171410bece12927e70d9884b011bc7
 MISC metadata.xml 589 BLAKE2B 36b17e71aeb533194b87a9101d730b3f233c23b175b65216bdeecfcbf1bc7ac0936b7b284cdb40a30573d630d34a9bf7c2ca966b26bef4a3e7c5d6e90a1075a5 SHA512 0b8556db4fe43dc25f7604dd98ebb01fb4318c8a861ca25a5d7db76fef4b076c2eb2a67b801807233ad950cfb0d70b438af3f9e84f408060a168d9897158c6eb
diff --git a/dev-java/guava/guava-31.1.ebuild b/dev-java/guava/guava-31.1.ebuild
deleted file mode 100644
index 63da6851c481..000000000000
--- a/dev-java/guava/guava-31.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 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/guava/archive/refs/tags/v31.1.tar.gz --slot 0 --keywords "amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-31.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava:${PV}-jre"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A collection of Google's core Java libraries"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# com.google.code.findbugs:jsr305:3.0.2 -> >=dev-java/jsr305-3.0.2:0
-# com.google.errorprone:error_prone_annotations:2.11.0 -> >=dev-java/error-prone-annotations-2.16:0
-# com.google.guava:failureaccess:1.0.1 -> >=dev-java/failureaccess-30.1.1:0
-# com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -> !!!artifactId-not-found!!!
-# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0
-# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0
-
-CP_DEPEND="
-	>=dev-java/checker-framework-qual-3.14.0:0
-	>=dev-java/error-prone-annotations-2.16:0
-	>=dev-java/failureaccess-30.1.1:0
-	>=dev-java/j2objc-annotations-2.8:0
-	>=dev-java/jsr305-3.0.2:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}"
-
-JAVA_AUTOMATIC_MODULE_NAME="com.google.common"
-JAVA_SRC_DIR="guava/src"
diff --git a/dev-java/guava/guava-32.1.2.ebuild b/dev-java/guava/guava-32.1.2.ebuild
index e829a5a060be..d97d736a8dd6 100644
--- a/dev-java/guava/guava-32.1.2.ebuild
+++ b/dev-java/guava/guava-32.1.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/checker-framework-qual:0