diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-01-26 18:18:06 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-01-26 18:18:06 +0000 |
| commit | 17a1849a981b531d66933e60f517d726b262a5d7 (patch) | |
| tree | ef94d15ec6d961122be22481a229ad58e8206545 | |
| parent | Enable UCLIBC_SUPPORT_AI_ADDRCONFIG support #452448 by Richard Yao. Add dup3... (diff) | |
| download | historical-17a1849a981b531d66933e60f517d726b262a5d7.tar.gz historical-17a1849a981b531d66933e60f517d726b262a5d7.tar.bz2 historical-17a1849a981b531d66933e60f517d726b262a5d7.zip | |
Run python_set_active_version conditionally.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/nmap/Manifest | 12 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.01.ebuild | 6 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.25.ebuild | 6 |
4 files changed, 19 insertions, 11 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 3b56b55f3127..1558b12a9bab 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.283 2013/01/26 17:19:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.284 2013/01/26 18:18:04 jer Exp $ + + 26 Jan 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild, + nmap-6.25.ebuild: + Run python_set_active_version conditionally. 26 Jan 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild, nmap-6.25.ebuild: diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index f6dd96ea8b8b..fe68966422bb 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -13,14 +13,14 @@ AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d76 DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a SHA512 0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9 WHIRLPOOL 24b125997c8ae5b7a514a6bcc5780b9a8aec8516e19616b0890fd34c8b7b182d04142e012c981a0e125468a4ee49ea7b13416f79031ede346846e59b08919dfd DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313 -EBUILD nmap-6.01.ebuild 2689 SHA256 035af5c2b5baea6950f9b144f61ae807e3f68e62755477c7509da727abf0ad6e SHA512 ef79e5bbd2b62bf1d42d9f65db592fd44a4f4f048f198c750adf822013d9615b71cbf10e960de4ad6e20c6ca18ca456833a31ff1bfc287c1fb6958529c27dc5f WHIRLPOOL a104fffcc575af7880f0dc80bc0d3cf579173fdd2b68380fc7a1f6207c6b9c9e08b023691fc311ecde09ee7366b4590341111b8b148ff9edf23f68ae1ed400a6 -EBUILD nmap-6.25.ebuild 3476 SHA256 89876a80482d268e2070472f0206b638756ea746b0b5a869ed1daa25249407ae SHA512 dc5b76abf1c0d6a0fa741090cef00834154b2925fd1c74f509e8fb6c6242317d0135580b3d16edccdbaa5ae95df687ec6caa91a2b793bebb5899a22e1e78ad21 WHIRLPOOL 6d42229c38a31da451eb63c6b61a796b9a04ae0f1a2a8d02f101f0037008705a64fbc7f9dde51228e9ed8ff6af9e0f150b49a5f5cf0e14fa2fa140c5da688013 -MISC ChangeLog 35175 SHA256 f42033d0042b062bd5b63cb6346c99bfa9e86bd7d5dd2f8987dbc926203982c2 SHA512 d1900338875678173a8ba7174b5492f278807965337e67cb408765ac1814deb29ff7ac125df7da907a3eba092cae5d142b469d0f7619d9839262bb4e42f6105c WHIRLPOOL 048d04182f8fb767cf008b68fba8d27982db90436214b1e4c029b5b670eccfefbaaaffdc2c8dcd650c68fc44c946d274de433e0c69402d35c97449cd96b718b7 +EBUILD nmap-6.01.ebuild 2725 SHA256 d6744cae353c9569722aa1621d57e889b5c31cf4549b02f787507bf81d5cb138 SHA512 f081af9e8a34b05479cac9e3b93b385b3d48145cd126d3b47e3b5a11f92fa13452dc2469f33ba2223211e0f58b3976b8e0a150d685a3f73610016ded9322d3ae WHIRLPOOL 5a60103d940949e66fd228b222633f3ee7abd4dd32d55e04d6bb295452e13821356c3a490c3334ec6c1de7024ac06d695fcc898d3d182a58a9e8b0b32ee008e7 +EBUILD nmap-6.25.ebuild 3512 SHA256 9977cad10a4be0356ba1653e0cad9c83375d80b97f69b602ca24463d95d74f20 SHA512 17837cae8fbf3fccbffc1ab9af526b3e8ce3d4ff76f42564d8041922a6218bbbe2f398993ed3e4fc143f8512a0aaaabe6b3c494186fe4c56fbfe9409b17f3c2a WHIRLPOOL f2f3b6a521a917bc7abfce91f15150d2a2d228c8265dfd626c29a3e53d6eda36973a7111799e584b6a3b685d85bc250eb2b2f9f5680dcab78e6d76aeb0f2ace7 +MISC ChangeLog 35308 SHA256 f31fab3c49ad0c118bd366834a2725993fa452d3f454c74e1f82fda37f073ee1 SHA512 4ce54b108499970eda27ffaa3de188e53a565040c0682d2b13fb479679d647c7f5d9ff26e5d2b27741063cf9a2dd88d3c9601e7f9b73224b0a24d4b902fb3c8e WHIRLPOOL 55bbaaa78e894314b7a459362316274d89bf5a23ce00dad5ec290b31fd8d705553ed6035139edb85baf65c440a7fdffdcba8763e4041829d1fab3ef1c3c0edd7 MISC metadata.xml 574 SHA256 e6e3cf0019fc9c4d17536fef3c1b5a5fcb1beeab750471eb02a1e3489df76a48 SHA512 c5fa120f3d8791b13981e8480e9ccdc6425fafe69bd30d4cbb8d81f55ffdea62fe3b7cb3024b4dc731a75a23221de255d80f1edbecd73badc22008966d2ebf3a WHIRLPOOL 766163e0f94f8596c4d800ab7a0dd19a1602da0e9b4ac0d452a9e6216c9efc7041204e1e4c912997257101225ae6be471eb1c7023f54d8e6a9da491065d3ae0c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEEEBQACgkQVWmRsqeSphParwCeNOWpmVgO58rEOn/MBujUmkXQ -L5UAn01Saj5zHriGoeQa7VaWwIsbMqfc -=/m9g +iEYEAREIAAYFAlEEHd0ACgkQVWmRsqeSphOpAwCdH3rkrlfRLZ5yIDXmBo8Hp/WD +nIcAnAsIfq/JFApAaVSVWtv5PSrXfc/i +=fxpq -----END PGP SIGNATURE----- diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild index 69446b701760..90d16e78940f 100644 --- a/net-analyzer/nmap/nmap-6.01.ebuild +++ b/net-analyzer/nmap/nmap-6.01.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/net-analyzer/nmap/nmap-6.01.ebuild,v 1.23 2013/01/26 17:19:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.24 2013/01/26 18:18:04 jer Exp $ EAPI="4" @@ -47,7 +47,9 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" pkg_setup() { - python_set_active_version 2 + if use gtk || use ndiff; then + python_set_active_version 2 + fi } src_unpack() { diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild index 8c91adb6acfb..90a04ae92e61 100644 --- a/net-analyzer/nmap/nmap-6.25.ebuild +++ b/net-analyzer/nmap/nmap-6.25.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/net-analyzer/nmap/nmap-6.25.ebuild,v 1.12 2013/01/26 17:19:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.13 2013/01/26 18:18:04 jer Exp $ EAPI="4" @@ -56,7 +56,9 @@ DEPEND=" S="${WORKDIR}/${MY_P}" pkg_setup() { - python_set_active_version 2 + if use gtk || use ndiff; then + python_set_active_version 2 + fi } src_unpack() { |