Added block on versions of <=dev-java/freemarker-2.3.10. See #211503 and #106239

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 7a5bab3ad16cd54c030f6224dfcf234dfc38d2b3..896e99c02e287c41ab7f8fe7e36bce1593d03076 100644 (file)
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.54 2008/02/26 10:30:51 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.55 2008/03/01 02:42:28 ali_bush Exp $
+
+  01 Mar 2008; Alistair Bush <ali_bush@gentoo.org> jython-2.2.1-r1.ebuild:
+  Added block on versions of <=dev-java/freemarker-2.3.10. See #211503 and
+  #106239
 
 *jython-2.2.1-r1 (26 Feb 2008)
 

diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 323e95c45d171d49c3ba9cad35121c1e3c95eaef..5c61f87aa45107932aaa033ddc991451ca59dcc4 100644 (file)
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,6 +6,6 @@ DIST jython-2.1.tar.bz2 1301528 RMD160 94ae22604c1a816af7d066f2ed88b2abaf5c51d1
 DIST jython_installer-2.2.1.jar 4663097 RMD160 73959d072925644b2959bc0c28ddd6a847e5c2ab SHA1 6fea1e8985af955fc843789e2d60fcfc38a76fd8 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68
 EBUILD jython-2.1-r10.ebuild 2674 RMD160 85b56e5d602522d25e722a77123826920e01413a SHA1 80e584728ea84918ee057c477d829aa6ca57fc91 SHA256 9b7660235fb4583d02fc5799cf2aa80bb0a195c5490ee56c4a1bbcb3f2ee38ab
 EBUILD jython-2.1-r11.ebuild 2948 RMD160 960108d66f0fad28090222179e947f70cd699027 SHA1 9ab5b19ff83ea2a573b614d6bacbceb6d8adc9d7 SHA256 b66850640319a2339e1f51cef4f94f15d1006b87f307ca0dfc3f7d1e9ff5c5df
-EBUILD jython-2.2.1-r1.ebuild 3747 RMD160 2bcb4b460607d24e4b875ae708cdf4586a34d65e SHA1 74d6b0df2fbec94a2952bcd26496c5e3133955cd SHA256 810d0aa733fedc41d224b4aac727309dbb048f3d3e8a7f74b3a29219d297f904
-MISC ChangeLog 7512 RMD160 4cef7aa4ecbf1a56d0b44952db829654d9aa5df8 SHA1 b0f491b6851a5350807eb171ad8f3d69f78673ff SHA256 bb37d79501c8a9b25ae3e032ca3274b08e531c6a577e288dba41e87dc2c806a2
+EBUILD jython-2.2.1-r1.ebuild 3777 RMD160 0cf6ea2e9963fc8df17c1831598e40b6b782c744 SHA1 ab856c417ee68c495dd279706b00da576e6197ba SHA256 353a64665ab5a2304e96d8783b33a3653c2ae823ec7cd70e4ce6374541294b71
+MISC ChangeLog 7673 RMD160 3a42234bdc50057e0b73db87be4cba4086480ef0 SHA1 1912db9502d7947af6a25116c8b2b5e102132661 SHA256 183432e26184a582bf244dcf670adc8a6f1ddf37b3041c06bc623af971bd8571
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9

diff --git a/dev-java/jython/jython-2.2.1-r1.ebuild b/dev-java/jython/jython-2.2.1-r1.ebuild
index 67bf38fcf4f1cb3f86d489354f106df3c4b5e74a..d43cd373f337aef124975795710f34e9a83a98b8 100644 (file)
--- a/dev-java/jython/jython-2.2.1-r1.ebuild
+++ b/dev-java/jython/jython-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.2.1-r1.ebuild,v 1.2 2008/02/26 16:29:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.2.1-r1.ebuild,v 1.3 2008/03/01 02:42:28 ali_bush Exp $
 
 JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
 #jdnc
@@ -28,7 +28,8 @@ CDEPEND="=dev-java/jakarta-oro-2.0*
        mysql? ( >=dev-java/jdbc-mysql-3.1 )
        postgres? ( dev-java/jdbc-postgresql )
        oracle? ( dev-java/jdbc-oracle-bin:10.2 )
-       servletapi? ( java-virtuals/servlet-api:2.5 )"
+       servletapi? ( java-virtuals/servlet-api:2.5 )
+       !<=dev-java/freemarker-2.3.10"
 RDEPEND=">=virtual/jre-1.4
        ${CDEPEND}"
 DEPEND=">=virtual/jdk-1.4