Don't require tests at run time (bug #341505).

Package-Manager: portage-2.2.0_alpha2_p1/cvs/Linux x86_64

4 files changed, 100 insertions, 3 deletions

diff --git a/dev-python/pygraphviz/ChangeLog b/dev-python/pygraphviz/ChangeLog
index dd4f1e413e7d..c120ec30e2ff 100644
--- a/dev-python/pygraphviz/ChangeLog
+++ b/dev-python/pygraphviz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pygraphviz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.6 2010/09/15 19:51:05 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.7 2010/10/29 21:40:13 arfrever Exp $
+
+*pygraphviz-1.0-r1 (29 Oct 2010)
+
+  29 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pygraphviz-1.0.ebuild, +pygraphviz-1.0-r1.ebuild,
+  +files/pygraphviz-1.0-avoid_tests.patch:
+  Don't require tests at run time (bug #341505).
 
 *pygraphviz-1.0 (15 Sep 2010)
 
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 6401b02ec3ac..14a73bd90154 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,5 +1,6 @@
+AUX pygraphviz-1.0-avoid_tests.patch 1237 RMD160 c1e75aeabc9f5845235c2c5393fe270db1f02348 SHA1 1c5020f08a2487cc5c5412d58e1f153e132eb405 SHA256 e51b10fd6a38bd191e60631f2fa547f61d502e247ece6d5d5dfa3ca61a2c1642
 AUX pygraphviz-1.0-setup.py.patch 1215 RMD160 c356d6acda1130e21b5048e984de59bcf68de904 SHA1 bf46119d7537555d2acf8ae66bd8e08a1c6b2c8d SHA256 d9b33fb2c9e7a29664f735d050a2f3a4ace7322a0260b6b4a14dc859fb259d25
 DIST pygraphviz-1.0.tar.gz 87236 RMD160 c2651201f841a5a04c3b0ff13d437576d44dc28a SHA1 093d16ce9c9f2591788fe990631f866ee207c6bd SHA256 f5c9b81993bbbcb3f6c5d172c035cde65298dccc7c377f34b0f524efaa12ba80
-EBUILD pygraphviz-1.0.ebuild 1191 RMD160 cc37a33f0895f76fdab4218d820066a8ccd79dac SHA1 9efade3d305e561764545725162108c6d5d5434f SHA256 a3740de938f7d1296a614662e333f3cdf104c95b2486745b16462b530849368f
-MISC ChangeLog 1049 RMD160 8e09bbf64126006ad2eafbef04cbbb9855d4f9a4 SHA1 6a92fb6e07b3a2b6deb25ffe9d69a2a798c67d69 SHA256 dffb75b4f58bfe306fa333c925d011daf2d1567fcfa9bb555dacb6e95e7120f1
+EBUILD pygraphviz-1.0-r1.ebuild 1284 RMD160 4b82ed05519173ddb8a601277f168a9045ce66c6 SHA1 288c7487962716acde84d16773cf55a7fd3d68f2 SHA256 046711f0484646595bd07f7b1e445ed62a219a0910ac0895126dfd713750630f
+MISC ChangeLog 1302 RMD160 b545dd97110237279d798199cdb38586598c22e2 SHA1 03cf1451c36a6072106212a97e7ff1ed0cb87d96 SHA256 d4c9282f996fc82bcf9055afe6381932b425c6845bf4b02fa775b775949e9e6b
 MISC metadata.xml 450 RMD160 0b1ad4d0244f4488b611020cb62da7e53950cc0f SHA1 12b513b5f8214e531054b1a3124d255a2d709a42 SHA256 d557a44d61bc5f7b285ce29d9ab787670018d052ac525f03e13e878e83dd6b06
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.0-avoid_tests.patch b/dev-python/pygraphviz/files/pygraphviz-1.0-avoid_tests.patch
new file mode 100644
index 000000000000..9744bf296ef9
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.0-avoid_tests.patch
@@ -0,0 +1,40 @@
+--- pygraphviz/agraph.py
++++ pygraphviz/agraph.py
+@@ -1623,28 +1623,3 @@
+     except (TypeError, ValueError):
+         return False
+     return True
+-
+-
+-def _test_suite():
+-    import doctest
+-    suite = doctest.DocFileSuite('tests/graph.txt',
+-                                 'tests/attributes.txt',
+-                                 'tests/layout_draw.txt',
+-                                 'tests/subgraph.txt',
+-                                 package='pygraphviz')
+-    doctest.testmod() # test docstrings in module
+-    return suite
+-
+-
+-if __name__ == "__main__":
+-    import os
+-    import sys
+-    import unittest
+-    if sys.version_info[:2] < (2, 4):
+-        print "Python version 2.4 or later required for tests (%d.%d detected)." %  sys.version_info[:2]
+-        sys.exit(-1)
+-    # directory of package (relative to this)
+-    nxbase=sys.path[0]+os.sep+os.pardir
+-    sys.path.insert(0,nxbase) # prepend to search path
+-    unittest.TextTestRunner().run(_test_suite())
+-    
+--- pygraphviz/__init__.py
++++ pygraphviz/__init__.py
+@@ -67,6 +67,3 @@
+     print "pygraphviz-"+__version__
+     neato=_get_prog('neato')
+     os.system(neato+' -V')
+-
+-# import tests: run as pygraphviz.test()
+-from tests import run as test
diff --git a/dev-python/pygraphviz/pygraphviz-1.0-r1.ebuild b/dev-python/pygraphviz/pygraphviz-1.0-r1.ebuild
new file mode 100644
index 000000000000..cda7e05d5366
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.0-r1.ebuild,v 1.1 2010/10/29 21:40:13 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ http://pypi.python.org/pypi/pygraphviz"
+SRC_URI="http://networkx.lanl.gov/download/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+RDEPEND=">=media-gfx/graphviz-2.12"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-setup.py.patch"
+	epatch "${FILESDIR}/${P}-avoid_tests.patch"
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" -c "import sys; sys.path.insert(0, '$(ls -d build-${PYTHON_ABI}/lib.*)'); import pygraphviz.tests; pygraphviz.tests.run()"
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die "Installation of examples failed"
+	fi
+
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/${PN}/tests"
+	}
+	python_execute_function -q delete_tests
+}