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

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-java/guava-testlib/Manifest b/dev-java/guava-testlib/Manifest
index 75593c41c492..6e95cd6e35af 100644
--- a/dev-java/guava-testlib/Manifest
+++ b/dev-java/guava-testlib/Manifest
@@ -1,6 +1,4 @@
-DIST guava-31.1.tar.gz 5583483 BLAKE2B b430257b6a21e8cc85b11241be3abc463d13d29d85c6e7a3e4240977213428ec92af63afb66d0637f6b6dbbab1e3493cfc684a6be21ba4633cec7c6df5d0a8e7 SHA512 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8
 DIST guava-32.1.2.tar.gz 5746736 BLAKE2B e10f9ca81acfd14c0bdc595d777c2738f88e35d3caf2ebaec5b3f3dcd6ee87672830671b8f99b0ce030d040adcbf0a88a4cba13a42dfb980bc926540b663167e SHA512 43a9b6068bd4b636f742a6a418a34f3b4d218a0ec14b39d5fbe67b4d3c11813295c3c0eb2cf41b5de7a2383eaba639001faab60dbf3821b7546e29fe9cf3dd78
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD guava-testlib-31.1.ebuild 1646 BLAKE2B 47da5c59670dc4ddf27b2f02a2befe071ba5348b1ff1582e500bab4fe47b1e5e1fbaac53ffc80246d505cf2101547b8ae1547f1862c881fc0dfefd7cf075f73a SHA512 1b9ab91d462df2c38d3ad10304906ab9d870d3308632cafefba10d24f78065b635d1759bf34a727064a5dd61bcb06206ee3172dad82b44229606657871639bd7
-EBUILD guava-testlib-32.1.2.ebuild 1303 BLAKE2B 06343cece40e6853d1059e5153879006cf781d33f2662927d4679d359521a1162a994ca7454ad8326e3714df4e26d6610ea263be559e7e3531b4fce0d60d23d1 SHA512 734d6b338d76233b31c6e20df568dfd2cdcd42d0d56e89849a90a8008825e45a0010064792ebfc6135fa5298a49315569ecd682c13c8d1777a29950f8a62533f
+EBUILD guava-testlib-32.1.2.ebuild 1299 BLAKE2B 65a8827d14fedecf990d663cc492819154f40555bf3bf05a2e8fdaedf439dc0c164202abb126b408d6491ab51c03cebe2b79d74a96099e9dd64e054d57f35039 SHA512 dcc87868edd97cb8d2f2d54d53768a80b554b6604351dc4d12660ac06c08f4541a3c01844893cb76f8f5ad9d21dc4c8c05bf274ff92a44794a818eedbfe5c97b
 MISC metadata.xml 388 BLAKE2B 619e640d22637685b8b59294275ab1a36e74839c5eb2f6002055cb40037406800379274d4085d41ce2a8f2000b6bedcd137b4e7fe38933734474f998e4cf909b SHA512 b44014388651d54e41671847c438c9ba03ff1a551924a82ff0ce12deb8f347e94f49469ab41413e052776c9b7893a1989d570f12454117e828051eef5fef1c11
diff --git a/dev-java/guava-testlib/guava-testlib-31.1.ebuild b/dev-java/guava-testlib/guava-testlib-31.1.ebuild
deleted file mode 100644
index b4a05d3138f6..000000000000
--- a/dev-java/guava-testlib/guava-testlib-31.1.ebuild
+++ /dev/null
@@ -1,51 +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 guava-testlib/pom.xml --download-uri https://github.com/google/guava/archive/v31.1.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild guava-testlib-31.1.ebuild
-
-EAPI=8
-
-# No tests because "error: package com.google.common.truth does not exist"
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.google.guava:guava-testlib:31.1-jre"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A set of java classes to assist the tests for Guava itself"
-HOMEPAGE="https://github.com/google/guava"
-SRC_URI="https://github.com/google/guava/archive/v${PV}.tar.gz -> guava-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: ${PN}/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:guava:31.1-jre -> >=dev-java/guava-31.1:0
-# com.google.j2objc:j2objc-annotations:1.3 -> >=dev-java/j2objc-annotations-2.8:0
-# junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# org.checkerframework:checker-qual:3.12.0 -> >=dev-java/checker-framework-qual-3.14.0:0
-
-CP_DEPEND="
-	dev-java/checker-framework-qual:0
-	dev-java/error-prone-annotations:0
-	~dev-java/guava-${PV}:0
-	dev-java/j2objc-annotations:0
-	dev-java/jsr305:0
-	dev-java/junit:4
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-S="${WORKDIR}/guava-${PV}"
-
-JAVA_SRC_DIR="${PN}/src"
diff --git a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
index 80d71fe50c23..f2a7f38e6762 100644
--- a/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
+++ b/dev-java/guava-testlib/guava-testlib-32.1.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/guava-${PV}"
 
 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