Version bump. Thanks Ian Delaney.

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

4 files changed, 37 insertions, 60 deletions

diff --git a/dev-python/networkx/ChangeLog b/dev-python/networkx/ChangeLog
index 22b1c9abd8ae..245c33d526c4 100644
--- a/dev-python/networkx/ChangeLog
+++ b/dev-python/networkx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/networkx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.12 2011/10/31 21:27:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.13 2011/12/17 04:22:08 bicatali Exp $
+
+*networkx-1.6 (17 Dec 2011)
+
+  17 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> -networkx-1.3.ebuild,
+  -networkx-1.4.ebuild, +networkx-1.6.ebuild:
+  Version bump. Thanks Ian Delaney.
 
   31 Oct 2011; Markos Chandras <hwoarang@gentoo.org> networkx-1.5.ebuild:
   Add CVS header.
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 7f4c4ba9dfae..26547a0e207e 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST networkx-1.3.tar.gz 596993 RMD160 540c6198656b12e5174a771761ec52dfb44d82cf SHA1 707139070c474ea8f9e5e56ce28594c5d463a379 SHA256 852feba8c6a46a4121d862590cdc232ffa74f68e35c19c2c0f3d76088641b65c
-DIST networkx-1.4.tar.gz 628239 RMD160 f5c497312d829b239ce4a2a29f07f4b5338e6e79 SHA1 a195ca0cc4ca94d2e07f91afe3b56641baccd61d SHA256 9b98190a7b454d0f2f9fc3d98630bd1e4b933181e08944d57d91d62f9c103b10
 DIST networkx-1.5.tar.gz 658607 RMD160 bd9b7fe662fab529560ac27e406e60d7b9529749 SHA1 f3971336903a8b8238c3b10c70554c288a002ab3 SHA256 3985f25e0bb830f5e3ab088bfd28ee46ed549105d845ee55fffc40d41940cedd
-EBUILD networkx-1.3.ebuild 948 RMD160 2871bd696a80bb2c6a780cc2060329b490551403 SHA1 692da8ffe4f722b1408f41f771f82d91d174db77 SHA256 81bf9b52481edf54a3c929b7153500d820286adab18aac68c05e5b14ad8a61d4
-EBUILD networkx-1.4.ebuild 936 RMD160 bfd7f4f90ec03e4956b24068a0aba9b40d7a854f SHA1 da36cf87882910f6cf0718cc4cde8a07b7c7b9ab SHA256 1c582212c940215edd7c78524db261c9b26c7d2786c626e3eb1d7d993bf086f3
+DIST networkx-1.6.tar.gz 707795 RMD160 95066c89565645bade07e520021d0249ce0955d8 SHA1 cf43e0033e2499f77afb21eb4ecce1a94e4a8273 SHA256 a2ee8399758e08bf7bc7910071474cdd92e364bbc22be1aa29bdfe0f26f7ba78
 EBUILD networkx-1.5.ebuild 1284 RMD160 7439cec4c95d6ccfe22b58901cae49d5815f7fec SHA1 5ea240224a811f781aef22250f6c8b849ef45ea3 SHA256 5115ef688370b507ad9102ef77d95e1da1afb4e97f67610105e7a8b3bf7a46cb
-MISC ChangeLog 2092 RMD160 44c39c2a1ca66c98d9e57708f52d5f06ccab44ae SHA1 70ba5203b46a15f16cf68f2c12c9a78ec6fac0e0 SHA256 1ed2c3b6fbd01948d467274a21d2210d8e69e0ca19f0b9058737dfda89071460
+EBUILD networkx-1.6.ebuild 1289 RMD160 51f6fc3842c237e0bec59b5e3d0f6235efee139f SHA1 4e6913612a2722a03be534d8dbe14c5cea11e4c1 SHA256 0455124f82aff615214e9b5381f2a7eafd15e145224a9360b7a6ddb538263bb6
+MISC ChangeLog 2281 RMD160 5ac1a82470e638ee9ec07e3c8cadf4b53a50335b SHA1 a25872c362bc0b2ed7d8396079b5896617e0e3cf SHA256 3a4d98168064ee63b39ed68c90391cd5ddd6e28808b7e3c8ed72af5209f29213
 MISC metadata.xml 841 RMD160 dae70ba81f3e473999ba6264dc2e0fc912c356a4 SHA1 72b8ec644ce7451c62afff557a16407907075073 SHA256 fe860e662a39de346362597cad729255eb99cabae42f122b308a6e62afadeed7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOrxKjAAoJEPqDWhW0r/LCnLwP/3lidMDwDGY4BjVjLUJnn4JS
