Replace virtual/pyparsing dep with dev-python/pyparsing. The split versions were removed and all in-tree versions support all impls now.

Package-Manager: portage-2.2.3/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 38 insertions, 11 deletions

diff --git a/dev-python/networkx/ChangeLog b/dev-python/networkx/ChangeLog
index fbd8b0c8a563..4a4e917890a3 100644
--- a/dev-python/networkx/ChangeLog
+++ b/dev-python/networkx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/networkx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.21 2013/09/02 06:43:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/ChangeLog,v 1.22 2013/09/12 22:29:20 mgorny Exp $
+
+  12 Sep 2013; Michał Górny <mgorny@gentoo.org> networkx-1.6-r1.ebuild,
+  networkx-1.7-r2.ebuild, networkx-1.8.1.ebuild:
+  Replace virtual/pyparsing dep with dev-python/pyparsing. The split versions
+  were removed and all in-tree versions support all impls now.
 
 *networkx-1.8.1 (02 Sep 2013)
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 49db4612d03f..12d1035174aa 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
 DIST networkx-1.8.1.tar.gz 806766 SHA256 b75ba675fd2831f60e3f5a028822a8f7b9993877854599e9694196f8b2f88233 SHA512 89372a1c33fd1a87221f68211490f922df62225b4716d88356cf7c9861a63a77217eb395918bf6907b50115bce1fe94e196eb60cacd534ee126ed5e738c43814 WHIRLPOOL f39a8231e3b01a26517b188c094e10d67410cdcb3e93932705c09175513318ddea1ac19d2cde24b7677a47a3baaa0db559970648a38fa907bd349b6f28bbd612
-EBUILD networkx-1.6-r1.ebuild 1567 SHA256 1f9b61b6de07d2b5ead36a19d71eb7fb168e16288179b62be412e309f0beb04b SHA512 6ac5e963572f1a48b96808b9e7ffd1a5110473c2efc3a9d4645cc4bbf85ce1466b1e4fa48f77dec0b14424b9c858017d8addd5f4456e20965bfc01c07e60747e WHIRLPOOL 4a4217ee8704524015a3b3781c81dfdd68d229eb854d90a345064a25f40167491ffe8d0a654d6b284d36ba4caef29e5b44c514680f7195d89bd2fa50498577ef
-EBUILD networkx-1.7-r2.ebuild 1519 SHA256 76b201a74db293ebcc67034103c6c6da044f9187718c045051ac2cb1f7715614 SHA512 8bac688772107d974c6190049ce279cdec4a457800a918a275f5a198ac316399ab10b1c76ec879c3c5d01d8a10b5dfff17a59f70c6a2fcd2da55545a2ac31bc6 WHIRLPOOL 96b2dd1c6526a803bc2e3e5ca78d634fae5fcce1e33cebc37582fa7a9af836a7f0ece1d7f0c79a37d1333a55d700c2ec5ec3c76d2e88623c252c74717a33c55e
-EBUILD networkx-1.8.1.ebuild 1519 SHA256 0f9e4638c41fdb58d5deee2598b9cfb00c915f70bb35bda463f4710d85c7ae03 SHA512 32ae24d1366e515876f211cc2afa61e98422ef20b42fb51c471c4997f06d4604c88b5573d39f67677cae321006f6241c1474cb70e0493182ba59fdba4b259020 WHIRLPOOL 296a5b7a390b53a1de98baf6195053e0528b88139f1c3ed76294567795ff20c85bd5b8a8e9cb4a3846afbf4c9846529162e88ef6b35d2ba37c6025c0cd113477
-MISC ChangeLog 3483 SHA256 8366fa558e019eea7510992ec6479b99051511cfe4b19528ca0328a9caa50160 SHA512 ee14c6e783265852a36136b89f9173e09f6c5b552609c82045aa99ac5014ce1d8e72452f0d974928adfb5d49cce62da1d92f7c484e6e1731c05c2bc73c015629 WHIRLPOOL ef1bba3940aac28106c1b8330eea3b932778227adee6d4f09ccb867168bab4a32baa4ef95b42b53d44f99be088e3ff7262d3cb6d2b715e2a343044a24bb3a19b
+EBUILD networkx-1.6-r1.ebuild 1570 SHA256 8046e0dfea7ca64c8d7497ff9535b0af335706e928b88b5366376038e231b2ca SHA512 31d1295e504876361f56b1611363e97f83902c6e27282e2ac74bc08423ea31a710a900755dd018c2ffd20bf7875810f055e2792314c51fb23867d0aefea1b890 WHIRLPOOL b8da7de8ad496398c90a40cc3a41ef3417cba5e4ddf62d3aefac023f5aaf910ff577472c35f4113724593558dca4645ab93a982f6c86ffb619151bfa862aa2b3
+EBUILD networkx-1.7-r2.ebuild 1522 SHA256 0a6ea73baf82bcb16af97bb31e4f95fcc6c88811a75fda316aeb21acafe34ae3 SHA512 635a8c0f64327948873e0f3cf0d00bcb9c0b6c1079479266542ea0353c77d35ecfdf7a7043547a944ec46d4e5cd39e1b043c3b6dd239b1851eac378791c792f3 WHIRLPOOL b42a6d3f1d8172e76d7640b749cee382a7f4c017a00a46d03509e410a9326fab3bd7209a7b80889d90d7b392c512ebe13acce74f749a8533f86b93b22b4c9d29
+EBUILD networkx-1.8.1.ebuild 1521 SHA256 7f89a20ee6936c135f932ee2a19af16ec34e47769d3c2f7e1f9e7ffa3e40731c SHA512 5bb383e0935a44bcb20627442941a0086753f174cddfaf5e08df86d11b3093e9e698a1b83b1e686b2b1653cddcde4c8487126e68969c81867f3c1c7ed973dce7 WHIRLPOOL cdf881643b9d5d9468f182aeec74b3056b2c44a30d0dd247d63c76165d0fd617908f83d9183d6483bbf82a36b438cbce5f758f5661a32768faba10e6d39f0992
+MISC ChangeLog 3747 SHA256 94bb0562d234721d8be9a64a16fd839d3ba24a6c3e6f532a150b7cc314d81e38 SHA512 c0a467005a96ca73c5e0e74541ba952278b85a5f289fe567a0323568a71395a03fcdd4802f6b44a628d98c632856af36b58c76531202ed8ef357551b0856832d WHIRLPOOL be968b12abcf5a1cfaf184511fa051eac47871851453843c591e27507b1115c0ab9cd75d5cefc6f4f8794b65f4bfac2d152dddf6d7702cd703a131a9b7d63a21
 MISC metadata.xml 914 SHA256 60cf9f3765f01c01099d1dbd7e1b737cb88473b9a78edf887cbc1c8c6bbd873d SHA512 9dbdb65428cdc8155769853cb742f1ed06565040143230be03e11b530fc6319269eea8615e37eae915abb04a333af3efff0a718eeb25ef76646c0719ff709fbd WHIRLPOOL 38611650ecf66f31a0aa324d8d1562da2b98bbb1e13037bce5ddd1598c6e269162498c6256d1191741d5ab319762a9d4da092e8687de40e0f5bc372c2c5fd1b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQJ8BAEBCABmBQJSMkBjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcTQP/jynqPFyquHGQH1DTF4ZKHnX
