Remove unused patch. Fix repoman complains.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 10 insertions, 90 deletions

diff --git a/dev-python/twisted-mail/ChangeLog b/dev-python/twisted-mail/ChangeLog
index ddbacc85569a..727307da6dec 100644
--- a/dev-python/twisted-mail/ChangeLog
+++ b/dev-python/twisted-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-mail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.34 2009/01/08 22:53:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.35 2009/09/06 20:42:55 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/twisted-mail-0.2.0-tests-2.2-compat.patch,
+  twisted-mail-8.1.0.ebuild, twisted-mail-8.2.0.ebuild:
+  Remove unused patch. Fix repoman complains.
 
 *twisted-mail-8.2.0 (08 Jan 2009)
 
diff --git a/dev-python/twisted-mail/files/twisted-mail-0.2.0-tests-2.2-compat.patch b/dev-python/twisted-mail/files/twisted-mail-0.2.0-tests-2.2-compat.patch
deleted file mode 100644
index bb43988bc759..000000000000
--- a/dev-python/twisted-mail/files/twisted-mail-0.2.0-tests-2.2-compat.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-=== modified file 'twisted/mail/test/test_imap.py'
---- twisted/mail/test/test_imap.py	
-+++ twisted/mail/test/test_imap.py	
-@@ -2431,7 +2431,12 @@
-         self.failUnless(self.stillConnected)
- 
-     def testIdleClientDoesDisconnect(self):
--        from twisted.test.test_task import Clock
-+        try:
-+            # 2.2 core has the Clock we need here
-+            from twisted.test.time_helpers import Clock
-+        except ImportError:
-+            # previous versions of core had it here
-+            from twisted.test.test_task import Clock
-         c = Clock()
-         c.install()
-         try:
-
-=== modified file 'twisted/mail/test/test_mail.py'
---- twisted/mail/test/test_mail.py	
-+++ twisted/mail/test/test_mail.py	
-@@ -17,7 +17,7 @@
- 
- from zope.interface import providedBy
- 
--from twisted.trial import unittest, util as tutil
-+from twisted.trial import unittest
- from twisted.mail import smtp
- from twisted.mail import pop3
- from twisted.names import dns
-@@ -221,6 +221,18 @@
-     def tearDown(self):
-         shutil.rmtree(self.d)
- 
-+    def _append(self, ignored, mbox):
-+        d = mbox.appendMessage('TEST')
-+        return self.assertFailure(d, Exception)
-+
-+    def _setState(self, ignored, mbox, rename=None, write=None, open=None):
-+        if rename is not None:
-+            mbox.AppendFactory._renameState = rename
-+        if write is not None:
-+            mbox.AppendFactory._writeState = write
-+        if open is not None:
-+            mbox.AppendFactory._openstate = open
-+
-     def testAppend(self):
-         mbox = mail.maildir.MaildirMailbox(self.d)
-         mbox.AppendFactory = FailingMaildirMailboxAppendMessageTask
-@@ -233,17 +245,13 @@
-         self.assertEquals(len(mbox.getMessage(5).read()), 6)
-         # test in the right order: last to first error location.
-         mbox.AppendFactory._renamestate = False
--        self.failUnless(isinstance(unittest.deferredError(mbox.appendMessage("TEST")),
--                                                        failure.Failure))
--        mbox.AppendFactory._renamestate = True
--        mbox.AppendFactory._writestate = False
--        self.failUnless(isinstance(unittest.deferredError(mbox.appendMessage("TEST")),
--                                                        failure.Failure))
--        mbox.AppendFactory._writestate = True
--        mbox.AppendFactory._openstate = False
--        self.failUnless(isinstance(unittest.deferredError(mbox.appendMessage("TEST")),
--                                                        failure.Failure))
--        mbox.AppendFactory._openstate = True
-+        d = self._append(None, mbox)
-+        d.addCallback(self._setState, mbox, rename=True, write=False)
-+        d.addCallback(self._append, mbox)
-+        d.addCallback(self._setState, mbox, write=True, open=False)
-+        d.addCallback(self._append, mbox)
-+        d.addCallback(self._setState, mbox, open=True)
-+        return d
- 
- 
- class MaildirAppendFileTestCase(unittest.TestCase):
-@@ -1097,11 +1105,6 @@
-     def tearDownClass(self):
-         smtp.DNSNAME = self.DNSNAME
- 
--    def tearDown(self):
--        reactor.iterate()
--        reactor.iterate()
--        reactor.iterate()
--
-     def testProcessAlias(self):
-         path = util.sibpath(__file__, 'process.alias.sh')
-         a = mail.alias.ProcessAlias(path, None, None)
-
diff --git a/dev-python/twisted-mail/twisted-mail-8.1.0.ebuild b/dev-python/twisted-mail/twisted-mail-8.1.0.ebuild
index 705c7954a57f..34573ca54823 100644
--- a/dev-python/twisted-mail/twisted-mail-8.1.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-8.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-8.1.0.ebuild,v 1.9 2009/01/08 22:55:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-8.1.0.ebuild,v 1.10 2009/09/06 20:42:55 idl0r Exp $
 
 MY_PACKAGE=Mail
 
@@ -12,5 +12,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
 	>=dev-python/twisted-names-0.2.0"
+RDEPEND="${DEPEND}"
 
 IUSE=""
diff --git a/dev-python/twisted-mail/twisted-mail-8.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-8.2.0.ebuild
index 795c4c1af9d5..a1514c83fecd 100644
--- a/dev-python/twisted-mail/twisted-mail-8.2.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-8.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-8.2.0.ebuild,v 1.2 2009/01/08 22:55:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-8.2.0.ebuild,v 1.3 2009/09/06 20:42:55 idl0r Exp $
 
 MY_PACKAGE=Mail
 
@@ -12,5 +12,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
 	>=dev-python/twisted-names-0.2.0"
+RDEPEND="${DEPEND}"
 
 IUSE=""