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

(Portage version: 2.1.2.9)

4 files changed, 7 insertions, 46 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/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