Remove twisted-web-0.5.0-r2 (the version with extra test patches for twisted-2.2.0): use twisted-2.4.0 and web 0.6.0 instead. Add new revisions with the nonworking websetroot removed.

(Portage version: 2.1.1_pre1-r2)
 (Signed Manifest commit)

6 files changed, 52 insertions, 242 deletions

diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index 9eb35a760632..1b1a90476857 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,13 +1,56 @@
-MD5 d3889ec24aea2dc7ae0c3a4005777e46 ChangeLog 2727
-MD5 57f23e26014f9e6ff7598d3835af2f22 files/digest-twisted-web-0.5.0-r1 253
-MD5 57f23e26014f9e6ff7598d3835af2f22 files/digest-twisted-web-0.5.0-r2 253
-MD5 98927af02f23b07a1abc57aad36071a5 files/digest-twisted-web-0.6.0 253
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX twisted-web-0.5.0-root-skip.patch 475 RMD160 5a93f37912c00bb9f8b139b54c68901b36d4093e SHA1 f06d91d40e3e85429b2a29beebb5424620431374 SHA256 619682d0267629476a7d783f7827ef1ceb56fd11a97fdbe7623ba72b33c98ecd
 MD5 8b5bd800eb0001964ddef202a539be91 files/twisted-web-0.5.0-root-skip.patch 475
-MD5 f0421e85956e3dbe3872a9c931ff7889 files/twisted-web-0.5.0-tests-2.2-compat-14780.patch 4570
-MD5 c3f4d2d4625c8db9ee3b000d5ae14317 files/twisted-web-0.5.0-tests-2.2-compat-14782.patch 1477
-MD5 cc4998326286c7923d65d8033d9fadbe files/twisted-web-0.5.0-tests-2.2-compat-14786.patch 1988
+RMD160 5a93f37912c00bb9f8b139b54c68901b36d4093e files/twisted-web-0.5.0-root-skip.patch 475
+SHA256 619682d0267629476a7d783f7827ef1ceb56fd11a97fdbe7623ba72b33c98ecd files/twisted-web-0.5.0-root-skip.patch 475
+AUX twisted-web-0.5.0-tests-2.2-compat.patch 4006 RMD160 23b068ebde8fc096117b6beff15ddf2b559eb320 SHA1 aa9d1a1a8698d191ca9acde578a348fcbe95bd26 SHA256 b0bd817232f37eba306a86fe0463cf509e94b8a37c7a032ebbfd0b59b8f7a24d
 MD5 0d086fde8bb2de73d9d4c6b50d936f19 files/twisted-web-0.5.0-tests-2.2-compat.patch 4006
-MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
+RMD160 23b068ebde8fc096117b6beff15ddf2b559eb320 files/twisted-web-0.5.0-tests-2.2-compat.patch 4006
+SHA256 b0bd817232f37eba306a86fe0463cf509e94b8a37c7a032ebbfd0b59b8f7a24d files/twisted-web-0.5.0-tests-2.2-compat.patch 4006
+DIST TwistedWeb-0.5.0.tar.bz2 263139 RMD160 61829c8ae492c7cf3f43f45c70a5653584e50378 SHA1 144657d7e6ca6cbb2fd20b9a07e1a83544867099 SHA256 7d33de4924c0f7819b3ba9980461ca2bf7b8f5619f21f90755c29255570b599e
+DIST TwistedWeb-0.6.0.tar.bz2 263572 RMD160 3884538b3d937365acbab06dbf44a7223ba019e0 SHA1 2593bfe51939e5260671a96e396f57e701685788 SHA256 db8cb87fd65f751a807fe22893145210235ce9fbc070e10fd827495f05babca6
+EBUILD twisted-web-0.5.0-r1.ebuild 575 RMD160 9788b450e24ba5a54de18389351dbedf8da2777c SHA1 a5ec7ed4f273d0a151b7da215ef271031408644e SHA256 d96f0322549cb92e1c5badfb11cccca7af2ff4ebf6742c7bc59d9faed77d2818
 MD5 895b22ee144f2d1180921cb9c0daf3af twisted-web-0.5.0-r1.ebuild 575
