Version bump. Fixes bug #137536 and bug #142024.

(Portage version: 2.1.2-r1)

4 files changed, 104 insertions, 2 deletions

diff --git a/dev-java/commons-discovery/ChangeLog b/dev-java/commons-discovery/ChangeLog
index 73f5c1378965..bb789f9e8ff6 100644
--- a/dev-java/commons-discovery/ChangeLog
+++ b/dev-java/commons-discovery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-discovery
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.16 2006/10/05 15:23:52 gustavoz Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.17 2007/01/20 14:13:31 betelgeuse Exp $
+
+*commons-discovery-0.4 (20 Jan 2007)
+
+  20 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.4-jar-target.patch, +commons-discovery-0.4.ebuild:
+  Version bump. Fixes bug #137536 and bug #142024.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   commons-discovery-0.2-r2.ebuild, commons-discovery-0.2-r3.ebuild:
diff --git a/dev-java/commons-discovery/commons-discovery-0.4.ebuild b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
new file mode 100644
index 000000000000..99a573d3300e
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.4.ebuild,v 1.1 2007/01/20 14:13:31 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Discovery: Service Discovery component"
+HOMEPAGE="http://jakarta.apache.org/commons/discovery"
+SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source test"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	test? ( >=dev-java/junit-3.8 )"
+
+S="${WORKDIR}/${P}-src/"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# https://issues.apache.org/jira/browse/DISCOVERY-10
+	epatch "${FILESDIR}/0.4-jar-target.patch"
+}
+
+src_compile() {
+	java-pkg-2_src_compile \
+		-Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+}
+
+src_test() {
+	eant test.discovery \
+		-Djunit.jar="$(java-pkg_getjar junit junit.jar)" \
+		-Dlogger.jar="$(java-pkg_getjar commons-logging commons-logging.jar)"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dodoc NOTICE.txt RELEASE-NOTES.txt || die
+
+	use doc && 	java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-discovery/files/0.4-jar-target.patch b/dev-java/commons-discovery/files/0.4-jar-target.patch
new file mode 100644
index 000000000000..7cc3c983efe6
--- /dev/null
+++ b/dev-java/commons-discovery/files/0.4-jar-target.patch
@@ -0,0 +1,41 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 498103)
++++ build.xml	(working copy)
+@@ -175,23 +175,26 @@
+     </javadoc>
+   </target>
+ 
++  <target name="jar" depends="compile"
++   description="Create the jar file">
++    <mkdir      dir="${build.home}/classes/META-INF"/>
++    <copy      file="LICENSE.txt"
++             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
++    <copy      file="NOTICE.txt"
++             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++    <mkdir      dir="${dist.home}"/>
++    <jar   jarfile="${dist.home}/${component.name}.jar"
++           basedir="${build.home}/classes"
++          manifest="${build.home}/conf/MANIFEST.MF"/>
++  </target>
+ 
+-  <target name="dist" depends="compile,javadoc"
++  <target name="dist" depends="jar,javadoc"
+    description="Create binary distribution">
+     <!-- TODO: top level files like LICENSE and README -->
+-    <mkdir      dir="${dist.home}"/>
+     <copy      file="LICENSE.txt"
+               todir="${dist.home}"/>
+     <copy      file="NOTICE.txt"
+               todir="${dist.home}"/>
+-    <mkdir      dir="${build.home}/classes/META-INF"/>
+-    <copy      file="LICENSE.txt"
+-             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+-    <copy      file="NOTICE.txt"
+-             tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+-    <jar    jarfile="${dist.home}/${component.name}.jar"
+-            basedir="${build.home}/classes"
+-           manifest="${build.home}/conf/MANIFEST.MF"/>
+   </target>
+ 
+ <!-- ========== Testing section ======================================== -->
diff --git a/dev-java/commons-discovery/files/digest-commons-discovery-0.4 b/dev-java/commons-discovery/files/digest-commons-discovery-0.4
new file mode 100644
index 000000000000..249329ca25f4
--- /dev/null
+++ b/dev-java/commons-discovery/files/digest-commons-discovery-0.4
@@ -0,0 +1,3 @@
+MD5 1275ad4c6ce54b9323269e30dc42dd0e commons-discovery-0.4-src.tar.gz 78453
+RMD160 2486848a6d754d522e7e87d5053a5c620b710346 commons-discovery-0.4-src.tar.gz 78453
+SHA256 596242302be4f0502073f5a934c608289bba6221591e7dbea53ce629f67498a3 commons-discovery-0.4-src.tar.gz 78453