dev-python/networkx: Move to distutils-r1.eclass

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 83 insertions, 15 deletions

diff --git a/dev-python/networkx/ChangeLog b/dev-python/networkx/ChangeLog
index eabd5021294e..26ca3466d9cd 100644
--- a/dev-python/networkx/ChangeLog
+++ b/dev-python/networkx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2012/12/31 13:02:58 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.17 2013/04/26 09:50:14 jlec Exp $
+
+*networkx-1.7-r2 (26 Apr 2013)
+
+  26 Apr 2013; Justin Lecher <jlec@gentoo.org> +networkx-1.7-r2.ebuild,
+  metadata.xml:
+  Move to distutils-r1.eclass
 
   31 Dec 2012; Michał Górny <mgorny@gentoo.org> networkx-1.6.ebuild,
   networkx-1.7-r1.ebuild, networkx-1.7.ebuild:
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index c1fc00be9750..c9c42ef351f2 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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 1284 SHA256 294862bd4424c8a8d4dc870e14f7bf05d8629f127f5662db0fda09de2287201c SHA512 f60ed1617c277d072471e613f59a921b203206a7d6dc9c0f858c75d34294581599871243f2790630a1687ecba6ac001a7deec3d5544480f2b172a276c3741286 WHIRLPOOL c7bdc7acbdbbc3662da8a13c97e2ffc0bcbf7f128a28bcbf709b635139f26dd79a89a2c832f0e764128559feb5fb278336e98b96dd8a5e63ba4aca7f7bd315f2
 EBUILD networkx-1.7-r1.ebuild 1383 SHA256 d81d7b3fe9c41d3345c090898fe7aa04448aa50880d63ebb67efd9a05c5e71a8 SHA512 ad9a73da4bfea929489dac0cd65af7c4759184079f19e58f6be2ebe6f9e0e4d13a42dd30d0ff7e493f9a42e5a1a1e0341c49527412c070a946ee5c05a12418c5 WHIRLPOOL fa6ce8a564ad771d393ce29f4ab04686b4f8d857797ceb34fd8bdd77d73b179674ffe4e0d83299cd18a0095b366f7bf5429653a9cbb41709b05be066601c985e
+EBUILD networkx-1.7-r2.ebuild 1685 SHA256 78a9e4c7d8c28856858e279b0d7b1f9e45490577758a9e778915e9ccc980aac1 SHA512 307f53a03ad171da741d8a197eeccd7e88accd44976c1c8de00de54db1e3a50d2b1547c31262304d595a7506c3e977d518dea82b5cff9e1dba6df6b47fb47959 WHIRLPOOL 88fccd1144125b2be67216167a129370bcf8a941ba0b3401571af478bce2d9a7db9e12021423f93b3b372a396fc97444936a77049440fd63f77ae67067aa0442
 EBUILD networkx-1.7.ebuild 1338 SHA256 5ac049fb7452d62a49a471abc8dd27c4de00e45bafd26f3635e174aae4014eb5 SHA512 1276625ac65af52102b1b14ef40f4b8847aa94fc82087caed9b7381117ca4babaa1b7274b9fa142f5117ca8dfc6316529db609e528b11526a9c57cfaf8cc218d WHIRLPOOL 4694446a93de05c27a8f9da09640b452839376dfd369f4b8199a119d769958bf1f54cfda2e8b63a8b9ef8e2a3a1e332d49684f15be418cd9f5fc8e2bfba8a8f0
