Remove unused patch. Fix repoman complains.

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

9 files changed, 32 insertions, 416 deletions

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index 832cd469d650..b157fd5df92c 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/twisted
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.105 2009/08/28 17:34:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.106 2009/09/06 21:11:31 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org> twisted-1.2.0.ebuild,
+  twisted-1.3.0.ebuild, -files/twisted-2.0.1-echo-less.patch,
+  -files/twisted-2.1.0-trial-tests.patch,
+  -files/twisted-2.1.0-trial-tests2.patch, twisted-8.1.0.ebuild,
+  twisted-8.2.0.ebuild:
+  Remove unused patch. Fix repoman complains.
 
 *twisted-8.2.0-r2 (28 Aug 2009)
 
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 863422ac1fba..a6169081c606 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,19 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX twistd.conf 277 RMD160 c959b879d6f7358b647c71c3b514a4a6c8a49eef SHA1 661269a3ce6ed02f03d4fce07757e77420fd44c4 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119
 AUX twistd.init 545 RMD160 b77acc9468cd619e9af334c8a36ed3f9bb003494 SHA1 74db83050a9e3bf55823bb5790280d1ec324d760 SHA256 c0aead865bee1fa7d88f2a59f936718621a9b52b1b623ae9e599f1226d8a0dc1
-AUX twisted-2.0.1-echo-less.patch 527 RMD160 c0a4f923a4bde04a1df183878b4c1414fad98b41 SHA1 d40f15ab30c46bbc165edd229d771245e5a0e6c0 SHA256 28d3a8ede3d30744c411dc86978f17601867e6e999d79e77527981b8ddb6fa49
 AUX twisted-2.1.0-echo-less.patch 269 RMD160 c7fd9d87325a453ce9215591fc296b4b31505369 SHA1 779c8ab267702a3efdbbd1566f390746e8801ebe SHA256 1f190151c00c37dc5055f9b2b1dd7b0943523f29d57f78d5ca5f57723e3d9705
-AUX twisted-2.1.0-trial-tests.patch 12253 RMD160 75d31c9095f4699a1af9c96679df8f1765fee2aa SHA1 ff5eb00216d7ea9480009572771e1481faefbb26 SHA256 c1a94192554d9478a904ad6069eba9ef1633455c1a7fa60b278bdd743a797691
-AUX twisted-2.1.0-trial-tests2.patch 1058 RMD160 20d9cfba5faa5ecda365a52fbc0007347096879e SHA1 0b5d6dd55cf8322a87547f25f68b2f2a34da3758 SHA256 abf94fbd130fdfd27164fe3b5d585fdfa211f7a6bd39e649daf1a74354208883
 AUX twisted-2.1.0-zsh-head.patch 592 RMD160 1fc8e7f8de64055e3801b442b4f666aef567ac71 SHA1 645f9ff44ff3b360026d0471092fd1b5f41d7122 SHA256 c9b8a994685159f21a3b0512eed1144876453db09f8d6843529dc0ef8d886029
 AUX twisted-8.2.0_tests.patch 10675 RMD160 6dd9a5fe60d9fb0eadccca93353d8ea8fe9f6970 SHA1 0a9a906463c0dfe88b01048dd0f689fa3abbee4c SHA256 5a13a4bc28b325a216198fe412d8916f89149c888c2b60f1be051d4d7c9dcd4b
 DIST TwistedCore-8.1.0.tar.bz2 1194164 RMD160 92f28c14709f5eb307757cd993a511344109c59a SHA1 77b6ebff5c11ea6efb62e41d0b09897d37d97423 SHA256 14b8cfc8c782073b0ce046b139dac55149992087209194696d390649b62f5f32
 DIST TwistedCore-8.2.0.tar.bz2 1205654 RMD160 7162be0d4f131e2e8379ba4330b0ff8978a6530c SHA1 0c4f24c661316a650ed1493d2c6a9ace6c10fd27 SHA256 481e8ea4b05b482aa1396ca3ad09fac6086acddfd57eed7bb63e1385717adde4
 DIST Twisted_NoDocs-1.2.0.tar.bz2 1281868 RMD160 f64a258a5c767c288cf39554471c4f37c4bed136 SHA1 6325d162a17e4527b60e1fcdcbf1c0c5dbd076f6 SHA256 b9245d8c5d4f0df35a20bfefd01db3c9edd6dd814e4c69481a50f59907d25fe1
 DIST Twisted_NoDocs-1.3.0.tar.bz2 1545890 RMD160 9b9d8c9667ef3e68118b7509d2c5991285c3a4b9 SHA1 fb4404c588efbe3b3cee24a7fd9bf2cd875b4d2e SHA256 bef1611e10a7493647b668dfff9095754a8881b4ac9364c098ca025820b48aef
