dev-python/pygraphviz: Version Bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 113 insertions, 19 deletions

diff --git a/dev-python/pygraphviz/ChangeLog b/dev-python/pygraphviz/ChangeLog
index 3466a622d50a..631d096ef8d4 100644
--- a/dev-python/pygraphviz/ChangeLog
+++ b/dev-python/pygraphviz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygraphviz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.15 2013/04/26 20:45:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.16 2013/12/29 00:55:28 jlec Exp $
+
+*pygraphviz-1.2 (29 Dec 2013)
+
+  29 Dec 2013; Justin Lecher <jlec@gentoo.org> +pygraphviz-1.2.ebuild,
+  +files/pygraphviz-1.2-avoid_tests.patch:
+  Version Bump
 
   26 Apr 2013; Michal Gorny <mgorny@gentoo.org> pygraphviz-1.1-r2.ebuild:
   Improve the conversion. Remove incorrect USE-dep on graphviz since the package
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 08a5550668ec..f17e9fc8fe58 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX pygraphviz-1.0-setup.py.patch 1215 SHA256 d9b33fb2c9e7a29664f735d050a2f3a4ace7322a0260b6b4a14dc859fb259d25 SHA512 176497d1e61ee74b6ca576b322ec47eccfb67d2fa1341c7f0f857ecc32ccd16660262abe46a90871ee4cba60587670d8b479bfd60944ac0de32b13f4aab4846c WHIRLPOOL c6b81f11eb014787d091d99842e6e64f16651b6646ae2da0e4537eb6cbb87b4c2bd40d87c879c02dc3022e8d02d4c178130c11e542ac3aa3b7a03e4cd6f5cba1
 AUX pygraphviz-1.1-avoid_tests.patch 1312 SHA256 5582f6e6425e9d61377ac0b949b6781cf6f0be63580623df5534b3d0d1d797ec SHA512 385c19dd6552316ee6c7cff76825451c2199e579e150390d316e0120701b6130da2bde891d7083e536e84d0c7d9ab74c6c64ea408b71d048aa428d33b7934890 WHIRLPOOL 9f140bd4cbd44e79f9d5a1297de869160fc74af19d080314ea46454dda9119a05e6d33a042cd493cdf92f1be2c5c38d1f7d119dea223023b0fb051d9c187134e
+AUX pygraphviz-1.2-avoid_tests.patch 1620 SHA256 56a331c73eb6b5f12dc67a4d8b4a2b3173d88095099c2b9271469b6bdd2a7e72 SHA512 74c161dbeb69ad2b9f381428b6cc0e0d8411d95b121fb16eb0f1e45344a52c2dafc2bf06cac8a6be8152fb1592bd55bf001da85e4e53ed82bec39f61c7d329f2 WHIRLPOOL 6493194b90fe0100c2e07384cd67e0ffe2a5e7396de822dc89557bd1bda1cfe2771b0f6cdc41a0604ef71ca97929618f867c0d1f100b69bb1f1342ae056a018b
 DIST pygraphviz-1.1.tar.gz 90750 SHA256 2179434df2228bc1b452039dae841700c1733e25011af075383fbded2984db96 SHA512 f7a87de5344f59498117ae2d5dcccc743c1502987b348ef1fd076b44189c40caf1a3d54fe9c369b68de831d03885855d3309c30cc2434756a72b3bf4532148d2 WHIRLPOOL f0d8e240ed2e4137935888321e0874020b35b22090a50acdaa9b9635b682147c9d6eb42d0fae7f6765b1b7caaa52a55af27b280945d945ba6f05776ad437dc33
