Make the emma launcher in /usr/bin optional with the launcher use flag because sci-biology/emboss also installs an emma binary there.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686)

2 files changed, 46 insertions, 1 deletions

diff --git a/dev-java/emma/ChangeLog b/dev-java/emma/ChangeLog
index 2cd0d6a4e2a6..af50a9627770 100644
--- a/dev-java/emma/ChangeLog
+++ b/dev-java/emma/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2008/04/07 11:46:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/emma/ChangeLog,v 1.14 2008/07/15 20:15:25 betelgeuse Exp $
+
+*emma-2.0.5312-r2 (15 Jul 2008)
+
+  15 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +emma-2.0.5312-r2.ebuild:
+  Make the emma launcher in /usr/bin optional with the launcher use flag
+  because sci-biology/emboss also installs an emma binary there.
 
   07 Apr 2008; Markus Rothe <corsair@gentoo.org> emma-2.0.5312-r1.ebuild:
   Added ~ppc64; bug #215406
diff --git a/dev-java/emma/emma-2.0.5312-r2.ebuild b/dev-java/emma/emma-2.0.5312-r2.ebuild
new file mode 100644
index 000000000000..d606cdb71107
--- /dev/null
+++ b/dev-java/emma/emma-2.0.5312-r2.ebuild
@@ -0,0 +1,38 @@
+# 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-r2.ebuild,v 1.1 2008/07/15 20:15:25 betelgeuse Exp $
+
+# No support for javadocs in build.xml
+EAPI=1
+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="+launcher"
+
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/ant-core-1.7.0"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	launcher? ( !sci-biology/emboss )"
+
+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
+	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
+}