Version bump.

(Portage version: 2.1.2.4)

4 files changed, 97 insertions, 1 deletions

diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 944208068289..ec6f5a25f10a 100644
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jgroups
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.15 2007/03/17 13:13:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.16 2007/04/23 17:58:26 betelgeuse Exp $
+
+*jgroups-2.4.1_p1 (23 Apr 2007)
+
+  23 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/2.4.1-jdk4.patch, +jgroups-2.4.1_p1.ebuild:
+  Version bump.
 
   17 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
   jgroups-2.2.7-r2.ebuild:
diff --git a/dev-java/jgroups/files/2.4.1-jdk4.patch b/dev-java/jgroups/files/2.4.1-jdk4.patch
new file mode 100644
index 000000000000..172a4aba1296
--- /dev/null
+++ b/dev-java/jgroups/files/2.4.1-jdk4.patch
@@ -0,0 +1,11 @@
+--- 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/digest-jgroups-2.4.1_p1 b/dev-java/jgroups/files/digest-jgroups-2.4.1_p1
new file mode 100644
index 000000000000..3a00272a721e
--- /dev/null
+++ b/dev-java/jgroups/files/digest-jgroups-2.4.1_p1
@@ -0,0 +1,3 @@
+MD5 dbe5417e129d63483b3277dd96aad9b0 JGroups-2.4.1-sp1.src.zip 7730494
+RMD160 d925f8f62a00edf29915b80b727d135102e563aa JGroups-2.4.1-sp1.src.zip 7730494
+SHA256 48229412ae47975cb0afcb3cbf24bb3e30fe5091f09a542d31e3e25964cdf051 JGroups-2.4.1-sp1.src.zip 7730494
diff --git a/dev-java/jgroups/jgroups-2.4.1_p1.ebuild b/dev-java/jgroups/jgroups-2.4.1_p1.ebuild
new file mode 100644
index 000000000000..94e733f5616b
--- /dev/null
+++ b/dev-java/jgroups/jgroups-2.4.1_p1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.4.1_p1.ebuild,v 1.1 2007/04/23 17:58:26 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="JGroups"
+MY_PV="${PV/_p/-sp}"
+MY_P="${MY_PN}-${MY_PV}"
+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"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/bsh
+	dev-java/commons-logging
+	dev-java/concurrent-util
+	dev-java/sun-jms
+	dev-java/sun-jmx"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}.src
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/2.4.1-jdk4.patch"
+
+	cd "${S}/lib" || die
+	rm -v *.jar || die
+
+	java-pkg_jar-from bsh
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from concurrent-util
+	java-pkg_jar-from sun-jms
+	java-pkg_jar-from sun-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. Does not build on 1.4 if we don't remove
+	# these as they require java.lang.management
+	rm -vr "${S}"/tests/{junit,other}/org || die
+}
+
+# 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
+
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src/*
+
+	insinto /usr/share/docs/${PF}
+	doins -r doc/* || die
+}
+
+RESTRICT="test"
+# A lot of these fail
+src_test() {
+	# run the report target for nice html pages
+	ANT_TASKS="ant-junit" eant unittests-xml
+}