Fix python dependencies (bug #435462 by Alexander Zubkov).

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 36 insertions, 11 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 59753eb2e927..21ca157c4494 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.257 2012/09/25 18:54:58 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.258 2012/12/01 16:47:11 jer Exp $
+
+  01 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild:
+  Fix python dependencies (bug #435462 by Alexander Zubkov).
 
 *nmap-5.51.6 (25 Sep 2012)
 
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index c7bd24083ce7..053410623a31 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nmap-4.75-include.patch 476 SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca SHA512 0805756e9aa3843d2a9e0ae41d202101bacfd60ec2c0f5accde617eb17759701d16d3c0b91f613e7a42d994212334f136e17d3664926df145638fd0ac578bfdd WHIRLPOOL ab3ffa461cb15227707424c4213bb4152c990766f1e78146ec4389431602e26142cb15f01138cb8b67c5e9f9c58b24fac6c3e1ab6b72f5749511da353d3010cc
 AUX nmap-4.75-nolua.patch 364 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619 SHA512 df83711db7250d8debbb70867da3e066ba13edf9b304cc5c61824a5a0f968bff3057c0a29efffbfdd9a68871f0cca0e93f2f6051c907b8ae4242a07eada832fc WHIRLPOOL 40a56b9ebf2c99578d4fab7b20ba0379e8ef55c3c782f8c29f33e9dc302b669434dd21fa40e1e82ce0b1249080abcaa3ce95c2dc23db010f7bd87f3f1cf99f10
 AUX nmap-5.00-python.patch 1205 SHA256 0fe36a2e95a2f6c01967191fe68aac87b7f66f9185846f79de15728608d09f8e SHA512 ebd7ed7fc25682c4a2c5dd6f4736b1e8c0dde48bc47ab09240b8413892d65a5309d75821a221c0bbc831054a2caa5b78e97e62f41b75096be3d822ebf6da2fef WHIRLPOOL 842ae3b99b1d3d2ee81aa0c7746fa5e64cb59f3aba8a4fa9f81214d49fb8c0152e281127f81692c682f0ad52741ab73e657fa675c1962f597d4b57d12b1b128c
@@ -20,6 +23,13 @@ EBUILD nmap-5.35.ebuild 1878 SHA256 52569140a07b39c67f4a8163391d304b3a859ab1fd43
 EBUILD nmap-5.51.6.ebuild 2511 SHA256 850b135e0e52d513380f4b5bad99fe2a1c1dc69ff4c048c4ae18883c696eca84 SHA512 b4d52d28ad6739512b693c527618f6ee0bc0ee6cbce2883ae2ce08239ceb09bb7cd6317dfc9a0c6a222f305c3de4e3b6ce15c611f3a39292515badbae3758a01 WHIRLPOOL 374dae1d0398415bd37cc1506b7a9a84a951f0ec10bf948427f494c7b0fdaeabbc23cc970633726a0a8ab3344d68066e04b101896dde3f4b8fdccc6024d9ce20
 EBUILD nmap-5.51.ebuild 2312 SHA256 8ed9723767076f6e5cc5a8290fdcb3d4ffe68361ddbf9b3c60dd94b4d2df204b SHA512 286c6f5367e34107d5273a8aa0bbad62666a43e97ff3a76a8227b539df8fe0ed9f6ac8de2b8422ce9f2291ec31c242bb0d7927dde462070464be02a7eedc794f WHIRLPOOL 2eedff89970dbe4ff9da4b8ec04be84b4a2961e246ac87bba22669977f3226755d5cd77a0961219a11ffd1bbba94819295c3a6d9b012458cc44b09f9831a794f
 EBUILD nmap-6.00.ebuild 1926 SHA256 67de5181a2d6f2176c0072c5ff8c35b2848555d69ee81438c1fd730978269b43 SHA512 751ad3017869c1425e7d5e85ac2ceaff81ff62fd88f5b0ca1c907b839181ffed640645e4418e6c5a5cac0ae811961a73de2989c04f2e0eb7e6a386190f6c471c WHIRLPOOL 64712da501a31edfa826aba60afc1b6336153b1ff3756c053e837f48d2ec7b4536f29d49ef12fa0668dea94f7d5e9097fdbc023375200f7082f2b163cb81bd20
-EBUILD nmap-6.01.ebuild 2693 SHA256 6457c05d9a54a543e5842e00cd743082c386314649821c33faa2b440d8d5af14 SHA512 f40b010e929e094ad641995aa77f8f8b8c543493aa3325d50792eaa94ce219aad652598b899f5f476af3e3334f4c39f4c4328c128677ca5e39a6a7ef90d1056b WHIRLPOOL 736b1aee603f58d0f5beb28e312b09f6881becc37e5804094e1064c8f6527fd01d0f7724f455558940150f8b9609e440f94ec81af69c00690ee39f1f65405785
-MISC ChangeLog 31646 SHA256 dfc465f3d255d90defb1d679ca08e7f2730c119e949872811b1e42f74c891ca5 SHA512 fc0b3ddab5f45409810aac024ca2848ad3327b1ea5e9c1ffe92c1ba363fdc4f7f8525a0e5eca7285d907395f761e56988b29bf9b3d5c78b94afb7589678bdf69 WHIRLPOOL 0b2a1845edfa5bed9df92bcbdda3d973d0f32b2e5093214d314ded77e500163a7f830893a5d769688a11de61d3b609cd47f3ae38bec9649956c029f606800635
+EBUILD nmap-6.01.ebuild 2768 SHA256 1062b516de5f6d95a2d69fece8c56409486079b68866f14761e9723904349458 SHA512 748c8250cf78fa9e664e9757866574e061f9c5221e2b5a5a0b844c5b10cf8a531c4422548de29f171c348b156eac34d034d3350ab2f51e9cd5adfceb0a3c1a77 WHIRLPOOL 239108a1c125ef3acaa67ab184d440c3cc749a2ec3dd41a295910c09e0ef2d88af48ba6e73e4a11b85995364a1235725de2d95df5d2c0c4ac798101c08964ca4
+MISC ChangeLog 31768 SHA256 ba2d3f289b70aa0d79265ed0e89a75cdd1439001b9151428fc2585e2edf82cff SHA512 545db89714cc9f362a8bb5442f6d7df82c909d73471e3c100b413d17d7b06273b224110cfe23ce97ec626d2fdc477cef3ac72207f309f43646d047e74331b4e2 WHIRLPOOL 56ff07da285d10032afe995ddbfceec888346d26bd9c697025dba95a2ec6a28c81b1348b28c596ed8de0814dbf84584fb020de916386fb01cc6ee92aef8cf5b0
 MISC metadata.xml 527 SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982 SHA512 7a0f0afdf604a997d8722f8b62b4829b980344b86a80faf346848abaab337e3b687f83ec1f1e1bca861619238466b1ce775deca538786721cdcba41d2166a77f WHIRLPOOL abc3f8636b57e7260916d96866b2c360e336077f0dc613339002ca86c4b78e59590c6b23beccdc47f9f5e282ad23ec330e5f6ec46a1da72cf9c9bd2d6fbe5450
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC6NJEACgkQVWmRsqeSphNgoQCeNdQAq3BGgISYWdVfY7vvxX1h
+NU4An0FHJCtC1iTZ7lW85teMaZzK/wGa
+=35Pi
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
index 01ff0bc912c5..5615905825f5 100644
--- a/net-analyzer/nmap/nmap-6.01.ebuild
+++ b/net-analyzer/nmap/nmap-6.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.3 2012/09/23 09:14:51 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.4 2012/12/01 16:47:11 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -18,16 +18,28 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="gtk lua ncat ndiff nmap-update nping ssl"
 
-DEPEND="dev-libs/libpcre
-	net-libs/libpcap[ipv6]
+NMAP_PYTHON_DEPEND="
+|| (
+	dev-lang/python:2.7[sqlite]
+	dev-lang/python:2.6[sqlite]
+	dev-lang/python:2.5[sqlite]
+	dev-python/pysqlite:2
+)
+"
+DEPEND="
 	dev-libs/apr
-	gtk? ( >=x11-libs/gtk+-2.6:2
-		   >=dev-python/pygtk-2.6
-		   || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
-		 )
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6]
+	gtk? (
+		>=x11-libs/gtk+-2.6:2
+		>=dev-python/pygtk-2.6
+		${NMAP_PYTHON_DEPEND}
+	)
 	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	ndiff? ( ${NMAP_PYTHON_DEPEND} )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl )
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"