Improve the conversion. Remove incorrect USE-dep on graphviz since the package uses the C interface only. Quote paths properly. Use EXAMPLES array. Do not remove namespaced tests.

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

3 files changed, 17 insertions, 29 deletions

diff --git a/dev-python/pygraphviz/ChangeLog b/dev-python/pygraphviz/ChangeLog
index a1752ac87988..3466a622d50a 100644
--- a/dev-python/pygraphviz/ChangeLog
+++ b/dev-python/pygraphviz/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2013/04/26 08:40:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/ChangeLog,v 1.15 2013/04/26 20:45:13 mgorny Exp $
+
+  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
+  uses the C interface only. Quote paths properly. Use EXAMPLES array. Do not
+  remove namespaced tests.
 
 *pygraphviz-1.1-r2 (26 Apr 2013)
 
@@ -63,4 +68,3 @@
   +files/pygraphviz-0.99.1-setup.py.patch, +metadata.xml,
   +pygraphviz-0.99.1.ebuild:
   Initial import, closing bug #253415, thanks Robert Morris
-
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 8b3a3f9feead..63b23e2688be 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 DIST pygraphviz-1.1.tar.gz 90750 SHA256 2179434df2228bc1b452039dae841700c1733e25011af075383fbded2984db96 SHA512 f7a87de5344f59498117ae2d5dcccc743c1502987b348ef1fd076b44189c40caf1a3d54fe9c369b68de831d03885855d3309c30cc2434756a72b3bf4532148d2 WHIRLPOOL f0d8e240ed2e4137935888321e0874020b35b22090a50acdaa9b9635b682147c9d6eb42d0fae7f6765b1b7caaa52a55af27b280945d945ba6f05776ad437dc33
 EBUILD pygraphviz-1.1-r1.ebuild 1340 SHA256 552c116aebe7d99bb240b5edd1f7ed939756651ec2db2ab2f84d69be7c092906 SHA512 f0c6c72bf29f3705af157f2f41252eff852937cc4b33ba823b7bedb67a014d17e17ffa3d962d5ffeaa28d9063f4d0e134bd4a75861070cd57fba086829d3d218 WHIRLPOOL 18a941771d93233a08555102a9e6bc481c34fa98457b72327fa58827de053abc571d9fcb135b2b7b21a8d760ad97580e4223755a6f93b2a4cbf97d9bc2c80a59
-EBUILD pygraphviz-1.1-r2.ebuild 1178 SHA256 0a7c69d9985183f8350b09efdd2538a5832b354b87881442a0d145138ce9c53d SHA512 27588bd030af18e8ea8a40f127ec4b1d3e5294484aadc12d40e07c817763b4d514b7d90d21743e2b1bf2fca5432570f0a98b66775e1f7b545820ef3f6f8841aa WHIRLPOOL 14e90424e019f72fdcdd9c02742041b21799f4d7a88ceb38a6c5d70da63dae0fee177958ce5c21d54e2bb2234bee8ab328facf5ad27855945ed0dd0aaadc5fdb
-MISC ChangeLog 2323 SHA256 2a8cebf10e8473d108f58517eaa8491f7e65f73a1a312a4f72277bdd5f8848d4 SHA512 5dd28d17cffc6e1fb6905db2219fb4a3d2c9af65a51f0849dbc831e84880e99b5e91c4fc21d8662751244002f0d07f76ecfe5842aaaae3e28139cf4fc03ab228 WHIRLPOOL a6fc4703fc90c9618f94ecacddaea217416e74cfaa26090afef9fe072ece47859fc9ad64364a3ab2df3b310b72ccb41e900b5cbf3365deca73b1ba91558d69a3
+EBUILD pygraphviz-1.1-r2.ebuild 1123 SHA256 f7dbbe19bf7782d3cfcbd3696074dc73dfc078e02fb0cfd2c5fa9c7b6a598d2e SHA512 512af01698b65087e13710f9d44bd40b03a0069014bd200dbe77acbe749e93df2fdbd6557f8e33629abca5dd0cdd9dbf67fbd154149339515f1dfb7187b7fe70 WHIRLPOOL 5b85fb3d6fd3ca3faaa9173ba80ba29a52d58b45076f13de7a8e9d2033b0a82916d6951c533454be4eb62a6101ea5f0bf2e1a45a15e0aa4879b2ae78e3a7a334
+MISC ChangeLog 2585 SHA256 7c3e691f3e6117016ac782c7672ac452e1aa7df0af08d91de06a189755cf49da SHA512 4609a561d983de3d4dc9a64b1b3d1467851fd11133b68b69104353b02086492ca857de9455044b5678030cbe68a6ba0ed0ca20466a41f0843f5923c9d3685019 WHIRLPOOL 9902f6a869f328938f84954b4789a3e9d001da08868b7f50279d0f0c311e6e56d1132b42f8a16ea12fcb27ab35e20737868cda2fed4aadd05918b2c71bbd8470
 MISC metadata.xml 454 SHA256 14d64f8a807b22d3cbdf60cb6c91d77936d64e1480f839d2bb20e21c9d02cf83 SHA512 93f46051b2d063bff4419659fb907a31a7089b186ee284cd3ca33b53ccb22aa5dbaf0a549ca346ac4ddaaa83ac939b0adb706a1dbd6f06f08cd49117f9f32cd4 WHIRLPOOL 291d83dde55df0ea48f3a4d7811ca6320a6cef035134902d22a2cc0eead40d43976a89501dec72030bd198da6334b1fd766d27e74d943bc8949355ed444ec0fd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlF6PZIACgkQgAnW8HDreRZe9gCfTHevr2x3hkYxE1EsHTfoglR0
-OJ8Anj/to//DNxR+I/AW3QffcsfEhr6U
-=5xK6
------END PGP SIGNATURE-----
diff --git a/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild b/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild
index fcc4ac312415..eebd59143d88 100644
--- a/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r2.ebuild,v 1.1 2013/04/26 08:40:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygraphviz/pygraphviz-1.1-r2.ebuild,v 1.2 2013/04/26 20:45:13 mgorny Exp $
 
 EAPI=5
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
-RDEPEND="media-gfx/graphviz[${PYTHON_USEDEP}]"
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -26,21 +27,14 @@ PATCHES=(
 )
 
 python_test() {
-	${PYTHON} \
-		-c "import sys; sys.path.insert(0, \"${BUILD_DIR}/lib/pygraphviz\"); import pygraphviz.tests; pygraphviz.tests.run()" || die
+	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+	"${PYTHON}" \
+		-c "import pygraphviz.tests; pygraphviz.tests.run()" \
+		|| die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
+	use examples && local EXAMPLES=( examples/. )
 
-python_install() {
-	distutils-r1_python_install
-
-	rm -fr "${ED}$(python_get_sitedir)/${PN}/tests"
+	distutils-r1_python_install_all
 }