Constrain jython dependency so it doesn't pulling 2.5 slot.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 19 insertions, 14 deletions

diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog
index 330fd0a35c5f..76e269eea25b 100644
--- a/dev-java/mx4j/ChangeLog
+++ b/dev-java/mx4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mx4j
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.27 2008/06/17 14:05:26 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.28 2009/07/23 13:20:03 ali_bush Exp $
+
+  23 Jul 2009; Alistair Bush <ali_bush@gentoo.org> mx4j-3.0.1-r2.ebuild,
+  mx4j-3.0.1-r4.ebuild, mx4j-3.0.2.ebuild,
+  files/mx4j-3.0.2-new-hessian.patch:
+  Constrain jython dependency so it doesn't pulling 2.5 slot.
 
 *mx4j-3.0.2 (17 Jun 2008)
 
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 8bc827b29b22..7665825cccee 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,5 +1,5 @@
 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: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
 @@ -12,13 +12,13 @@
  import java.io.IOException;
@@ -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/mx4j-3.0.1-r2.ebuild b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
index ff0b55c26945..d2b30c0c3b0a 100644
--- a/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.7 2007/11/13 21:51:55 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r2.ebuild,v 1.8 2009/07/23 13:20:03 ali_bush Exp $
 
 JAVA_PKG_OPT_USE="examples"
 JAVA_PKG_IUSE="doc source examples"
@@ -29,7 +29,7 @@ COMMON_DEP="
 		~dev-java/servletapi-2.3
 		=dev-java/burlap-3.0*
 		=dev-java/hessian-3.0.8*
-		dev-java/jython
+		=dev-java/jython-2.2*
 		=dev-java/gnu-jaf-1*
 		=dev-java/gnu-javamail-1*
 	)
diff --git a/dev-java/mx4j/mx4j-3.0.1-r4.ebuild b/dev-java/mx4j/mx4j-3.0.1-r4.ebuild
index 769481f5a0c3..65e58a3f0465 100644
--- a/dev-java/mx4j/mx4j-3.0.1-r4.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r4.ebuild,v 1.3 2008/05/03 02:46:33 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.1-r4.ebuild,v 1.4 2009/07/23 13:20:03 ali_bush Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="examples source doc"
@@ -29,7 +29,7 @@ COMMON_DEP="
 		java-virtuals/servlet-api:2.3
 		dev-java/burlap:3.0
 		dev-java/hessian:3.0.8
-		dev-java/jython
+		=dev-java/jython-2.2*
 		dev-java/gnu-jaf:1
 		java-virtuals/javamail
 	)
diff --git a/dev-java/mx4j/mx4j-3.0.2.ebuild b/dev-java/mx4j/mx4j-3.0.2.ebuild
index fa85177a8abc..5939242b46a2 100644
--- a/dev-java/mx4j/mx4j-3.0.2.ebuild
+++ b/dev-java/mx4j/mx4j-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.1 2008/06/17 14:05:26 nelchael Exp $
+# $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 $
 
 EAPI=1
 JAVA_PKG_IUSE="examples source doc"
@@ -28,7 +28,7 @@ COMMON_DEP="
 		www-servers/axis:1
 		java-virtuals/servlet-api:2.3
 		dev-java/hessian:3.0
-		dev-java/jython
+		dev-java/jython:0
 		dev-java/gnu-jaf:1
 		java-virtuals/javamail
 	)
@@ -48,7 +48,7 @@ DEPEND=">=virtual/jdk-1.5
 src_unpack() {
 	unpack "${P}-src.tar.gz"
 
-	epatch "${FILESDIR}/${P}-new-hessian.patch"
+	#epatch "${FILESDIR}/${P}-new-hessian.patch"
 
 	if use doc; then
 		mkdir binary && cd binary