Version bump. Fix building with ant-1.8 - bug #305929. Use java_prepare.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

5 files changed, 109 insertions, 14 deletions

diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 28bec2959a46..ba178742066f 100644
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jgroups
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.30 2010/01/15 20:33:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.31 2010/02/28 01:32:20 caster Exp $
+
+*jgroups-2.9.0 (28 Feb 2010)
+
+  28 Feb 2010; Vlastimil Babka <caster@gentoo.org> -files/2.4.1-jdk4.patch,
+  +files/2.9.0-ant-1.8-compat.patch, jgroups-2.7.0.ebuild,
+  +jgroups-2.9.0.ebuild:
+  Version bump. Fix building with ant-1.8 - bug #305929. Use java_prepare.
 
   15 Jan 2010; Jonathan Callen <abcd@gentoo.org> jgroups-2.7.0.ebuild:
   Add prefix keywords
diff --git a/dev-java/jgroups/files/2.4.1-jdk4.patch b/dev-java/jgroups/files/2.4.1-jdk4.patch
deleted file mode 100644
index 172a4aba1296..000000000000
--- a/dev-java/jgroups/files/2.4.1-jdk4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- RequestCorrelator.java	2007/03/08 10:19:56	1.30.2.4
-+++ src/org/jgroups/blocks/RequestCorrelator.java	2007/04/23 10:15:57	1.30.2.5
-@@ -926,7 +926,7 @@
-                         call_stack.set(new_stack);
-                     }
-                     public void resetThreadLocal() {
--                        call_stack.remove();
-+                        call_stack.set(null);
-                     }
-                 });
-         }
diff --git a/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch
new file mode 100644
index 000000000000..46a7820377ec
--- /dev/null
+++ b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch
@@ -0,0 +1,20 @@
+--- build.xml.orig	2010-02-28 02:14:36.000000000 +0100
++++ build.xml	2010-02-28 02:15:13.000000000 +0100
+@@ -43,8 +43,6 @@
+     <property name="threadcount" value="false"/>
+     <property name="test.verbose" value="0"/>
+ 
+-    <taskdef resource="testngtasks" classpathref="jg.classpath"/>
+-
+     <!-- properties to determine IP version used -->
+     <condition property="java.net.preferIPv4Stack" value="true" else="false">
+       <isfalse value="${jgroups.useIPv6}"/>
+@@ -63,6 +61,8 @@
+         </fileset>
+     </path>
+ 
++    <taskdef resource="testngtasks" classpathref="jg.classpath"/>
++
+     <!-- patternsets used to define test sets -->
+     <patternset id="flush.tests">
+         <include name="org/jgroups/tests/FlushTest*"/>
diff --git a/dev-java/jgroups/jgroups-2.7.0.ebuild b/dev-java/jgroups/jgroups-2.7.0.ebuild
index 95a20261c44f..7b6307c4060c 100644
--- a/dev-java/jgroups/jgroups-2.7.0.ebuild
+++ b/dev-java/jgroups/jgroups-2.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild,v 1.4 2010/01/15 20:33:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.7.0.ebuild,v 1.5 2010/02/28 01:32:20 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source"
@@ -28,7 +28,7 @@ DEPEND=">=virtual/jdk-1.5
 
 S=${WORKDIR}/${MY_P}.src
 
-src_prepare() {
+java_prepare() {
 	cd "${S}/lib" || die
 	rm -v *.jar || die
 
diff --git a/dev-java/jgroups/jgroups-2.9.0.ebuild b/dev-java/jgroups/jgroups-2.9.0.ebuild
new file mode 100644
index 000000000000..730d4b0b79ae
--- /dev/null
+++ b/dev-java/jgroups/jgroups-2.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.9.0.ebuild,v 1.1 2010/02/28 01:32:20 caster Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="JGroups"
+MY_PV="${PV/_p/-sp}"
+MY_P="${MY_PN}-${MY_PV}.GA"
+DESCRIPTION="JGroups is a toolkit for reliable multicast communication."
+SRC_URI="mirror://sourceforge/javagroups/${MY_P}.src.zip"
+HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RDEPEND=">=virtual/jre-1.5
+	dev-java/bsh:0
+	dev-java/log4j:0
+	java-virtuals/jmx"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}.src
+
+java_prepare() {
+	# bug #305929
+	epatch "${FILESDIR}/2.9.0-ant-1.8-compat.patch"
+
+	cd "${S}/lib" || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from bsh
+	java-pkg_jar-from log4j
+	java-pkg_jar-from --virtual jmx
+
+	# Needed for unit tests
+	#java-pkg_jar-from --build-only junit
+	# One unit tests needs this
+	#java-pkg_jar-from --build-only bcprov
+
+	# Just get rid of these as they are of no use to us as we don't install them
+	# Always tries to compile them.
+	#if ! use test; then
+		rm -vr "${S}"/tests/{junit,other,junit-functional}/org || die
+		rm -v "${S}/src/org/jgroups/util/JUnitXMLReporter.java" || die
+	#fi
+}
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+# The jar target generates jgroups-all.jar that has the demos and tests in it
+EANT_BUILD_TARGET="jgroups-core.jar"
+
+src_install() {
+	java-pkg_dojar dist/jgroups-*.jar
+	dodoc CREDITS README || die
+
+	if use doc; then
+		java-pkg_dojavadoc dist/javadoc
+		insinto /usr/share/doc/${PF}
+		doins -r doc/* || die
+	fi
+	use source && java-pkg_dosrc src/*
+
+}
+
+RESTRICT="test"
+# A lot of these fail. Don't know status in 2.7
+# as need testng in main tree first.
+src_test() {
+	# run the report target for nice html pages
+	ANT_TASKS="ant-junit" eant unittests-xml
+}