gentoo resync : 29.12.2022

3 files changed, 2 insertions, 55 deletions

diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
index d7f782a6c6b6..338102bdc6cf 100644
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@@ -1,5 +1,3 @@
-DIST guice-4.1.tar.gz 23212767 BLAKE2B bab34da971c1a154eca468bbae4f32db97c0f7ce88bd66cea9c79ef08871db06877ab1ea6495c920977ae139af0bddef2fa4bef8ff5783d2bd53c736bfa07153 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00
 DIST guice-5.1.0.tar.gz 650452 BLAKE2B 66c56b8605d189a3a6834a1de9ba6b7c6600583dfefa7808ae0b0b71d7f07746811a76326fc3ff56f2fd0d377f7bc3eb04d1c996ab2289eb48dff91d2f12b5f0 SHA512 b9719f07725c3188b8b903c8eee74ef59397f85f7452e38ef8ba2b3b66a56cef427d4dcee4e5d9c4033404a2f5cdadc2d40b6f7076b4c08fe1ec109910206e6a
-EBUILD guice-4.1.ebuild 1140 BLAKE2B 656569e3c4d002cddbc0d36858bc82e323937e325a624300143355202ab131a83bf2c3df1091ba8ed9cb8150fd8b3026360cfdc49b2e3f55820646eac47e60dc SHA512 cb4ad67515a9bedfa8d736c5dd4b3ba3e031a0db6624d22edb7740fd7fb8a0c3564c86294e2208845e8e2d1813f9b4b3727643c707247ba11e567638928e0f01
-EBUILD guice-5.1.0.ebuild 2281 BLAKE2B adad775d03e5518dde990a47900a5b96f39110bdb51700820afba87f92f25e578db98d884bf4206e94197014d5a4b8c117aa2455268f491eaeaba6efb0c610c6 SHA512 b6b220a0f873296608234c51bd473c01ec1b7cfeb82b6136db9e28d33ab929760ad92d9c29c528e6938e564b22375e91f30fef2ac2f01b514e17478adf48faae
+EBUILD guice-5.1.0.ebuild 2278 BLAKE2B 90567214c17a2e34c10ae83432e5f2cdd031ee325dcc381114df2c3b6c4bfbd3727b51bc37a722c27b5a3ab4f9fc621bc259aba3d1c03d8b4d21ef25442dc911 SHA512 7a1efdf154ccd4d96dc4c574fd9657a3863966706477b56be1bc71679829c25e69f87c9facca30a80d420b0ecacb066329746731d49f8f2064a41f4092f1413a
 MISC metadata.xml 371 BLAKE2B 2960f7040449f39cf4371b64df2a64fadfb000d042ccc4560d23cdc0f92cc4c55718a155990db42f7d1eebf1d8b5702e5094cca9bcb0e3e01cccf37e6509889d SHA512 522b9d8b6b85e48e522663cf9b93ee077b2adeb073795d5adb4df81935518dc8e712e85e2a4fc56e4ae1a0656ccc0b35831038afed7d65b880b80d1bffcbbec8
diff --git a/dev-java/guice/guice-4.1.ebuild b/dev-java/guice/guice-4.1.ebuild
deleted file mode 100644
index a73ec4a039fc..000000000000
--- a/dev-java/guice/guice-4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A lightweight dependency injection framework for Java 5 and above"
-HOMEPAGE="https://github.com/google/guice/"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-RESTRICT="test"
-
-CP_DEPEND="dev-java/aopalliance:1
-	>=dev-java/asm-5:4
-	>=dev-java/cglib-3.1:3
-	dev-java/guava:20
-	dev-java/javax-inject:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}"
-
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common.xml"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	default
-
-	# Where could we get this FREAKIN jar?
-	java-pkg_clean ! -name "bnd-*.jar"
-}
-
-src_compile() {
-	EANT_BUILD_TARGET="compile manifest" java-pkg-2_src_compile
-	jar cfm ${PN}.jar build/META-INF/MANIFEST.MF -C build/classes . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	dodoc {CONTRIBUTING,README}.md
-	use source && java-pkg_dosrc core/src/*
-}
diff --git a/dev-java/guice/guice-5.1.0.ebuild b/dev-java/guice/guice-5.1.0.ebuild
index dd9bb5373e8d..e1ee08998250 100644
--- a/dev-java/guice/guice-5.1.0.ebuild
+++ b/dev-java/guice/guice-5.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Most of the test dependencies are missing in Gentoo.
 RESTRICT="test"