summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-01-31 02:31:23 +0000
committerJeroen Roovers <jer@gentoo.org>2013-01-31 02:31:23 +0000
commitcf40cc8785b1507d1f28057ea112649ea6f740bc (patch)
tree7b5eabb610da70279e0304431a31add39592c6e6 /net-analyzer/nmap
parentFix compile issues, thanks to Diego Elio Petteno and Pacho Ramos in bug #428550 (diff)
downloadhistorical-cf40cc8785b1507d1f28057ea112649ea6f740bc.tar.gz
historical-cf40cc8785b1507d1f28057ea112649ea6f740bc.tar.bz2
historical-cf40cc8785b1507d1f28057ea112649ea6f740bc.zip
Bring back USE=ipv6.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer/nmap')
-rw-r--r--net-analyzer/nmap/ChangeLog5
-rw-r--r--net-analyzer/nmap/Manifest10
-rw-r--r--net-analyzer/nmap/nmap-6.25.ebuild9
3 files changed, 14 insertions, 10 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 1558b12a9bab..ec148dc6b373 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,9 @@
# 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.284 2013/01/26 18:18:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.285 2013/01/31 02:31:21 jer Exp $
+
+ 31 Jan 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.25.ebuild:
+ Bring back USE=ipv6.
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 fe68966422bb..d1ef3e225253 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -14,13 +14,13 @@ DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebca
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 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
+EBUILD nmap-6.25.ebuild 3547 SHA256 c63b9d45fc91158db19f19ed44e49565d924d14d8be11e578810886760e4ee3f SHA512 dfd2168ff9ae4c618b030a236c1735486e1cc60ed2aace14f86cfcf73659f1b0b46e5b1c342b08d8f9b1eac1a50937ae3de9890125504e076a9e773962f590c4 WHIRLPOOL dd6084a4dd47b0e260b13d676d0591bdca51e25ddb4c099d82a5808432b5946798d7a2ed2f33c241755ec091db72c3f7f0b7ad95280d48c6463c83f5c682c6b1
+MISC ChangeLog 35397 SHA256 3dc5fc243512c439d5651f7285edaecd82b60e8f17acdbe10dc190547946cdff SHA512 4870513d5db3e2c778d724906d90ca28a45d7a7d3acd494b4b835a8bda1737173ebeb568b25e035645dfba27d19e5618c7d919cbbddd835a4c3d050dcfcbd870 WHIRLPOOL ea67bb6280e811a43c3db9e30ecf45ae534f8af54a9a8aeee069b3b318c9d965175bdf009c05c6707be440b696304d4792d22eb80b8883c15b43e408f211b69d
MISC metadata.xml 574 SHA256 e6e3cf0019fc9c4d17536fef3c1b5a5fcb1beeab750471eb02a1e3489df76a48 SHA512 c5fa120f3d8791b13981e8480e9ccdc6425fafe69bd30d4cbb8d81f55ffdea62fe3b7cb3024b4dc731a75a23221de255d80f1edbecd73badc22008966d2ebf3a WHIRLPOOL 766163e0f94f8596c4d800ab7a0dd19a1602da0e9b4ac0d452a9e6216c9efc7041204e1e4c912997257101225ae6be471eb1c7023f54d8e6a9da491065d3ae0c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlEEHd0ACgkQVWmRsqeSphOpAwCdH3rkrlfRLZ5yIDXmBo8Hp/WD
-nIcAnAsIfq/JFApAaVSVWtv5PSrXfc/i
-=fxpq
+iEYEAREIAAYFAlEJ13sACgkQVWmRsqeSphNxRgCZAZdaeriQaFgD3SuO7rW2Z8kd
+j1oAn2tMH04ivTiuKyWVRsRGIAKolmvU
+=rkqp
-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index 90a04ae92e61..7ae24762e36b 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.13 2013/01/26 18:18:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.14 2013/01/31 02:31:21 jer Exp $
EAPI="4"
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
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 nls nmap-update nping ssl"
+IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
for lingua in ${NMAP_LINGUAS}; do
IUSE+=" linguas_${lingua}"
@@ -36,7 +36,7 @@ NMAP_PYTHON_DEPEND="
RDEPEND="
dev-libs/apr
dev-libs/libpcre
- net-libs/libpcap
+ net-libs/libpcap[ipv6=]
gtk? (
>=x11-libs/gtk+-2.6:2
>=dev-python/pygtk-2.6
@@ -111,11 +111,12 @@ src_configure() {
# The bundled libdnet is incompatible with the version available in the
# tree, so we cannot use the system library here.
econf \
+ $(use_enable ipv6) \
+ $(use_enable nls) \
$(use_with gtk zenmap) \
$(use_with lua liblua) \
$(use_with ncat) \
$(use_with ndiff) \
- $(use_enable nls) \
$(use_with nmap-update) \
$(use_with nping) \
$(use_with ssl openssl) \