Nastily extend ~x86-fbsd to -r1 and remove the non-split-ant -r0.

Package-Manager: portage-2.1.2.9

5 files changed, 15 insertions, 71 deletions

diff --git a/dev-java/emma/ChangeLog b/dev-java/emma/ChangeLog
index 3b46db3086b0..cb3fc5c30749 100644
--- a/dev-java/emma/ChangeLog
+++ b/dev-java/emma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/emma
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.11 2007/06/11 11:14:25 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.12 2007/06/11 13:07:22 caster Exp $
+
+  11 Jun 2007; Vlastimil Babka <caster@gentoo.org> -emma-2.0.5312.ebuild,
+  emma-2.0.5312-r1.ebuild:
+  Nastily extend ~x86-fbsd to -r1 and remove the non-split-ant -r0.
 
   11 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   emma-2.0.5312-r1.ebuild:
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index f4140f1eded7..f0a9229fb379 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,37 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX emma-2.0.5312-java15api.patch 841 RMD160 56a8200d6135f642cd384185c7fcda401506f900 SHA1 8506742164e545e2a86c52764a1efdae1746d9b1 SHA256 c8e0b61ebb49a7705afb81642a01964cb4adc590f543aef09f18393d60606c68
 MD5 f007314555644b050ce445fd8b808c41 files/emma-2.0.5312-java15api.patch 841
 RMD160 56a8200d6135f642cd384185c7fcda401506f900 files/emma-2.0.5312-java15api.patch 841
 SHA256 c8e0b61ebb49a7705afb81642a01964cb4adc590f543aef09f18393d60606c68 files/emma-2.0.5312-java15api.patch 841
 DIST emma-2.0.5312-src.zip 421109 RMD160 404fe6d3212e04d65a6aebd511ce90b9dc7d9ffd SHA1 3f14c6bb30a0ee91bf938984c8188ffd9665c5f2 SHA256 2c6cd6177f2cf4b011ac23c3d301be3655ef1fb276b523d5a5155064917a9833
-EBUILD emma-2.0.5312-r1.ebuild 934 RMD160 8db1c9b6e8e9249aa52210096fd11a80de138508 SHA1 67285ce48bc9a0e64be90da6f8a2541a1911352e SHA256 2d13c3684a42162aff7509cf57125ad2273d4f9c8d5607bd60250ce3bfcd23ef
-MD5 7a6208e5cf708bd79d4f69e6bb078c49 emma-2.0.5312-r1.ebuild 934
-RMD160 8db1c9b6e8e9249aa52210096fd11a80de138508 emma-2.0.5312-r1.ebuild 934
-SHA256 2d13c3684a42162aff7509cf57125ad2273d4f9c8d5607bd60250ce3bfcd23ef emma-2.0.5312-r1.ebuild 934
-EBUILD emma-2.0.5312.ebuild 1002 RMD160 dfbc7df149f7f9349cdb08d6cfe3a0dfe2cc2b23 SHA1 cfdda3bcb71fee15bf66c2539bbeb853be4e1480 SHA256 76a7bc70484fe5130dbe4dae65c359464abb079be6c80a4114bf240d10a14457
-MD5 1e28544a9b6fe44f14aa0461b5d9c0fd emma-2.0.5312.ebuild 1002
-RMD160 dfbc7df149f7f9349cdb08d6cfe3a0dfe2cc2b23 emma-2.0.5312.ebuild 1002
-SHA256 76a7bc70484fe5130dbe4dae65c359464abb079be6c80a4114bf240d10a14457 emma-2.0.5312.ebuild 1002
-MISC ChangeLog 1730 RMD160 5617812646dbf3da3ad37c0185de9b8e46769a52 SHA1 008b1ac7e5151bf32fa76faa33aeffb9085b3f84 SHA256 4f9a177b1e7986f8503377e550301b70eb051f60153187d48d47eb3850e1a0cd
-MD5 c607f40b51fb8fdd253212d90b39c195 ChangeLog 1730
-RMD160 5617812646dbf3da3ad37c0185de9b8e46769a52 ChangeLog 1730
-SHA256 4f9a177b1e7986f8503377e550301b70eb051f60153187d48d47eb3850e1a0cd ChangeLog 1730
+EBUILD emma-2.0.5312-r1.ebuild 945 RMD160 fdcaa1219361d72ec74a537e2b0a45d56ff88029 SHA1 ea10578e5a283716e7b2056ef8887bb12f714175 SHA256 8820ccb249a380947c8053f2db421c48676840232e577c9cd29db42e37d23bc0
+MD5 c2c40639eda7e285d804d5a55502db3b emma-2.0.5312-r1.ebuild 945
+RMD160 fdcaa1219361d72ec74a537e2b0a45d56ff88029 emma-2.0.5312-r1.ebuild 945
+SHA256 8820ccb249a380947c8053f2db421c48676840232e577c9cd29db42e37d23bc0 emma-2.0.5312-r1.ebuild 945
+MISC ChangeLog 1901 RMD160 26ea2d256da7562f28aec9abd7506b0cc92c1c03 SHA1 7d113970758f094e9060d18ed54b7c8c8e00830c SHA256 1a11a1188ae9866bfb560e4a1534a6d5a1bc9dc9902692e69dfe99935d91c8d6
+MD5 c8a9fbb1543b706c62cb023dc1415b68 ChangeLog 1901
+RMD160 26ea2d256da7562f28aec9abd7506b0cc92c1c03 ChangeLog 1901
+SHA256 1a11a1188ae9866bfb560e4a1534a6d5a1bc9dc9902692e69dfe99935d91c8d6 ChangeLog 1901
 MISC metadata.xml 592 RMD160 d1f2fcdd7feb4c535cff23981c474ad1c37c5197 SHA1 9a90291e2477aa04e11cd564618d7b8206397e92 SHA256 f22956a7dd015dd918f5bfe11952ff2b0da603453d0fe8aba4d19671403288fb
 MD5 a6d783f741e260c8bc32c1b290a13054 metadata.xml 592
 RMD160 d1f2fcdd7feb4c535cff23981c474ad1c37c5197 metadata.xml 592
 SHA256 f22956a7dd015dd918f5bfe11952ff2b0da603453d0fe8aba4d19671403288fb metadata.xml 592
