Block zopeinterface wrt #190882, don't remove it unless you fix it.

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

4 files changed, 18 insertions, 17 deletions

diff --git a/net-zope/zodb/ChangeLog b/net-zope/zodb/ChangeLog
index 2931c08bdffa..077f13281f6b 100644
--- a/net-zope/zodb/ChangeLog
+++ b/net-zope/zodb/ChangeLog
@@ -1,13 +1,10 @@
 # ChangeLog for net-zope/zodb
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/ChangeLog,v 1.27 2008/05/27 21:31:53 tupone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/ChangeLog,v 1.28 2009/06/01 09:15:43 ssuominen Exp $
 
-  27 May 2008; Tupone Alfredo <tupone@gentoo.org> zodb-3.3.1.ebuild,
-  zodb-3.4.0.ebuild, zodb-3.4.1.ebuild:
-  Making repoman happy
-
-  22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
-  Redigest for Manifest2
+  01 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> zodb-3.3.1.ebuild,
+  zodb-3.6.0.ebuild:
+  Block zopeinterface wrt #190882, don't remove it unless you fix it.
 
   02 Feb 2007; Steve Dibb <beandog@gentoo.org> zodb-3.6.0.ebuild:
   Add ~amd64, bug 163805
diff --git a/net-zope/zodb/Manifest b/net-zope/zodb/Manifest
index 12801164793a..f1599bc24004 100644
--- a/net-zope/zodb/Manifest
+++ b/net-zope/zodb/Manifest
@@ -1,7 +1,7 @@
 AUX zodb-3.3.1_umaskbug.patch 704 RMD160 ad5008388ad9c550cb58c94b023ba175ccf33fa5 SHA1 c56259d1e7176bcd7b6cdee74838a6dc40b4625d SHA256 25886896af902f6fbf5c6e3d0792dce0cc336f8daeafa05dc47fe208bc5fdd2a
 DIST ZODB3-3.3.1.tgz 1019277 RMD160 2a72596c7a2db0394d780aeee8ad5d3ab820b2fc SHA1 698e764f4e52612632a89ae6fb10b61ca69c1749 SHA256 9ecd9842faad4fbcda903100515ab1d4244fcf3b46a9db67857ea59542b0d49d
 DIST ZODB3-3.6.0.tgz 1193131 RMD160 799e8bc0f1db8125407ca9b7d87e79877606c003 SHA1 959be4060a7759c08912065cd4b050ea2813cfa5 SHA256 b81862b604fb924e7ecc34b69c04016dca5c16368570bfcdece06dfb2a2e42ab
-EBUILD zodb-3.3.1.ebuild 742 RMD160 92f2bd5e5271d41aa3f55c8152d9eb53d8a64677 SHA1 14483ac9aa83e5de980c3b257fd2fd57ab4f0144 SHA256 6c2da6bab2fb373d9fea65ee6d35bab5e2e1f56643e15de5d1fddfb80b004866
-EBUILD zodb-3.6.0.ebuild 528 RMD160 0f39d6ddee9bdee3531fa0436f0ace0269e6b2d2 SHA1 8dab49952e4a31068ea6e7087ea076f016aa4ac6 SHA256 9fa94f657c83dcbea6c6387f3eae4da6f87dfffec2f2a05e8f8fd5b71168d59f
-MISC ChangeLog 3830 RMD160 814c53e826db2923eff1f50fedc10a0ba42ad39a SHA1 38cfc33777f1b1b84ae311a1cb806c977817af2b SHA256 1efaa58f236ab933548f8bebb34bab3e86dc71929bb7226290f5b49d88a19a46
+EBUILD zodb-3.3.1.ebuild 789 RMD160 9fd18b3b914d03626483c6c87699fa639f80c4e7 SHA1 1dd7dbd3a425d6a56fbf5e697dfda62d2c207979 SHA256 f4adf3569822a2b65e43c48fb27f2b26c5a980a03f2d2fdebeb33e7fff84fc32
+EBUILD zodb-3.6.0.ebuild 574 RMD160 1479fe6c1d17d72d366270cc191c74e170bee4e5 SHA1 dc2848f21d01a37661a6461b7085402bc11efffb SHA256 5c2095d541e7ad547ea8d770d81b62cc8d672091201d569c5b6412c20c65cebe
+MISC ChangeLog 3779 RMD160 961404991e24c407a4359309bbc0b5edf79734ae SHA1 c5ced71ee463981e6df07c936ad584f21d61080d SHA256 557d69b2d8161c44cbc0227570a6d2dc0d89a13610947ad4733d97902c385be3
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
diff --git a/net-zope/zodb/zodb-3.3.1.ebuild b/net-zope/zodb/zodb-3.3.1.ebuild
index f9bcd0b28d7c..f3c194b31a29 100644
--- a/net-zope/zodb/zodb-3.3.1.ebuild
+++ b/net-zope/zodb/zodb-3.3.1.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/net-zope/zodb/zodb-3.3.1.ebuild,v 1.5 2008/05/27 21:31:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.3.1.ebuild,v 1.6 2009/06/01 09:15:43 ssuominen Exp $
 
 inherit distutils
 
@@ -14,7 +14,9 @@ SLOT="3.3"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.3.4"
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+	!net-zope/zopeinterface"
 
 S=${WORKDIR}/${MY_P}3-${PV}
 
diff --git a/net-zope/zodb/zodb-3.6.0.ebuild b/net-zope/zodb/zodb-3.6.0.ebuild
index 766adc907c25..ee326e8ecf81 100644
--- a/net-zope/zodb/zodb-3.6.0.ebuild
+++ b/net-zope/zodb/zodb-3.6.0.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/net-zope/zodb/zodb-3.6.0.ebuild,v 1.4 2007/02/02 02:24:03 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.6.0.ebuild,v 1.5 2009/06/01 09:15:43 ssuominen Exp $
 
 inherit distutils
 
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.3.5"
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+	!net-zope/zopeinterface"
 
 S=${WORKDIR}/${MY_P}3-${PV}