-MD5 cc693690579dc7cb1e6b6de26e6492ec twisted-web-0.5.0-r2.ebuild 735
+RMD160 9788b450e24ba5a54de18389351dbedf8da2777c twisted-web-0.5.0-r1.ebuild 575
+SHA256 d96f0322549cb92e1c5badfb11cccca7af2ff4ebf6742c7bc59d9faed77d2818 twisted-web-0.5.0-r1.ebuild 575
+EBUILD twisted-web-0.5.0-r3.ebuild 904 RMD160 12f2637ddfadc10cdb825d18a3cb13b3cdfebf53 SHA1 9e6fdae9f811a7dfbe6a4d8cd06a23570b80f77d SHA256 f1fca99736b8cf947d5d67aea0564df7198723712d130fda678af3a419145476
+MD5 6db867ac46ceae00fadf3239cd905157 twisted-web-0.5.0-r3.ebuild 904
+RMD160 12f2637ddfadc10cdb825d18a3cb13b3cdfebf53 twisted-web-0.5.0-r3.ebuild 904
+SHA256 f1fca99736b8cf947d5d67aea0564df7198723712d130fda678af3a419145476 twisted-web-0.5.0-r3.ebuild 904
+EBUILD twisted-web-0.6.0-r1.ebuild 851 RMD160 749895afc9420fb8bb3f4d98f687136ee6449ad6 SHA1 f0edb499b8262d3529e425f2bb07661e517f7b5f SHA256 06b313fd390e1485d86fafc9ae854a42ca7b8177a2ea2f383c3aa80015a06e36
+MD5 f9f7e4a720d628e44575d233d834698e twisted-web-0.6.0-r1.ebuild 851
+RMD160 749895afc9420fb8bb3f4d98f687136ee6449ad6 twisted-web-0.6.0-r1.ebuild 851
+SHA256 06b313fd390e1485d86fafc9ae854a42ca7b8177a2ea2f383c3aa80015a06e36 twisted-web-0.6.0-r1.ebuild 851
+EBUILD twisted-web-0.6.0.ebuild 519 RMD160 c0e1bfcf8f4413684b569bb164113f23577046de SHA1 8ba4a3f4882ad0d3b42a79b7d5d5932cd98d7b9c SHA256 3f52cd07042f1fb220b59fead8e2da2c7409194cb5c4e72ce2f4923f16213659
 MD5 f72046700127e4d975241726b3110fa8 twisted-web-0.6.0.ebuild 519