+DIST pygraphviz-1.2.tar.gz 90913 SHA256 2e8a82a07dcf006b9558d22c5a6357c012193d4cc681776845e515fffeccc6b3 SHA512 e477af635594c3ba1aa6fa499bc5e60df14e76616a1a777f648e2e96d3953dd3d0b3bae4a92275dac2f7466276cf526ecb8b6a63fd3fbad26ee24b67d76ecfa3 WHIRLPOOL 2757d02b130f326ee2638b78761094de1a841293b6de1d5ea2c89c169cbc8525041e06daef9ded32d7c1ac944ef99293ab67fee6c75a2976283f87725635a4d5
 EBUILD pygraphviz-1.1-r1.ebuild 1340 SHA256 552c116aebe7d99bb240b5edd1f7ed939756651ec2db2ab2f84d69be7c092906 SHA512 f0c6c72bf29f3705af157f2f41252eff852937cc4b33ba823b7bedb67a014d17e17ffa3d962d5ffeaa28d9063f4d0e134bd4a75861070cd57fba086829d3d218 WHIRLPOOL 18a941771d93233a08555102a9e6bc481c34fa98457b72327fa58827de053abc571d9fcb135b2b7b21a8d760ad97580e4223755a6f93b2a4cbf97d9bc2c80a59
 EBUILD pygraphviz-1.1-r2.ebuild 1123 SHA256 f7dbbe19bf7782d3cfcbd3696074dc73dfc078e02fb0cfd2c5fa9c7b6a598d2e SHA512 512af01698b65087e13710f9d44bd40b03a0069014bd200dbe77acbe749e93df2fdbd6557f8e33629abca5dd0cdd9dbf67fbd154149339515f1dfb7187b7fe70 WHIRLPOOL 5b85fb3d6fd3ca3faaa9173ba80ba29a52d58b45076f13de7a8e9d2033b0a82916d6951c533454be4eb62a6101ea5f0bf2e1a45a15e0aa4879b2ae78e3a7a334
-MISC ChangeLog 2585 SHA256 7c3e691f3e6117016ac782c7672ac452e1aa7df0af08d91de06a189755cf49da SHA512 4609a561d983de3d4dc9a64b1b3d1467851fd11133b68b69104353b02086492ca857de9455044b5678030cbe68a6ba0ed0ca20466a41f0843f5923c9d3685019 WHIRLPOOL 9902f6a869f328938f84954b4789a3e9d001da08868b7f50279d0f0c311e6e56d1132b42f8a16ea12fcb27ab35e20737868cda2fed4aadd05918b2c71bbd8470
+EBUILD pygraphviz-1.2.ebuild 1118 SHA256 33145e04bad9f52a985ea34ee48ddf80a0ac51c77fe43f4bd646a66115f38a58 SHA512 3ea1de431e5a34eab8536f15cec527b80014454ea61ee8d291000712872e6a80e1b8005c04c2448002818f59dac2afc36de30dfd6517dc51237fc857d84dbb75 WHIRLPOOL 38ea5c2c886cf2009974da49723faa1302215c5843e33212aed092b1ba12a25f7065e978e09131bef0bff4166319c2b7612f0e303c96cd89d6c8bd3a428012bc
+MISC ChangeLog 2744 SHA256 c4d3ff9bb0979148650a4b597807955865eed0a803f472d4869729da9f92088d SHA512 d619c3f7595ad1a34374d37eae80b28d1569b8d61c5d19018fb0c3705e55ab112a4756a21e6aaf33310b3580965fa88c1a9fa4f2961409448cacf85a5e6db5c1 WHIRLPOOL effacd86ec2679dc0d0d21f15f653083c733a542a59d578cd0071289ec1bc7660c07f04d648845a7e8a607fb3452207f5a0dd17bf743fadd93d49d175e733c02
 MISC metadata.xml 454 SHA256 14d64f8a807b22d3cbdf60cb6c91d77936d64e1480f839d2bb20e21c9d02cf83 SHA512 93f46051b2d063bff4419659fb907a31a7089b186ee284cd3ca33b53ccb22aa5dbaf0a549ca346ac4ddaaa83ac939b0adb706a1dbd6f06f08cd49117f9f32cd4 WHIRLPOOL 291d83dde55df0ea48f3a4d7811ca6320a6cef035134902d22a2cc0eead40d43976a89501dec72030bd198da6334b1fd766d27e74d943bc8949355ed444ec0fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJReufkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD2A0P/iE2uAVU62pRiI2GcEyVOeGK