-uty7FA9XI0OHiTHWgsslJ3T/iO7l2FzhnW2kCMkcTQzvU/dGdg47ywc0Nqymp+41
-Ud2OuUgX3MOlLJfJTcCISJIKgrUkS1OENwDgXikBopr9//vyUDWoRgrOCBDD3C2a
-fbX2kxl6HTRKVNlCKlDIAKbuscsX0uo+EaqghUyL5eyQ5s6fU6t8w0V94rjQdWnd
-fUgdM4xvPwf1ldvQmdraDCddfAFirA/OOToPN8DzhFdQ6YWqUhMjEdH6+C5s14vt
-c+ZqLUIneJTdhmYtaqt4HHwEv0TlJe8/Jwp0/kMvTxwpsBu3r8dk0RAdRliolGZy
-hmKI1ks0UgIYlQfLhw+UpGKt6S1ALtEDNCr5S+FiAbBrD7mjjAuDMkIlML1oUB6p
-6XT5JOHHdMHoXtKwp4KFDBXRQtTfEt48LMN41cNjBa5eteGHhs3zEPVk5XEaeNmQ
-YVgA7cC+ZlliBILImbmxdYNS0xdW5lGOcHThmBI6wrt3sly2YIrt193qor1Ih7WZ
-Qk8RaKhadADfow6sdhcs1DvTs2eK6prIXNV8pNZw3GpI8YtgPk9AO6okcg5appwh
-c6DYRF4LQFQQP0tLzYpztOjJ4Nfmb9mv+Oc3PClWZcUkUwfSUJn3Z5epUtrCobzP
-dzMyIP8CdhbuNW67t0P+
-=bGLu
+iEYEARECAAYFAk7sGPgACgkQ1ycZbhPLE2CdWgCfZmBdkkmisXAE45imaRPuyJS3
+QrgAnA6nJMTBSDBBlwU/IJFT6b+ybUkl
+=+Yut
 -----END PGP SIGNATURE-----
diff --git a/dev-python/networkx/networkx-1.3.ebuild b/dev-python/networkx/networkx-1.3.ebuild
deleted file mode 100644
index b44d010416ca..000000000000
--- a/dev-python/networkx/networkx-1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.3.ebuild,v 1.2 2010/11/10 18:17:24 grobian Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
-
-inherit distutils
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.lanl.gov http://pypi.python.org/pypi/networkx"
-SRC_URI="http://networkx.lanl.gov/download/networkx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="examples? (
-		dev-python/matplotlib
-		dev-python/pygraphviz
-		dev-python/pyparsing
-		dev-python/pyyaml
-		sci-libs/scipy
-	)"
-
-src_install() {
-	distutils_src_install
-	rm -f "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE}.txt
-	use examples || rm -r "${ED}"usr/share/doc/${PF}/examples
-}
diff --git a/dev-python/networkx/networkx-1.4.ebuild b/dev-python/networkx/networkx-1.6.ebuild
index 6d4cbabeb687..8fe36f8f2a74 100644
--- a/dev-python/networkx/networkx-1.4.ebuild
+++ b/dev-python/networkx/networkx-1.6.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.4.ebuild,v 1.1 2011/01/29 00:22:20 arfrever Exp $
+# $Header: 
+/var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.6.ebuild,v 1.2 2011/12/08 21:27:17 idella4 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5"
+#SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 
 inherit distutils
 
@@ -15,10 +16,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
-IUSE="examples"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc examples"
 
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools
+		doc? (
+			dev-python/matplotlib
+			dev-python/pygraphviz
+			dev-python/sphinx
+		)"
 RDEPEND="examples? (
 		dev-python/matplotlib
 		dev-python/pygraphviz
@@ -27,8 +33,19 @@ RDEPEND="examples? (
 		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
 	use examples || rm -r "${ED}"usr/share/doc/${PF}/examples
+	use doc && dohtml -r doc/build/html/*
 }