-MD5 f54e17672c5bd61a4be34f204e79fca5 files/digest-emma-2.0.5312 244
-RMD160 37bb6d5c11e45a5936131b039faecea09ece96d6 files/digest-emma-2.0.5312 244
-SHA256 9441a4d129d99cb5c71d5c5ae8f523121e22fc91e98039bb824325241b4efc87 files/digest-emma-2.0.5312 244
 MD5 f54e17672c5bd61a4be34f204e79fca5 files/digest-emma-2.0.5312-r1 244
 RMD160 37bb6d5c11e45a5936131b039faecea09ece96d6 files/digest-emma-2.0.5312-r1 244
 SHA256 9441a4d129d99cb5c71d5c5ae8f523121e22fc91e98039bb824325241b4efc87 files/digest-emma-2.0.5312-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGbS6aNQqtfCuFneMRAoi5AKCemXIXOMuKSNnFXY2A4B2q9FGy1gCfW/RU
-r9Ma86LrzpkIb9RKN4wqpyk=
-=VrXe
------END PGP SIGNATURE-----
diff --git a/dev-java/emma/emma-2.0.5312-r1.ebuild b/dev-java/emma/emma-2.0.5312-r1.ebuild
index c6216661ce53..2e5a20894b6b 100644
--- a/dev-java/emma/emma-2.0.5312-r1.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r1.ebuild,v 1.5 2007/06/11 11:14:25 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r1.ebuild,v 1.6 2007/06/11 13:07:22 caster Exp $
 
 # No support for javadocs in build.xml
 JAVA_PKG_IUSE="source"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 
 IUSE=""
 
diff --git a/dev-java/emma/emma-2.0.5312.ebuild b/dev-java/emma/emma-2.0.5312.ebuild
deleted file mode 100644
index 132a63405a48..000000000000
--- a/dev-java/emma/emma-2.0.5312.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312.ebuild,v 1.6 2007/05/23 17:20:41 flameeyes Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="a 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 ~ppc x86 ~x86-fbsd"
-
-# No support for javadocs in build.xml
-IUSE="source"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		app-arch/unzip
-		source? ( app-arch/zip )"
-
-EANT_BUILD_TARGET="build"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-java15api.patch"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_jarinto /usr/share/ant-core/lib/
-	java-pkg_dojar dist/${PN}_ant.jar
-	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/files/digest-emma-2.0.5312 b/dev-java/emma/files/digest-emma-2.0.5312
deleted file mode 100644
index b4f37ac6bfc4..000000000000
--- a/dev-java/emma/files/digest-emma-2.0.5312
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 649464ab0a5941b8e47046762fc57020 emma-2.0.5312-src.zip 421109
-RMD160 404fe6d3212e04d65a6aebd511ce90b9dc7d9ffd emma-2.0.5312-src.zip 421109
-SHA256 2c6cd6177f2cf4b011ac23c3d301be3655ef1fb276b523d5a5155064917a9833 emma-2.0.5312-src.zip 421109