+iGXQdbRoVTLCc/D1Z8uA+gR2RYtnJluw3/wPbzczdxW4DubwF9Si1sPCSOOvGq9G
+n5RWRN+thSu8lweeqmnxqLtB/9v4c48jxGqfsqNqXrasPX/dSITr4Qi2SFpayx94
+QCTBM0M2r0JDCFvVq7cKb3NqVKHUrM2/NGKEM+YKKxDPaDMtcIssD0ApbUaO1T1A
+tjJpZH0Y3GPJVP/oDfhfzWmYL4KtawjaeBl/dneehXxWyxRRqJNulJGAuTx2GD/E
+/w9aiLsTGGmsPSze8o2wo9efaphbOtd6InQio2Tv1rucUdhjEtS18DJ+jpEuJIsz
+evP12rqnrIXchAAmXR0CUOBX6QdKSpxx+eYEHElloD/BRddjh0I7z5nvi5IGaCSz
+GfFTl7PThMJy8UQMnfGQiD9R2iZQewCYOrg1szKXhSB9QrCoHO9cmbLGfbIim9pu
+mZO22M02/AAAZ1/1Zb90Zbu9AAHxr1b8sSCeOWkdkIJhveKdwPcFyxuLqz1RP/Hy
+UM7LV6hPx4/mNu1XdjFp/yMQ2D/j5xP35+xDAHhP41rzFUQCCjYtoc2mdWD8c9Rc
++ooEsjXhsZGkbo/y9gJoBWuTBjk3DC/67RodaFuUfA1Hws5NBltZLFx3O/T1fXbC
+9xKUILcU6YrwBxO4K0nY
+=84GB
+-----END PGP SIGNATURE-----
diff --git a/dev-python/networkx/networkx-1.6-r1.ebuild b/dev-python/networkx/networkx-1.6-r1.ebuild
index 68edca151930..b7e2efca92e6 100644
--- a/dev-python/networkx/networkx-1.6-r1.ebuild
+++ b/dev-python/networkx/networkx-1.6-r1.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/networkx/networkx-1.6-r1.ebuild,v 1.1 2013/08/18 10:42:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.6-r1.ebuild,v 1.2 2013/09/12 22:29:20 mgorny Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ RDEPEND="
 	examples? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		virtual/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/networkx/networkx-1.7-r2.ebuild b/dev-python/networkx/networkx-1.7-r2.ebuild
index e34cea08845e..33d4038ce7d0 100644
--- a/dev-python/networkx/networkx-1.7-r2.ebuild
+++ b/dev-python/networkx/networkx-1.7-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/networkx/networkx-1.7-r2.ebuild,v 1.3 2013/08/18 10:38:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.7-r2.ebuild,v 1.4 2013/09/12 22:29:20 mgorny Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ RDEPEND="
 	examples? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		virtual/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/networkx/networkx-1.8.1.ebuild b/dev-python/networkx/networkx-1.8.1.ebuild
index b6e066151b0e..45979aae7326 100644
--- a/dev-python/networkx/networkx-1.8.1.ebuild
+++ b/dev-python/networkx/networkx-1.8.1.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/networkx/networkx-1.8.1.ebuild,v 1.1 2013/09/02 06:43:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.8.1.ebuild,v 1.2 2013/09/12 22:29:20 mgorny Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ RDEPEND="
 	examples? (
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/pygraphviz[${PYTHON_USEDEP}]
-		virtual/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		sci-libs/scipy[${PYTHON_USEDEP}]
 	)"