Update for new Hessian, update patch.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 37 insertions, 21 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index f1fb84ace11c..b443e966766c 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/mx4j
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.29 2009/10/04 15:08:07 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.30 2010/04/03 12:13:31 nelchael Exp $
+
+  03 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> mx4j-3.0.2.ebuild,
+  files/mx4j-3.0.2-new-hessian.patch:
+  Update for new Hessian, update patch.
 
   04 Oct 2009; Vlastimil Babka <caster@gentoo.org> -mx4j-3.0.1-r2.ebuild:
   Remove old.
diff --git a/dev-java/mx4j/Manifest b/dev-java/mx4j/Manifest
index 2b239e963a4b..f00f6fb01799 100644
--- a/dev-java/mx4j/Manifest
+++ b/dev-java/mx4j/Manifest
@@ -1,9 +1,23 @@
-AUX mx4j-3.0.2-new-hessian.patch 1658 RMD160 aac9396114ae80b0803d24e2a586ea7c4349ff2a SHA1 26e3b099a9e8db27c0dd702d3ab4b4916e284513 SHA256 32d4da342dea44b8333049b76d1ff1131f57633bfab3ab0a538c97bcf93795f8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mx4j-3.0.2-new-hessian.patch 1666 RMD160 2c4a52a9bfd76f928c45a653a0699f4a48ab7837 SHA1 6a893284abe3c38aaa393bbec4a35f18df761287 SHA256 831bbce4b2ecddd0d1a6f24181fb993dddfb601d559a99227b9cb8f925f227bf
 DIST mx4j-3.0.1-src.tar.gz 622504 RMD160 fbbc976aebbe7af024992f15be7feb364d6d2b15 SHA1 e35d4935c0b780cb51760cc30322bf576523e319 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba
 DIST mx4j-3.0.1.tar.gz 4562130 RMD160 918808d122fba60388d5b344edffad3756b50936 SHA1 49094816e404f531c2442ea91a2167e5a9f38239 SHA256 bcb066f5b2323c66b80e80e641685e3adbd4a2d4c654f31c4a49b32b8290e006
 DIST mx4j-3.0.2-src.tar.gz 618163 RMD160 5f516ca95a6ab83fdf6275a7a8ca1adf59176426 SHA1 984994ce426d86589e34715ccfafc0263376e2b6 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266
 DIST mx4j-3.0.2.tar.gz 4555894 RMD160 adc57c55f631410f4c3cc01d909863e8e51ac4b1 SHA1 97b566fc3b50c3122f35ab15a61c21b5af22c6f3 SHA256 282bd68e517aba3d0f5bbf76f90c3c09e446c529e7796467ab7de65398bb1115
 EBUILD mx4j-3.0.1-r4.ebuild 2475 RMD160 19810edfd15c6745800bb4902350fbb8e7f908ca SHA1 ffb614204b43452066e6e59db4402e0ae71b34d2 SHA256 de24692a9d4d241ded1de72c5b04f746a01065343116a547e44ef3147057b2c4
-EBUILD mx4j-3.0.2.ebuild 2460 RMD160 fc3e515c844581e11f17066076af026954b445f0 SHA1 803c7572b01c5d7e2223e4a84d8f93848065c1b4 SHA256 2cf157523cec183bb3cf56f43a0588e5eac274c04bd0b35dfc5df150c560f4de
-MISC ChangeLog 4268 RMD160 1737214a35404a61e3d9fee21999e70ff8141879 SHA1 bbae5fef0dfd2a8d7b9d017022c7f2fc61367742 SHA256 3e5f592c53491ffff7e86fc6e048fc3a3b9fd5f21d830da2e4427df0fd0cfe9e
+EBUILD mx4j-3.0.2.ebuild 2439 RMD160 8c575354b66bf01b38f17916a1311b36909e1d4d SHA1 5f0c4d6db0125c12dfe68463de053a33a3cdb3fe SHA256 ef84e799cf87e1db2b246a1713e8d44fcdd46ee287cf7ac2133b9dee60a359a6
+MISC ChangeLog 4422 RMD160 9ae4b11a822f5487c9e7ae0c35a038c70cd7201e SHA1 e83d44dcbceb635e0c41620749113f3c5a358bea SHA256 3dd8eaaa00a0c0f785b33d239c51256bf63fa489e3d353ff09999f07f2209746
 MISC metadata.xml 960 RMD160 f01dfdf3b03a84656f0c17ee634381d01e6288f9 SHA1 0c20fd32321a719a2c1e1047bbad403c0c6158da SHA256 a7c53c20547646cf8ee55f8c64935ed669eddfcc8dd3e54da66afecf21b4d2da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBAgAGBQJLtzDxAAoJEBZyv1r2qA5GbJQH/3+b6lHeijVvy8cpCzAdC2+J
