gentoo auto-resync : 10:03:2024 - 18:45:26

3 files changed, 2 insertions, 87 deletions

diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 4c01926eff56..8d0af02805cf 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-r5.ebuild 1823 BLAKE2B 9f776ee22beab70bf495eb0afbd8f3136626af1a8dfbb4d863986f871540965203c7bf674424dfba29a5984259c9520acb69d292fac1dedee5dab4e5373fb2b3 SHA512 3e2b53b333a97f0d6c79ba27ee132c33e36ef12ebc6893c80dfa2d3ad7055dfee7347a33d858c1435d48812ba4a0731b46c8ad7a928dbded07cb1949981f8aa0
-EBUILD emma-2.0.5312-r6.ebuild 1745 BLAKE2B cd4bb77951fb9349eef005b2e3004080f0f150a1861532dc7b5fc88033fcccf8ec01e1cfd77d92784c8d73ecd7c709c84385dd83d61c63217f9484a18c60c969 SHA512 71374d6d96e57bf12991539b7929aff7b1b23e2b96814292e3536865f3361484c8d405ab18f44989a45b09d8167d3c7e1bf51c9109cf2050ab4e3ed2311cbcfe
+EBUILD emma-2.0.5312-r6.ebuild 1754 BLAKE2B 1a8ee9f3ea3e5f0da68195ba8de820bf81fc17c84df17071553c96a81592c0a3a506cbd4c57b25f97af91f0068ca54a205d15a101d9422bb4081ae436992555c SHA512 a4bb69f6f69626055bce2bc7aa6c35064bb514edf3a95431123a51b50f6f2ad8d1e8ce759f0c78cce3529b663bffe1fa6fce3801711aeb32bc25f03ff7d4789d
 MISC metadata.xml 860 BLAKE2B 9e3723bdb2d6d82a4b6882e6e495367b94717dcc6b62154fa76a275bb39bd8418d0a748c990b28e9c21ef7a7c4703d6a80374cbeae69f7655e36f57110433d7f SHA512 2de0835234df8151fc96f57a6662357589eed19f6b528f4e9084633a79c60bc0e82dfb0447e5398f0f810fe481c278e75220f14fce5a26c65aeb6e0dbe43883a
diff --git a/dev-java/emma/emma-2.0.5312-r5.ebuild b/dev-java/emma/emma-2.0.5312-r5.ebuild
deleted file mode 100644
index ba18147cfcf8..000000000000
--- a/dev-java/emma/emma-2.0.5312-r5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_PROVIDES="
-	emma:emma:${PV}
-	emma:emma_ant:${PV}
-"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Free Java code coverage tool"
-HOMEPAGE="https://emma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/emma/emma-release/${PV}/${P}-src.zip"
-S="${WORKDIR}/${P}"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+launcher"
-
-BDEPEND="app-arch/unzip"
-CP_DEPEND="dev-java/ant-core:0"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*
-	launcher? ( !sci-biology/emboss:0 )"
-
-PATCHES=( "${FILESDIR}/emma-2.0.5312-java15api.patch" )
-
-src_prepare() {
-	default #780585
-}
-
-src_compile() {
-	einfo "Compiling emma.jar"
-	JAVA_JAR_FILENAME="emma.jar"
-	JAVA_MAIN_CLASS="emmarun"
-	JAVA_RESOURCE_DIRS=( core/res )
-	JAVA_SRC_DIR=( core/data core/java1{2,3,4} )
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":emma.jar"
-	rm -r target || die
-
-	einfo "Compiling emma_ant.jar"
-	JAVA_JAR_FILENAME="emma_ant.jar"
-	JAVA_MAIN_CLASS="com.vladium.emma.ANTMain"
-	JAVA_RESOURCE_DIRS=()
-	JAVA_SRC_DIR=( ant/ant1{4,5} )
-	java-pkg-simple_src_compile
-	JAVA_GENTOO_CLASSPATH_EXTRA+=":emma_ant.jar"
-	rm -r target || die
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_SRC_DIR=(
-			core/data core/java1{2,3,4}
-			ant/ant1{4,5}
-		)
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar "emma.jar" "emma_ant.jar"
-	java-pkg_register-ant-task
-
-	use launcher && java-pkg_dolauncher ${PN} --main emmarun
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc core/data/*
-		java-pkg_dosrc core/java1{2,3,4}/*
-		java-pkg_dosrc ant/ant1{4,5}*
-	fi
-}
diff --git a/dev-java/emma/emma-2.0.5312-r6.ebuild b/dev-java/emma/emma-2.0.5312-r6.ebuild
index 0038b8b308f5..10a18486c01d 100644
--- a/dev-java/emma/emma-2.0.5312-r6.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r6.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+launcher"