3 files changed, 15 insertions, 43 deletions
diff --git a/dev-java/emma/ChangeLog b/dev-java/emma/ChangeLog
index 4403ac6a95e2..330920398791 100644
--- a/dev-java/emma/ChangeLog
+++ b/dev-java/emma/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/emma
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.19 2008/08/31 13:32:47 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.20 2010/01/08 19:04:26 caster Exp $
+
+  08 Jan 2010; Vlastimil Babka <caster@gentoo.org> -emma-2.0.5312-r1.ebuild,
+  emma-2.0.5312-r2.ebuild:
+  Fix building with ibm-jdk-bin-1.6 on 64bits - bug #220463.
 
   31 Aug 2008; Markus Meier <maekke@gentoo.org> emma-2.0.5312-r2.ebuild:
   amd64 stable, bug #212344
diff --git a/dev-java/emma/emma-2.0.5312-r1.ebuild b/dev-java/emma/emma-2.0.5312-r1.ebuild
deleted file mode 100644
index b407d64ca5c8..000000000000
--- a/dev-java/emma/emma-2.0.5312-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 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.7 2008/04/07 11:46:44 corsair Exp $
-
-# No support for javadocs in build.xml
-JAVA_PKG_IUSE="source"
-
-inherit base 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 ~ppc64 x86 ~x86-fbsd"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/ant-core-1.7.0"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-PATCHES="${FILESDIR}/${P}-java15api.patch"
-
-EANT_BUILD_TARGET="build"
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/${PN}_ant.jar
-	java-pkg_register-ant-task
-	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-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild
index 80ba2ab364c7..c7c161606ba4 100644
--- a/dev-java/emma/emma-2.0.5312-r2.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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-r2.ebuild,v 1.6 2008/08/31 13:32:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/emma-2.0.5312-r2.ebuild,v 1.7 2010/01/08 19:04:26 caster Exp $
 
 # No support for javadocs in build.xml
-EAPI=1
+EAPI=2
 JAVA_PKG_IUSE="source"
 
 inherit base java-pkg-2 java-ant-2
@@ -24,10 +24,14 @@ RDEPEND=">=virtual/jre-1.4
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip"
 
-PATCHES=( "${FILESDIR}/${P}-java15api.patch" )
-
 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
+}
+
 src_install() {
 	java-pkg_dojar dist/${PN}.jar
 	java-pkg_dojar dist/${PN}_ant.jar