Dependencies added for testsuite, rev bumped

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64

3 files changed, 63 insertions, 12 deletions

diff --git a/dev-python/networkx/ChangeLog b/dev-python/networkx/ChangeLog
index 49d31f8c506c..0e5e6dfdae1d 100644
--- a/dev-python/networkx/ChangeLog
+++ b/dev-python/networkx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/networkx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.14 2012/07/19 16:02:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.15 2012/11/03 15:35:36 idella4 Exp $
+
+*networkx-1.7-r1 (04 Nov 2012)
+
+  04 Nov 2012; Ian Delaney <idella4@gentoo.org> +networkx-1.7-r1.ebuild:
+  Dependencies added for testsuite, rev bumped
 
 *networkx-1.7 (19 Jul 2012)
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index d2e45357e562..1afbee75c726 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST networkx-1.6.tar.gz 707795 SHA256 a2ee8399758e08bf7bc7910071474cdd92e364bbc22be1aa29bdfe0f26f7ba78 SHA512 c72f41ade51335d9c41e63ce4688b843113f1ac2523cfaca505f4715496c8c61fe5e680f77c6561d1618381ac028d151cedc40ba8035c907ceb5e0179da50002 WHIRLPOOL 4faf788029bfff14737e05462b61c4b5144b0a6761ab7563a8edcdb3f7c327453d2d393f2d96d2929ad089bd40ff5f55d6fa4c4f05c1475214cb44e6b5da3e25
 DIST networkx-1.7.tar.gz 728145 SHA256 eb62de98a0fa74aec9c31fffbac8089a703c6413601678f3fb1a0016bad2bdc1 SHA512 04dcd9c67339428713213b1fe43a96f6f52234189e3924fd45889456566251587c7567cf8c817b032e3993551c226be766a593f9c7dcc54a5c0cab2ae2bd3c65 WHIRLPOOL 3133198faaffe136534335a1a74e58192d0ef585444cb4ccaa9368ebb2c13be559f5fe7296ebae2f58eb5644242c56a967b0c2523d92cc716fa2a7db83b2e528
 EBUILD networkx-1.6.ebuild 1288 SHA256 459bc1c9b32c441e53570dc210a4d95fd7508cf2936c34a2edf76e63530a22b7 SHA512 f2e0d892115a8f8a28f0ef11965e446877e05482938e2e02e95f8f5c79c6cca60954eff5de822870ab7144b9b2dc487c1e92b56b4595da09afff200033ffbeb2 WHIRLPOOL 56ab7b393b621a74e9fe3b46f1ef3f0c3d46b133c7edd1aa07d99e0b24da5d78fee10aff438fb42aa553a186e97ba2987ddb284a7afc339e1d97f0653021013b
+EBUILD networkx-1.7-r1.ebuild 1387 SHA256 19f7ae58548554d15d14b89cfafa3a557813bd2294956e17a65ee568936a0087 SHA512 00728c93f6524abe2ab15bf7495869d664c8df87613582393c2392868bc190c11772ab6953249a84daaafc04b5d6cd300f1c618b5a3e2e193682d4eaef5dc9e0 WHIRLPOOL 8284978734706016db811368f5fc5affb1d7b1e006087713042a28d773239011c8166dc549afbb76a018aced114ffcdd7768ddeb7efb6243ef6be0db3e86e9b7
 EBUILD networkx-1.7.ebuild 1343 SHA256 81641f77f3ab37e308b911d6127498c021ecc241c2477eb30ee6fdf41694b466 SHA512 ecfe09fc25991046ec9812df3fe46f552f16ab14e378fa73b61dd3d6bf620f633504d8f9175ae8e694f2374d6d14d51397658bf627eddab68f0c802fb6ec7bc1 WHIRLPOOL e616b91524ca77e8390940380b0a1bf8f3523f91bf5b7ba23a259e9b1871ae9556c0f9b63a1a6b1f97fc6b51cdf7313aeae66d3ddee2cc545df5b295ed9d5913
-MISC ChangeLog 2426 SHA256 49f46de9cc27a296f24bf5734d6dee30078b5dac2f6c1a36cd13ed52f7c75f92 SHA512 46f6fcacc176156714c00d80c8d86bc6cd91b09dd37dc59d16655223ddce7a58ba21779ae19896024188855cd8e535ab30e1c662804d136d33e77982f94e1588 WHIRLPOOL 4d34853f3e6c8e00e1ef10dbdbc0c461631167e26064c5e32a7ef4669eed1b45cd4e6c12ff68a030bd3f6b26eaecf570b460d202804892f4c0fe7c9818fc0097
+MISC ChangeLog 2578 SHA256 9d7887021b3946c2e4f58587f55fdbc635224d5921f1309c2a477ba4c14c7b56 SHA512 997af79ba9d04b106489fb8db7698bcfbcfda116371e3d3e4a41d85245843e6e86f5ee8e500821b9a430d760fdb2e96f145b2a5e33c050eb35f093fef9d523f5 WHIRLPOOL d9f9cfcd56532181d2c0613e5cec3e20ef999877f79c67afa96cd8627d5aa7df82834c6e2213f7322d6ef7f59034a35f77a5172099a5316b914c24e627cbbf0e
 MISC metadata.xml 908 SHA256 b7fe6cba6200b16138d3fc3fa23251652d23b85c76cdc582dc8d99e6ccc567d7 SHA512 741bc8e60965826d34b2e7fe3f854f4ae9ee6742c50f95699bab2fb06e5c6d13786182a14b93fc9ee58b20df263fe27cfdf8a9bb98142490a6138586cdb4e012 WHIRLPOOL c74ba0d564c42d5bcb3018a3f130f1e496ad7eeadd768b6278ddff4cf31b8e46340b9690272d5f58de281d7f3d9dcf226c326cee2771e3d2be3379786ffef51c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAlAIL4YACgkQ1ycZbhPLE2B/vwCeJFlZno1ad2Fh4SNQf/Qo5Lbc
-jCgAoJcxErY0cr9mqBzekeM5mIuZJ7Ru
-=uxJi
------END PGP SIGNATURE-----
diff --git a/dev-python/networkx/networkx-1.7-r1.ebuild b/dev-python/networkx/networkx-1.7-r1.ebuild
new file mode 100644
index 000000000000..ea944982d148
--- /dev/null
+++ b/dev-python/networkx/networkx-1.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r1.ebuild,v 1.1 2012/11/03 15:35:36 idella4 Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 3.*"
+DISTUTILS_SRC_TEST=nosetests
+
+inherit distutils
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.lanl.gov http://pypi.python.org/pypi/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos"
+IUSE="doc examples"
+
+DEPEND="dev-python/setuptools
+		doc? (
+			dev-python/matplotlib
+			dev-python/pygraphviz
+			dev-python/sphinx
+	)
+		test? ( dev-python/matplotlib
+		sci-libs/scipy
+		)"
+RDEPEND="examples? (
+		dev-python/matplotlib
+		dev-python/pygraphviz
+		dev-python/pyparsing
+		dev-python/pyyaml
+		sci-libs/scipy
+	 )"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		# PYTHONPATH is necessary to use networkx to be installed.
+		cd "${S}/doc" && PYTHONPATH="${S}" make html \
+			|| die "doc compilation failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	rm -f "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE}.txt || die
+	use examples || rm -r "${ED}"usr/share/doc/${PF}/examples
+	use doc && dohtml -r doc/build/html/*
+}