[dev-python/manuel] patch changed how to strip zope, cleanup

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

3 files changed, 28 insertions, 33 deletions

diff --git a/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch b/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch
index 3846403..6f6dec2 100644
--- a/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch
+++ b/dev-python/manuel/files/manuel-1.6.0-rm_zope_test.patch
@@ -1,7 +1,7 @@
 diff -ur manuel-1.6.0.orig/src/manuel/tests.py manuel-1.6.0/src/manuel/tests.py
 --- src/manuel/tests.py	2012-04-17 03:08:54.000000000 +0800
-+++ src/manuel/tests.py	2012-04-28 03:50:54.472458025 +0800
-@@ -9,17 +8,11 @@
++++ src/manuel/tests.py	2012-05-21 20:43:20.981722893 +0800
+@@ -9,16 +9,17 @@
  import os.path
  import re
  import unittest
@@ -12,40 +12,43 @@ diff -ur manuel-1.6.0.orig/src/manuel/tests.py manuel-1.6.0/src/manuel/tests.py
  here = os.path.dirname(os.path.abspath(__file__))
  
 -checker = zope.testing.renormalizing.RENormalizing([
--    (re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
--    ])
--
++try:
++    checker = zope.testing.renormalizing.RENormalizing([
+     (re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
+     ])
 -
++except:
++    pass
+ 
  def turtle_on_the_bottom_test():
      """We use manuel to test itself.
- 
-@@ -52,7 +52,6 @@
+@@ -52,7 +53,6 @@
      optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
-
+ 
      m = manuel.ignore.Manuel()
 -    m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
      m += manuel.codeblock.Manuel()
      m += manuel.capture.Manuel()
      m += manuel.testcase.SectionManuel()
-@@ -66,3 +59,5 @@
+@@ -66,3 +66,6 @@
          suite,
          doctest.DocTestSuite(),
          ))
++
 +if __name__ == '__main__':
 +    unittest.TextTestRunner().run(test_suite())
-
 diff -ur manuel-1.6.0.orig/src/manuel/index.txt manuel-1.6.0/src/manuel/index.txt
---- src/manuel/index.txt	2012-04-17 03:08:54.000000000 +0800
-+++ src/manuel/index.txt	2012-04-28 05:43:26.918993769 +0800
+--- src/manuel/index.txt        2012-04-17 03:08:54.000000000 +0800
++++ src/manuel/index.txt        2012-04-28 05:43:26.918993769 +0800
 @@ -166,16 +166,16 @@
- 
+
  .. code-block:: python
- 
+
 -     import os.path
 -     import manuel.testing
 +    import os.path
 +    import manuel.testing
- 
+
 -     class StripDirsTestCase(manuel.testing.TestCase):
 -         def shortDescription(self):
 +    class StripDirsTestCase(manuel.testing.TestCase):
@@ -55,8 +58,9 @@ diff -ur manuel-1.6.0.orig/src/manuel/index.txt manuel-1.6.0/src/manuel/index.tx
 -         m, path_to_test, TestCase=StripDirsTestCase)
 +    suite = manuel.testing.TestSuite(
 +        m, path_to_test, TestCase=StripDirsTestCase)
- 
+
 -    >>> list(suite)[0].shortDescription()
 +    list(suite)[0].shortDescription()
      'bugs.txt'
 
+
diff --git a/dev-python/manuel/manuel-1.6.0.ebuild b/dev-python/manuel/manuel-1.6.0.ebuild
index 4017e66..00f9f73 100644
--- a/dev-python/manuel/manuel-1.6.0.ebuild
+++ b/dev-python/manuel/manuel-1.6.0.ebuild
@@ -3,10 +3,11 @@
 # $Header: $
 
 EAPI="4"
-PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="2.5 3.*"
 DISTUTILS_SRC_TEST=setup.py
+RESTRICT_PYTHON_ABIS="*-jython"
+#2.5 fails tests purely due to test files using relative import.
+PYTHON_TESTS_RESTRICTED_ABIS="2.5"
 inherit distutils eutils
 
 DESCRIPTION="Manuel lets you build tested documentation."
@@ -18,23 +19,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 
-DEPEND="dev-python/setuptools
-	dev-python/six"
-#	test? ( net-zope/zope-testing )"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/six"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+#       test? ( net-zope/zope-testing )"
 
 DOCS=( CHANGES.txt )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-rm_zope_test.patch
 }
-
-src_test() {
-	testing() {
-		pushd build-${PYTHON_ABI}/lib > /dev/null
-#		PYTHONPATH=. 
-		"$(PYTHON)" -m ${PN}.tests
-		popd > /dev/null
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/manuel/metadata.xml b/dev-python/manuel/metadata.xml
index d02cc23..7422e5a 100644
--- a/dev-python/manuel/metadata.xml
+++ b/dev-python/manuel/metadata.xml
@@ -4,7 +4,7 @@
         <herd>python</herd>
         <maintainer><email>tampakrap@gentoo.org</email></maintainer>
         <maintainer>
-                <email>della5@iinet.com.au</email>
+                <email>jonheed@hotmail.com,della5@iinet.com.au</email>
                 <name>Ian Delaney aka idella4 proxy maintainer</name>
         </maintainer>
 </pkgmetadata>