Use slot deps for gtk+ and explicitly set RDEPEND.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

4 files changed, 16 insertions, 9 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 9a6b243a0c8b..051132c30b0c 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.240 2011/02/13 23:17:49 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.241 2011/03/28 21:02:05 radhermit Exp $
+
+  28 Mar 2011; Tim Harder <radhermit@gentoo.org> nmap-5.21-r1.ebuild,
+  nmap-5.35.ebuild, nmap-5.51.ebuild:
+  Use slot deps for gtk+ and explicitly set RDEPEND.
 
 *nmap-5.51 (13 Feb 2011)
 
diff --git a/net-analyzer/nmap/nmap-5.21-r1.ebuild b/net-analyzer/nmap/nmap-5.21-r1.ebuild
index df296a2be60f..a92f7cb3c771 100644
--- a/net-analyzer/nmap/nmap-5.21-r1.ebuild
+++ b/net-analyzer/nmap/nmap-5.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21-r1.ebuild,v 1.9 2010/11/15 16:34:32 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21-r1.ebuild,v 1.10 2011/03/28 21:02:05 radhermit Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,12 +20,13 @@ IUSE="gtk lua ssl"
 
 DEPEND="dev-libs/libpcre
 	net-libs/libpcap
-	gtk? ( >=x11-libs/gtk+-2.6
+	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 )
 		 )
 	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
 	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-analyzer/nmap/nmap-5.35.ebuild b/net-analyzer/nmap/nmap-5.35.ebuild
index b83fe97ffc09..d68d6ed2929b 100644
--- a/net-analyzer/nmap/nmap-5.35.ebuild
+++ b/net-analyzer/nmap/nmap-5.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.35.ebuild,v 1.2 2010/11/15 16:34:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.35.ebuild,v 1.3 2011/03/28 21:02:05 radhermit Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -21,12 +21,13 @@ IUSE="gtk lua ssl"
 
 DEPEND="dev-libs/libpcre
 	net-libs/libpcap
-	gtk? ( >=x11-libs/gtk+-2.6
+	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 )
 		 )
 	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
 	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-analyzer/nmap/nmap-5.51.ebuild b/net-analyzer/nmap/nmap-5.51.ebuild
index dbf69902dad7..6677ef095f1b 100644
--- a/net-analyzer/nmap/nmap-5.51.ebuild
+++ b/net-analyzer/nmap/nmap-5.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.51.ebuild,v 1.1 2011/02/13 23:17:49 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.51.ebuild,v 1.2 2011/03/28 21:02:05 radhermit Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,12 +20,13 @@ IUSE="gtk lua ssl"
 
 DEPEND="dev-libs/libpcre
 	net-libs/libpcap
-	gtk? ( >=x11-libs/gtk+-2.6
+	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 )
 		 )
 	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
 	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"