+LZAnm7q5KLNL7UxsFVNAWYI0QajPlMKf83trzU7zkElVU3DVGxI/QLODMOaI6aoV
+XwXkWjvF7XYafvKZMW/UZPJmqS+xENAzjvbvDX/upkVrp4FgNdhTdpa3fEAwGvVF
+UG8dPoXpifrjFJqPtiA0RB7Z6UXtytbNNecsMDuZ1QTULa5XkaAB5k+o+iSqgwMP
+dFvDqqXRZLJhnsPMlw2mcf8d7A92HGjhRnlbY+lpPO785IIXLsa1lzEy4hAkwxvr
+qOtKze6NyMmAUQKwZF+RRR4GlAWaLhNmzk24x5kuoWaD3nDghdeEE3ZlPoXIo7U=
+=b3vR
+-----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
index 7665825cccee..25de4b50b8f5 100644
--- a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
+++ b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch
@@ -1,6 +1,6 @@
 diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
---- mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2008-06-17 15:32:02.000000000 +0200
-+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2008-06-17 15:51:14.000000000 +0200
+--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:19.815790652 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 13:09:29.096398617 +0100
 @@ -12,13 +12,13 @@
  import java.io.IOException;
  import java.io.ObjectInputStream;
@@ -18,8 +18,8 @@ diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JM
     private Class type;
  
 diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2008-06-17 15:32:02.000000000 +0200
-+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2008-06-17 15:51:14.000000000 +0200
+--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:09:19.815790652 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 13:11:41.543862447 +0100
 @@ -13,12 +13,12 @@
  import java.io.ObjectOutputStream;
  
@@ -28,7 +28,7 @@ diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JM
 +import com.caucho.hessian.io.AbstractSerializer;
  
  /**
-  * @version $Revision: 1.2 $
+  * @version $Revision: 1.3 $
   */
 -class JMXSerializer extends Serializer
 +class JMXSerializer extends AbstractSerializer
diff --git a/dev-java/mx4j/mx4j-3.0.2.ebuild b/dev-java/mx4j/mx4j-3.0.2.ebuild
index 5939242b46a2..7e1683a4232b 100644
--- a/dev-java/mx4j/mx4j-3.0.2.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.2.ebuild,v 1.2 2009/07/23 13:20:03 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.2.ebuild,v 1.3 2010/04/03 12:13:31 nelchael Exp $
 
-EAPI=1
+EAPI=2
 JAVA_PKG_IUSE="examples source doc"
 
 inherit java-pkg-2 java-ant-2
@@ -27,8 +27,8 @@ COMMON_DEP="
 		dev-java/commons-logging
 		www-servers/axis:1
 		java-virtuals/servlet-api:2.3
-		dev-java/hessian:3.0
-		dev-java/jython:0
+		dev-java/hessian:4.0
+		dev-java/jython:2.5
 		dev-java/gnu-jaf:1
 		java-virtuals/javamail
 	)
@@ -45,10 +45,8 @@ RDEPEND="
 DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}"
 
-src_unpack() {
-	unpack "${P}-src.tar.gz"
-
-	#epatch "${FILESDIR}/${P}-new-hessian.patch"
+src_prepare() {
+	epatch "${FILESDIR}/${P}-new-hessian.patch"
 
 	if use doc; then
 		mkdir binary && cd binary
@@ -62,8 +60,8 @@ src_unpack() {
 		java-pkg_jar-from commons-logging commons-logging.jar
 		java-pkg_jar-from axis-1
 		java-pkg_jar-from --virtual servlet-api-2.3 servlet.jar
-		java-pkg_jar-from hessian-3.0
-		java-pkg_jar-from jython jython.jar
+		java-pkg_jar-from hessian-4.0
+		java-pkg_jar-from jython-2.5 jython.jar
 		java-pkg_jar-from gnu-jaf-1 activation.jar
 		java-pkg_jar-from --virtual javamail mail.jar
 	fi