Update for new Hessian, update patch.

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

4 files changed, 33 insertions, 15 deletions

diff --git a/dev-java/mx4j-tools/ChangeLog b/dev-java/mx4j-tools/ChangeLog
index bf0384886194..3939abe0a2ce 100644
--- a/dev-java/mx4j-tools/ChangeLog
+++ b/dev-java/mx4j-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/mx4j-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.11 2009/10/04 15:09:39 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.12 2010/04/03 12:01:25 nelchael Exp $
+
+  03 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  mx4j-tools-3.0.2.ebuild, files/mx4j-tools-3.0.2-new-hessian.patch:
+  Update for new Hessian, update patch.
 
   04 Oct 2009; Vlastimil Babka <caster@gentoo.org> -mx4j-tools-3.0.1.ebuild:
   Remove old.
diff --git a/dev-java/mx4j-tools/Manifest b/dev-java/mx4j-tools/Manifest
index 7521c5413e12..307991a61dba 100644
--- a/dev-java/mx4j-tools/Manifest
+++ b/dev-java/mx4j-tools/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mx4j-tools-3.0.1-split-javadoc-build.patch 1979 RMD160 197b4d91dae38d2d43153924893167d07700ae1d SHA1 a8d279c8a2bbb3bab87c776864e3137428a9c8bc SHA256 e34ab853dc00c9cae2f7f41f7431f7ab2eb26bfe7a37decf46ffd8f827d3263b
-AUX mx4j-tools-3.0.2-new-hessian.patch 1666 RMD160 352930c192b6d513f6c59383a65613dd505da558 SHA1 4a6164c6b3eb5f5c3d0850682296619bac600d8a SHA256 4b700d89ff60276426db1ca799018b4f0b58855f17de434940eeb24a5bdd5a21
+AUX mx4j-tools-3.0.2-new-hessian.patch 1666 RMD160 651a0218bf9551298beaa11a2de36a16b4e51aee SHA1 4b4ab11b723968669bb42b17404332233cd59c52 SHA256 b7e823df3ba4153cd05221577c30af0df3954317666e6efea7a9c5804ab6b379
 AUX mx4j-tools-3.0.2-split-javadoc-build.patch 2049 RMD160 4f305247fce4bfcb77a3d966f3da0d74c93025d1 SHA1 5e670ef97e5a6bb35df4b5419e41255479dea430 SHA256 90066b3c38398eb54a6f1e4359284d120225ee9a71e60b0d0e43cf543aabc3d1
 DIST mx4j-3.0.1-src.tar.gz 622504 RMD160 fbbc976aebbe7af024992f15be7feb364d6d2b15 SHA1 e35d4935c0b780cb51760cc30322bf576523e319 SHA256 f6cef53b68b06d97041f77b69e091eb76f08d1bd0d92f48c9bea958e8cb5dcba
 DIST mx4j-3.0.2-src.tar.gz 618163 RMD160 5f516ca95a6ab83fdf6275a7a8ca1adf59176426 SHA1 984994ce426d86589e34715ccfafc0263376e2b6 SHA256 bb552a8512567c4ab508a04c5931bff0d859dce36b44bdc4213c6433f02cb266
 EBUILD mx4j-tools-3.0.1-r2.ebuild 2632 RMD160 925023a7be0c02986a9b2db964ccf4caf37578a2 SHA1 43b50b1ffa8ef30a1f098e5a86b769d0ee9434ef SHA256 f8dafeca46d9fe00bce784eb13a2782ec739a6070838ad77c1bf70980ecafc01
-EBUILD mx4j-tools-3.0.2.ebuild 2636 RMD160 5e285503cfebd419c1f102a65391ec14b94cb59c SHA1 03924c7f9fe87226e892f4dda972dc7a9ff02714 SHA256 6dc8acf70834fb6adc5b2a76e979d11c632636713cc7380fd97f77f794fc07e1
-MISC ChangeLog 1847 RMD160 a1f8bdee1e65d6e02030ac09f56b8720808d3830 SHA1 0faed609624012949853837d72e545b0f5576624 SHA256 b18375b23caff7340a79065e0480c83fd671f30f0a0415b20c72af2972588812
+EBUILD mx4j-tools-3.0.2.ebuild 2640 RMD160 632566967538aae21fea737ab7a8d91186710741 SHA1 c87ff73d448ed371730cecdc1c43332ebf159b43 SHA256 c8170c3c89a043d3ab2eefd980c816d8007e15f8f6b25f15ec0afb4d409e4958
+MISC ChangeLog 2013 RMD160 70465ade940d3d730462d1678c13846e92c6665c SHA1 ff41c34d341fb3f909bc3f69db4ae3902b979557 SHA256 4ea542389eb9808ccbb89beb1b31bcc282f84d0dbe1390645ca04897e5c07764
 MISC metadata.xml 889 RMD160 b4710dc114109cc4aaafed6f23345bae364bc419 SHA1 798ad4429ca92df8a2d51bd052fb688861e67fde SHA256 2bab20e1dd2a72731c4fce19fba4536e318a86fb4c8152a6c9f089097e9e064c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBAgAGBQJLty4bAAoJEBZyv1r2qA5G0U4H/iIy9Kx8I9fLWPKP+Z5iGxbS
+dd7p3Ec6fL/fS/I9X15EXweqPbDPY9rzvMzxb1KLoQYtouAcu+Y42RIGz+ob6y6/
+YDgc1fzy4oBAj8Rlh0bhhP7VIu44EeHP9f+gMWbKfRbuPBoRp2nPm7TdQTCM3hrw
+tqUcdb4B7NBRlvVKwLSajgVceDihvHZsQ29vN/jrYwRfokhQF7pv7pEQe4iJOf//
+MqPu/BF/Eu5YEWesUM+E/k9hlaahY6dQUsVLVzHcNko892ZiotcelSuSYJ7c3aI1
+HDXKzpA2HxEnbXF3fVo0jI+PTwTqR9RPYVhXAfdBMpfVBZZyNu3IMCvIFUjUWQY=
+=ebw/
+-----END PGP SIGNATURE-----
diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch
index 8bc827b29b22..b547fad67854 100644
--- a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch
+++ b/dev-java/mx4j-tools/files/mx4j-tools-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.vanilla/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 12:54:18.939790664 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java	2010-04-03 12:54:33.880886399 +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 12:54:18.939790664 +0100
++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java	2010-04-03 12:55:30.055835991 +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.1 $
+  * @version $Revision: 1.2 $
   */
 -class JMXSerializer extends Serializer
 +class JMXSerializer extends AbstractSerializer
diff --git a/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild b/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild
index f6fc64cc900c..df6837f7939a 100644
--- a/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild
+++ b/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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-tools/mx4j-tools-3.0.2.ebuild,v 1.1 2008/06/17 14:03:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild,v 1.2 2010/04/03 12:01:25 nelchael Exp $
 
 EAPI=1
 
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-java/commons-logging
 	dev-java/log4j
 	=www-servers/axis-1*
-	dev-java/hessian:3.0
+	dev-java/hessian:4.0
 	dev-java/jython
 	java-virtuals/servlet-api:2.3
 	java-virtuals/jaf
@@ -64,8 +64,8 @@ src_unpack() {
 
 	# optionals
 #    java-pkg_jar-from jetty org.mortbay.jetty.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 --virtual jaf
 	java-pkg_jar-from --virtual javamail
 }