+RMD160 c0e1bfcf8f4413684b569bb164113f23577046de twisted-web-0.6.0.ebuild 519
+SHA256 3f52cd07042f1fb220b59fead8e2da2c7409194cb5c4e72ce2f4923f16213659 twisted-web-0.6.0.ebuild 519
+MISC ChangeLog 3306 RMD160 649e85bf1fd6d25fecbbaa3103701bb08edf0a91 SHA1 2e55bd96df772026a8296b8069b88740ae1dbea5 SHA256 df046be100866b05bbe3fc423dc10be5d4b3a2a42277c8520d56b54fc3cb06c7
+MD5 3c68eccac7c38a3626bbb52ec771f08d ChangeLog 3306
+RMD160 649e85bf1fd6d25fecbbaa3103701bb08edf0a91 ChangeLog 3306
+SHA256 df046be100866b05bbe3fc423dc10be5d4b3a2a42277c8520d56b54fc3cb06c7 ChangeLog 3306
+MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
+MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
+RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
+SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata.xml 218
+MD5 57f23e26014f9e6ff7598d3835af2f22 files/digest-twisted-web-0.5.0-r1 253
+RMD160 d2ee02a02a49de6adf9a55491a398c2dd7b769bb files/digest-twisted-web-0.5.0-r1 253
+SHA256 8092e2fabf7c7a484d5a071341a19a3c523e4e534399bac66f6ab8731cd0b22a files/digest-twisted-web-0.5.0-r1 253
+MD5 57f23e26014f9e6ff7598d3835af2f22 files/digest-twisted-web-0.5.0-r3 253
+RMD160 d2ee02a02a49de6adf9a55491a398c2dd7b769bb files/digest-twisted-web-0.5.0-r3 253
+SHA256 8092e2fabf7c7a484d5a071341a19a3c523e4e534399bac66f6ab8731cd0b22a files/digest-twisted-web-0.5.0-r3 253
+MD5 98927af02f23b07a1abc57aad36071a5 files/digest-twisted-web-0.6.0 253
+RMD160 47a7a3d7afbf177bc91374506e1e476e72932af4 files/digest-twisted-web-0.6.0 253
+SHA256 bebcedc1248f4d85c73008ea74ca2c6174d7955ec8e1b5018da1d7fa483b44b2 files/digest-twisted-web-0.6.0 253
+MD5 98927af02f23b07a1abc57aad36071a5 files/digest-twisted-web-0.6.0-r1 253
+RMD160 47a7a3d7afbf177bc91374506e1e476e72932af4 files/digest-twisted-web-0.6.0-r1 253
+SHA256 bebcedc1248f4d85c73008ea74ca2c6174d7955ec8e1b5018da1d7fa483b44b2 files/digest-twisted-web-0.6.0-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEoE4VUElL7eJpfEQRAgCiAJ9Bg3EeDHGDtqS/JIVSTweCGCdEmQCcCaGu
+JZFXPonGYzBlSjoTpFWdjFA=
+=AvxB
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2 b/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2
deleted file mode 100644
index 58850c744dfb..000000000000
--- a/dev-python/twisted-web/files/digest-twisted-web-0.5.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 287b9402ca99d05e6d3be99413317633 TwistedWeb-0.5.0.tar.bz2 263139
-RMD160 61829c8ae492c7cf3f43f45c70a5653584e50378 TwistedWeb-0.5.0.tar.bz2 263139
-SHA256 7d33de4924c0f7819b3ba9980461ca2bf7b8f5619f21f90755c29255570b599e TwistedWeb-0.5.0.tar.bz2 263139
diff --git a/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14780.patch b/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14780.patch
deleted file mode 100644
index 3c5a36d4fcc3..000000000000
--- a/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14780.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Index: twisted/web/test/test_xmlrpc.py
-===================================================================
---- twisted/web/test/test_xmlrpc.py	(revision 14779)
-+++ twisted/web/test/test_xmlrpc.py	(revision 14780)
-@@ -96,18 +96,20 @@
-         return xmlrpc.Proxy("http://127.0.0.1:%d/" % self.port)
- 
-     def testResults(self):
--        x = self.proxy().callRemote("add", 2, 3)
--        self.assertEquals(unittest.deferredResult(x), 5)
--        x = self.proxy().callRemote("defer", "a")
--        self.assertEquals(unittest.deferredResult(x), "a")
--        x = self.proxy().callRemote("dict", {"a" : 1}, "a")
--        self.assertEquals(unittest.deferredResult(x), 1)
--        x = self.proxy().callRemote("pair", 'a', 1)
--        self.assertEquals(unittest.deferredResult(x), ['a', 1])
--        x = self.proxy().callRemote("complex")
--        self.assertEquals(unittest.deferredResult(x),
--                          {"a": ["b", "c", 12, []], "D": "foo"})
-+        inputOutput = [
-+            ("add", (2, 3), 5),
-+            ("defer", ("a",), "a"),
-+            ("dict", ({"a": 1}, "a"), 1),
-+            ("pair", ("a", 1), ["a", 1]),
-+            ("complex", (), {"a": ["b", "c", 12, []], "D": "foo"})]
- 
-+        dl = []
-+        for meth, args, outp in inputOutput:
-+            d = self.proxy().callRemote(meth, *args)
-+            d.addCallback(self.assertEquals, outp)
-+            dl.append(d)
-+        return defer.DeferredList(dl)
-+
-     def testErrors(self):
-         for code, methodName in [(666, "fail"), (666, "deferFail"),
-                                  (12, "fault"), (23, "noSuchMethod"),
-@@ -140,38 +142,44 @@
-         self.port = self.p.getHost().port
- 
-     def testListMethods(self):
-+
-+        def cbMethods(meths):
-+            meths.sort()
-+            self.failUnlessEqual(
-+                meths,
-+                ['add', 'complex', 'defer', 'deferFail',
-+                 'deferFault', 'dict', 'fail', 'fault',
-+                 'pair', 'system.listMethods',
-+                 'system.methodHelp',
-+                 'system.methodSignature'])
-+
-         d = self.proxy().callRemote("system.listMethods")
--        list = unittest.deferredResult(d)
--        list.sort()
--        self.failUnlessEqual(list, ['add', 'complex', 'defer', 'deferFail',
--                                    'deferFault', 'dict', 'fail', 'fault',
--                                    'pair', 'system.listMethods',
--                                    'system.methodHelp',
--                                    'system.methodSignature'])
-+        d.addCallback(cbMethods)
-+        return d
- 
-     def testMethodHelp(self):
--        d = self.proxy().callRemote("system.methodHelp", 'defer')
--        help = unittest.deferredResult(d)
--        self.failUnlessEqual(help, 'Help for defer.')
-+        inputOutputs = [
-+            ("defer", "Help for defer."),
-+            ("fail", ""),
-+            ("dict", "Help for dict.")]
- 
--        d = self.proxy().callRemote("system.methodHelp", 'fail')
--        help = unittest.deferredResult(d)
--        self.failUnlessEqual(help, '')
-+        dl = []
-+        for meth, expected in inputOutputs:
-+            d = self.proxy().callRemote("system.methodHelp", meth)
-+            d.addCallback(self.assertEquals, expected)
-+            dl.append(d)
-+        return defer.DeferredList(dl)
- 
--        d = self.proxy().callRemote("system.methodHelp", 'dict')
--        help = unittest.deferredResult(d)
--        self.failUnlessEqual(help, 'Help for dict.')
--
-     def testMethodSignature(self):
--        d = self.proxy().callRemote("system.methodSignature", 'defer')
--        sig = unittest.deferredResult(d)
--        self.failUnlessEqual(sig, '')
-+        inputOutputs = [
-+            ("defer", ""),
-+            ("add", [['int', 'int', 'int'],
-+                     ['double', 'double', 'double']]),
-+            ("pair", [['array', 'string', 'int']])]
- 
--        d = self.proxy().callRemote("system.methodSignature", 'add')
--        sig = unittest.deferredResult(d)
--        self.failUnlessEqual(sig, [['int', 'int', 'int'],
--                                   ['double', 'double', 'double']])
--
--        d = self.proxy().callRemote("system.methodSignature", 'pair')
--        sig = unittest.deferredResult(d)
--        self.failUnlessEqual(sig, [['array', 'string', 'int']])
-+        dl = []
-+        for meth, expected in inputOutputs:
-+            d = self.proxy().callRemote("system.methodSignature", meth)
-+            d.addCallback(self.assertEquals, expected)
-+            dl.append(d)
-+        return defer.DeferredList(dl)
diff --git a/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14782.patch b/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14782.patch
deleted file mode 100644
index 4c19296e5f3b..000000000000
--- a/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14782.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: twisted/web/test/test_xmlrpc.py
-===================================================================
---- twisted/web/test/test_xmlrpc.py	(revision 14781)
-+++ twisted/web/test/test_xmlrpc.py	(revision 14782)
-@@ -88,9 +88,7 @@
-         self.port = self.p.getHost().port
- 
-     def tearDown(self):
--        self.p.stopListening()
--        reactor.iterate()
--        reactor.iterate()
-+        return self.p.stopListening()
- 
-     def proxy(self):
-         return xmlrpc.Proxy("http://127.0.0.1:%d/" % self.port)
-@@ -108,7 +106,7 @@
-             d = self.proxy().callRemote(meth, *args)
-             d.addCallback(self.assertEquals, outp)
-             dl.append(d)
--        return defer.DeferredList(dl)
-+        return defer.DeferredList(dl, fireOnOneErrback=True)
- 
-     def testErrors(self):
-         for code, methodName in [(666, "fail"), (666, "deferFail"),
-@@ -168,7 +166,7 @@
-             d = self.proxy().callRemote("system.methodHelp", meth)
-             d.addCallback(self.assertEquals, expected)
-             dl.append(d)
--        return defer.DeferredList(dl)
-+        return defer.DeferredList(dl, fireOnOneErrback=True)
- 
-     def testMethodSignature(self):
-         inputOutputs = [
-@@ -182,4 +180,4 @@
-             d = self.proxy().callRemote("system.methodSignature", meth)
-             d.addCallback(self.assertEquals, expected)
-             dl.append(d)
--        return defer.DeferredList(dl)
-+        return defer.DeferredList(dl, fireOnOneErrback=True)
diff --git a/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14786.patch b/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14786.patch
deleted file mode 100644
index c3da66ff722d..000000000000
--- a/dev-python/twisted-web/files/twisted-web-0.5.0-tests-2.2-compat-14786.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: twisted/web/test/test_xmlrpc.py
-===================================================================
---- twisted/web/test/test_xmlrpc.py	(revision 14785)
-+++ twisted/web/test/test_xmlrpc.py	(revision 14786)
-@@ -23,6 +23,12 @@
- 
- import time
- 
-+class TestRuntimeError(RuntimeError):
-+    pass
-+
-+class TestValueError(ValueError):
-+    pass
-+
- class Test(XMLRPC):
- 
-     FAILURE = 666
-@@ -50,11 +56,11 @@
-         return defer.succeed(x)
- 
-     def xmlrpc_deferFail(self):
--        return defer.fail(ValueError())
-+        return defer.fail(TestValueError())
- 
-     # don't add a doc string, it's part of the test
-     def xmlrpc_fail(self):
--        raise RuntimeError
-+        raise TestRuntimeError
- 
-     def xmlrpc_fault(self):
-         return xmlrpc.Fault(12, "hello")
-@@ -109,19 +115,17 @@
-         return defer.DeferredList(dl, fireOnOneErrback=True)
- 
-     def testErrors(self):
-+        dl = []
-         for code, methodName in [(666, "fail"), (666, "deferFail"),
-                                  (12, "fault"), (23, "noSuchMethod"),
-                                  (17, "deferFault"), (42, "SESSION_TEST")]:
--            l = []
--            d = self.proxy().callRemote(methodName).addErrback(l.append)
--            timeout = time.time() + 10
--            while not l and time.time() < timeout:
--                reactor.iterate(0.01)
--            if not l:
--                self.fail("timeout")
--            l[0].trap(xmlrpc.Fault)
--            self.assertEquals(l[0].value.faultCode, code)
--        log.flushErrors(RuntimeError, ValueError)
-+            d = self.proxy().callRemote(methodName)
-+            d = self.assertFailure(d, xmlrpc.Fault)
-+            d.addCallback(lambda exc, code=code: self.assertEquals(exc.faultCode, code))
-+            dl.append(d)
-+        d = defer.DeferredList(dl, fireOnOneErrback=True)
-+        d.addCallback(lambda ign: log.flushErrors(TestRuntimeError, TestValueError))
-+        return d
- 
- 
- class XMLRPCTestCase2(XMLRPCTestCase):
diff --git a/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild b/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild
deleted file mode 100644
index deb893a6f4e5..000000000000
--- a/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-0.5.0-r2.ebuild,v 1.5 2006/05/26 17:46:43 marienz Exp $
-
-MY_PACKAGE=Web
-
-inherit twisted eutils
-
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-DEPEND="=dev-python/twisted-2.2*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-root-skip.patch"
-	epatch "${FILESDIR}/${P}-tests-2.2-compat-14780.patch"
-	epatch "${FILESDIR}/${P}-tests-2.2-compat-14782.patch"
-	epatch "${FILESDIR}/${P}-tests-2.2-compat-14786.patch"
-	epatch "${FILESDIR}/${P}-tests-2.2-compat.patch"
-}