gentoo resync : 12.05.2022

3 files changed, 2 insertions, 37 deletions

diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index b8cdcf3a7d8c..387771951369 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,4 +1,3 @@
 DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
-EBUILD assertj-core-2.3.0-r1.ebuild 821 BLAKE2B 37c145003810d09f2a58cc9a0b78014efb2b023b6f12fd892f2faa9eedcd9dd74a75f131a798b9128aff8663584839792d8cf3a8a5193319fd8f510763483b76 SHA512 7d4d650ff8f8a1e27b5fce6cd3476699c9b4c47d68d2e4a6aee42db8a7b0638fcd901f30eb00ed7624c0e4d72e093597ceef879c0ef5dad541870fcca48e04d4
-EBUILD assertj-core-2.3.0.ebuild 801 BLAKE2B 251b6caa0e965be7b0c66d5af54b787d0260ae143806a02d9a05baefedf6378c46d721dbfa7cfb523a9379af88a7f057272ce330e79a95993760b75a42561f87 SHA512 8af9f5a57fd8fdaaf43727ee0e0a9fe58d6c0cfa285af076abfe807a8a26862a01f7ec3fb0ac52bd7c31a4bb024b7934e0808e564f70058979f2f4bcbfca6c74
+EBUILD assertj-core-2.3.0-r1.ebuild 817 BLAKE2B 185e0e988f59a0c512c762176f83e5fbb5005ae950cdb9fab78ee4e80b222f23b203504f32f60d96648efb06c6ab23516cb30570672d6c7a89bede1037303ed9 SHA512 1c8356ce2314bc8e956092e2e8a0c849d9fb0d29bc24256e461b554ae1b5d18bfeafcbb3265f7b83c6281851df12a28b62f6cf8c86dba796d3eda3171752b9d3
 MISC metadata.xml 640 BLAKE2B 3582da14da36e366b2436a5f49b6c0265705ebc109a01fdfc9380ec5b02a92a7b7257e2f410118e88ff369c78e126ed87a697088e481637211de572cc84758b8 SHA512 975fe87b3997787302e135fb742893e042eef0a75c6ed0de1a61d34ccbbde8d17b9c637b31c2569236864b00ce9579c8818546ac49d4a1b6c1ad393013b83d7c
diff --git a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
index 21ab78c440d6..018ad72c7861 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://joel-costigliola.github.io/assertj/"
 SRC_URI="https://github.com/assertj/assertj-core/archive/assertj-core-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="2"
 
 CDEPEND="dev-java/cglib:3
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
deleted file mode 100644
index 4d52cde7788b..000000000000
--- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.assertj:assertj-core:2.3.0"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library that provides a fluent interface for writing assertions"
-HOMEPAGE="http://joel-costigliola.github.io/assertj/"
-SRC_URI="https://github.com/joel-costigliola/${PN}/archive/${P}.tar.gz"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-SLOT="2"
-
-CDEPEND="dev-java/cglib:3
-	dev-java/junit:4"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="cglib-3,junit-4"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc {CONTRIBUTING,README}.md
-}