Version bump.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 9442080682896af5ed600d97910dd7e07781ee3b..ec6f5a25f10a4b3eb5763a4f1d3af89dd03b0b36 100644 (file)
--- 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/Manifest b/dev-java/jgroups/Manifest
index cc091fe37fc2046c0257f854d0a1114c17b2a3b2..9c36de0a2759525f9804985c3bbf4bfe8da9490b 100644 (file)
--- a/dev-java/jgroups/Manifest
+++ b/dev-java/jgroups/Manifest
@@ -1,7 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 2.4.1-jdk4.patch 432 RMD160 25d0f39b96300f1e897a7c890845ef25871c8aaa SHA1 f6a7586ea8ea2f67cb3a0170e374cc5269071ab6 SHA256 511b1ffcccfee48bb54d5a9ea22460ba33df11e7a2fcd657819af2aaef965f67
+MD5 7d29b7c8dc38318c6f0d94ba6f82680f files/2.4.1-jdk4.patch 432
+RMD160 25d0f39b96300f1e897a7c890845ef25871c8aaa files/2.4.1-jdk4.patch 432
+SHA256 511b1ffcccfee48bb54d5a9ea22460ba33df11e7a2fcd657819af2aaef965f67 files/2.4.1-jdk4.patch 432
 DIST JGroups-2.2.7.src.zip 4294564 RMD160 a04e4b2ee7ab93abe9e5eba13ac3fc19a37a923c SHA1 4709efb6c36173655ea23e475d502f15607ae3b2 SHA256 2d2ab93c7a9f0e5bb9cad9c99b1636e99295b177b65c26145df82b91c5ca208e
+DIST JGroups-2.4.1-sp1.src.zip 7730494 RMD160 d925f8f62a00edf29915b80b727d135102e563aa SHA1 4e27e9d493f5b2bdb0c7bdc06300917a4c0be410 SHA256 48229412ae47975cb0afcb3cbf24bb3e30fe5091f09a542d31e3e25964cdf051
 EBUILD jgroups-2.2.7-r1.ebuild 1497 RMD160 ad859186c1f77d5fbbb90cb00f32b040404164ec SHA1 ac0338d522995db9e003e7915c910b0d16c0cafb SHA256 d30da2395ab05e85fa779dc929ce5ba961b1fc3dbf3b09eb078b6547d0eaa21e
 MD5 1cdde47cdabeff2ab39f18fafda9470d jgroups-2.2.7-r1.ebuild 1497
 RMD160 ad859186c1f77d5fbbb90cb00f32b040404164ec jgroups-2.2.7-r1.ebuild 1497
@@ -10,10 +15,14 @@ EBUILD jgroups-2.2.7-r2.ebuild 1495 RMD160 1ee855d8fd8861915fbf419710314b0390869
 MD5 92862435fafeca722d3fa82d9be21fe3 jgroups-2.2.7-r2.ebuild 1495
 RMD160 1ee855d8fd8861915fbf419710314b03908695ff jgroups-2.2.7-r2.ebuild 1495
 SHA256 632564f2e012ebf3d7798f705e421785fe78de430bbb2200a066248ef5cfe523 jgroups-2.2.7-r2.ebuild 1495
-MISC ChangeLog 2252 RMD160 c6ae17c51743fe1c9098dd1c9b723fd9f203e795 SHA1 62a6d12c55c4ba0286451225811023a7baaff1d5 SHA256 e25378a9cc54376a25504cdffa31e31b53f536fae742fd15f8377c249b3b6c45
-MD5 58846a7ee2ab0d79f132fe08896f7b3e ChangeLog 2252
-RMD160 c6ae17c51743fe1c9098dd1c9b723fd9f203e795 ChangeLog 2252
-SHA256 e25378a9cc54376a25504cdffa31e31b53f536fae742fd15f8377c249b3b6c45 ChangeLog 2252
+EBUILD jgroups-2.4.1_p1.ebuild 1934 RMD160 5ce84e8928053ff7e164b67565e445d3cf148f3a SHA1 5c032fb199d93d8496f7f8fb90e5858ebdc5c283 SHA256 d5e6f75d14e130446ead44f311b354019771fef8e4ea798f9e6a2787643b869b
+MD5 32b3185d85c579d767a794318e5c508e jgroups-2.4.1_p1.ebuild 1934
+RMD160 5ce84e8928053ff7e164b67565e445d3cf148f3a jgroups-2.4.1_p1.ebuild 1934
+SHA256 d5e6f75d14e130446ead44f311b354019771fef8e4ea798f9e6a2787643b869b jgroups-2.4.1_p1.ebuild 1934
+MISC ChangeLog 2408 RMD160 a6241db2cdda709ab5cb2c7376058594d4e2a5f1 SHA1 501175e84080bda631051205157c3cba11973859 SHA256 99d47681aaf053912f838c83a34ed593304a09290cebd5e581c0b0c65583b86a
+MD5 a06e1414c6ab7d6e0812d807807f0261 ChangeLog 2408
+RMD160 a6241db2cdda709ab5cb2c7376058594d4e2a5f1 ChangeLog 2408
+SHA256 99d47681aaf053912f838c83a34ed593304a09290cebd5e581c0b0c65583b86a ChangeLog 2408
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -24,10 +33,13 @@ SHA256 92b28975ab315189ecd4f0e0671fcdb91c5763439077a9342819ebe5f4f31df6 files/di
 MD5 c95b83e519d1cab7a4a91744f4964425 files/digest-jgroups-2.2.7-r2 247
 RMD160 c5abb6bc98013efe3144f60dd9fa4adfc01587a5 files/digest-jgroups-2.2.7-r2 247
 SHA256 92b28975ab315189ecd4f0e0671fcdb91c5763439077a9342819ebe5f4f31df6 files/digest-jgroups-2.2.7-r2 247
+MD5 dee3d445a4e1c052fdaf776b41638e7a files/digest-jgroups-2.4.1_p1 259
+RMD160 7249024c968b4eda3bfce26077ef8c6641c566c3 files/digest-jgroups-2.4.1_p1 259
+SHA256 c37791769bc5ce5b71964ceed4ec2f3c732d72c2c029e97e6b92ab498ef7ac6b files/digest-jgroups-2.4.1_p1 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF++mYcxLzpIGCsLQRArtFAKCNLZfmn2/LAZlMThu5+0h6B0qNvwCeOIPd
-nrMLFx7QyoFU9B37ZMjBT0A=
-=7/45
+iD8DBQFGLPPGcxLzpIGCsLQRAomPAJ0V5I0TsJcl9P6kxFAUfKf/tBfpEgCfZRiS
+9h732zaTuY/spI7zOj18y60=
+=+Lbe
 -----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
new file mode 100644 (file)
index 0000000..172a4ab
--- /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 (file)
index 0000000..3a00272
--- /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 (file)
index 0000000..94e733f
--- /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
+}