-EBUILD twisted-1.2.0.ebuild 924 RMD160 656f6baec6675ccbb70b55635a88f8b6e785ecb7 SHA1 34f625c845efd200e03e93c445a45652e1d96616 SHA256 4fbbc9847a93d515826d7b872f44d4ee054d23f26d413e7a72188e35ffa73713
-EBUILD twisted-1.3.0.ebuild 986 RMD160 4ad7bb919259b51db58935bae8880b3f4740b3a6 SHA1 7efba37e315d76c5f43171308f015ecacc4d122d SHA256 cb55a28df27a9536fc18a9811015e3563070f9d84cb3d4e9a8701a17b1d30786
-EBUILD twisted-8.1.0.ebuild 3397 RMD160 7c7849168ea1709a2a17231e0ecff68def1a2c70 SHA1 2a6a29abb48232ed33ac010178be560b016f4004 SHA256 83a812adffe6c2c6261fc62e46c536b87d77296ed6fd1a95885ab2a6be8c78a3
+EBUILD twisted-1.2.0.ebuild 942 RMD160 8dce3b39ff9824745d587a518aedfaabf33fb884 SHA1 47c214c460cea82033753c164d6cf1003c25ed28 SHA256 fa63e04ff084ed4a630e499714aa41228658e9b1af072627a0c816a0a1bb82b5
+EBUILD twisted-1.3.0.ebuild 1004 RMD160 2ee9254bbfd45c3d553b6e17d456b80c02318179 SHA1 3047717343b484b4eeb0da67cb7aeb33ed10b995 SHA256 df9edd0e272c0f7582d47b0984eb9d78e55ab248f09caf98abee311a07066fea
+EBUILD twisted-8.1.0.ebuild 3417 RMD160 5d31380e70c11d6cb068a98d3338340edd9dd0a0 SHA1 8c9f34625dcf8f688cb8e1c2557012c50cdcb5b7 SHA256 61bc6479f41f5ba17ced9e3c265c6f9b52cdf8a24a1092ec52652bd5339dcb05
 EBUILD twisted-8.2.0-r2.ebuild 3516 RMD160 67d3f30b33f73a8c49c644af81e668a76d9a78b9 SHA1 757cbf8631868a79081cdfa61579cf42a1847efa SHA256 870da9363b4f488802bb31b4f1dfc533bfef0832253aef6928670a2769daeabf
-EBUILD twisted-8.2.0.ebuild 3409 RMD160 40cb7a28121f1867793188e43a95c19e90189edf SHA1 9101a22303a48b5f68f84092084efcdbed51c30a SHA256 9fcf43b2c728eb7fe3cdaeae91f831ff9637ebad3a617ff469ed3d9d69e16151
-MISC ChangeLog 17976 RMD160 c3cc1468e955a6f3ade13b610ed08f1bc45c3132 SHA1 80e5168178dd6ba7e9de9e2db3cde33b318739e7 SHA256 056c41d1613e2da6b36c1766c703df61eacf24dc53be251b54842f5a9ee751f7
+EBUILD twisted-8.2.0.ebuild 3427 RMD160 3550f3983e8d036e2c7a9aa58fb4ddd918e71689 SHA1 5e0e40286b75be09111b759a3dc0d61d1c5eaf96 SHA256 4281e638d362dcf10963a8dba174ce431bcb5f4c89bce9c6e514555060685fd2
+MISC ChangeLog 18287 RMD160 e54cf8600d2104e8eba0acc07f43235ed48bc69b SHA1 11b1d91f4b6e7990f41a82adf5846af161ee4521 SHA256 8b7a70f7b52854d9c56c1f2feb3301f142bd32bbc95848c4066c4c1926912e6d
 MISC metadata.xml 516 RMD160 3603e0b110b1486ed5c02ec37ccee6712e2098c8 SHA1 3fe53dc137c9bd5437e8f6fb1d397491f5e9281e SHA256 702ffca7fc318ecb382067e3bccf620bebd7da614430ea82de24445b9f75524c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqkJY4ACgkQixe2jn+ufTiR+wCdEgp2e8WVf4AkxHQK6UTkLXoh