-MISC ChangeLog 2721 SHA256 643088839cfe8cbafb00476b655d7fc9197e56de3d394a3a767f94b8d61fc0f6 SHA512 8178c5f58c3edef3143b699894fca8403cb9e736954d970a6ee6375867219631e583efd71bcda9deb5ec171975940193a72c6e3d86ae6084dd2b12d09796f015 WHIRLPOOL 901907c152f705335d4568669bfdf88bfcba7fe3ccfb343efb5daf3f4b5acbe8a66b122b42cf26273befbb92d0c86a8d057136ba228bded50270457f7f20c3d2
-MISC metadata.xml 908 SHA256 b7fe6cba6200b16138d3fc3fa23251652d23b85c76cdc582dc8d99e6ccc567d7 SHA512 741bc8e60965826d34b2e7fe3f854f4ae9ee6742c50f95699bab2fb06e5c6d13786182a14b93fc9ee58b20df263fe27cfdf8a9bb98142490a6138586cdb4e012 WHIRLPOOL c74ba0d564c42d5bcb3018a3f130f1e496ad7eeadd768b6278ddff4cf31b8e46340b9690272d5f58de281d7f3d9dcf226c326cee2771e3d2be3379786ffef51c
+MISC ChangeLog 2870 SHA256 7fcee8137fc404e7046021dfa73399342cd3847b6309c5d9bd6a8ac4472ddb57 SHA512 363a2e3a188ec25f03a70b47ea519ec3c164df2ac9ac0bf5b9fbd4723ab74bf7a0977650d117316fbaa5598363a692366c2d3cd0340a5244bd18ec864465a7ce WHIRLPOOL 55e3bc765cfa0f23bdb164f761f5a2ba263bdde3c0e9dbec67f8de160c74400fd1ce2e20c33f23169dae098aa0fb9d6a7c0b19db519c430faa43400e651168b8
+MISC metadata.xml 914 SHA256 60cf9f3765f01c01099d1dbd7e1b737cb88473b9a78edf887cbc1c8c6bbd873d SHA512 9dbdb65428cdc8155769853cb742f1ed06565040143230be03e11b530fc6319269eea8615e37eae915abb04a333af3efff0a718eeb25ef76646c0719ff709fbd WHIRLPOOL 38611650ecf66f31a0aa324d8d1562da2b98bbb1e13037bce5ddd1598c6e269162498c6256d1191741d5ab319762a9d4da092e8687de40e0f5bc372c2c5fd1b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDhjRUACgkQfXuS5UK5QB2mcgP/fLSwomynG7Y3Rd7O5BQMJ0ob
-/55NA9zAwOMZmKoTlON+F4ArHWMydq3C+O+zToQw41Acf/3lttpE01KH4otAiziH
-jsWycsxHoxmpm4/a8GJkQjmQVxSU3yY6nps7u1S2/jDvK9KnnizI5+BsrpK9WdsB
-0mdoRm4xakrrxvSqD3k=
-=j7vp
+iEYEAREKAAYFAlF6TdcACgkQgAnW8HDreRYT2QCfad7YU/A4JCcjWgFsxvmu+8iW
+Sa8AoJGQ7m3mKm5HwibmELqKS2NYznGs
+=wV4t
 -----END PGP SIGNATURE-----
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index f9a40378c47d..a799ec270063 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<longdescription lang="en">NetworkX is a Python-based package for the creation, manipulation, and
+  <herd>python</herd>
+  <longdescription lang="en">NetworkX is a Python-based package for the creation, manipulation, and
   study of the structure, dynamics, and functions of complex networks.
   The structure of a graph or network is encoded in the edges (connections,
   links, ties, arcs, bonds) between nodes (vertices, sites, actors). If
@@ -11,7 +11,7 @@
   mean a graph with weights (fields, properties) on nodes and/or edges.
   The potential audience for NetworkX includes: mathematicians, physicists,
   biologists, computer scientists, social scientists.</longdescription>
-	<upstream>
-		<remote-id type="pypi">networkx</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="pypi">networkx</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-1.7-r2.ebuild b/dev-python/networkx/networkx-1.7-r2.ebuild
new file mode 100644
index 000000000000..3194c6c38709
--- /dev/null
+++ b/dev-python/networkx/networkx-1.7-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.1 2013/04/26 09:50:14 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+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 test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	examples? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		virtual/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	 )"
+
+python_compile_all() {
+	if use doc; then
+		elog "Building docs"
+		# PYTHONPATH is necessary to use networkx to be installed.
+		cd "${S}"/doc || die
+		sed \
+			-e "s:^\t\./:\t${PYTHON} :g" \
+			-i Makefile || die
+		pwd
+		PYTHONPATH="${S}:${PYTHONPATH}" make html \
+			|| die "doc compilation failed"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -f "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE}.txt || die
+	if ! use examples; then
+		rm -r "${ED}"usr/share/doc/${P}/examples || die
+	fi
+	use doc && dohtml -r doc/build/html/*
+}