-nY+Wa/KFn9Wr8jBNFIZY3HFX6AHqUGqC0r7Mfjo8f1ONiQwsFpuyzza4McLntsy1
-Bf40A/uROQTqsAO5CtTXlWdcMvjs1//IPy9znZspW95nWyBelDTqKnY0vM/L8tal
-c24hYi6nXhQn+Swocqanu34ibEFKt6xC0wN4V7R1ZbE8yTuU49BT2lusvIHDA6JL
-RZGs1ZNSbTZ5dIiP5bg/cBITQApn8lOH2OQSngKQ2FqVQMXmHTtzcfZLv/UVfL+P
-BicpeuuJPlkpsAhXPq4EG/rfiIQtKEZheUsn/dUKFIF599jaMom90VEDZgr6tTtY
-GUl0ONB2bQWl5n8NpurkawzuqYP6U6go5YYvL2/gju3iOiwO9bjRvZrDLujFj+2+
-NrrZGk4W0UNF/QyjWjMZpykUC2Ut27vL83rYWms5q0v+HLGRHsq9sR/ogCVWgdnH
-jQ4xpaYqSH+LK4QuqsOAfa44EgXLrJxwq7kyRmcDOTAWIl9WGrfaaf5JaVoh1r/E
-5oaRYtlUvTEmpWzMLFjP7EIoKXiOcxT2BAmGm4xlqV38OJysqZ6LX586WhYHJVsn
-4o8fZedqW0UfwOZYHUUE0OrqoGVECILn8gh97G+p3Y/osNDodQ1aa1j/yllF7oRn
-w80KCdyg/izHOxsIokXO
-=JFAM
+iQIcBAEBCgAGBQJSv3MBAAoJELnU8jG9FVir1ZIP/2o0bunl/MGeI6aOIT4jdSwt
+O4z0YvsWZesOlwoR6d9FVE/B+OAx1pN6UBgh+GP46w9SHKNFNqsgCeXhzg71XRP5
+oBQPFsK0GSW5m3X2h6bAwvy39oC5LG9Rp0nSEZRrmRrnXpcmtBfgGsPpQHpFuy7X
+imaKMoAMlbph7wwz+b/gvYgKx2i19qupeAOst5Vrp4GMAAsMXjL7NMySsg2gI7Dl
+BSFiVZXXMa1XZ4HE3HKl4BwA67YC6mG8QH8SRCTgevrCwKYJKzUSHn9g/oCMIJ4G
+3HLxm9wYc5nrSEOyqI/bP6Y3oG4RSTuETCq0GmJgCSCyiJVcvGbL6MEfS/TEAiNt
+1WNb2qpRff4rRTEfOAeyPU+9DwB8dn3yls5WIojQ64ovziyXxG7RFGrMyciXxX2L
+gYIbb6jWaWT5M01BdThwHQxhLlGiJ6rMdFbgTut0lHObW7s7tVyaMEQ+V/rAC6xk
+uLkEdlb2B5+Tnw8ks236zZYdytZ4NpMXErjPF7nEIAavWV5cDpjrBQfPy4iN2aRV
+cIKY9H+0nS8owsxkdHXkKJu4RsWbNKDKTC1JqZXGzqCWCnd51I+MzHtOVedVKUEu
+P8tdxr5TieNR1c6Yut45iJ5vE6uLwtx8HKU6lNTUqJEpIjp4ATcjTqR1pqcqjGue
+H/4k6KpYSvj2abXKovNb
+=jpV/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch b/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
new file mode 100644
index 000000000000..d444ee3d2df7
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.2-avoid_tests.patch
@@ -0,0 +1,47 @@
+ pygraphviz/__init__.py |  2 --
+ pygraphviz/agraph.py   | 25 -------------------------
+ 2 files changed, 27 deletions(-)
+
+diff --git a/pygraphviz/__init__.py b/pygraphviz/__init__.py
+index a807801..33f727e 100644
+--- a/pygraphviz/__init__.py
++++ b/pygraphviz/__init__.py
+@@ -68,5 +68,3 @@ def version():
+     neato=_get_prog('neato')
+     os.system(neato+' -V')
+ 
+-# import tests: run as pygraphviz.test()
+-from tests import run as test
+diff --git a/pygraphviz/agraph.py b/pygraphviz/agraph.py
+index c9f735b..90a661e 100644
+--- a/pygraphviz/agraph.py
++++ b/pygraphviz/agraph.py
+@@ -1771,28 +1771,3 @@ class ItemAttribute(Attribute):
+                        value.decode(self.encoding))
+             except KeyError: # gv.agxget returned KeyError, skip
+                 continue
+-
+-
+-
+-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())
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
new file mode 100644
index 000000000000..ee760623fd3b
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.2.ebuild,v 1.1 2013/12/29 00:55:28 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-setup.py.patch
+	"${FILESDIR}"/${P}-avoid_tests.patch
+)
+
+python_test() {
+	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+	"${PYTHON}" \
+		-c "import pygraphviz.tests; pygraphviz.tests.run()" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}