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

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

6 files changed, 114 insertions, 27 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/Manifest b/dev-java/jgroups/Manifest
index 3fefd127d004..2c94fe01311b 100644
--- a/dev-java/jgroups/Manifest
+++ b/dev-java/jgroups/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 2.4.1-jdk4.patch 432 RMD160 25d0f39b96300f1e897a7c890845ef25871c8aaa SHA1 f6a7586ea8ea2f67cb3a0170e374cc5269071ab6 SHA256 511b1ffcccfee48bb54d5a9ea22460ba33df11e7a2fcd657819af2aaef965f67
+AUX 2.9.0-ant-1.8-compat.patch 733 RMD160 72c6e8b8a02f74045e2971d4c5fb7598bcfbc995 SHA1 68b404162b20cd63191e684ff640cb46c35bf659 SHA256 71b28581158c44ff9c4ff5734db9b3d6843f1ad8583abad2d6be4ae88bccfa88
 DIST JGroups-2.7.0.GA.src.zip 9113439 RMD160 068b9afa5115701baaba38764e75bf4efce346eb SHA1 a607a1cea8e712417ccd32ba04a048aa01e6be4c SHA256 e938f6d0f2e1b31606bd91275e2647e49e2bae48d6fa7848103baca44a998041
-EBUILD jgroups-2.7.0.ebuild 1944 RMD160 a991a2fd21891fe8fc183d6c62c3068edc378b75 SHA1 a43050308da533b0a78deb7fd9dd45ece0763bd3 SHA256 31ce01231ff8c960108bb9d4932a121ee71d46f6de6cb961846e091c205bc7f5
-MISC ChangeLog 4161 RMD160 56f182bbb6431f92570172ab66e92b47ff38c0e0 SHA1 6f380768eb082bbf0db7739ee4a7088f2dcf0917 SHA256 a5e4d0b8784ff52bd5c1f325dbb2c1851fbd4695a1cde6e19fd4a5e790042dfd
+DIST JGroups-2.9.0.GA.src.zip 9227273 RMD160 b6285ba5fcc53a88f2413a2ba156723d57fb0c02 SHA1 61fb6a3c18b04ad439f890428ffc3ffbc4a54ac1 SHA256 d8094e696b399e109a71289ddb4dc62c0ac52000528bc800056d225b80871a53
+EBUILD jgroups-2.7.0.ebuild 1947 RMD160 c99f1bbfc6a0d784232c18863eb39109670b63fb SHA1 8760b100d349318d3acf71de339c02078aad8f9e SHA256 6e7a7a29b43517f00ac346a44157f7944d51e753ab2200761646baaf58aa363a
+EBUILD jgroups-2.9.0.ebuild 1995 RMD160 1e2bc4a4593dbf2f78749279b1473eadc10d8053 SHA1 48129748ef5b1d796d5db4472a0bd299260f390e SHA256 dc19c1fe32d96fd192ea073d0ab81140e90d5cbd5c6b8d47aeb944dc21eb91b1
+MISC ChangeLog 4429 RMD160 fe9b06fdaf484a8485e2108a16ed9ea8bd9f3b84 SHA1 a76db66f328340cce62a71b08ce15441bcf77567 SHA256 e9721a055a7572c1d19e8edcab744ecfaa1fff7c628f49b7b2fb2b5068732afc
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktQ0TUACgkQOypDUo0oQOp7HACgmV7Wp0i0W1d4QQ4B1UkrpbNG
-lhYAoMdpTyVSe/Ykwikj43f3LlA4BuwQ
-=ddY3
------END PGP SIGNATURE-----
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
+}