Add a dep on Python 2 (bug #311157).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 8244a20b44ca6c81c35d37488e15a8e1c4f2ab8b..1c72c9b99c5821d4c7c0c2990df8e83284a84946 100644 (file)
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.221 2010/03/25 19:37:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.222 2010/04/03 15:58:59 spock Exp $
+
+  03 Apr 2010; Michał Januszewski <spock@gentoo.org> nmap-5.21.ebuild:
+  Add a dep on Python 2 (bug #311157).
 
   25 Mar 2010; Michał Januszewski <spock@gentoo.org> nmap-5.20.ebuild:
   Fix bug #308723.

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index afdb1f8b9ea10fcbfa856e1433a8ce1997462cd4..84f58a96a50f6495a85efc99459c39b525fb36cb 100644 (file)
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -22,13 +22,13 @@ EBUILD nmap-5.00-r2.ebuild 1484 RMD160 852ef37ef74988cd3b98eb62d47086577deb7192
 EBUILD nmap-5.00.ebuild 1566 RMD160 25216ab94dabeede619569e4110c19710c9116dc SHA1 88f3725e6a4472fe5e7bea493067e4281af87e40 SHA256 879897c9f604e4895f50dc21c6b6a7570652bbb551bb4702379a855b625f3212
 EBUILD nmap-5.10_beta1.ebuild 1533 RMD160 131d53ea0981f81b084d5cde72a4cec3a5f33952 SHA1 c3a01d832411288b50bbfbb88c0ca58b7b55c7d7 SHA256 ab9281463b95d9fcef8eec13ef582089f0d65bdcf020b1bde54a6643634242ad
 EBUILD nmap-5.20.ebuild 1632 RMD160 f71a5583f22bbf59a4731f4983f22fc671269cf6 SHA1 fee264defa95832066f5dadc36bcbaec2e14225a SHA256 207162594e57bb7c2263b33f7def4fe11f476e308f422023fa244e64c3f256e9
-EBUILD nmap-5.21.ebuild 1585 RMD160 365f47f191622c877fcb48d78a5533c9cb5d3b03 SHA1 94cb1ff3f69fc1299f9079ffcfdeb32964ac154b SHA256 d7b15517c8632053e31ba7f3d2816ef682d73ab15595de5862e0513689f9bf7a
-MISC ChangeLog 26899 RMD160 d5ab37a88745233531ca38c775a6401aa9a605af SHA1 5ed1b681cfb31313b157b8d9bf5df35e7b913ffa SHA256 0e78c78ac3ec662571232c6403b068fab0b63bbe9da42bc3f62f250ed65181fe
+EBUILD nmap-5.21.ebuild 1655 RMD160 04bd1b917e64f138eca8fecee6c0ece16a668fdb SHA1 7976d3d8e0af2dd89cba76e96f136bab5433cb39 SHA256 3fd040d494a64f86c658e9808da8cc23ca39f96f71d606e2271aa8006ed79999
+MISC ChangeLog 27011 RMD160 bf46b56305ccc6d2e300aabe294068c96bc47e69 SHA1 6ac88dbd8c997c9dcd65260b2596dc38fb4a6940 SHA256 47228ae740f35768a88545fc181709707a646c81463e10c61d58fac1589736f3
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuruxcACgkQchej4aZK9/fIuQCeO9XFgWNc6mmeJbllzlSrVZyh
-KN4AnRtRvjomK9stqi4Bf2T2qaubp3Gw
-=bQcl
+iEYEARECAAYFAku3ZckACgkQchej4aZK9/deygCfeXkf5Ror2F7cFbb3T6WtYnMZ
+SQ0An00lIGp8uDCeiRr1XEXWMglo77Xk
+=nOqT
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/nmap/nmap-5.21.ebuild b/net-analyzer/nmap/nmap-5.21.ebuild
index d3d252139f1eb9a9d7dd91271d883d8cf995223b..b2cfbdf33a0362ba40c14b217761458f10b89ab9 100644 (file)
--- a/net-analyzer/nmap/nmap-5.21.ebuild
+++ b/net-analyzer/nmap/nmap-5.21.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21.ebuild,v 1.5 2010/03/21 14:41:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.21.ebuild,v 1.6 2010/04/03 15:58:59 spock Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2"
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic python
 
 MY_P=${P/_beta/BETA}
 
@@ -29,6 +30,10 @@ DEPEND="dev-libs/libpcre
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_prepare() {
        epatch "${FILESDIR}/${PN}-4.75-include.patch"
        epatch "${FILESDIR}/${PN}-4.75-nolua.patch"