gentoo resync : 20.03.2022

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 5fb17123eb62..d72f34962000 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,5 +1,4 @@
 AUX emma-2.0.5312-java15api.patch 841 BLAKE2B b3a03a2f309303e0966703204a66980081778ca261b7ed82d8471ce3a295e4b5f8af0d6a8547f01150930a7c3378f8472ccef3ccb9382b74d9782e246530bc93 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23
 DIST emma-2.0.5312-src.zip 421109 BLAKE2B bca287d7cdd61902fd156eac80596db07801e8dabd342d7cc68d3e0b4c0ff7b4de2b14d8b01d3521a291f7401ddc0ead67db6f9c601b26669ce9265bc28e0209 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b
-EBUILD emma-2.0.5312-r3.ebuild 1039 BLAKE2B b2de84bac7d81c2af8a0ccd6cbc7df2ef24671d32e76ea768026a2f38f01599c0ddc3b4f152af084d2c7f4d121e083c74951df52a37af79717a20b3dda053c77 SHA512 6f0ee5d7c95a68765a83ef268ffac1b5d8f05ba7a2c270332e7f86ca929274cf7359f5abb29a9b75c00b6d4d41202a70b15f1c46ba40db3168c5305f40320475
-EBUILD emma-2.0.5312-r4.ebuild 1081 BLAKE2B e41af9bdce0beb1047eb07426bc1e43210a6e4121b0137df125b042a09d1d79b326ec8b8551873ab5b40a60fe4fc495f4b02ce1917a6cf1d23cb1e878531fea3 SHA512 ebd081024dc67609c0908ec00047532a95df9d859c2824ca409bbc7765d565887715699d75c5ad3beb433ab5b58195bc04c0957e2c46abe515bc71f2f345be27
+EBUILD emma-2.0.5312-r4.ebuild 1077 BLAKE2B b6d34c9723b82b2b3ec0a3627e66f956a3b176b1d5b7d8a76ded455e5a9dea9f5d5679c7cca9fb4a53965f51e5b1fdb6d39227c1f143695f3dd8a428c03fca1c SHA512 e9521a424929f3039a60ad1b700d80b48944d2ba5a4997d45fb7c4e942c571262564f75de80dbcd5a8329c92d8434cb5a30aa1d5905a74628e09b7a11468c4f4
 MISC metadata.xml 860 BLAKE2B 9e3723bdb2d6d82a4b6882e6e495367b94717dcc6b62154fa76a275bb39bd8418d0a748c990b28e9c21ef7a7c4703d6a80374cbeae69f7655e36f57110433d7f SHA512 2de0835234df8151fc96f57a6662357589eed19f6b528f4e9084633a79c60bc0e82dfb0447e5398f0f810fe481c278e75220f14fce5a26c65aeb6e0dbe43883a
diff --git a/dev-java/emma/emma-2.0.5312-r3.ebuild b/dev-java/emma/emma-2.0.5312-r3.ebuild
deleted file mode 100644
index 08620ee93566..000000000000
--- a/dev-java/emma/emma-2.0.5312-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java code coverage tool"
-HOMEPAGE="http://emma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+launcher"
-
-CDEPEND="
-	dev-java/ant-core
-	launcher? ( !sci-biology/emboss )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="build"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-java15api.patch"
-	# bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
-	sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	java-pkg_dojar "dist/${PN}_ant.jar"
-	java-pkg_register-ant-task
-
-	use launcher && java-pkg_dolauncher ${PN} --main emmarun
-
-	# One of these does not have java sources
-	use source && java-pkg_dosrc */*/com 2> /dev/null
-}
diff --git a/dev-java/emma/emma-2.0.5312-r4.ebuild b/dev-java/emma/emma-2.0.5312-r4.ebuild
index 5e00f2ec4a50..0ea013aa1a3e 100644
--- a/dev-java/emma/emma-2.0.5312-r4.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+launcher"