+zZMAn2WHhn0R/ykUQ5lDwowlT0WX0sgf
+=Pi42
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted/files/twisted-2.0.1-echo-less.patch b/dev-python/twisted/files/twisted-2.0.1-echo-less.patch
deleted file mode 100644
index de366669ed68..000000000000
--- a/dev-python/twisted/files/twisted-2.0.1-echo-less.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'twisted/test/test_process.py'
---- twisted/test/test_process.py	
-+++ twisted/test/test_process.py	
-@@ -76,7 +76,7 @@
- 
- class EchoProtocol(protocol.ProcessProtocol):
- 
--    s = "1234567" * 1001
-+    s = "1234567" * 11
-     finished = 0
- 
-     def connectionMade(self):
-@@ -86,7 +86,7 @@
- 
-     def outReceived(self, data):
-         self.buffer += data
--        if len(self.buffer) == 70070:
-+        if len(self.buffer) == 770:
-             self.transport.closeStdin()
- 
-     def processEnded(self, reason):
-
diff --git a/dev-python/twisted/files/twisted-2.1.0-trial-tests.patch b/dev-python/twisted/files/twisted-2.1.0-trial-tests.patch
deleted file mode 100644
index 892b066eb8d8..000000000000
--- a/dev-python/twisted/files/twisted-2.1.0-trial-tests.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-Index: Twisted/twisted/trial/test/test_output.py
-===================================================================
---- Twisted/twisted/trial/test/test_output.py	(revision 14794)
-+++ Twisted/twisted/trial/test/test_output.py	(revision 14797)
-@@ -1,17 +1,14 @@
- from twisted.trial import unittest
-+from twisted.trial.test import packages
- from twisted.python import util
- from twisted.internet import utils, reactor, interfaces
--import os, re
-+import os, re, sys
- 
--def getTrialPath():
--    fp = os.path.abspath(unittest.__file__)
--    trialPath = fp.split(os.sep)[:-3] + ['bin', 'trial']
--    return os.path.normpath(os.path.join(fp, os.pardir, os.pardir,
--                                         os.pardir, 'bin', 'trial'))
- 
--
- def runTrialWithEnv(env, *args):
--    return utils.getProcessOutput(getTrialPath(), args=args, errortoo=1,
-+    params = [ '-c', 'from twisted.scripts.trial import run; run()' ]
-+    params.extend(args)
-+    return utils.getProcessOutput(sys.executable, args=params, errortoo=1,
-                                   env=env)
- 
- 
-@@ -27,16 +24,14 @@
-     ## shell out for this stuff.
- 
-     debug = False
-+    parent = "_testImportErrors"
- 
--    def _getMockEnvironment(self):
--        path = self._getMockPath()
--        env = os.environ.copy()
--        if not env.has_key('PYTHONPATH'):
--            env['PYTHONPATH'] = path
--        else:
--            env['PYTHONPATH'] += os.pathsep + path
--        return env
-+    def setUp(self):
-+        packages.setUp(self.parent)
- 
-+    def tearDown(self):
-+        packages.tearDown(self.parent)
-+
-     def _runTrial(self, env, *args):
-         d = runTrialWithEnv(env, *args)
-         if self.debug:
-@@ -44,42 +39,29 @@
-         return d
-         
-     def runTrial(self, *args):
--        return self._runTrial(self._getMockEnvironment(), *args)
-+        env = os.environ.copy()
-+        env['PYTHONPATH'] = os.pathsep.join([self.parent] + sys.path)
-+        return self._runTrial(env, *args)
- 
-     def runTrialPure(self, *args):
--        return self._runTrial(os.environ, *args)
--
-+        env = os.environ.copy()
-+        env['PYTHONPATH'] = os.pathsep.join(sys.path)
-+        return self._runTrial(env, *args)
-+ 
-     def _print(self, stuff):
-         print stuff
-         return stuff
- 
--    def _getMockPath(self):
--        from twisted.trial import test
--        return os.path.normpath(util.sibpath(test.__file__, 'foo'))
--
-     def failUnlessIn(self, container, containee, *args, **kwargs):
-         # redefined to be useful in callbacks
--        unittest.TestCase.failUnlessSubstring(self, containee, container,
--                                              *args, **kwargs)
-+        self.failUnlessSubstring(containee, container, *args, **kwargs)
-         return container
- 
-     def failIfIn(self, container, containee, *args, **kwargs):
-         # redefined to be useful in callbacks
--        unittest.TestCase.failIfSubstring(self, containee, container,
--                                          *args, **kwargs)
-+        self.failIfSubstring(containee, container, *args, **kwargs)
-         return container
- 
--    def test_trialFound(self):
--        self.failUnless(os.path.isfile(getTrialPath()), getTrialPath())
--
--    def test_mockPathCorrect(self):
--        # This doesn't test a feature.  This tests that we are accurately finding
--        # the directory with all of the mock modules and packages.
--        path = self._getMockPath()
--        self.failUnless(path.endswith('twisted/trial/test/foo'), 
--                        'got path: %r' % path)
--        self.failUnless(os.path.isdir(path))
--
-     def test_trialRun(self):
-         d = self.runTrial('--help')
-         d.addCallback(self.failUnless, 'trial')
-@@ -155,7 +137,7 @@
-         return d
- 
-     def test_nonRecurseImportErrors(self):
--        d = self.runTrial('package2')
-+        d = self.runTrial('-N', 'package2')
-         d.addCallback(self.failUnlessIn, 'IMPORT ERROR')
-         d.addCallback(self.failUnlessIn, "No module named frotz")
-         d.addCallback(self.failIfIn, '<module')
-@@ -170,8 +152,8 @@
-         return d
-     
-     def test_filename(self):
--        path = self._getMockPath()
--        d = self.runTrialPure(os.path.join(path, 'package/test_module.py'))
-+        d = self.runTrialPure(os.path.join(self.parent,
-+                                           'package', 'test_module.py'))
-         d.addCallback(self.failIfIn, 'IMPORT ERROR')
-         d.addCallback(self.failIfIn, 'IOError')
-         d.addCallback(self.failUnlessIn, 'OK')
-@@ -180,8 +162,8 @@
- 
-     def test_dosFile(self):
-         ## XXX -- not really an output test, more of a script test
--        path = self._getMockPath()
--        d = self.runTrialPure(os.path.join(path, 'package/test_dos_module.py'))
-+        d = self.runTrialPure(os.path.join(self.parent,
-+                                           'package', 'test_dos_module.py'))
-         d.addCallback(self.failIfIn, 'IMPORT ERROR')
-         d.addCallback(self.failIfIn, 'IOError')
-         d.addCallback(self.failUnlessIn, 'OK')
-Index: Twisted/twisted/trial/test/test_loader.py
-===================================================================
---- Twisted/twisted/trial/test/test_loader.py	(revision 14794)
-+++ Twisted/twisted/trial/test/test_loader.py	(revision 14797)
-@@ -1,13 +1,18 @@
- import sys, os
- from twisted.python import util
-+from twisted.trial.test import packages
- from twisted.trial import unittest
- from twisted.trial import runner
- 
- 
- class FinderTest(unittest.TestCase):
-     def setUp(self):
-+        packages.setUp()
-         self.loader = runner.TestLoader()
- 
-+    def tearDown(self):
-+        packages.tearDown()
-+
-     def test_findPackage(self):
-         sample1 = self.loader.findByName('twisted')
-         import twisted as sample2
-@@ -45,7 +50,12 @@
-         
-         
- class FileTest(unittest.TestCase):
--    samplePath = util.sibpath(__file__, 'foo')
-+    parent = '_test_loader_FileTest'
-+    
-+    def setUp(self):
-+        self.oldPath = sys.path[:]
-+        sys.path.append(self.parent)
-+        packages.setUp(self.parent)
- 
-     def tearDown(self):
-         importedModules = ['goodpackage',
-@@ -55,6 +65,8 @@
-         for moduleName in importedModules:
-             if sys.modules.has_key(moduleName):
-                 del sys.modules[moduleName]
-+        packages.tearDown(self.parent)
-+        sys.path = self.oldPath
- 
-     def test_notFile(self):
-         self.failUnlessRaises(ValueError,
-@@ -66,39 +78,33 @@
-         self.failUnlessEqual(sample2, sample1)
- 
-     def test_moduleNotInPath(self):
--        sample1 = runner.filenameToModule(os.path.join(self.samplePath,
-+        sys.path, newPath = self.oldPath, sys.path
-+        sample1 = runner.filenameToModule(os.path.join(self.parent,
-                                                        'goodpackage',
-                                                        'test_sample.py'))
--        sys.path.append(self.samplePath)
-+        sys.path = newPath
-         from goodpackage import test_sample as sample2
--        try:
--            self.failUnlessEqual(os.path.splitext(sample2.__file__)[0],
--                                 os.path.splitext(sample1.__file__)[0])
--        finally:
--            sys.path.remove(self.samplePath)
-+        self.failUnlessEqual(os.path.splitext(sample2.__file__)[0],
-+                             os.path.splitext(sample1.__file__)[0])
- 
-     def test_packageInPath(self):
--        sys.path.append(self.samplePath)
--        try:
--            package1 = runner.filenameToModule(os.path.join(self.samplePath,
--                                                            'goodpackage'))
--            import goodpackage
--            self.failUnlessEqual(goodpackage, package1)
--        finally:
--            sys.path.remove(self.samplePath)
-+        package1 = runner.filenameToModule(os.path.join(self.parent,
-+                                                        'goodpackage'))
-+        import goodpackage
-+        self.failUnlessEqual(goodpackage, package1)
- 
-     def test_packageNotInPath(self):
--        package1 = runner.filenameToModule(os.path.join(self.samplePath,
-+        sys.path, newPath = self.oldPath, sys.path
-+        package1 = runner.filenameToModule(os.path.join(self.parent,
-                                                         'goodpackage'))
--        sys.path.append(self.samplePath)
-+        sys.path = newPath
-         import goodpackage
--        sys.path.remove(self.samplePath)
-         self.failUnlessEqual(os.path.splitext(goodpackage.__file__)[0],
-                              os.path.splitext(package1.__file__)[0])
- 
-     def test_directoryNotPackage(self):
-         self.failUnlessRaises(ValueError, runner.filenameToModule,
--                              self.samplePath)
-+                              util.sibpath(__file__, 'directory'))
- 
-     def test_filenameNotPython(self):
-         self.failUnlessRaises(ValueError, runner.filenameToModule,
-@@ -120,14 +126,17 @@
-     ##   * could be a file / directory
-     ##   * could be name of a python object
- 
--    samplePath = util.sibpath(__file__, 'foo')
-+    parent = '_test_loader'
-     
-     def setUp(self):
-         self.loader = runner.TestLoader()
--        sys.path.append(self.samplePath)
-+        self.oldPath = sys.path[:]
-+        sys.path.append(self.parent)
-+        packages.setUp(self.parent)
- 
-     def tearDown(self):
--        sys.path.remove(self.samplePath)
-+        sys.path = self.oldPath
-+        packages.tearDown(self.parent)
- 
-     def test_loadMethod(self):
-         import sample
-Index: Twisted/twisted/trial/test/packages.py
-===================================================================
---- Twisted/twisted/trial/test/packages.py	(revision 0)
-+++ Twisted/twisted/trial/test/packages.py	(revision 14797)
-@@ -0,0 +1,101 @@
-+import os, shutil
-+
-+testModule = """
-+from twisted.trial import unittest
-+
-+class FooTest(unittest.TestCase):
-+    def testFoo(self):
-+        pass
-+"""
-+
-+dosModule = testModule.replace('\n', '\r\n')
-+
-+
-+testSample = """
-+'''This module is used by test_loader to test the Trial test loading
-+functionality. Do NOT change the number of tests in this module.
-+Do NOT change the names the tests in this module.
-+'''
-+
-+import unittest as pyunit
-+from twisted.trial import unittest
-+
-+class FooTest(unittest.TestCase):
-+    def test_foo(self):
-+        pass
-+
-+    def test_bar(self):
-+        pass
-+
-+
-+class PyunitTest(pyunit.TestCase):
-+    def test_foo(self):
-+        pass
-+
-+    def test_bar(self):
-+        pass
-+
-+
-+class NotATest(object):
-+    def test_foo(self):
-+        pass
-+
-+
-+class AlphabetTest(unittest.TestCase):
-+    def test_a(self):
-+        pass
-+
-+    def test_b(self):
-+        pass
-+
-+    def test_c(self):
-+        pass
-+"""
-+
-+
-+files = [
-+    ('badpackage/__init__.py', 'frotz\n'),
-+    ('badpackage/test_module.py', ''),
-+    ('package2/__init__.py', ''),
-+    ('package2/test_module.py', 'import frotz\n'),
-+    ('package/__init__.py', ''),
-+    ('package/frotz.py', 'frotz\n'),
-+    ('package/test_bad_module.py', 'raise ZeroDivisionError("fake error")'),
-+    ('package/test_dos_module.py', dosModule),
-+    ('package/test_import_module.py', 'import frotz'),
-+    ('package/test_module.py', testModule),
-+    ('goodpackage/__init__.py', ''),
-+    ('goodpackage/test_sample.py', testSample),
-+    ('goodpackage/sub/__init__.py', ''),
-+    ('goodpackage/sub/test_sample.py', testSample)
-+    ]
-+
-+
-+def createFiles(files, parentDir='.'):
-+    for filename, contents in files:
-+        filename = os.path.join(parentDir, filename)
-+        _createDirectory(filename)
-+        fd = open(filename, 'w')
-+        fd.write(contents)
-+        fd.close()
-+
-+def _createDirectory(filename):
-+    directory = os.path.dirname(filename)
-+    if not os.path.exists(directory):
-+        os.makedirs(directory)
-+
-+def setUp(parentDir='.'):
-+    createFiles(files, parentDir)
-+
-+def removeFiles(files, parentDir):
-+    directories = {}
-+    for filename, _ in files:
-+        directories[os.path.dirname(os.path.join(parentDir, filename))] = True
-+    dirs = directories.keys()
-+    dirs.sort()
-+    dirs.reverse()
-+    for directory in dirs:
-+        shutil.rmtree(directory)
-+
-+def tearDown(parentDir='.'):
-+    removeFiles(files, parentDir)
diff --git a/dev-python/twisted/files/twisted-2.1.0-trial-tests2.patch b/dev-python/twisted/files/twisted-2.1.0-trial-tests2.patch
deleted file mode 100644
index 357586b3cda8..000000000000
--- a/dev-python/twisted/files/twisted-2.1.0-trial-tests2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: twisted/trial/test/test_script.py
-===================================================================
---- twisted/trial/test/test_script.py	(revision 14825)
-+++ twisted/trial/test/test_script.py	(revision 14826)
-@@ -63,12 +63,14 @@
-             raise unittest.SkipTest("This test runs an external process. "
-                                     "This reactor doesn't support it.")
-         import test_output, os
--        d = test_output.runTrialWithEnv(os.environ, '--testmodule',
-+        env = os.environ.copy()
-+        env['PYTHONPATH'] = os.pathsep.join(sys.path)
-+        d = test_output.runTrialWithEnv(env, '--testmodule',
-                                         sibpath('moduletest.py'))
-         d.addCallback(lambda x : self.assertSubstring(
-             'twisted.trial.test.test_test_visitor', x))
-         return d
--                             
-+        
-     def test_parseLocalVariable(self):
-         declaration = '-*- test-case-name: twisted.trial.test.test_trial -*-'
-         localVars = trial._parseLocalVariables(declaration)
diff --git a/dev-python/twisted/twisted-1.2.0.ebuild b/dev-python/twisted/twisted-1.2.0.ebuild
index ad85a63bc225..555daa5d5c2d 100644
--- a/dev-python/twisted/twisted-1.2.0.ebuild
+++ b/dev-python/twisted/twisted-1.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/twisted-1.2.0.ebuild,v 1.17 2009/01/08 23:30:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.2.0.ebuild,v 1.18 2009/09/06 21:11:31 idl0r Exp $
 
 inherit distutils
 
@@ -19,6 +19,7 @@ DEPEND=">=dev-lang/python-2.2
 	dev-python/pyopenssl
 	gtk? ( >=dev-python/pygtk-1.99 )
 	doc? ( =dev-python/twisted-docs-${PV} )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/Twisted-${PV}"
 
diff --git a/dev-python/twisted/twisted-1.3.0.ebuild b/dev-python/twisted/twisted-1.3.0.ebuild
index 1fdd24b42029..1d8269747171 100644
--- a/dev-python/twisted/twisted-1.3.0.ebuild
+++ b/dev-python/twisted/twisted-1.3.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/twisted-1.3.0.ebuild,v 1.14 2009/01/08 23:25:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.3.0.ebuild,v 1.15 2009/09/06 21:11:31 idl0r Exp $
 
 inherit distutils
 
@@ -21,6 +21,7 @@ DEPEND=">=dev-lang/python-2.2
 	dev-python/pyopenssl
 	gtk? ( >=dev-python/pygtk-1.99 )
 	doc? ( =dev-python/twisted-docs-${PV} )"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/Twisted-${MY_PV}
 
diff --git a/dev-python/twisted/twisted-8.1.0.ebuild b/dev-python/twisted/twisted-8.1.0.ebuild
index e1fb9b5aba87..d475702b0bf4 100644
--- a/dev-python/twisted/twisted-8.1.0.ebuild
+++ b/dev-python/twisted/twisted-8.1.0.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-python/twisted/twisted-8.1.0.ebuild,v 1.9 2008/12/20 18:26:47 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-8.1.0.ebuild,v 1.10 2009/09/06 21:11:31 idl0r Exp $
 
 inherit eutils distutils versionator
 
@@ -21,6 +21,7 @@ DEPEND=">=dev-lang/python-2.3
 	crypt? ( >=dev-python/pyopenssl-0.5.1 )
 	gtk? ( >=dev-python/pygtk-1.99 )
 	!dev-python/twisted-docs"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/twisted/twisted-8.2.0.ebuild b/dev-python/twisted/twisted-8.2.0.ebuild
index 2ad45451ee24..6e2734e45c9e 100644
--- a/dev-python/twisted/twisted-8.2.0.ebuild
+++ b/dev-python/twisted/twisted-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/twisted-8.2.0.ebuild,v 1.1 2009/01/08 22:44:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-8.2.0.ebuild,v 1.2 2009/09/06 21:11:31 idl0r Exp $
 
 inherit eutils distutils versionator
 
@@ -21,6 +21,7 @@ DEPEND=">=dev-lang/python-2.3
 	crypt? ( >=dev-python/pyopenssl-0.5.1 )
 	gtk? ( >=dev-python/pygtk-1.99 )
 	!dev-python/twisted-docs"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}