public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-24 12:50 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-12-24 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     eba0e3a0dd9ac6ffc9a1ceae51822d65145a0cfb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 12:50:00 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 12:50:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba0e3a0

net-analyzer/nmap: Make makefile.dep. Do not remove targets.

Package-Manager: portage-2.2.26

 net-analyzer/nmap/nmap-7.01.ebuild | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index 0022291..dd19efc 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -96,6 +96,11 @@ src_prepare() {
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
 
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
 	# Fix desktop files wrt bug #432714
 	sed -i \
 		-e '/^Encoding/d' \
@@ -126,6 +131,11 @@ src_configure() {
 }
 
 src_compile() {
+	local directory
+	for directory in . libnetutil ncat nmap-update nping nsock/src; do
+		emake -C "${directory}" makefile.dep
+	done
+
 	emake \
 		AR=$(tc-getAR) \
 		RANLIB=$(tc-getRANLIB)


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-09-01  9:04 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-09-01  9:04 UTC (permalink / raw
  To: gentoo-commits

commit:     16c922b4fd1d889ded3196b5aa37d6c9e511c8aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 07:41:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 09:04:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c922b4

net-analyzer/nmap: fix libpcre configure arg

Not going to touch the older ebuilds as they work fine for now.

Closes: https://bugs.gentoo.org/937837
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0fa4d25ff5fa..a93dbd521953 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 		# The bundled libdnet is incompatible with the version available in the
 		# tree, so we cannot use the system library here.
 		--with-libdnet=included
-		--with-pcre="${ESYSROOT}"/usr
+		--with-libpcre="${ESYSROOT}"/usr
 		--without-dpdk
 	)
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     add1150d7cea0c57c741ce57ca0c292b5b32bc91
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add1150d

net-analyzer/nmap: Stabilize 7.95 amd64, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index a16a9653997a..82218df92303 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     b4a6f62464cbf772ffe70ebc3944a7774d5fef66
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a6f624

net-analyzer/nmap: Stabilize 7.95 ppc64, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index 4036fc0387b0..ade7b3e5de69 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     02793706ea5dd944073a5abb2d411f001b7eb8b0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:18 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02793706

net-analyzer/nmap: Stabilize 7.95 arm64, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index 52eaf81a1a05..4036fc0387b0 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     045f6e55220b149bfeb8b73f1df535e902c44649
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:16 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045f6e55

net-analyzer/nmap: Stabilize 7.95 sparc, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index af4839aa63fa..52eaf81a1a05 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1de6012f978f891a5825d88ec847361a1f2315eb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:14 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de6012f

net-analyzer/nmap: Stabilize 7.95 arm, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index 0fa4d25ff5fa..151abb4025c9 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2d92919faf19d87846b83a62e645e68ad43e0ff1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:20 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d92919f

net-analyzer/nmap: Stabilize 7.95 x86, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index ade7b3e5de69..a16a9653997a 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-05-10 23:07 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-05-10 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6ec0e18954365f0b40b0cce1a17cf46f030ba001
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 23:07:15 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 10 23:07:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec0e189

net-analyzer/nmap: Stabilize 7.95 ppc, #931695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.95.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
index 151abb4025c9..af4839aa63fa 100644
--- a/net-analyzer/nmap/nmap-7.95.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -27,7 +27,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     cc3dd7eaf893d4e781757521570c516d957bf3e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:03 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3dd7ea

net-analyzer/nmap: Stabilize 7.94-r1 ppc, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 52851938ccf2..b81d359012f1 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     7ab44b7f9f5f46f8864ec8c1564b9916128c17d4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab44b7f

net-analyzer/nmap: Stabilize 7.94-r1 ppc64, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 9050bebb7efe..52851938ccf2 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     566601c24ca2278d08e1237969d028c486676c20
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:05 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566601c2

net-analyzer/nmap: Stabilize 7.94-r1 amd64, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 9211bf31763d..483564501d6c 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ac3ef35b28ace9cdcd53380d524c7ed74372b373
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3ef35b

net-analyzer/nmap: Stabilize 7.94-r1 sparc, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index c41acf8a5f9c..304ec31f2f31 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     a413f103e8c2d3dd2351b5865fabe6338cfefbc0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:08 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a413f103

net-analyzer/nmap: Stabilize 7.94-r1 arm, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 304ec31f2f31..b7291c14554c 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     35c742846f57f2fedf5eab06c391232d2dce793e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:06 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c74284

net-analyzer/nmap: Stabilize 7.94-r1 arm64, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index 483564501d6c..c41acf8a5f9c 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  6:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     839f009f78e3062846d915fabd5662a629015fef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 06:41:04 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 06:41:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839f009f

net-analyzer/nmap: Stabilize 7.94-r1 x86, #930960

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
index b81d359012f1..9211bf31763d 100644
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2024-04-30  4:38 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2024-04-30  4:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e96b131c7c5036490685986a33d4711e601e3385
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 04:36:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 04:38:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96b131c

net-analyzer/nmap: add 7.95

Closes: https://bugs.gentoo.org/916709
Closes: https://bugs.gentoo.org/927775
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest                         |  4 ++-
 .../nmap/{nmap-9999.ebuild => nmap-7.95.ebuild}    | 37 ++++++++++++++++------
 net-analyzer/nmap/nmap-9999.ebuild                 | 37 ++++++++++++++++------
 3 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 49124d2a35a6..633b02eaf585 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,6 @@
 DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
 DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
 DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec
-DIST nmap-7.95-patches.tar.xz 4144 BLAKE2B d2c6d1b811538ff21c5f4654562a2adaf216f3437c08d4b787892ca2d8b1500376eb7cc794357d0262bf18d23ffd5f356192ba48b6748dc8365cdc601fecdc9c SHA512 3bfc7ba506bc8623c2b62a7ef386621e1b066ed27d3ba1a6909b336c87c6894c9a972fd847ddf5278752c201e905af1deb71f91d264d82b17e3878fd4de1a2a2
+DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b SHA512 e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd
+DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c SHA512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e
+DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71 SHA512 ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild
similarity index 88%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.95.ebuild
index 043bcfa6f516..0fa4d25ff5fa 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.95.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
-inherit autotools lua-single plocale python-single-r1 toolchain-funcs
+inherit autotools distutils-r1 lua-single plocale toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -27,7 +30,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"
 
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
@@ -73,6 +76,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	zenmap? ( ${DISTUTILS_DEPS} )
 "
 
 if [[ ${PV} != *9999* ]] ; then
@@ -80,12 +84,10 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${WORKDIR}"/${PN}-7.95-patches
+	"${WORKDIR}"/${PN}-7.95-patches-2
 )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
-
 	use nse && lua-single_pkg_setup
 }
 
@@ -134,6 +136,8 @@ src_configure() {
 	export ac_cv_path_PYTHON="${PYTHON}"
 	export am_cv_pathless_PYTHON="${EPYTHON}"
 
+	python_setup
+
 	local myeconfargs=(
 		$(use_enable ipv6)
 		$(use_enable nls)
@@ -166,6 +170,17 @@ src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)"
+
+	if use zenmap ; then
+		cd zenmap || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	local -x PATH="${S}:${PATH}"
+
+	default
 }
 
 src_install() {
@@ -179,9 +194,13 @@ src_install() {
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
 
-	if use ndiff || use zenmap ; then
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
+
+	if use ndiff ; then
 		python_optimize
 	fi
 
-	use symlink && dosym /usr/bin/ncat /usr/bin/nc
+	if use zenmap ; then
+		distutils-r1_src_install
+	fi
 }

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 043bcfa6f516..0fa4d25ff5fa 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
-inherit autotools lua-single plocale python-single-r1 toolchain-funcs
+inherit autotools distutils-r1 lua-single plocale toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -27,7 +30,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz"
 
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
@@ -73,6 +76,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
+	zenmap? ( ${DISTUTILS_DEPS} )
 "
 
 if [[ ${PV} != *9999* ]] ; then
@@ -80,12 +84,10 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${WORKDIR}"/${PN}-7.95-patches
+	"${WORKDIR}"/${PN}-7.95-patches-2
 )
 
 pkg_setup() {
-	python-single-r1_pkg_setup
-
 	use nse && lua-single_pkg_setup
 }
 
@@ -134,6 +136,8 @@ src_configure() {
 	export ac_cv_path_PYTHON="${PYTHON}"
 	export am_cv_pathless_PYTHON="${EPYTHON}"
 
+	python_setup
+
 	local myeconfargs=(
 		$(use_enable ipv6)
 		$(use_enable nls)
@@ -166,6 +170,17 @@ src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)"
+
+	if use zenmap ; then
+		cd zenmap || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_test() {
+	local -x PATH="${S}:${PATH}"
+
+	default
 }
 
 src_install() {
@@ -179,9 +194,13 @@ src_install() {
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
 
-	if use ndiff || use zenmap ; then
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
+
+	if use ndiff ; then
 		python_optimize
 	fi
 
-	use symlink && dosym /usr/bin/ncat /usr/bin/nc
+	if use zenmap ; then
+		distutils-r1_src_install
+	fi
 }


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-07-06  5:59 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-07-06  5:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8aa9f0c823c3a569a512327be65cc9d039c89f32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 05:58:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 05:58:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa9f0c8

net-analyzer/nmap: port 9999 to libpcre2

Closes: https://bugs.gentoo.org/887081
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest         | 1 +
 net-analyzer/nmap/nmap-9999.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 05183fc01e09..5696ae9f2ec4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -5,3 +5,4 @@ DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e5
 DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
 DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
 DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec
+DIST nmap-7.95-patches.tar.xz 4144 BLAKE2B d2c6d1b811538ff21c5f4654562a2adaf216f3437c08d4b787892ca2d8b1500376eb7cc794357d0262bf18d23ffd5f356192ba48b6748dc8365cdc601fecdc9c SHA512 3bfc7ba506bc8623c2b62a7ef386621e1b066ed27d3ba1a6909b336c87c6894c9a972fd847ddf5278752c201e905af1deb71f91d264d82b17e3878fd4de1a2a2

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 246e6bb067d6..dd5c455a7461 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -27,7 +27,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz"
 
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
@@ -41,7 +41,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	dev-libs/liblinear:=
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	net-libs/libpcap
 	ndiff? ( ${PYTHON_DEPS} )
 	libssh2? (
@@ -80,7 +80,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${WORKDIR}"/${PN}-7.94-patches
+	"${WORKDIR}"/${PN}-7.95-patches
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1995ea4644af00f120970cc90018982594b76001
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1995ea46

net-analyzer/nmap: Stabilize 7.94 x86, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index dc608fe43f08..7cdb9f5b02a3 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     05b4fbec408fdef42e591d6ecb134b15054f36cc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b4fbec

net-analyzer/nmap: Stabilize 7.94 ppc64, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index 8a703fb68b54..dc608fe43f08 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     6df5e9ba9794b8f098398ce628807c42a199d4ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:14 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df5e9ba

net-analyzer/nmap: Stabilize 7.94 ppc, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index 629381122901..11c82c8402cc 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     fa66f07e58b91f00a069fe2a4ec98c5a7d4c40d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:12 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa66f07e

net-analyzer/nmap: Stabilize 7.94 sparc, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index 7cdb9f5b02a3..629381122901 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d5160eb64080799287c53839816e9b91aba02a29
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5160eb6

net-analyzer/nmap: Stabilize 7.94 arm, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index 81a8d12e3859..8a703fb68b54 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     d260abe4bc18a01fcaa6c46d3c5bda4d6e762886
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d260abe4

net-analyzer/nmap: Stabilize 7.94 arm64, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index 246e6bb067d6..6978def26374 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-06-25  7:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-06-25  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     312a735899344e15b1793ccb71f98f864d586c60
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:04:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:04:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312a7358

net-analyzer/nmap: Stabilize 7.94 amd64, #909138

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index 6978def26374..81a8d12e3859 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -24,7 +24,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-05-21 19:41 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-05-21 19:41 UTC (permalink / raw
  To: gentoo-commits

commit:     64620d3c640666e4e9a345d92babb5167b4e7692
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 19:41:25 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 21 19:41:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64620d3c

net-analyzer/nmap: fix live ebuild

Closes: https://bugs.gentoo.org/906903
Fixes: 77eba6f506b1f629034647c8b7debcba8d599a6a
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 7 +++++--
 net-analyzer/nmap/nmap-9999.ebuild | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index a12d68736f19..246e6bb067d6 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -22,12 +22,13 @@ else
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
+
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
 SLOT="0"
@@ -89,7 +90,9 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if use verify-sig ; then
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
 		# Needed for downloaded patch (which is unsigned, which is fine)
 		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
 	fi

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index a12d68736f19..246e6bb067d6 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -22,12 +22,13 @@ else
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
+
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
 SLOT="0"
@@ -89,7 +90,9 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if use verify-sig ; then
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+	elif use verify-sig ; then
 		# Needed for downloaded patch (which is unsigned, which is fine)
 		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
 	fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-05-21 19:35 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-05-21 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     2d14f7eae55af52cb3e811d6326d9820a3aa2faa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 19:18:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 21 19:35:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d14f7ea

net-analyzer/nmap: disable py3.9

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.94.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
index d1dbe307710b..a12d68736f19 100644
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
 inherit autotools lua-single plocale python-single-r1 toolchain-funcs

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index d1dbe307710b..a12d68736f19 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
 PLOCALE_BACKUP="en"
 inherit autotools lua-single plocale python-single-r1 toolchain-funcs


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-05-21 18:36 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-05-21 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     77eba6f506b1f629034647c8b7debcba8d599a6a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 18:33:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 21 18:35:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77eba6f5

net-analyzer/nmap: add 7.94

Bug: https://bugs.gentoo.org/906881
Closes: https://bugs.gentoo.org/702288
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest                         |  3 +++
 .../nmap/{nmap-9999.ebuild => nmap-7.94.ebuild}    | 23 +++++++++++-----------
 net-analyzer/nmap/nmap-9999.ebuild                 | 23 +++++++++++-----------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ba0eb83f06f4..05183fc01e09 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -2,3 +2,6 @@ DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
+DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
+DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
+DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
similarity index 89%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.94.ebuild
index f18840ef8839..d1dbe307710b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.94.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{9..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
@@ -22,6 +22,7 @@ else
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -78,16 +79,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-9999-netutil-else.patch
+	"${WORKDIR}"/${PN}-7.94-patches
 )
 
 pkg_setup() {
@@ -96,6 +88,15 @@ pkg_setup() {
 	use nse && lua-single_pkg_setup
 }
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+	fi
+
+	default
+}
+
 src_prepare() {
 	default
 

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index f18840ef8839..d1dbe307710b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 )
 LUA_REQ_USE="deprecated"
 PYTHON_COMPAT=( python3_{9..11} )
 PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
@@ -22,6 +22,7 @@ else
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
@@ -78,16 +79,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-9999-netutil-else.patch
+	"${WORKDIR}"/${PN}-7.94-patches
 )
 
 pkg_setup() {
@@ -96,6 +88,15 @@ pkg_setup() {
 	use nse && lua-single_pkg_setup
 }
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+	fi
+
+	default
+}
+
 src_prepare() {
 	default
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-04-02 21:57 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-04-02 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     54c3961cd8fd050411752bc036f2e6d24b1aa075
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 21:54:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 21:56:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c3961c

net-analyzer/nmap: tidy up system-lua logic

In 5bb392d690d47baf051b7efaea990a0afda25618, we unmasked system-lua, but iamben
points out the REQUIRED_USE logic was backwards here where system-lua needed
nse on rather than the other way around.

Fix that by just dropping system-lua as a flag, so we now always use the
system Lua if we need it (i.e. if we're building nse).

Bug: https://bugs.gentoo.org/253269
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml                            |  1 -
 .../nmap/{nmap-7.92-r2.ebuild => nmap-7.92-r3.ebuild}     | 14 ++++++++------
 .../nmap/{nmap-7.93-r2.ebuild => nmap-7.93-r3.ebuild}     | 14 ++++++++------
 net-analyzer/nmap/nmap-9999.ebuild                        | 15 +++++++++------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index e31f57e3f592..c93c9fdc4493 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="symlink">Install symlink to nc</flag>
-		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
 		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
 	</use>
 	<upstream>

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r3.ebuild
similarity index 91%
rename from net-analyzer/nmap/nmap-7.92-r2.ebuild
rename to net-analyzer/nmap/nmap-7.92-r3.ebuild
index 2c418afbe2a5..62e1a494d022 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r3.ebuild
@@ -26,9 +26,9 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink"
 REQUIRED_USE="
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	nse? ( ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
 
@@ -40,13 +40,15 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	nse? ( sys-libs/zlib )
+	nse? (
+		${LUA_DEPS}
+		sys-libs/zlib
+	)
 	ssl? ( dev-libs/openssl:0= )
 	symlink? (
 		!net-analyzer/netcat
 		!net-analyzer/openbsd-netcat
 	)
-	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -67,7 +69,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use system-lua && lua-single_pkg_setup
+	use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -99,9 +101,9 @@ src_configure() {
 		$(use_with libssh2) \
 		$(use_with ncat) \
 		$(use_with nping) \
+		$(use_with nse liblua) \
 		$(use_with ssl openssl) \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \

diff --git a/net-analyzer/nmap/nmap-7.93-r2.ebuild b/net-analyzer/nmap/nmap-7.93-r3.ebuild
similarity index 92%
rename from net-analyzer/nmap/nmap-7.93-r2.ebuild
rename to net-analyzer/nmap/nmap-7.93-r3.ebuild
index 0b02e213c5e4..d2a477897b76 100644
--- a/net-analyzer/nmap/nmap-7.93-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r3.ebuild
@@ -28,9 +28,9 @@ fi
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="|| ( NPSL-0.94 NPSL-0.95 )"
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink"
 REQUIRED_USE="
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	nse? ( ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
 
@@ -42,7 +42,10 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	nse? ( sys-libs/zlib )
+	nse? (
+		${LUA_DEPS}
+		sys-libs/zlib
+	)
 	ssl? ( dev-libs/openssl:0= )
 	symlink? (
 		ncat? (
@@ -50,7 +53,6 @@ RDEPEND="
 			!net-analyzer/openbsd-netcat
 		)
 	)
-	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -79,7 +81,7 @@ PATCHES=(
 pkg_setup() {
 	python-any-r1_pkg_setup
 
-	use system-lua && lua-single_pkg_setup
+	use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -114,9 +116,9 @@ src_configure() {
 		$(use_with libssh2) \
 		$(use_with ncat) \
 		$(use_with nping) \
+		$(use_with nse liblua) \
 		$(use_with ssl openssl) \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 8617f57210bf..f18840ef8839 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -30,10 +30,10 @@ fi
 # https://github.com/nmap/nmap/issues/2199
 LICENSE="NPSL-0.95"
 SLOT="0"
-IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
+IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	nse? ( ${LUA_REQUIRED_USE} )
 	symlink? ( ncat )
 "
 
@@ -47,7 +47,10 @@ RDEPEND="
 		sys-libs/zlib
 	)
 	nls? ( virtual/libintl )
-	nse? ( sys-libs/zlib )
+	nse? (
+		${LUA_DEPS}
+		sys-libs/zlib
+	)
 	ssl? ( dev-libs/openssl:= )
 	symlink? (
 		ncat? (
@@ -55,7 +58,6 @@ RDEPEND="
 			!net-analyzer/openbsd-netcat
 		)
 	)
-	system-lua? ( ${LUA_DEPS} )
 	zenmap? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -64,6 +66,7 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}"
+# Python is always needed at build time for some scripts
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
@@ -90,7 +93,7 @@ PATCHES=(
 pkg_setup() {
 	python-single-r1_pkg_setup
 
-	use system-lua && lua-single_pkg_setup
+	use nse && lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -134,10 +137,10 @@ src_configure() {
 		$(use_with ncat)
 		$(use_with ndiff)
 		$(use_with nping)
+		$(use_with nse liblua)
 		$(use_with ssl openssl)
 		$(use_with zenmap)
 		$(usex libssh2 --with-zlib)
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua)
 		$(usex nse --with-zlib)
 		--cache-file="${S}"/config.cache
 		# The bundled libdnet is incompatible with the version available in the


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-01-12 17:18 Ulrich Müller
  0 siblings, 0 replies; 183+ messages in thread
From: Ulrich Müller @ 2023-01-12 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7a0075bffbf7e96b999bd888ed399a34f46ea4cc
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 17:15:00 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 17:18:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0075bf

net-analyzer/nmap: Update LICENSE

"Versions of Nmap released under previous versions of the NPSL may also
be used under the NPSL 0.95 terms." (https://nmap.org/changelog)

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92-r2.ebuild                          | 2 +-
 net-analyzer/nmap/{nmap-7.93-r1.ebuild => nmap-7.93-r2.ebuild} | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
index b048ac202f48..2c418afbe2a5 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -22,7 +22,7 @@ else
 
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-	LICENSE="|| ( NPSL-0.92 GPL-2 )"
+	LICENSE="|| ( NPSL-0.92 NPSL-0.95 GPL-2 )"
 fi
 
 SLOT="0"

diff --git a/net-analyzer/nmap/nmap-7.93-r1.ebuild b/net-analyzer/nmap/nmap-7.93-r2.ebuild
similarity index 98%
rename from net-analyzer/nmap/nmap-7.93-r1.ebuild
rename to net-analyzer/nmap/nmap-7.93-r2.ebuild
index 58b6435c8550..fd0f89bab51f 100644
--- a/net-analyzer/nmap/nmap-7.93-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r2.ebuild
@@ -26,7 +26,7 @@ else
 fi
 
 # https://github.com/nmap/nmap/issues/2199
-LICENSE="NPSL-0.94"
+LICENSE="|| ( NPSL-0.94 NPSL-0.95 )"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 103c09dbfcaf..446c5f2db922 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -28,7 +28,7 @@ else
 fi
 
 # https://github.com/nmap/nmap/issues/2199
-LICENSE="NPSL-0.94"
+LICENSE="NPSL-0.95"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-01-10  8:36 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-01-10  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a6b7d460c0cc771d7a6bdae1cd1841f5a85683bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 08:35:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:36:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b7d460

net-analyzer/nmap: crank copyright

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
index 9ed09a572931..b048ac202f48 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index cb3c5fa1e068..103c09dbfcaf 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-01-10  8:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-01-10  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a569f13b5a60aff8d82db75bedcda526728be8b1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 04:56:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:34:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a569f13b

Revert "net-analyzer/nmap: drop 7.92-r2"

This reverts commit 0fe19fdc6d362149e8f6df90f04fa1423ff8c010.

This is the last version released under GPL-2 for compatibility:
https://nmap.org/npsl/

It says:
"""
Note that some releases of Nmap may fall under a previous version of this license,
or a different license entirely. The exact terms for a given version of Nmap can
be found in the included LICENSE or COPYING file.

To ease the transition to the NPSL, the first three Nmap releases made under
that license (Nmap 7.90, 7.91, and 7.92) may also be used under the previous
Nmap license terms by anyone who prefers those.
"""

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest            |   2 +
 net-analyzer/nmap/nmap-7.92-r2.ebuild | 142 ++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 8e4258cbc673..ba0eb83f06f4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,4 @@
+DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
+DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
new file mode 100644
index 000000000000..699b452ebd6e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+inherit autotools lua-single toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/nmap/nmap"
+
+	# Just in case for now as future seems undecided.
+	LICENSE="NPSL"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
+	inherit verify-sig
+
+	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+	LICENSE="|| ( NPSL GPL-2 )"
+fi
+
+SLOT="0"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	symlink? ( ncat )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	nse? ( sys-libs/zlib )
+	ssl? ( dev-libs/openssl:0= )
+	symlink? (
+		!net-analyzer/netcat
+		!net-analyzer/openbsd-netcat
+	)
+	system-lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
+)
+
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+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_with libssh2) \
+		$(use_with ncat) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
+		$(usex nse --with-zlib) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre="${ESYSROOT}"/usr \
+		--without-ndiff \
+		--without-zenmap
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	# See bug #831713 for return of -j1
+	LC_ALL=C emake \
+		-j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2023-01-10  8:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2023-01-10  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     25e5315c5470b97446e1074c787440883db7fd34
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 05:15:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:34:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e5315c

net-analyzer/nmap: fix LICENSE

Apologies for missing this before - for some reason (it was in October,
so I can't recall exactly) I didn't update LICENSE with the 7.93 bump
(perhaps thought the issue wasn't resolved b/c upstream bug still open...?)

Bug: https://github.com/nmap/nmap/issues/2199
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/{nmap-7.93.ebuild => nmap-7.93-r1.ebuild} | 5 +++--
 net-analyzer/nmap/nmap-9999.ebuild                          | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93-r1.ebuild
similarity index 97%
rename from net-analyzer/nmap/nmap-7.93.ebuild
rename to net-analyzer/nmap/nmap-7.93-r1.ebuild
index 1c9da575583a..58b6435c8550 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,8 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="|| ( NPSL GPL-2 )"
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.94"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 747d81979e00..cb3c5fa1e068 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -27,7 +27,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
-LICENSE="|| ( NPSL GPL-2 )"
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.94"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap"
 REQUIRED_USE="


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-12-16  4:03 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-12-16  4:03 UTC (permalink / raw
  To: gentoo-commits

commit:     596a1d015f482ba524a8e9ca791841c190df1804
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 04:03:00 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 04:03:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596a1d01

net-analyzer/nmap: drop upstreamed python3 patch in live

Bug: https://bugs.gentoo.org/702288
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 4588e1d360ac..747d81979e00 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -84,7 +84,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
 	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-9999-netutil-else.patch
-	"${FILESDIR}"/${PN}-9999-python3.patch
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-28 19:53 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-10-28 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0fe19fdc6d362149e8f6df90f04fa1423ff8c010
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 19:36:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:50:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe19fdc

net-analyzer/nmap: drop 7.92-r2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest            |   2 -
 net-analyzer/nmap/nmap-7.92-r2.ebuild | 142 ----------------------------------
 2 files changed, 144 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ba0eb83f06f4..8e4258cbc673 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,2 @@
-DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
-DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
deleted file mode 100644
index 699b452ebd6e..000000000000
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/nmap/nmap"
-
-	# Just in case for now as future seems undecided.
-	LICENSE="NPSL"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
-	inherit verify-sig
-
-	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-	LICENSE="|| ( NPSL GPL-2 )"
-fi
-
-SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
-REQUIRED_USE="
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
-	symlink? ( ncat )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nse? ( sys-libs/zlib )
-	ssl? ( dev-libs/openssl:0= )
-	symlink? (
-		!net-analyzer/netcat
-		!net-analyzer/openbsd-netcat
-	)
-	system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-pkg_setup() {
-	use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre="${ESYSROOT}"/usr \
-		--without-ndiff \
-		--without-zenmap
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	# See bug #831713 for return of -j1
-	LC_ALL=C emake \
-		-j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	use symlink && dosym /usr/bin/ncat /usr/bin/nc
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:48 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:48 UTC (permalink / raw
  To: gentoo-commits

commit:     3115ab568925606e26785f49d40aceeb34d9d47e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:48:34 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:48:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3115ab56

net-analyzer/nmap: Stabilize 7.93 x86, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index 0ece400f8063..1c9da575583a 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:47 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1f1211581347eb0e9360624d2eaa95f926840c29
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:47:28 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:47:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f121158

net-analyzer/nmap: Stabilize 7.93 sparc, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index fdbb8ffc92a8..0ece400f8063 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:46 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:46 UTC (permalink / raw
  To: gentoo-commits

commit:     73727dc6e7a275c9e83971ed61450d4fafbbb512
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:46:15 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:46:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73727dc6

net-analyzer/nmap: Stabilize 7.93 ppc64, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index dfb065f1b367..fdbb8ffc92a8 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:45 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8417cfccbd8908c120b29bbde4c255622254a314
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:45:02 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:45:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8417cfcc

net-analyzer/nmap: Stabilize 7.93 ppc, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index 3e7f39264f41..dfb065f1b367 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:44 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:44 UTC (permalink / raw
  To: gentoo-commits

commit:     89794c26aba9f8062f17f0db796e080eafb11d4b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:44:04 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:44:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89794c26

net-analyzer/nmap: Stabilize 7.93 arm64, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index b6e1417999aa..3e7f39264f41 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:43 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     724809afcc8aa8728389cd50c77816724ea7654d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:42:55 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:42:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724809af

net-analyzer/nmap: Stabilize 7.93 arm, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index c140d89a884c..b6e1417999aa 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-10-11  6:41 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2022-10-11  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     8af3c5209625c19c720c307ed9da08e7f70a3b75
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 06:41:07 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 06:41:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af3c520

net-analyzer/nmap: Stabilize 7.93 amd64, #876655

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index 7c6ddc0d5bfd..c140d89a884c 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="|| ( NPSL GPL-2 )"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-09-04 23:56 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-09-04 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e86f2d6edad50bc23e970dd413171d28ff54ba65
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 23:55:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 23:55:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86f2d6e

net-analyzer/nmap: fix build with < OpenSSL 3; don't automagically detect python2

Closes: https://bugs.gentoo.org/868483
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.93.ebuild | 17 +++++++++++++++--
 net-analyzer/nmap/nmap-9999.ebuild | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-7.93.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -51,7 +52,10 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
 if [[ ${PV} != *9999* ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	python-any-r1_pkg_setup
+
 	use system-lua && lua-single_pkg_setup
 }
 
@@ -96,6 +102,13 @@ src_prepare() {
 }
 
 src_configure() {
+	export ac_cv_path_PYTHON="${PYTHON}"
+	export am_cv_pathless_PYTHON="${EPYTHON}"
+
+	# Workaround for https://github.com/nmap/nmap/issues/2516
+	# bug #868483
+	append-cppflags -DOPENSSL_API_COMPAT=10101
+
 	# The bundled libdnet is incompatible with the version available in the
 	# tree, so we cannot use the system library here.
 	econf \

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 9470b5ddbf08..c65faf378336 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic lua-single python-any-r1 toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -51,7 +52,10 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
 
 if [[ ${PV} != *9999* ]] ; then
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
@@ -71,6 +75,8 @@ PATCHES=(
 )
 
 pkg_setup() {
+	python-any-r1_pkg_setup
+
 	use system-lua && lua-single_pkg_setup
 }
 
@@ -96,6 +102,13 @@ src_prepare() {
 }
 
 src_configure() {
+	export ac_cv_path_PYTHON="${PYTHON}"
+	export am_cv_pathless_PYTHON="${EPYTHON}"
+
+	# Workaround for https://github.com/nmap/nmap/issues/2516
+	# bug #868483
+	append-cppflags -DOPENSSL_API_COMPAT=10101
+
 	# The bundled libdnet is incompatible with the version available in the
 	# tree, so we cannot use the system library here.
 	econf \


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-09-03  3:49 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-09-03  3:49 UTC (permalink / raw
  To: gentoo-commits

commit:     629c66e841a616ab168923fb009bf50fcb30ade8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 03:35:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 03:35:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=629c66e8

net-analyzer/nmap: add 7.93

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest                             |  2 ++
 .../nmap/{nmap-9999.ebuild => nmap-7.93.ebuild}        | 18 +++++++-----------
 net-analyzer/nmap/nmap-9999.ebuild                     | 18 +++++++-----------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 49819935ca25..ba0eb83f06f4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,4 @@
 DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
 DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
+DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
+DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.93.ebuild
similarity index 90%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.93.ebuild
index 62661ccfa927..9470b5ddbf08 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.93.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
@@ -14,8 +14,6 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/nmap/nmap"
 
-	# Just in case for now as future seems undecided.
-	LICENSE="NPSL"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
@@ -24,10 +22,9 @@ else
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-	LICENSE="|| ( NPSL GPL-2 )"
 fi
 
+LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="
@@ -54,9 +51,10 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(
@@ -92,7 +90,7 @@ src_prepare() {
 	eautoreconf
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
+		# We need the original for a Darwin-specific fix, bug #604432
 		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
 	fi
 }
@@ -112,16 +110,14 @@ src_configure() {
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
 		--with-pcre="${ESYSROOT}"/usr \
+		--without-dpdk \
 		--without-ndiff \
 		--without-zenmap
 }
 
 src_compile() {
 	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
+	for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do
 		emake -C "${directory}" makefile.dep
 	done
 

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 62661ccfa927..9470b5ddbf08 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
@@ -14,8 +14,6 @@ if [[ ${PV} == *9999* ]] ; then
 
 	EGIT_REPO_URI="https://github.com/nmap/nmap"
 
-	# Just in case for now as future seems undecided.
-	LICENSE="NPSL"
 else
 	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
@@ -24,10 +22,9 @@ else
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-	LICENSE="|| ( NPSL GPL-2 )"
 fi
 
+LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
 IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
 REQUIRED_USE="
@@ -54,9 +51,10 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
 fi
 
 PATCHES=(
@@ -92,7 +90,7 @@ src_prepare() {
 	eautoreconf
 
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
+		# We need the original for a Darwin-specific fix, bug #604432
 		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
 	fi
 }
@@ -112,16 +110,14 @@ src_configure() {
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
 		--with-pcre="${ESYSROOT}"/usr \
+		--without-dpdk \
 		--without-ndiff \
 		--without-zenmap
 }
 
 src_compile() {
 	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
+	for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do
 		emake -C "${directory}" makefile.dep
 	done
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-07-19 15:09 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-07-19 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     82dd30fa966e703982dfed6e6cf258f2fa0405fb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 15:08:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 15:09:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82dd30fa

net-analyzer/nmap: add blockers on netcat

Closes: https://bugs.gentoo.org/858365
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/{nmap-7.92-r1.ebuild => nmap-7.92-r2.ebuild} | 4 ++++
 net-analyzer/nmap/nmap-9999.ebuild                             | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92-r1.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
similarity index 97%
rename from net-analyzer/nmap/nmap-7.92-r1.ebuild
rename to net-analyzer/nmap/nmap-7.92-r2.ebuild
index 752a2273e4f7..699b452ebd6e 100644
--- a/net-analyzer/nmap/nmap-7.92-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -45,6 +45,10 @@ RDEPEND="
 	)
 	nse? ( sys-libs/zlib )
 	ssl? ( dev-libs/openssl:0= )
+	symlink? (
+		!net-analyzer/netcat
+		!net-analyzer/openbsd-netcat
+	)
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 3b55f48a5dbd..62661ccfa927 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi
@@ -45,6 +45,12 @@ RDEPEND="
 	)
 	nse? ( sys-libs/zlib )
 	ssl? ( dev-libs/openssl:0= )
+	symlink? (
+		ncat? (
+			!net-analyzer/netcat
+			!net-analyzer/openbsd-netcat
+		)
+	)
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-07-14 11:06 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-07-14 11:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f1367051f359503107ca26cc9971f5513da9f50d
Author:     Mathieu Tortuyaux <mtortuyaux <AT> microsoft <DOT> com>
AuthorDate: Sat Jul  9 14:20:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 11:06:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1367051

net-analyzer/nmap: add symlink from ncat to nc

For compatiblity, it's good to have `nc` in the PATH too.

[sam: keep it as an extra flag to avoid more blockers;
it's useful to be able to evaluate two implementations.]

Closes: https://github.com/gentoo/gentoo/pull/26287
Signed-off-by: Mathieu Tortuyaux <mtortuyaux <AT> microsoft.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml                              | 1 +
 net-analyzer/nmap/{nmap-7.92.ebuild => nmap-7.92-r1.ebuild} | 9 +++++++--
 net-analyzer/nmap/nmap-9999.ebuild                          | 9 +++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 21fee1f7bbb0..4ca312aa6de6 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="ncat">Install the ncat utility</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
+		<flag name="symlink">Install symlink to nc</flag>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92-r1.ebuild
similarity index 94%
rename from net-analyzer/nmap/nmap-7.92.ebuild
rename to net-analyzer/nmap/nmap-7.92-r1.ebuild
index 8d80c56138aa..752a2273e4f7 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r1.ebuild
@@ -29,8 +29,11 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	symlink? ( ncat )
+"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -130,4 +133,6 @@ src_install() {
 		install
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 2812d6599000..3b55f48a5dbd 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -29,8 +29,11 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
+IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
+REQUIRED_USE="
+	system-lua? ( nse ${LUA_REQUIRED_USE} )
+	symlink? ( ncat )
+"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -131,4 +134,6 @@ src_install() {
 		install
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use symlink && dosym /usr/bin/ncat /usr/bin/nc
 }


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-04-17 17:22 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-04-17 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5b02b5c1379a25b7992cde481441b12467bdd58c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 17:22:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 17:22:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b02b5c1

net-analyzer/nmap: fix UnusedLocalUse

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 1e504a2dd7d7..21fee1f7bbb0 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -16,7 +16,6 @@
 	<use>
 		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="ncat">Install the ncat utility</flag>
-		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-03-20 18:43 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-03-20 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     364385a3aef73b6f0fa20ff8c11b1aff44bdacc4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 18:42:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 18:43:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364385a3

net-analyzer/nmap: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 6 +++---
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 6 +++---
 net-analyzer/nmap/nmap-7.92.ebuild    | 4 ++--
 net-analyzer/nmap/nmap-9999.ebuild    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 37d6bd0196ec..1734ec441e00 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -111,8 +111,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 7beabe6e0b00..1af1818ce083 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -117,8 +117,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 8578d039870f..8d80c56138aa 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -116,8 +116,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index e04fab825e5c..2812d6599000 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -117,8 +117,8 @@ src_compile() {
 	done
 
 	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2022-01-22  4:42 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2022-01-22  4:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e2418094a1aa5653cbaf3a88cb5d354f58a7032e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 04:41:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 04:41:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2418094

net-analyzer/nmap: force -j1 again in src_install for now

Apparently not fixed, or a new issue resurfaced anyway.

Closes: https://bugs.gentoo.org/831713
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 4 +++-
 net-analyzer/nmap/nmap-9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 348adce730a5..8578d039870f 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -121,7 +121,9 @@ src_compile() {
 }
 
 src_install() {
+	# See bug #831713 for return of -j1
 	LC_ALL=C emake \
+		-j1 \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 466e9b414a06..e04fab825e5c 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -122,7 +122,9 @@ src_compile() {
 }
 
 src_install() {
+	# See bug #831713 for return of -j1
 	LC_ALL=C emake \
+		-j1 \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-11-19  8:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-11-19  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a3b2d7f8404b9e772094be8b45e4e6d3fb927cf1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 07:53:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 08:33:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b2d7f8

net-analyzer/nmap: drop -j1 from install

Been meaning to grep for -j1 and look at what I can do
after seeing slyfox's recent blog post (and then
a recent comment in a Portage bug) and have been
chipping away at them since. After that latest
reminder, noticed this one!

This has been there since 2005 as far as I can
tell and was fixed upstream in 2006:
https://github.com/nmap/nmap/commit/be9e8bf7b105f1f423f01a92f5b243de58da4693

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index ab5c1cca1c67..b24708e3ba63 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -121,7 +121,7 @@ src_compile() {
 }
 
 src_install() {
-	LC_ALL=C emake -j1 \
+	LC_ALL=C emake \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 58f0f67de1fa..996ba7b0df85 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -122,7 +122,7 @@ src_compile() {
 }
 
 src_install() {
-	LC_ALL=C emake -j1 \
+	LC_ALL=C emake \
 		DESTDIR="${D}" \
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-27 14:53 Marek Szuba
  0 siblings, 0 replies; 183+ messages in thread
From: Marek Szuba @ 2021-09-27 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     66afd8b440f60edd2c601b6fc01b895442f19e58
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 27 14:52:26 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 27 14:52:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66afd8b4

net-analyzer/nmap: keyword 7.92 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 8b3167e3b42..ab5c1cca1c6 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-14  5:17 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-14  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4e46d1c0d6781d25cf80f6efc486ea32a9e07671
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 05:16:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 05:16:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e46d1c0

net-analyzer/nmap: Stabilize 7.92 sparc, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index fc296eb4d60..8b3167e3b42 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-14  5:15 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-14  5:15 UTC (permalink / raw
  To: gentoo-commits

commit:     39db185e7dbfa6afba645238a365debd8e4ba78f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 05:13:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 05:13:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39db185e

net-analyzer/nmap: Stabilize 7.92 arm64, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 83ebdbbb2a9..5a7e17130df 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-14  5:15 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-14  5:15 UTC (permalink / raw
  To: gentoo-commits

commit:     71a3d0519de0ebd8be2eb560f5141d1a7ff9e033
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 05:14:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 05:14:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a3d051

net-analyzer/nmap: Stabilize 7.92 arm, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 5a7e17130df..fc296eb4d60 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-12 23:01 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-12 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     7db0f296cd84c79c1fb078c0b2c5d9fc977dc48e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 23:00:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 23:00:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7db0f296

net-analyzer/nmap: Stabilize 7.92 ppc, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index a5697e1792c..83ebdbbb2a9 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-12 23:01 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-12 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     f724976884ab95cae95e4e8d3b060c64609ee574
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 23:00:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 23:00:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7249768

net-analyzer/nmap: Stabilize 7.92 ppc64, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 05feca33a6a..a5697e1792c 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-12 23:00 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-12 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ea00833c75735fa1a69879d9617734190f301996
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 22:59:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 22:59:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea00833c

net-analyzer/nmap: Stabilize 7.92 amd64, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index d0ab6cc2b59..74e746d6207 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-09-12 23:00 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-09-12 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     c0098151133b1682cadf260cc8e8195f45d4383e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 22:59:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 12 22:59:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0098151

net-analyzer/nmap: Stabilize 7.92 x86, #812815

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.92.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
index 74e746d6207..05feca33a6a 100644
--- a/net-analyzer/nmap/nmap-7.92.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 	LICENSE="|| ( NPSL GPL-2 )"
 fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-08-09  3:47 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-08-09  3:47 UTC (permalink / raw
  To: gentoo-commits

commit:     a355cce76d15a88a307c07ee7939a2b8148f6d22
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  9 02:08:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  9 02:08:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a355cce7

net-analyzer/nmap: add 7.92

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest                               | 2 ++
 net-analyzer/nmap/{nmap-9999.ebuild => nmap-7.92.ebuild} | 8 ++++----
 net-analyzer/nmap/nmap-9999.ebuild                       | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d261befb90a..335efc4b01d 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,5 @@
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
 DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96
+DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
+DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.92.ebuild
similarity index 91%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.92.ebuild
index 0b17737335e..d0ab6cc2b59 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.92.ebuild
@@ -17,14 +17,15 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
 	LICENSE="|| ( NPSL GPL-2 )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SLOT="0"
@@ -59,7 +60,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
 	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-9999-netutil-else.patch
 )
 
 pkg_setup() {
@@ -101,7 +101,7 @@ src_configure() {
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
-		--with-pcre=/usr \
+		--with-pcre="${ESYSROOT}"/usr \
 		--without-ndiff \
 		--without-zenmap
 }

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0b17737335e..58f0f67de1f 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -17,14 +17,15 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
 	LICENSE="|| ( NPSL GPL-2 )"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 SLOT="0"
@@ -101,7 +102,7 @@ src_configure() {
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
-		--with-pcre=/usr \
+		--with-pcre="${ESYSROOT}"/usr \
 		--without-ndiff \
 		--without-zenmap
 }


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-07-31 13:40 Michał Górny
  0 siblings, 0 replies; 183+ messages in thread
From: Michał Górny @ 2021-07-31 13:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f93385a369dd481ff392bc3c093ce225a15394dd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 06:35:24 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 13:32:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93385a3

net-analyzer/nmap: Use BROOT for verify-sig key path

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 2011c9655da..d8498b95868 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 0143075841b..0b17737335e 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]] ; then
 	# Just in case for now as future seems undecided.
 	LICENSE="NPSL"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/nmap.asc
 	inherit verify-sig
 
 	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-29 18:28 Mikle Kolyada
  0 siblings, 0 replies; 183+ messages in thread
From: Mikle Kolyada @ 2021-04-29 18:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ebb3687ff9e7414380486ba1a1309a6fadece4b6
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 18:09:16 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 18:28:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb3687f

net-analyzer/nmap: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 7 ++-----
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 7 ++-----
 net-analyzer/nmap/nmap-9999.ebuild    | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 4ce4485f5c7..37d6bd0196e 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
+IUSE="ipv6 libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -31,10 +31,7 @@ RDEPEND="
 		dev-vcs/subversion
 	)
 	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 492355ccf04..2011c9655da 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -28,7 +28,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -40,10 +40,7 @@ RDEPEND="
 		sys-libs/zlib
 	)
 	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index fa6114906f2..0143075841b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -28,7 +28,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+IUSE="ipv6 libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
@@ -40,10 +40,7 @@ RDEPEND="
 		sys-libs/zlib
 	)
 	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-23 13:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-23 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     347a4912b2fa1cf57e6205c4f716ad3e1b3c309a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 13:34:33 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 13:34:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347a4912

net-analyzer/nmap: drop 7.91-r1

Closes: https://bugs.gentoo.org/782583
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 116 ----------------------------------
 1 file changed, 116 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
deleted file mode 100644
index ab9ed8c0ddb..00000000000
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="|| ( NPSL GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
-REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-pkg_setup() {
-	use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr \
-		--without-ndiff \
-		--without-zenmap
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-16  4:47 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-16  4:47 UTC (permalink / raw
  To: gentoo-commits

commit:     259e3d2c5867d70c8f09edfa5c9ce48a881262ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 04:27:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 04:40:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259e3d2c

net-analyzer/nmap: add verify-sig support

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/Manifest            | 1 +
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5451f0f7941..d261befb90a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,3 @@
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
+DIST nmap-7.91.tar.bz2.asc 195 BLAKE2B 16c4bad309c4652128a67f00c6b89f6552f432166733cac45756c20df0f48bdd0b8b9edbcce3df8f25d0a8e422be2494d9d5639fa74fc3f1e2c13489c52387c1 SHA512 376b74fc15896a1008709dac45b5af5d35ca00a1753994aba3ee6cffe2c2f0d67619fab45d57e83b454cfb376defe965f2bf881ef4cb8d5f8f2215979ad8ee96

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 165e7157943..6778cf91051 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -5,12 +5,13 @@ EAPI=7
 
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
-
-inherit autotools lua-single toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+inherit autotools lua-single toolchain-funcs verify-sig
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
 SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
@@ -34,6 +35,7 @@ RDEPEND="
 	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-16  0:40 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-16  0:40 UTC (permalink / raw
  To: gentoo-commits

commit:     1531ebd278bc2f562975914ba5a6e618e3419e60
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 00:39:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 00:39:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1531ebd2

net-analyzer/nmap: Stabilize 7.91-r2 ppc, #782583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 782a8b63f97..165e7157943 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-13 16:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-13 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2d3da4124c272e9205015b36eea6a9b6f29910b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 16:05:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 16:05:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3da412

net-analyzer/nmap: Stabilize 7.91-r2 ppc64, #782583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 35300760756..782a8b63f97 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-13 16:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-13 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ac034dc5fc08559c2c1ad69c33b1c2a9ecfa382e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 16:05:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 16:05:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac034dc5

net-analyzer/nmap: Stabilize 7.91-r2 arm, #782583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index b0579310df9..cfa3646ca6f 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-13 16:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-13 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c407939010af6f074763a4f32e40b0656417a66a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 16:05:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 16:05:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4079390

net-analyzer/nmap: Stabilize 7.91-r2 sparc, #782583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index cfa3646ca6f..35300760756 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-13 16:05 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-13 16:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8be0675acb066f4ca4d3bed2d0f625f83b433184
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 16:05:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 16:05:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be0675a

net-analyzer/nmap: Stabilize 7.91-r2 arm64, #782583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 96f3cae61dc..b0579310df9 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-13 16:03 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-13 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7518f40a9c38dd833e20585b92287f8e0add3f1d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 16:03:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 16:03:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7518f40a

net-analyzer/nmap: Stabilize 7.91-r2 x86, #782583

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 24cec4cd2f4..96f3cae61dc 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-04-03 15:57 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-04-03 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     814f95e9ceba083345c0a49ee3bcdd44c490caf8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 01:32:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 15:55:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814f95e9

net-analyzer/nmap: drop unused desktop, flag-o-matic

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 5f48909bca0..4ce4485f5c7 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools desktop flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 8b08d910d67..ab9ed8c0ddb 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 09c622523f3..587628f5722 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic lua-single toolchain-funcs
+inherit autotools lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 782f91bf13e..0b9f3ddf365 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 LUA_COMPAT=( lua5-3 )
 LUA_REQ_USE="deprecated"
 
-inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs
+inherit autotools git-r3 lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-03-11 18:15 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-03-11 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     bdd30173fbcbce509dba00a67d41e4b93fa7ed3b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 18:14:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 18:14:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd30173

net-analyzer/nmap: revert 7.91-r2 keywords

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild
index 62abcdf5afc..09c622523f3 100644
--- a/net-analyzer/nmap/nmap-7.91-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-03-06 20:35 Ulrich Müller
  0 siblings, 0 replies; 183+ messages in thread
From: Ulrich Müller @ 2021-03-06 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     ba502f42a7ab3f8282dd5b88cf8c4126971c987e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 20:34:12 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 20:34:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba502f42

net-analyzer/nmap: Update LICENSE

"Effective immediately, Nmap 7.91 (which is the current version) and
7.90 can also be used and redistributed under the previous (Nmap 7.80)
license terms."
https://github.com/nmap/nmap/issues/2199#issuecomment-792048244

Bug: https://bugs.gentoo.org/749390
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 610bd50821a..8b08d910d67 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
 SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
-LICENSE="NPSL"
+LICENSE="|| ( NPSL GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-03-04  4:58 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-03-04  4:58 UTC (permalink / raw
  To: gentoo-commits

commit:     aa8f5b8468677803bbfe9e93a7e35c4cd4eeb5de
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  4 04:55:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar  4 04:55:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8f5b84

net-analyzer/nmap: remove old

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 129 ----------------------------------
 net-analyzer/nmap/nmap-7.91.ebuild    | 108 ----------------------------
 2 files changed, 237 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
deleted file mode 100644
index 41fbe9aca70..00000000000
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nmap-update? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-)
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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_with libssh2) \
-		$(use_with ncat) \
-		--without-ndiff \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--without-zenmap \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-}

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
deleted file mode 100644
index 006cbe5ee03..00000000000
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-
-LICENSE="NPSL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr \
-		--without-ndiff \
-		--without-zenmap
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-18  8:22 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-18  8:22 UTC (permalink / raw
  To: gentoo-commits

commit:     af677eb1c6b112c0649545bfd82f772dda1348ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 08:22:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 08:22:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af677eb1

net-analyzer/nmap: Stabilize 7.91-r1 ppc, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index a46666146a8..610bd50821a 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-18  8:22 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-18  8:22 UTC (permalink / raw
  To: gentoo-commits

commit:     9cc47a302a27f2d086e82b4f7c0b6516fb7f49a5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 08:22:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 08:22:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc47a30

net-analyzer/nmap: Stabilize 7.80-r2 ppc, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6a0187c3ab5..5f48909bca0 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-16 12:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-16 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     412fac654821d7b2bc2a0f86a62dcc94871c044f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 12:33:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 12:33:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412fac65

net-analyzer/nmap: Stabilize 7.91-r1 arm, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 6af2f924049..a46666146a8 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-16 12:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-16 12:34 UTC (permalink / raw
  To: gentoo-commits

commit:     9eb191fcce7d9969751ee33fb99f3ebc8aff65b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 12:33:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 12:33:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb191fc

net-analyzer/nmap: Stabilize 7.80-r2 arm, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6b0ca2a471a..6a0187c3ab5 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-14  2:10 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-14  2:10 UTC (permalink / raw
  To: gentoo-commits

commit:     5f0fddfc64b0eb593fd2de09c434cd25e2a5952b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 02:10:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 02:10:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0fddfc

net-analyzer/nmap: Stabilize 7.80-r2 arm64, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index f6b39c90554..6b0ca2a471a 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-14  2:10 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-14  2:10 UTC (permalink / raw
  To: gentoo-commits

commit:     42ace55f23428439e5f7aea1c692cf95e69472bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 02:10:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 02:10:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ace55f

net-analyzer/nmap: Stabilize 7.91-r1 arm64, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 8b21bb0c8e6..6af2f924049 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05 12:31 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     a0b102f378d2965cfc64ac86849d82862fe901fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 12:30:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 12:30:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b102f3

net-analyzer/nmap: Stabilize 7.80-r2 x86, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 3c6bf8c786e..f6b39c90554 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05 12:31 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f11b62c271554ab368cc58539a7cd0e60dbda598
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 12:30:55 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 12:30:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11b62c2

net-analyzer/nmap: Stabilize 7.91-r1 x86, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index c11901c3144..8b21bb0c8e6 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05 10:40 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05 10:40 UTC (permalink / raw
  To: gentoo-commits

commit:     722179fe57307388a26ca4b6e340bac4ae714bf0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 10:40:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 10:40:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722179fe

net-analyzer/nmap: Stabilize 7.91-r1 amd64, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 475b418f52e..c11901c3144 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05 10:40 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05 10:40 UTC (permalink / raw
  To: gentoo-commits

commit:     8dce6bb3f15181e2c8a68f4a2366500f8e0767ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 10:40:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 10:40:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dce6bb3

net-analyzer/nmap: Stabilize 7.80-r2 amd64, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 6259d01db17..3c6bf8c786e 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05  6:36 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     3a0a9667b917f041243875064306a4d77df918d9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 06:35:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 06:35:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0a9667

net-analyzer/nmap: Stabilize 7.91-r1 ppc64, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index fe7f573fe0b..475b418f52e 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05  6:36 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05  6:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6bb9422ba4297f7759800049f5df51761814f44b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 06:35:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 06:35:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bb9422b

net-analyzer/nmap: Stabilize 7.80-r2 ppc64, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 9707914dc4d..6259d01db17 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05  6:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     216702a8def65c3196ec178a98c03dc230b6125f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 06:34:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 06:34:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216702a8

net-analyzer/nmap: Stabilize 7.91-r1 sparc, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 29cae90c6f0..fe7f573fe0b 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-02-05  6:34 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2021-02-05  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     efe6f3e34333725d15a7e56d205ba87687b4b5ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  5 06:34:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 06:34:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe6f3e3

net-analyzer/nmap: Stabilize 7.80-r2 sparc, #768750

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 86253e24991..9707914dc4d 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-01-25 22:23 Mikle Kolyada
  0 siblings, 0 replies; 183+ messages in thread
From: Mikle Kolyada @ 2021-01-25 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     103cc745cf921addfe9d96b93a406123134f1987
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 22:22:58 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 22:23:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103cc745

net-analyzer/nmap: add myself as maintainer

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 668d67a59b2..0d1aaf91510 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -9,9 +9,9 @@
 		<email>dilfridge@gentoo.org</email>
 		<name>Andreas K. Hüttel</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
 		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2021-01-06 14:35 Fabian Groffen
  0 siblings, 0 replies; 183+ messages in thread
From: Fabian Groffen @ 2021-01-06 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     eea26de7b61dc7f188ee7a35a0bbfd84f32ee626
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 14:34:37 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 14:35:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea26de7

net-analyzer/nmap: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.80-r2.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.91-r1.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.91.ebuild    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index a70d5648057..41fbe9aca70 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 

diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
index 7b40515497d..86253e24991 100644
--- a/net-analyzer/nmap/nmap-7.80-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 

diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
index 3b611d01445..29cae90c6f0 100644
--- a/net-analyzer/nmap/nmap-7.91-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
 REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index ecd6339ffe9..006cbe5ee03 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-12-27  0:05 Marek Szuba
  0 siblings, 0 replies; 183+ messages in thread
From: Marek Szuba @ 2020-12-27  0:05 UTC (permalink / raw
  To: gentoo-commits

commit:     4b3b89a166b295db16dcbee179bae41eefd8c324
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 00:00:44 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 00:05:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3b89a1

net-analyzer/nmap: migrate to lua-single.eclass

The live ebuild, the latest release currently in the tree and the latest
release available under the GPL. In all three cases, upstream build
scripts require version 5.3 of Lua and while they do not use pkgconfig,
they check for versioned files/directories first.

IUSE=system-lua is still there but defaults to enabled now.

Bug: https://bugs.gentoo.org/253269
Closes: https://bugs.gentoo.org/752774
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../nmap/{nmap-9999.ebuild => nmap-7.80-r2.ebuild} | 54 ++++++++++++++++------
 .../nmap/{nmap-9999.ebuild => nmap-7.91-r1.ebuild} | 23 +++++----
 net-analyzer/nmap/nmap-9999.ebuild                 | 18 ++++++--
 3 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild
similarity index 62%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.80-r2.ebuild
index 00bb4385aaa..7b40515497d 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r2.ebuild
@@ -2,17 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools desktop flag-o-matic lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
-EGIT_REPO_URI="https://github.com/nmap/nmap"
-
-LICENSE="NPSL"
+LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -22,12 +26,16 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
 	nse? ( sys-libs/zlib )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -36,14 +44,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.21-python.patch
 	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
 	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-9999-netutil-else.patch
 )
 
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -54,6 +65,11 @@ src_prepare() {
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
 
 	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
 
@@ -72,22 +88,26 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_with libssh2) \
 		$(use_with ncat) \
+		--without-ndiff \
+		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
+		--without-zenmap \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		$(usex nse --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
-		--with-pcre=/usr \
-		--without-ndiff \
-		--without-zenmap
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
 }
 
 src_compile() {
 	local directory
 	for directory in . libnetutil nsock/src \
 		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
 		$(usex nping nping '')
 	do
 		emake -C "${directory}" makefile.dep
@@ -104,6 +124,14 @@ src_install() {
 		STRIP=: \
 		nmapdatadir="${EPREFIX}"/usr/share/nmap \
 		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
 }

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild
similarity index 79%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.91-r1.ebuild
index 00bb4385aaa..3b611d01445 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.91-r1.ebuild
@@ -2,17 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools flag-o-matic lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
-
-EGIT_REPO_URI="https://github.com/nmap/nmap"
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -27,7 +31,7 @@ RDEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -41,9 +45,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
 	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-9999-netutil-else.patch
 )
 
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -75,7 +82,7 @@ src_configure() {
 		$(use_with nping) \
 		$(use_with ssl openssl) \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 00bb4385aaa..782f91bf13e 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,7 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+LUA_COMPAT=( lua5-3 )
+LUA_REQ_USE="deprecated"
+
+inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
@@ -11,8 +15,8 @@ EGIT_REPO_URI="https://github.com/nmap/nmap"
 
 LICENSE="NPSL"
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
-REQUIRED_USE="system-lua? ( nse )"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua"
+REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/liblinear:=
@@ -27,7 +31,7 @@ RDEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	system-lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}"
 
@@ -44,6 +48,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-9999-netutil-else.patch
 )
 
+pkg_setup() {
+	use system-lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -75,7 +83,7 @@ src_configure() {
 		$(use_with nping) \
 		$(use_with ssl openssl) \
 		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
 		$(usex nse --with-zlib) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-25  7:44 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-11-25  7:44 UTC (permalink / raw
  To: gentoo-commits

commit:     acbd7472e53e79b723be061a3711a6fe462cd691
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 07:44:43 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 07:44:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbd7472

net-analyzer/nmap: ppc64 stable wrt bug #756271

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index 0abbc32ad3f..ecd6339ffe9 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-24 14:40 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2020-11-24 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     de35f106e8b276c77d5b2168cf263e552da84877
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 14:39:45 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 14:39:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de35f106

net-analyzer/nmap: Stabilize 7.91 arm, #756271

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index d0ebed33cab..0abbc32ad3f 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-24 12:57 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-11-24 12:57 UTC (permalink / raw
  To: gentoo-commits

commit:     24bb3836636a6e5b713f2f380522ac5b75e8c894
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 12:56:58 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 12:56:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bb3836

net-analyzer/nmap: x86 stable wrt bug #756271

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index 4df63865d01..d0ebed33cab 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-24 12:56 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-11-24 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     eca3344cd959554f9acb461ee607613ceea737ba
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 12:55:58 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 12:55:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca3344c

net-analyzer/nmap: sparc stable wrt bug #756271

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index e0719632f5a..4df63865d01 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-24 12:55 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-11-24 12:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a528a5d3f43609ee318a2e849936572c16b2473b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 12:55:10 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 12:55:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a528a5d3

net-analyzer/nmap: ppc stable wrt bug #756271

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index 726ea432c18..e0719632f5a 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-24 12:54 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-11-24 12:54 UTC (permalink / raw
  To: gentoo-commits

commit:     968e59a12d7de970bf0f40372d73f6574c0223a8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 12:54:15 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 12:54:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968e59a1

net-analyzer/nmap: amd64 stable wrt bug #756271

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index e54200e31b3..726ea432c18 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-24  3:16 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2020-11-24  3:16 UTC (permalink / raw
  To: gentoo-commits

commit:     da166b78a2ac19f38a90c652447ae0904a886c42
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 03:16:31 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 03:16:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da166b78

net-analyzer/nmap: Stabilize 7.91 arm64, #756271

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index f7d07cf2a70..e54200e31b3 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-04 11:41 Andreas K. Hüttel
  0 siblings, 0 replies; 183+ messages in thread
From: Andreas K. Hüttel @ 2020-11-04 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     7fc9c2ccc69e2175e55ffaad705c1ce19a279fe8
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 11:36:29 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 11:41:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc9c2cc

net-analyzer/nmap: Adopt

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index e3359b713ef..668d67a59b2 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+		<name>Andreas K. Hüttel</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-04  7:29 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2020-11-04  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     15b6f2f32e3ef0347df90a98d63840ed7bd99a1d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 07:29:07 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 07:29:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b6f2f3

net-analyzer/nmap: Stabilize 7.80-r1 arm64, #753041

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index f3166e2f526..baade24ff44 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-11-04  0:44 Sam James
  0 siblings, 0 replies; 183+ messages in thread
From: Sam James @ 2020-11-04  0:44 UTC (permalink / raw
  To: gentoo-commits

commit:     6bce6441db4b0c2fca174e5dcb84c1489c3b60bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 00:30:46 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 00:30:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bce6441

net-analyzer/nmap: join as (co-)maintainer

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 717311a0967..e3359b713ef 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-10-15  9:53 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2020-10-15  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     dc7dfa35dfc7dc3b16aa4c0def359b2660e1643b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 09:14:11 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 09:53:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc7dfa35

net-analyzer/nmap: Drop unused eclass, update DESCRIPTION

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 9 +++------
 net-analyzer/nmap/nmap-9999.ebuild    | 5 ++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index c31710c9585..6136d44ba18 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -2,14 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools desktop flag-o-matic toolchain-funcs
 
-MY_P=${P/_beta/BETA}
-inherit autotools desktop flag-o-matic toolchain-funcs user
-
-DESCRIPTION="A utility for network discovery and security auditing"
+DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
 SRC_URI="
-	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://nmap.org/dist/${P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
 
@@ -51,7 +49,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
 )
-S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 96c09bd0978..053d71e8466 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 MY_P=${P/_beta/BETA}
-inherit autotools desktop flag-o-matic git-r3 toolchain-funcs user
+inherit autotools desktop flag-o-matic git-r3 toolchain-funcs
 
-DESCRIPTION="A utility for network discovery and security auditing"
+DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
 
 EGIT_REPO_URI="https://github.com/nmap/nmap"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-10-15  9:53 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2020-10-15  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     12eea3fc8f50b59808a62e47a2e764b917f01c22
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 09:52:26 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 09:53:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12eea3fc

net-analyzer/nmap: Drop logo

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nmap/Manifest            | 1 -
 net-analyzer/nmap/nmap-7.80-r1.ebuild | 5 +----
 net-analyzer/nmap/nmap-7.91.ebuild    | 5 +----
 net-analyzer/nmap/nmap-9999.ebuild    | 1 -
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 27d71a651af..5451f0f7941 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,2 @@
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d
-DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 6136d44ba18..f3166e2f526 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -6,10 +6,7 @@ inherit autotools desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild
index 00d8c3c0c95..f7d07cf2a70 100644
--- a/net-analyzer/nmap/nmap-7.91.ebuild
+++ b/net-analyzer/nmap/nmap-7.91.ebuild
@@ -6,10 +6,7 @@ inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
+SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
 
 LICENSE="NPSL"
 SLOT="0"

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 3fa4e3e598d..00bb4385aaa 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -8,7 +8,6 @@ DESCRIPTION="Network exploration tool and security / port scanner"
 HOMEPAGE="https://nmap.org/"
 
 EGIT_REPO_URI="https://github.com/nmap/nmap"
-SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 
 LICENSE="NPSL"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-10-04  6:58 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2020-10-04  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6d6a2aa3ac777b1e32c6cdab36c58496ee4590a1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 06:57:55 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 06:58:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6a2aa3

net-analyzer/nmap: Fix LICENSE

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.90.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.90.ebuild b/net-analyzer/nmap/nmap-7.90.ebuild
index f9b6702ee09..2b988dd25f2 100644
--- a/net-analyzer/nmap/nmap-7.90.ebuild
+++ b/net-analyzer/nmap/nmap-7.90.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
 
-LICENSE="GPL-2"
+LICENSE="NPSL"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-05-22 11:38 Andreas Sturmlechner
  0 siblings, 0 replies; 183+ messages in thread
From: Andreas Sturmlechner @ 2020-05-22 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     445b6ef13d07d2fac60301b899723e9e686d7f95
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 11:37:38 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 11:37:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445b6ef1

net-analyzer/nmap: Cleanup IUSE leftovers

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml        | 2 --
 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild    | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 37088b5933c..717311a0967 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -8,11 +8,9 @@
 	<use>
 		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="ncat">Install the ncat utility</flag>
-		<flag name="ndiff">Install the ndiff utility</flag>
 		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
-		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index f17847a96e5..c31710c9585 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ipv6 libressl libssh2 ncat ndiff nmap-update nping +nse ssl system-lua"
+IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 
 RDEPEND="

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 1c4060d3fe2..f45ed83d38a 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat ndiff nmap-update nping +nse ssl system-lua"
+IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-05-22 10:51 Andreas Sturmlechner
  0 siblings, 0 replies; 183+ messages in thread
From: Andreas Sturmlechner @ 2020-05-22 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9fd149287f841fb4090d59867d66b76d38775b37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 21:13:49 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 10:51:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd14928

net-analyzer/nmap: Drop IUSE ndiff, nls, zenmap

Closes: https://bugs.gentoo.org/702288
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 64 +++++------------------------------
 net-analyzer/nmap/nmap-9999.ebuild    | 62 ++++-----------------------------
 2 files changed, 15 insertions(+), 111 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index e974f482eb2..f17847a96e5 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -2,11 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
+inherit autotools desktop flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="https://nmap.org/"
@@ -14,21 +12,13 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ipv6 libressl libssh2 ncat ndiff nmap-update nping +nse ssl system-lua"
+REQUIRED_USE="system-lua? ( nse )"
 
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
@@ -37,8 +27,6 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
 	nmap-update? (
 		dev-libs/apr
 		dev-vcs/subversion
@@ -49,17 +37,9 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:= )
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
 "
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
@@ -73,12 +53,6 @@ PATCHES=(
 )
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -86,22 +60,6 @@ src_prepare() {
 
 	default
 
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
@@ -126,14 +84,13 @@ src_configure() {
 	# tree, so we cannot use the system library here.
 	econf \
 		$(use_enable ipv6) \
-		$(use_enable nls) \
 		$(use_with libssh2) \
 		$(use_with ncat) \
-		$(use_with ndiff) \
+		--without-ndiff \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
-		$(use_with zenmap) \
+		--without-zenmap \
 		$(usex libssh2 --with-zlib) \
 		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
@@ -175,9 +132,4 @@ src_install() {
 	fi
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
 }

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 7f9ceb695c1..1c4060d3fe2 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,11 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
+inherit autotools desktop flag-o-matic git-r3 toolchain-funcs user
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="https://nmap.org/"
@@ -16,17 +14,9 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="ipv6 libressl libssh2 ncat ndiff nmap-update nping +nse ssl system-lua"
+REQUIRED_USE="system-lua? ( nse )"
 
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
@@ -35,8 +25,6 @@ RDEPEND="
 		net-libs/libssh2[zlib]
 		sys-libs/zlib
 	)
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
 	nmap-update? (
 		dev-libs/apr
 		dev-vcs/subversion
@@ -47,17 +35,9 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:= )
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
 "
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
@@ -72,12 +52,6 @@ PATCHES=(
 )
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
 src_prepare() {
 	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
 
@@ -85,22 +59,6 @@ src_prepare() {
 
 	default
 
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
@@ -125,14 +83,13 @@ src_configure() {
 	# tree, so we cannot use the system library here.
 	econf \
 		$(use_enable ipv6) \
-		$(use_enable nls) \
 		$(use_with libssh2) \
 		$(use_with ncat) \
-		$(use_with ndiff) \
+		--without-ndiff \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
-		$(use_with zenmap) \
+		--without-zenmap \
 		$(usex libssh2 --with-zlib) \
 		$(usex nse --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
@@ -174,9 +131,4 @@ src_install() {
 	fi
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
 }


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-25 19:15 Thomas Deutschmann
  0 siblings, 0 replies; 183+ messages in thread
From: Thomas Deutschmann @ 2020-03-25 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2a61b415291233346e34da87702c2c3c292d3bdf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 19:15:14 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 19:15:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a61b415

net-analyzer/nmap: security cleanup (bug #711308)

Bug: https://bugs.gentoo.org/711308
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-analyzer/nmap/Manifest            |   1 -
 net-analyzer/nmap/nmap-7.70-r1.ebuild | 195 ----------------------------------
 2 files changed, 196 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 753fcf719ae..e34efcfd0b5 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,2 @@
-DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3

diff --git a/net-analyzer/nmap/nmap-7.70-r1.ebuild b/net-analyzer/nmap/nmap-7.70-r1.ebuild
deleted file mode 100644
index f6b7e054ca3..00000000000
--- a/net-analyzer/nmap/nmap-7.70-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? ( net-libs/libssh2[zlib] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.70-time.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	sed -i \
-		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
-		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
-		configure.ac
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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 libssh2) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-17 18:00 Sergei Trofimovich
  0 siblings, 0 replies; 183+ messages in thread
From: Sergei Trofimovich @ 2020-03-17 18:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a4f0ef96c7bb12d2f182174ebc6d7543bf8bc695
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Mar 17 17:37:52 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 18:00:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f0ef96

net-analyzer/nmap: stable 7.80-r1 for hppa, bug #711308

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 4ae93031942..f0e760e7435 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:41 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     5bb38dec1c523ac01488e7026108b7e868edba79
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:40:28 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:40:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb38dec

net-analyzer/nmap: x86 stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 14da7371a2e..4ae93031942 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:37 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5feb0c0adf6aabf22470fa57d5a1234dbc1551f1
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:36:46 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:36:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5feb0c0a

net-analyzer/nmap: sparc stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 80ad21f4bbc..14da7371a2e 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:34 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ec6515aa68c6424e4c3666ed4af1eadd805be06f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:33:17 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:33:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec6515aa

net-analyzer/nmap: ppc64 stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index c592a681067..80ad21f4bbc 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:31 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e964c259fce1e2a0363676851cd59c54b844fd36
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:30:12 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:30:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e964c259

net-analyzer/nmap: ppc stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 6997e5b877a..c592a681067 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:29 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:29 UTC (permalink / raw
  To: gentoo-commits

commit:     09bdf22e01787dd0bf55702259be0dd7661bafc6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:29:01 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:29:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bdf22e

net-analyzer/nmap: ia64 stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 61b8b0d8bde..6997e5b877a 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:27 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     28d1f1b2ca1ef86bfc7aecac34bb41f7f1b1f25a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:27:10 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:27:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d1f1b2

net-analyzer/nmap: arm stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index 1952588b8ad..61b8b0d8bde 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2020-03-15 18:26 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2020-03-15 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     fb5b8348c1129385f9dee23e97f51b448cf520fb
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:25:15 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:25:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb5b8348

net-analyzer/nmap: amd64 stable wrt bug #711308

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.80-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
index a742c24a232..1952588b8ad 100644
--- a/net-analyzer/nmap/nmap-7.80-r1.ebuild
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2019-09-18  8:31 Fabian Groffen
  0 siblings, 0 replies; 183+ messages in thread
From: Fabian Groffen @ 2019-09-18  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f6fcd67858690eca97c148d179625655d94f32f7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 08:30:43 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 08:31:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6fcd678

net-analyzer/nmap: drop *-solaris, bug #396353

Closes: https://bugs.gentoo.org/396353
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.80.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index e9bc260c7a9..2158e6bff70 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua

diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild
index b3ddc62aa35..0c3f096077e 100644
--- a/net-analyzer/nmap/nmap-7.80.ebuild
+++ b/net-analyzer/nmap/nmap-7.80.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	https://nmap.org/dist/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~jer/nmap-logo-64.png
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2019-08-10 22:40 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2019-08-10 22:40 UTC (permalink / raw
  To: gentoo-commits

commit:     4a7f27421c511451f5c945f5c8bf952c5e4bf92e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 22:39:14 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 22:40:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7f2742

net-analyzer/nmap: Version 7.80

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.80.ebuild | 185 +++++++++++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 0d32bba7d5f..753fcf719ae 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,3 @@
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
+DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3

diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild
new file mode 100644
index 00000000000..cf94423c0af
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.80.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	nse? ( sys-libs/zlib )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	local lingua
+	if use nls; then
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+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 libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2019-05-31 13:00 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2019-05-31 13:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e88cca73b39de0a3e38e83ee6d0013ccafdafcc6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 12:46:37 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 31 13:00:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88cca73

net-analyzer/nmap: Update live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/nmap/nmap-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index c282246d451..6b625c9459b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs user
 
 MY_P=${P/_beta/BETA}
 
@@ -65,7 +65,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.70-time.patch
 )
 S="${WORKDIR}/${MY_P}"
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-04-15  8:21 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2018-04-15  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b6ea20f346f4b1b82c50f0f7dc9b1d4a645b7405
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 08:20:43 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 08:21:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ea20f3

net-analyzer/nmap: Old.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 net-analyzer/nmap/Manifest         |   1 -
 net-analyzer/nmap/nmap-7.40.ebuild | 179 -------------------------------------
 2 files changed, 180 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 58b6e4ecc35..0d32bba7d5f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,2 @@
-DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf04d599ed2257f89cc1e419a9dbf94101a5b1d5ad6815e1a94974b3c02ad81354897ba3bb032a5e3d616468d SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
deleted file mode 100644
index b1b445aa953..00000000000
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-)
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-	eautoreconf
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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 zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-04-14 11:40 Markus Meier
  0 siblings, 0 replies; 183+ messages in thread
From: Markus Meier @ 2018-04-14 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     9700aec99b7f2f22e32808c540b29672a7ef5b89
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 11:37:36 2018 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 11:37:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9700aec9

net-analyzer/nmap: arm stable, bug #651118

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index a649c0dacfc..40fea0e3b9d 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-04-08  4:58 Matt Turner
  0 siblings, 0 replies; 183+ messages in thread
From: Matt Turner @ 2018-04-08  4:58 UTC (permalink / raw
  To: gentoo-commits

commit:     7ebb440629959cdcf0db2e639ab94c6063daf99a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  8 04:54:36 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 04:54:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebb4406

net-analyzer/nmap-7.70: ppc stable, bug 651118

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 1d627ed723e..8b370276511 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-04-08  4:58 Matt Turner
  0 siblings, 0 replies; 183+ messages in thread
From: Matt Turner @ 2018-04-08  4:58 UTC (permalink / raw
  To: gentoo-commits

commit:     01d1d03575636d6aee7fe276fa82f426c5ea2388
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  8 04:54:42 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr  8 04:54:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d1d035

net-analyzer/nmap-7.70: ppc64 stable, bug 651118

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 8b370276511..a649c0dacfc 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-04-01 10:00 Tobias Klausmann
  0 siblings, 0 replies; 183+ messages in thread
From: Tobias Klausmann @ 2018-04-01 10:00 UTC (permalink / raw
  To: gentoo-commits

commit:     bf1b6f4415d86981b966a4e5c304420a6bdcce4b
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  1 10:00:07 2018 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sun Apr  1 10:00:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1b6f44

net-analyzer/nmap-7.70-r0: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/651118

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 9aef014d5c7..1d627ed723e 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-03-22 23:01 Sergei Trofimovich
  0 siblings, 0 replies; 183+ messages in thread
From: Sergei Trofimovich @ 2018-03-22 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     2c5b78d26024dd690e82c2b3db71cdb3b22e084e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 23:00:58 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 23:00:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5b78d2

net-analyzer/nmap: stable 7.70 for ia64, bug #651118

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 1be53752554..254429f1948 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-03-22 22:25 Sergei Trofimovich
  0 siblings, 0 replies; 183+ messages in thread
From: Sergei Trofimovich @ 2018-03-22 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     639b423b1c6c8d08a6f52041285bf531d7099478
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Mar 22 17:09:29 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 22:25:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639b423b

net-analyzer/nmap: stable 7.70 for sparc, bug #651118

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index d92cac5d145..1be53752554 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-03-22 16:08 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2018-03-22 16:08 UTC (permalink / raw
  To: gentoo-commits

commit:     a1b364d201ce65a61018d3921afc42c6a0e4f4b7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 16:08:26 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 16:08:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b364d2

net-analyzer/nmap: Stable for HPPA too.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --ignore-arches

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index df9861d9ab5..d92cac5d145 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-03-22 14:25 Mikle Kolyada
  0 siblings, 0 replies; 183+ messages in thread
From: Mikle Kolyada @ 2018-03-22 14:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9065226953221e34e1913c507ae07eb3d54bd906
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 14:24:23 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 14:25:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90652269

net-analyzer/nmap: amd64 stable wrt bug #651118

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/nmap/nmap-7.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 59a746de80e..df9861d9ab5 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="
 	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-03-21 21:00 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2018-03-21 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     f3db38bca12e575de54234854a8dd7a7a2ef8027
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 20:58:22 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 20:58:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3db38bc

net-analyzer/nmap: Version 7.70.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.70.ebuild | 194 +++++++++++++++++++++++++++++++++++++
 2 files changed, 195 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ac6015a86c8..3d383771ece 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,5 @@
 DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf04d599ed2257f89cc1e419a9dbf94101a5b1d5ad6815e1a94974b3c02ad81354897ba3bb032a5e3d616468d SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d
 DIST nmap-7.50.tar.bz2 9309616 BLAKE2B 79f257f4c19762729ddfe7bb950263253d98b0902d22f0bf87ff64b7400c5e0c8e8c1a6b5a8c75e3f835dedbf7087808b1bd8444126655138382ea2db1ccb748 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2
 DIST nmap-7.60.tar.bz2 10394925 BLAKE2B bb3a392292adeebe60dc9716ee61ee09a2f86703a1370ffd6a6c63969a75733660046279d122b1b529a3ea25083bde9334d5e13496ad6a9bd9d6562031b8ae09 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
+DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3

diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
new file mode 100644
index 00000000000..59a746de80e
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? ( net-libs/libssh2[zlib] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	local lingua
+	if use nls; then
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+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 libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-03-21 21:00 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2018-03-21 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a30cbc170b5995017a60353ff1787fbec384fe8f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 20:59:35 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 20:59:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30cbc17

net-analyzer/nmap: Old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/nmap/Manifest         |   2 -
 net-analyzer/nmap/nmap-7.50.ebuild | 179 ----------------------------------
 net-analyzer/nmap/nmap-7.60.ebuild | 194 -------------------------------------
 3 files changed, 375 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 3d383771ece..58b6e4ecc35 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,5 +1,3 @@
 DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf04d599ed2257f89cc1e419a9dbf94101a5b1d5ad6815e1a94974b3c02ad81354897ba3bb032a5e3d616468d SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d
-DIST nmap-7.50.tar.bz2 9309616 BLAKE2B 79f257f4c19762729ddfe7bb950263253d98b0902d22f0bf87ff64b7400c5e0c8e8c1a6b5a8c75e3f835dedbf7087808b1bd8444126655138382ea2db1ccb748 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2
-DIST nmap-7.60.tar.bz2 10394925 BLAKE2B bb3a392292adeebe60dc9716ee61ee09a2f86703a1370ffd6a6c63969a75733660046279d122b1b529a3ea25083bde9334d5e13496ad6a9bd9d6562031b8ae09 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3

diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
deleted file mode 100644
index e8d52c0afb3..00000000000
--- a/net-analyzer/nmap/nmap-7.50.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-)
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-	eautoreconf
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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 ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}

diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
deleted file mode 100644
index 59a746de80e..00000000000
--- a/net-analyzer/nmap/nmap-7.60.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? ( net-libs/libssh2[zlib] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	sed -i \
-		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
-		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
-		configure.ac
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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 libssh2) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-01-08 13:58 Ulrich Müller
  0 siblings, 0 replies; 183+ messages in thread
From: Ulrich Müller @ 2018-01-08 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e829c371592c8b1899da5fc156d30b70c4a135d6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 13:57:06 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 13:57:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e829c371

net-analyzer/nmap: Fix typo in variable name.

Closes: https://bugs.gentoo.org/643860
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.50.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.60.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 75ad3bdc6aa..b1b445aa953 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -84,7 +84,7 @@ src_prepare() {
 	local lingua
 	if use nls; then
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${linguas} ${LINGUAS-${lingua}}; then
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi

diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
index 4cef5f17ec7..e8d52c0afb3 100644
--- a/net-analyzer/nmap/nmap-7.50.ebuild
+++ b/net-analyzer/nmap/nmap-7.50.ebuild
@@ -84,7 +84,7 @@ src_prepare() {
 	local lingua
 	if use nls; then
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${linguas} ${LINGUAS-${lingua}}; then
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi

diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
index d6bd64a6b69..59a746de80e 100644
--- a/net-analyzer/nmap/nmap-7.60.ebuild
+++ b/net-analyzer/nmap/nmap-7.60.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 	local lingua
 	if use nls; then
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${linguas} ${LINGUAS-${lingua}}; then
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 3424bf9d8b6..ad91a6386b5 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
 	local lingua
 	if use nls; then
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${linguas} ${LINGUAS-${lingua}}; then
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2018-01-06 18:32 Ulrich Müller
  0 siblings, 0 replies; 183+ messages in thread
From: Ulrich Müller @ 2018-01-06 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6a0e29a70af811da20c95cbd5a89771db03c99f8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 18:30:06 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 18:32:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0e29a7

net-analyzer/nmap: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/nmap/nmap-7.40.ebuild | 7 +++----
 net-analyzer/nmap/nmap-7.50.ebuild | 7 +++----
 net-analyzer/nmap/nmap-7.60.ebuild | 7 +++----
 net-analyzer/nmap/nmap-9999.ebuild | 7 +++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 1582792f3e6..75ad3bdc6aa 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
 	system-lua? ( nse )
@@ -82,10 +81,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi

diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
index cfbafe0a31b..4cef5f17ec7 100644
--- a/net-analyzer/nmap/nmap-7.50.ebuild
+++ b/net-analyzer/nmap/nmap-7.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
 	system-lua? ( nse )
@@ -82,10 +81,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi

diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
index e925ad725d8..d6bd64a6b69 100644
--- a/net-analyzer/nmap/nmap-7.60.ebuild
+++ b/net-analyzer/nmap/nmap-7.60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,6 @@ IUSE="
 	zenmap
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
 	system-lua? ( nse )
@@ -88,10 +87,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index f92eba2649f..3424bf9d8b6 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,6 @@ IUSE="
 	zenmap
 "
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 REQUIRED_USE="
 	system-lua? ( nse )
 	ndiff? ( ${PYTHON_REQUIRED_USE} )
@@ -83,10 +82,10 @@ src_prepare() {
 
 	default
 
+	local lingua
 	if use nls; then
-		local lingua=''
 		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
+			if ! has ${linguas} ${LINGUAS-${lingua}}; then
 				rm -r zenmap/share/zenmap/locale/${lingua} || die
 				rm zenmap/share/zenmap/locale/${lingua}.po || die
 			fi


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-08-26  9:00 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-08-26  9:00 UTC (permalink / raw
  To: gentoo-commits

commit:     486c3e75a9612e24bef1dfa19ec62aba3653632d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 08:59:41 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 08:59:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486c3e75

net-analyzer/nmap: Update live ebuild.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-analyzer/nmap/nmap-7.60.ebuild | 13 ++++++------
 net-analyzer/nmap/nmap-9999.ebuild | 41 ++++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
index 2e1a4c75258..e925ad725d8 100644
--- a/net-analyzer/nmap/nmap-7.60.ebuild
+++ b/net-analyzer/nmap/nmap-7.60.ebuild
@@ -37,9 +37,7 @@ RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-	)
+	libssh2? ( net-libs/libssh2[zlib] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? (
@@ -60,8 +58,6 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
-
-S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
@@ -72,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 )
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use ndiff || use zenmap; then
@@ -128,7 +125,9 @@ src_prepare() {
 		configure.ac
 
 	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
 	eautoreconf
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# we need the original for a Darwin-specific fix, bug #604432
 		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
@@ -141,14 +140,14 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
-		$(use_with ncat) \
 		$(use_with libssh2) \
-		$(usex libssh2 --with-zlib) \
+		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
 		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index ef0334de9f3..d78311ad1c1 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -10,7 +10,7 @@ inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
 MY_P=${P/_beta/BETA}
 
 DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
+HOMEPAGE="https://nmap.org/"
 
 EGIT_REPO_URI="https://github.com/nmap/nmap"
 SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
@@ -18,7 +18,10 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
@@ -32,35 +35,38 @@ RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	libssh2? ( net-libs/libssh2[zlib] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
 "
 DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
-
-S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
 	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 )
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use ndiff || use zenmap; then
@@ -94,14 +100,21 @@ src_prepare() {
 	sed -i \
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
-
 	# Fix desktop files wrt bug #432714
 	sed -i \
 		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
 		zenmap/install_scripts/unix/zenmap-root.desktop \
 		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
 	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
 	eautoreconf
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# we need the original for a Darwin-specific fix, bug #604432
 		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
@@ -114,12 +127,14 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
+		$(use_with libssh2) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
 		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
 		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-08-08 12:18 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-08-08 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     3d209ecedba43027950846e30744afad46d0a030
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 12:17:58 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 12:17:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d209ece

net-analyzer/nmap: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/nmap/nmap-7.40-r1.ebuild | 180 ----------------------------------
 1 file changed, 180 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.40-r1.ebuild b/net-analyzer/nmap/nmap-7.40-r1.ebuild
deleted file mode 100644
index cfbafe0a31b..00000000000
--- a/net-analyzer/nmap/nmap-7.40-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-)
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-	eautoreconf
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-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 ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-08-08 12:17 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-08-08 12:17 UTC (permalink / raw
  To: gentoo-commits

commit:     a8e3423633e730858cfc0029cff4cbb28f8d02cb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 12:16:46 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 12:17:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e34236

net-analyzer/nmap: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/metadata.xml     |   3 +-
 net-analyzer/nmap/nmap-7.60.ebuild | 196 +++++++++++++++++++++++++++++++++++++
 3 files changed, 199 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 2e0011795cc..7dbcd96d94d 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,4 @@
 DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-7.50.tar.bz2 9309616 SHA256 e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2 WHIRLPOOL 9fd0a9fb8de6e4e169cf7a9ce8b06b3e245f66aa3643cb6be4b1933d824091d4211d3207893f5bff5621c7746434db92a5745c3500e3ce8de1bb0c6e2820d365
+DIST nmap-7.60.tar.bz2 10394925 SHA256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4 WHIRLPOOL ca5a10ca5a685c53fa37a72857c009333287c6559409fb1dfcc5edc5e48034b3d280f76e555e159156b5befc0167b9198673e07ccd2e6a0a80c2d3dc2395fff0
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index bd677b0812d..37088b5933c 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -6,12 +6,13 @@
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 	<use>
-		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
+		<flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="ncat">Install the ncat utility</flag>
 		<flag name="ndiff">Install the ndiff utility</flag>
 		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
 		<flag name="nping">Install the nping utility</flag>
 		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
+		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
 		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild
new file mode 100644
index 00000000000..2e1a4c75258
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.60.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+	)
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+	eautoreconf
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+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 ncat) \
+		$(use_with libssh2) \
+		$(usex libssh2 --with-zlib) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-06-20 11:58 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-06-20 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     1335356d7a8e1851a8114a57c0e5f6aee7c6f21a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 11:55:58 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 11:55:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1335356d

net-analyzer/nmap: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.50.ebuild | 180 +++++++++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index b482e61946d..2e0011795cc 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,2 +1,3 @@
 DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
+DIST nmap-7.50.tar.bz2 9309616 SHA256 e9a96a8e02bfc9e80c617932acc61112c23089521ee7d6b1502ecf8e3b1674b2 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2 WHIRLPOOL 9fd0a9fb8de6e4e169cf7a9ce8b06b3e245f66aa3643cb6be4b1933d824091d4211d3207893f5bff5621c7746434db92a5745c3500e3ce8de1bb0c6e2820d365
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild
new file mode 100644
index 00000000000..cfbafe0a31b
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.50.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+)
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+	eautoreconf
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+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 ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-06-11 11:49 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-06-11 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f345fbadd9ea8e0cf308171da467a24700a7a36c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 11:48:07 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 11:49:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f345fbad

net-analyzer/nmap: Old.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-analyzer/nmap/Manifest         |   1 -
 net-analyzer/nmap/nmap-7.31.ebuild | 175 -------------------------------------
 2 files changed, 176 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index ec28c225d14..b482e61946d 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,2 @@
-DIST nmap-7.31.tar.bz2 9000848 SHA256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 SHA512 891593dfa13f235a97c2cebfd8f557d7f8c1c9edacf62c460c7ee8ee7bf5f4df1805da903ee031985b8cc91293c739b025ebe4c5fa9d66a3580b2da2f3b4870c WHIRLPOOL a0f3ad25d70bb8db440c4a4d631dd5324216b5a9310a3f59d13cb64c235ac6e8ab922ff517a6938e1b06b6ef85b98b93864ad8236074046eaab2b2a13f9cebad
 DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
deleted file mode 100644
index 236ceeceafc..00000000000
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
-		"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
-		"${FILESDIR}"/${PN}-7.25-libpcre.patch \
-		"${FILESDIR}"/${PN}-7.31-libnl.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-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 zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-06-10 15:10 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2017-06-10 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f042f9d7d70851437d6f3f9434a526bcfb69aa98
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 15:10:28 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 15:10:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f042f9d7

net-analyzer/nmap: ia64 stable wrt bug #612854

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 0a10167a400..1582792f3e6 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-03-25 10:08 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-03-25 10:08 UTC (permalink / raw
  To: gentoo-commits

commit:     9da6c53f8a5685abca1c718063323d005670ac2e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 10:06:14 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 10:08:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da6c53f

net-analyzer/nmap: Use a single config.cache to speed up configure.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../nmap/{nmap-9999.ebuild => nmap-7.40-r1.ebuild} | 32 +++++++++++++++-------
 net-analyzer/nmap/nmap-9999.ebuild                 |  9 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.40-r1.ebuild
similarity index 86%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-7.40-r1.ebuild
index 431ae56c880..cfbafe0a31b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-7.40-r1.ebuild
@@ -5,18 +5,20 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P=${P/_beta/BETA}
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="http://nmap.org/"
-
-EGIT_REPO_URI="https://github.com/nmap/nmap"
-SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
@@ -54,11 +56,11 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
 	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
 	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
 )
 
@@ -68,6 +70,11 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
 src_prepare() {
 	rm -r libpcap/ || die
 
@@ -95,9 +102,13 @@ src_prepare() {
 		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
 		Makefile.in || die
 
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
 	# Fix desktop files wrt bug #432714
 	sed -i \
-		-e '/^Encoding/d' \
 		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
 		zenmap/install_scripts/unix/zenmap-root.desktop \
 		zenmap/install_scripts/unix/zenmap.desktop || die
@@ -116,17 +127,18 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
-		$(use_with zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
 		--with-pcre=/usr
+	#	Commented out because configure does weird things
 	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
 }
 
 src_compile() {

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 431ae56c880..ef0334de9f3 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -97,11 +97,9 @@ src_prepare() {
 
 	# Fix desktop files wrt bug #432714
 	sed -i \
-		-e '/^Encoding/d' \
 		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
 		zenmap/install_scripts/unix/zenmap-root.desktop \
 		zenmap/install_scripts/unix/zenmap.desktop || die
-
 	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
 	eautoreconf
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -116,17 +114,18 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls) \
-		$(use_with zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
 		$(use_with nmap-update) \
 		$(use_with nping) \
 		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
 		--with-libdnet=included \
 		--with-pcre=/usr
+	#	Commented out because configure does weird things
 	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-03-21 12:31 Michael Weber
  0 siblings, 0 replies; 183+ messages in thread
From: Michael Weber @ 2017-03-21 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     8f29671e0f96adc85f267f1e58ff927e9de8eb33
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 12:31:29 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 12:31:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f29671e

net-analyzer/nmap: arm ppc ppc64 stable (bug 612854).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 412afc2a2ab..019312c24df 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-03-17 10:42 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2017-03-17 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     be33e85e242fbbb0a1555afc9f40149097a5ab30
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 10:40:51 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 10:40:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be33e85e

net-analyzer/nmap: sparc stable wrt bug #612854

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 67ac61e146f..412afc2a2ab 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-03-17 10:15 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2017-03-17 10:15 UTC (permalink / raw
  To: gentoo-commits

commit:     051eff1701e06998c49f77ff32e1e4384384fecd
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 10:12:45 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 10:12:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051eff17

net-analyzer/nmap: amd64 stable wrt bug #612854

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 523f4c30451..c68b15bf335 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-03-17  7:08 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-03-17  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     df9faa114df3f2152d18d6f1670710fc7e168009
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 07:08:11 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 07:08:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9faa11

net-analyzer/nmap: Stable for HPPA (bug #612854).

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 4b2f5e5a57c..523f4c30451 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-02-10 17:40 Michael Weber
  0 siblings, 0 replies; 183+ messages in thread
From: Michael Weber @ 2017-02-10 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     71f0cabdf494846cd7dc3dd69dbb95555261d95b
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 17:40:33 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 17:40:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f0cabd

net-analyzer/nmap: arm stable (bug 604494).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/nmap/nmap-7.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 41fd57c29a..0c2f2ac32a 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-23 17:15 Richard Farina
  0 siblings, 0 replies; 183+ messages in thread
From: Richard Farina @ 2017-01-23 17:15 UTC (permalink / raw
  To: gentoo-commits

commit:     b6565fd85220b303d0a2d4e03d731984d4cd8ea7
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 17:14:17 2017 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 17:14:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6565fd8

net-analyzer/nmap: make repoman quiet

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/nmap/nmap-7.12.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.31.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index a69f99d..b36e279 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index bb2759c..41fd57c 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index b50424e..117ee98 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index ededf90..57c15e5 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-22 16:48 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-01-22 16:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0b3503b98e45c4400edc6d81b9850419fbb5719c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 16:48:29 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 16:48:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3503b9

net-analyzer/nmap: Drop USE=ipv6 dep on libpcap.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/nmap/nmap-7.12.ebuild | 4 ++--
 net-analyzer/nmap/nmap-7.31.ebuild | 2 +-
 net-analyzer/nmap/nmap-7.40.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index 9cb5a00..a69f99d 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	net-libs/libpcap
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 27b3e9c..bb2759c 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	net-libs/libpcap
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 4ea8959..b50424e 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	net-libs/libpcap
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index ff1ea85..ededf90 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	net-libs/libpcap
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-22 16:43 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-01-22 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0caf9596ecc386b6f33244ad735c7f433eb4d2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 16:43:26 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 16:43:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0caf95

net-analyzer/nmap: Drop USE=lua description.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/nmap/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 50be26d..bd677b0 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
-		<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag>
 		<flag name="ncat">Install the ncat utility</flag>
 		<flag name="ndiff">Install the ndiff utility</flag>
 		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-21 11:04 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2017-01-21 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e1d21eaacf057bb77dc44dad9c3888a697c3891d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 11:04:36 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 11:04:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d21eaa

net-analyzer/nmap: Stable for HPPA (bug #604494).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 net-analyzer/nmap/nmap-7.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index e89f0e6..27b3e9c 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-06 14:33 Tobias Klausmann
  0 siblings, 0 replies; 183+ messages in thread
From: Tobias Klausmann @ 2017-01-06 14:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f4ca04c8334b50ed8ed9a25c26d467eef5515b13
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 14:22:14 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 14:33:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4ca04c8

net-analyzer/nmap-7.31-r0: stable on alpha

Gentoo-Bug: 604494

 net-analyzer/nmap/nmap-7.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 171c6e1..96268c0 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-04 17:09 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2017-01-04 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     8edc53daded362b6de1cf1e26a0d58b75b09cf9b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 17:08:20 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 17:08:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edc53da

net-analyzer/nmap: x86 stable wrt bug #604494

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 5508614..171c6e1 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-04 16:56 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2017-01-04 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     1e66f6b7d67072cbcfaa9d630bed3c3c1d41015d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 16:56:18 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 16:56:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e66f6b7

net-analyzer/nmap: amd64 stable wrt bug #604494

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.31.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 1fe61b5..5508614 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2017-01-03 14:09 Fabian Groffen
  0 siblings, 0 replies; 183+ messages in thread
From: Fabian Groffen @ 2017-01-03 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     86a62d35647397b546ec9340da8e454f204aad83
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 14:08:42 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 14:08:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a62d35

net-analyzer/nmap: apply workaround not to destroy a fix for Darwin, bug #604432

Package-Manager: portage-2.2.28-prefix

 net-analyzer/nmap/nmap-7.40.ebuild | 7 ++++++-
 net-analyzer/nmap/nmap-9999.ebuild | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 1fe61b5..28b7751 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -111,7 +111,12 @@ src_prepare() {
 
 	epatch_user
 
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
 	eautoreconf
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
 }
 
 src_configure() {

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 7ed59bd..b7315c6 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -99,7 +99,12 @@ src_prepare() {
 
 	epatch_user
 
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
 	eautoreconf
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-12-23 21:09 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-12-23 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     210fa31b818b79000e7820f85caa19ec3cb3488b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 21:08:54 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 21:08:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210fa31b

net-analyzer/nmap: Version bump (bug #603542).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.40.ebuild | 172 +++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 15d74ba..30335f8 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -3,4 +3,5 @@ DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b72
 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-7.30.tar.bz2 9003761 SHA256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f SHA512 effef6d1d3f333a8c9a628a2acc0d0faec5967ef09a7d831a4d8d287f224167305e54f575e571eebb0f30544675bf27c834fdaf468db00cdb3fcad14e392303c WHIRLPOOL d20627c806131fcec6583f8d2eb3504f669d2165391d5ba17bdf86be3417cc5ca783ff5d1552735bbeb75ac34d236ca36cfe754c29596ec8703a6b669a91aa55
 DIST nmap-7.31.tar.bz2 9000848 SHA256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 SHA512 891593dfa13f235a97c2cebfd8f557d7f8c1c9edacf62c460c7ee8ee7bf5f4df1805da903ee031985b8cc91293c739b025ebe4c5fa9d66a3580b2da2f3b4870c WHIRLPOOL a0f3ad25d70bb8db440c4a4d631dd5324216b5a9310a3f59d13cb64c235ac6e8ab922ff517a6938e1b06b6ef85b98b93864ad8236074046eaab2b2a13f9cebad
+DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
new file mode 100644
index 00000000..1fe61b5
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
+		"${FILESDIR}"/${PN}-7.25-libpcre.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-10-22  9:58 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-10-22  9:58 UTC (permalink / raw
  To: gentoo-commits

commit:     1dfbe5397d2aa8bcf974db853f53462067eee648
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 22 09:08:27 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 09:58:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfbe539

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.3.2

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.31.ebuild | 172 +++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 99a27b4..15d74ba 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -2,4 +2,5 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-7.30.tar.bz2 9003761 SHA256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f SHA512 effef6d1d3f333a8c9a628a2acc0d0faec5967ef09a7d831a4d8d287f224167305e54f575e571eebb0f30544675bf27c834fdaf468db00cdb3fcad14e392303c WHIRLPOOL d20627c806131fcec6583f8d2eb3504f669d2165391d5ba17bdf86be3417cc5ca783ff5d1552735bbeb75ac34d236ca36cfe754c29596ec8703a6b669a91aa55
+DIST nmap-7.31.tar.bz2 9000848 SHA256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 SHA512 891593dfa13f235a97c2cebfd8f557d7f8c1c9edacf62c460c7ee8ee7bf5f4df1805da903ee031985b8cc91293c739b025ebe4c5fa9d66a3580b2da2f3b4870c WHIRLPOOL a0f3ad25d70bb8db440c4a4d631dd5324216b5a9310a3f59d13cb64c235ac6e8ab922ff517a6938e1b06b6ef85b98b93864ad8236074046eaab2b2a13f9cebad
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
new file mode 100644
index 00000000..1fe61b5
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
+		"${FILESDIR}"/${PN}-7.25-libpcre.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-09-30  9:15 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-09-30  9:15 UTC (permalink / raw
  To: gentoo-commits

commit:     b81b83eab7b3a68c2e7eacae58ffdd8689ebce9a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:14:08 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 09:14:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81b83ea

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.3.1

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.30.ebuild | 172 +++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 3b2033a..1a19fab 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -3,4 +3,5 @@ DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b72
 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-7.25BETA1.tar.bz2 8580974 SHA256 6866457809b598f8e85c9e8c79773f1821de29cc1b6f574cc7fed4ad8c01c178 SHA512 6d2fc83186086ea8d01003b8d79af0b45788378ef32c5e8f9b14561db5adfc407e388df044f1e3420f4f3d21115bc1623da0b6a926bd3d20816265cb10efe092 WHIRLPOOL 18bfca4d494c59fa6625ecb1e5ad7a7f838236c73269c9e0b2094e57d047ba1095284e26d4cbfb1a85a797af4b7f4abf02ffbc89c4664c6a5aea3912d4c3fb94
 DIST nmap-7.25BETA2.tar.bz2 8874592 SHA256 6c66a150c9e346ccdca0aa16ef8c2a5310449444fe15cf5ec3f3a151978378d0 SHA512 0a40267d578ac7ff461783a4b22e584a7c3fee42c321843fce24dd6cddabc068cc7acd0fc8fd85f3952ed05033792adcb28e2919ed70f5fb30826a81c4777fe0 WHIRLPOOL 4c165d45afe0295f5cdb68cd90e7e7d5951ffb31115b3aedc37722872b130adab088cae851c12db0d213aabecfbdcda2b1dae48c6a01bdd8e5d98148c084c98d
+DIST nmap-7.30.tar.bz2 9003761 SHA256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f SHA512 effef6d1d3f333a8c9a628a2acc0d0faec5967ef09a7d831a4d8d287f224167305e54f575e571eebb0f30544675bf27c834fdaf468db00cdb3fcad14e392303c WHIRLPOOL d20627c806131fcec6583f8d2eb3504f669d2165391d5ba17bdf86be3417cc5ca783ff5d1552735bbeb75ac34d236ca36cfe754c29596ec8703a6b669a91aa55
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.30.ebuild b/net-analyzer/nmap/nmap-7.30.ebuild
new file mode 100644
index 00000000..1fe61b5
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.30.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
+		"${FILESDIR}"/${PN}-7.25-libpcre.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-09-09  5:02 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-09-09  5:02 UTC (permalink / raw
  To: gentoo-commits

commit:     1170d3372281a283d775907df6a40c8e18aa830a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 05:01:49 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 05:02:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1170d337

net-analyzer/nmap: Update live ebuild.

Package-Manager: portage-2.3.0

 net-analyzer/nmap/nmap-9999.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index ca472d6..7ed59bd 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -66,9 +66,9 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
 		"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
-		"${FILESDIR}"/${PN}-7.25-libpcre.patch
+		"${FILESDIR}"/${PN}-7.25-libpcre.patch \
+		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''
@@ -122,11 +122,13 @@ src_configure() {
 }
 
 src_compile() {
-	local dep deps="build-dnet build-nbase build-nsock build-netutil"
-	use system-lua || deps="build-lua ${deps}"
-
-	for dep in ${deps}; do
-		emake makefile.dep ${dep}
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
 	done
 
 	emake \


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-09-03 10:56 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-09-03 10:56 UTC (permalink / raw
  To: gentoo-commits

commit:     2e264247a69c277d712ccdd9013bf0793ac19eeb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  3 10:51:29 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 10:51:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e264247

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.3.0

 net-analyzer/nmap/Manifest               |   1 +
 net-analyzer/nmap/nmap-7.25_beta2.ebuild | 172 +++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 9518669..3b2033a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -2,4 +2,5 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-7.25BETA1.tar.bz2 8580974 SHA256 6866457809b598f8e85c9e8c79773f1821de29cc1b6f574cc7fed4ad8c01c178 SHA512 6d2fc83186086ea8d01003b8d79af0b45788378ef32c5e8f9b14561db5adfc407e388df044f1e3420f4f3d21115bc1623da0b6a926bd3d20816265cb10efe092 WHIRLPOOL 18bfca4d494c59fa6625ecb1e5ad7a7f838236c73269c9e0b2094e57d047ba1095284e26d4cbfb1a85a797af4b7f4abf02ffbc89c4664c6a5aea3912d4c3fb94
+DIST nmap-7.25BETA2.tar.bz2 8874592 SHA256 6c66a150c9e346ccdca0aa16ef8c2a5310449444fe15cf5ec3f3a151978378d0 SHA512 0a40267d578ac7ff461783a4b22e584a7c3fee42c321843fce24dd6cddabc068cc7acd0fc8fd85f3952ed05033792adcb28e2919ed70f5fb30826a81c4777fe0 WHIRLPOOL 4c165d45afe0295f5cdb68cd90e7e7d5951ffb31115b3aedc37722872b130adab088cae851c12db0d213aabecfbdcda2b1dae48c6a01bdd8e5d98148c084c98d
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.25_beta2.ebuild b/net-analyzer/nmap/nmap-7.25_beta2.ebuild
new file mode 100644
index 00000000..1fe61b5
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.25_beta2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
+		"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
+		"${FILESDIR}"/${PN}-7.25-libpcre.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+
+	eautoreconf
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-07-27 15:57 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-07-27 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     0ea274bac6481586a19af195a07029709470d9f3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 15:57:12 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 15:57:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea274ba

net-analyzer/nmap: Alternatively depend on >=net-libs/libpcap-1.8.0 without a USE flag restriction (iamben).

Package-Manager: portage-2.3.0

 net-analyzer/nmap/nmap-7.12.ebuild       | 2 +-
 net-analyzer/nmap/nmap-7.25_beta1.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index 00dd823..9cb5a00 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}

diff --git a/net-analyzer/nmap/nmap-7.25_beta1.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
index 979b7b5..ff216a8 100644
--- a/net-analyzer/nmap/nmap-7.25_beta1.ebuild
+++ b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
@@ -34,7 +34,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index bfeb1ee..40c25d6 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 RDEPEND="
 	dev-libs/liblinear:=
 	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
+	|| ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
 	zenmap? (
 		dev-python/pygtk:2[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-07-22  5:47 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-07-22  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     4bcf7d234913f01f2829d204684542ca56f850d3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 05:47:12 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 05:47:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcf7d23

net-analyzer/nmap: Old.

Package-Manager: portage-2.3.0

 net-analyzer/nmap/Manifest         |   1 -
 net-analyzer/nmap/nmap-7.11.ebuild | 169 -------------------------------------
 2 files changed, 170 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index fb8f011..9518669 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,6 +1,5 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
-DIST nmap-7.11.tar.bz2 8960056 SHA256 13fa971555dec00e495a5b72c1f9efa1363b8e6c7388a2f05117cb0778c0954a SHA512 d64481afaa1cb1e70261a21ccff935bb7d45966f78f03a653d0cd32719bd7b13c05938716f906eb9f4b12d80ac772fb7e4dd434048fb947712267d73073f69f5 WHIRLPOOL e22b6bf9019f45d1c2017be0ca7f129bdc40d09df597b3ae50280dd6c9c67839b989fb562520d1c46f617c5280e7e10f35d0e42f8be4a033cc0f0250e0dd999e
 DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-7.25BETA1.tar.bz2 8580974 SHA256 6866457809b598f8e85c9e8c79773f1821de29cc1b6f574cc7fed4ad8c01c178 SHA512 6d2fc83186086ea8d01003b8d79af0b45788378ef32c5e8f9b14561db5adfc407e388df044f1e3420f4f3d21115bc1623da0b6a926bd3d20816265cb10efe092 WHIRLPOOL 18bfca4d494c59fa6625ecb1e5ad7a7f838236c73269c9e0b2094e57d047ba1095284e26d4cbfb1a85a797af4b7f4abf02ffbc89c4664c6a5aea3912d4c3fb94
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.11.ebuild b/net-analyzer/nmap/nmap-7.11.ebuild
deleted file mode 100644
index 6eb5dd2..0000000
--- a/net-analyzer/nmap/nmap-7.11.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-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 zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-07-04 11:45 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-07-04 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     03ed245244db3ca76824eec9d19189dc4db48615
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 11:45:01 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 11:45:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ed2452

net-analyzer/nmap: Stable for PPC64 (bug #583558).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/nmap/nmap-7.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index 576e5aa..f2a84d4 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-06-30 19:24 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-06-30 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d3bcad46e75318852e66becad906d48758819448
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 19:04:16 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 19:23:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3bcad46

net-analyzer/nmap: Stable for HPPA (bug #583558).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 net-analyzer/nmap/nmap-7.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index 618cc52..576e5aa 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-06-01 10:46 Tobias Klausmann
  0 siblings, 0 replies; 183+ messages in thread
From: Tobias Klausmann @ 2016-06-01 10:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3d850fb663310df7e1ac9683760b76366ff45773
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 10:45:37 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 10:45:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d850fb6

net-analyzer/nmap-7.12-r0: add alpha keyword

Gentoo-Bug: 583558

Package-Manager: portage-2.3.0_rc1

 net-analyzer/nmap/nmap-7.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index f148f90..e36df06 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-05-31 19:19 Markus Meier
  0 siblings, 0 replies; 183+ messages in thread
From: Markus Meier @ 2016-05-31 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     031ba1fa095392cf501401edcd52e49a4013ae56
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 19:19:08 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue May 31 19:19:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031ba1fa

net-analyzer/nmap: arm stable, bug #583558

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="arm"

 net-analyzer/nmap/nmap-7.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index 6eb5dd2..f148f90 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-04-07 11:41 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-04-07 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c2ee1156c57a3fd8c9c858ec284040bd0e3c6b1f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 11:17:10 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 11:40:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ee1156

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.2.28

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.12.ebuild | 169 +++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5d5fe0a..ddcb4a7 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -3,4 +3,5 @@ DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd1
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
 DIST nmap-7.10.tar.bz2 8947277 SHA256 58cf8896d09057d1c3533f430c06b22791d0227ebbb93dede2ccb73693ed4b4b SHA512 38bdbc1902875db150faf2051d90d4200dd3c2ca2abbd7dbe55981899e90c1ab173f84d9d76f1a3d4d3ff1edf927373f948c12cfcb0eae79d8ede20607308e6f WHIRLPOOL 1155d7f673ec2c87457781d56065eeeed8363ede66a1b36bc0d7e3cb10c34266cbd432d4333d8c13fc01a6cdb0d4f3f30d79258a7b1d97fc359bcc9bf9269a8f
 DIST nmap-7.11.tar.bz2 8960056 SHA256 13fa971555dec00e495a5b72c1f9efa1363b8e6c7388a2f05117cb0778c0954a SHA512 d64481afaa1cb1e70261a21ccff935bb7d45966f78f03a653d0cd32719bd7b13c05938716f906eb9f4b12d80ac772fb7e4dd434048fb947712267d73073f69f5 WHIRLPOOL e22b6bf9019f45d1c2017be0ca7f129bdc40d09df597b3ae50280dd6c9c67839b989fb562520d1c46f617c5280e7e10f35d0e42f8be4a033cc0f0250e0dd999e
+DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
new file mode 100644
index 0000000..6eb5dd2
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-03-24  5:33 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-03-24  5:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f8699e0c517c133a9c0ecb6bdeb7862609d5ceda
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 05:32:48 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 05:32:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8699e0c

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.2.28

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.11.ebuild | 169 +++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 1e897a6..5d5fe0a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -2,4 +2,5 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1
 DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae SHA512 f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351 WHIRLPOOL f769a28b32c24874eb3d4fc3100ae1e7f271bc54837f992505754f31104de18a12116350b3fbf3402719d7e84110054e8f4fb7ea18ffa3b45f17fab8554998eb
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
 DIST nmap-7.10.tar.bz2 8947277 SHA256 58cf8896d09057d1c3533f430c06b22791d0227ebbb93dede2ccb73693ed4b4b SHA512 38bdbc1902875db150faf2051d90d4200dd3c2ca2abbd7dbe55981899e90c1ab173f84d9d76f1a3d4d3ff1edf927373f948c12cfcb0eae79d8ede20607308e6f WHIRLPOOL 1155d7f673ec2c87457781d56065eeeed8363ede66a1b36bc0d7e3cb10c34266cbd432d4333d8c13fc01a6cdb0d4f3f30d79258a7b1d97fc359bcc9bf9269a8f
+DIST nmap-7.11.tar.bz2 8960056 SHA256 13fa971555dec00e495a5b72c1f9efa1363b8e6c7388a2f05117cb0778c0954a SHA512 d64481afaa1cb1e70261a21ccff935bb7d45966f78f03a653d0cd32719bd7b13c05938716f906eb9f4b12d80ac772fb7e4dd434048fb947712267d73073f69f5 WHIRLPOOL e22b6bf9019f45d1c2017be0ca7f129bdc40d09df597b3ae50280dd6c9c67839b989fb562520d1c46f617c5280e7e10f35d0e42f8be4a033cc0f0250e0dd999e
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.11.ebuild b/net-analyzer/nmap/nmap-7.11.ebuild
new file mode 100644
index 0000000..6eb5dd2
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.11.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-03-19  7:23 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2016-03-19  7:23 UTC (permalink / raw
  To: gentoo-commits

commit:     0ec150e67db4ed56445aeb9a9042a737f31b2e5a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 07:13:04 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 07:23:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec150e6

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.2.28

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.10.ebuild | 169 +++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 7fbc9a4..1e897a6 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,5 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae SHA512 f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351 WHIRLPOOL f769a28b32c24874eb3d4fc3100ae1e7f271bc54837f992505754f31104de18a12116350b3fbf3402719d7e84110054e8f4fb7ea18ffa3b45f17fab8554998eb
 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
+DIST nmap-7.10.tar.bz2 8947277 SHA256 58cf8896d09057d1c3533f430c06b22791d0227ebbb93dede2ccb73693ed4b4b SHA512 38bdbc1902875db150faf2051d90d4200dd3c2ca2abbd7dbe55981899e90c1ab173f84d9d76f1a3d4d3ff1edf927373f948c12cfcb0eae79d8ede20607308e6f WHIRLPOOL 1155d7f673ec2c87457781d56065eeeed8363ede66a1b36bc0d7e3cb10c34266cbd432d4333d8c13fc01a6cdb0d4f3f30d79258a7b1d97fc359bcc9bf9269a8f
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.10.ebuild b/net-analyzer/nmap/nmap-7.10.ebuild
new file mode 100644
index 0000000..6eb5dd2
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.10.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-03-04  2:16 Stephen Klimaszewski
  0 siblings, 0 replies; 183+ messages in thread
From: Stephen Klimaszewski @ 2016-03-04  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     1aa83fbfe8bdba5af3c1d27644357cf373650f31
Author:     Steev Klimaszewski <steev <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 02:15:36 2016 +0000
Commit:     Stephen Klimaszewski <steev <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 02:16:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa83fbf

net-analyzer/nmap: Mark 7.01 ~arm64

Tested on Cortex-A53.  Caveat that only "ipv6 ncat ndiff nls nping nse ssl" useflags have been tested.

Package-Manager: portage-2.2.27

 net-analyzer/nmap/nmap-7.01.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index f4f4ffc..1010116 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-02-04 20:24 Tobias Klausmann
  0 siblings, 0 replies; 183+ messages in thread
From: Tobias Klausmann @ 2016-02-04 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     1ed84be071195e126791a25a89c3112a3291f612
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  4 20:24:23 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu Feb  4 20:24:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed84be0

net-analyzer/nmap: add alpha keyword

Gentoo-Bug: 569660

Package-Manager: portage-2.2.27

 net-analyzer/nmap/nmap-7.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index ecda7d6..f4f4ffc 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2016-01-09 16:08 Markus Meier
  0 siblings, 0 replies; 183+ messages in thread
From: Markus Meier @ 2016-01-09 16:08 UTC (permalink / raw
  To: gentoo-commits

commit:     7ab33d73368782f37b8dbd97fb6c36433c46ed33
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 16:08:20 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 16:08:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab33d73

net-analyzer/nmap: arm stable, bug #569660

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"

 net-analyzer/nmap/nmap-7.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index b5e98b2..ecda7d6 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-27  9:30 Mikle Kolyada
  0 siblings, 0 replies; 183+ messages in thread
From: Mikle Kolyada @ 2015-12-27  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     002025c629e803b045f2862247e3b681216f54bf
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 09:27:08 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 09:27:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002025c6

net-analyzer/nmap: sparc stable wrt bug #569660

Package-Manager: portage-2.2.24

 net-analyzer/nmap/nmap-7.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index 2b983c7..b5e98b2 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-26 10:06 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-12-26 10:06 UTC (permalink / raw
  To: gentoo-commits

commit:     78c3b57b9ace8bd7797df839ad03028370fd4c75
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 10:06:02 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 10:06:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c3b57b

net-analyzer/nmap: Stable for HPPA PPC64 (bug #569660).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-analyzer/nmap/nmap-7.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index 6833669..2b983c7 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-25 19:42 Mikle Kolyada
  0 siblings, 0 replies; 183+ messages in thread
From: Mikle Kolyada @ 2015-12-25 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d6a48734a9fb98fa3897f286de721a2ae197b128
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 19:39:01 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 19:39:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a48734

net-analyzer/nmap: x86 stable wrt bug #569660

Package-Manager: portage-2.2.24

 net-analyzer/nmap/nmap-7.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index 76ad426..6833669 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-25 15:55 Agostino Sarubbo
  0 siblings, 0 replies; 183+ messages in thread
From: Agostino Sarubbo @ 2015-12-25 15:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e84465e89f645f170b2f036f9e1fa6ad372adfa8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 15:55:21 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:55:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e84465e8

net-analyzer/nmap: amd64 stable wrt bug #569660

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-analyzer/nmap/nmap-7.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index 9c90f5a..76ad426 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-25 15:02 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-12-25 15:02 UTC (permalink / raw
  To: gentoo-commits

commit:     648401f62dac58e4e23aa3d7f7215dfd82129a30
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 14:59:24 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:01:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648401f6

net-analyzer/nmap: Conditionally make makefile.dep (bug #569678 by iGentoo).

Package-Manager: portage-2.2.26

 net-analyzer/nmap/nmap-7.01.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
index dd19efc..9c90f5a 100644
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -132,7 +132,11 @@ src_configure() {
 
 src_compile() {
 	local directory
-	for directory in . libnetutil ncat nmap-update nping nsock/src; do
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
 		emake -C "${directory}" makefile.dep
 	done
 


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-12-16  8:15 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-12-16  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     076ac810b302d08449e95b5982f665562e7020fa
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 07:49:59 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 07:49:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076ac810

net-analyzer/nmap: Version bump.

Package-Manager: portage-2.2.26

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.01.ebuild | 155 +++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a096848..7fbc9a4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,4 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae SHA512 f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351 WHIRLPOOL f769a28b32c24874eb3d4fc3100ae1e7f271bc54837f992505754f31104de18a12116350b3fbf3402719d7e84110054e8f4fb7ea18ffa3b45f17fab8554998eb
+DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
new file mode 100644
index 0000000..0022291
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.01.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-11-24  6:05 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-11-24  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8575c40181428db65b36f15e717154e52271ddb4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 06:05:02 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 06:05:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8575c401

net-analyzer/nmap: Old.

Package-Manager: portage-2.2.25

 net-analyzer/nmap/Manifest                  |   2 -
 net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild | 157 ----------------------------
 net-analyzer/nmap/nmap-6.49_beta6.ebuild    | 155 ---------------------------
 3 files changed, 314 deletions(-)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index c86a189..a096848 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,5 +1,3 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
-DIST nmap-6.49BETA2.tar.bz2 8810504 SHA256 e2f2aaa872fec288b927ceb59500edba198d8767adbe3a83a939e7921b224b79 SHA512 f21f0e6677c5936d49aab0a7de083b1309c49a91289691636d5ad1dfa052426d657b0a1df30519fcda712007abee0a4cd1bf89963b2e6758b11d2c18d96d637e WHIRLPOOL 1fd1b57f6b95526fabfd30cdee3064b6626735b51fcd23b8b3e91609e1b7fc126f0fd97fc2f2d478f8035ae148830afb5ab5c6bc454ac518a3023b566e1c100d
-DIST nmap-6.49BETA6.tar.bz2 8904750 SHA256 9c548ee0e3f0db73c4b5f8434c0bc7c99188333562c4bc4e04fb721533ff1637 SHA512 ca8bfc2dfa7f9e892e8014eefaf8aa97cefcf6f05946177e07b4dcf8e82cb1c1c2db2cf3bacd2fef1e5c4c93d7b73607e1367880e01a26f3a32c77fed09ead28 WHIRLPOOL 82e6c89b71405372b443600ab9da49fde2c2af63ab9d1990b5c6011ac52426ed28206175ae715c8e31f3d4c2acbe0536be535b878a0837578e41aff5c2c90a2c
 DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae SHA512 f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351 WHIRLPOOL f769a28b32c24874eb3d4fc3100ae1e7f271bc54837f992505754f31104de18a12116350b3fbf3402719d7e84110054e8f4fb7ea18ffa3b45f17fab8554998eb
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
deleted file mode 100644
index a3d9dc0..0000000
--- a/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-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 zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}

diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
deleted file mode 100644
index 07bc0c8..0000000
--- a/net-analyzer/nmap/nmap-6.49_beta6.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-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 zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-11-24  6:05 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-11-24  6:05 UTC (permalink / raw
  To: gentoo-commits

commit:     dfdbf77126635fb80d28ccc9987851b4dbe19aae
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 06:03:37 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 06:03:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdbf771

net-analyzer/nmap: Version bump (bug #566568 by Anton Bolshakov).

Package-Manager: portage-2.2.25

 net-analyzer/nmap/Manifest         |   1 +
 net-analyzer/nmap/nmap-7.00.ebuild | 155 +++++++++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a1b2c8f..c86a189 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,5 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-6.49BETA2.tar.bz2 8810504 SHA256 e2f2aaa872fec288b927ceb59500edba198d8767adbe3a83a939e7921b224b79 SHA512 f21f0e6677c5936d49aab0a7de083b1309c49a91289691636d5ad1dfa052426d657b0a1df30519fcda712007abee0a4cd1bf89963b2e6758b11d2c18d96d637e WHIRLPOOL 1fd1b57f6b95526fabfd30cdee3064b6626735b51fcd23b8b3e91609e1b7fc126f0fd97fc2f2d478f8035ae148830afb5ab5c6bc454ac518a3023b566e1c100d
 DIST nmap-6.49BETA6.tar.bz2 8904750 SHA256 9c548ee0e3f0db73c4b5f8434c0bc7c99188333562c4bc4e04fb721533ff1637 SHA512 ca8bfc2dfa7f9e892e8014eefaf8aa97cefcf6f05946177e07b4dcf8e82cb1c1c2db2cf3bacd2fef1e5c4c93d7b73607e1367880e01a26f3a32c77fed09ead28 WHIRLPOOL 82e6c89b71405372b443600ab9da49fde2c2af63ab9d1990b5c6011ac52426ed28206175ae715c8e31f3d4c2acbe0536be535b878a0837578e41aff5c2c90a2c
+DIST nmap-7.00.tar.bz2 8918906 SHA256 9f442301c615c608a385831c3505cdfed9b0795cd100f1a258b04509802802ae SHA512 f8b4368de5956698e76a2a102102feb4bd00338cf983bfbf7bcd8c941288bb4a02c45469724e8a1daed87f41536a3f16a68fc604171fe23093575ac631637351 WHIRLPOOL f769a28b32c24874eb3d4fc3100ae1e7f271bc54837f992505754f31104de18a12116350b3fbf3402719d7e84110054e8f4fb7ea18ffa3b45f17fab8554998eb
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-7.00.ebuild b/net-analyzer/nmap/nmap-7.00.ebuild
new file mode 100644
index 0000000..0022291
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.00.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-11-14  9:55 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-11-14  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b2a93264f88e3950b40de270af6bbc49a374144d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 09:54:50 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 09:55:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a93264

net-analyzer/nmap: Drop space.

Package-Manager: portage-2.2.24

 net-analyzer/nmap/nmap-6.49_beta6.ebuild | 2 +-
 net-analyzer/nmap/nmap-9999.ebuild       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
index 26dd911..07bc0c8 100644
--- a/net-analyzer/nmap/nmap-6.49_beta6.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
@@ -128,7 +128,7 @@ src_configure() {
 src_compile() {
 	emake \
 		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
+		RANLIB=$(tc-getRANLIB)
 }
 
 src_install() {

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 694b1eb..813a279 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -128,7 +128,7 @@ src_compile() {
 
 	emake \
 		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
+		RANLIB=$(tc-getRANLIB)
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-11-14  8:56 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-11-14  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     af4a7972f38cc87d4786c3828fe57aa7998abf5f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 08:55:56 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 08:55:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4a7972

net-analyzer/nmap: Re-add liblua-ar patch.

Package-Manager: portage-2.2.24

 net-analyzer/nmap/nmap-6.49_beta6.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
index 7013913..26dd911 100644
--- a/net-analyzer/nmap/nmap-6.49_beta6.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -73,7 +73,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-5.21-python.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
 
 	if use nls; then
 		local lingua=''


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-11-14  8:07 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-11-14  8:07 UTC (permalink / raw
  To: gentoo-commits

commit:     bf9f1614964b9ea3c20d94eab7cb975e275126e7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 07:50:15 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 07:50:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9f1614

net-analyzer/nmap: Old.

Package-Manager: portage-2.2.24

 net-analyzer/nmap/nmap-6.47-r2.ebuild    | 153 ------------------------------
 net-analyzer/nmap/nmap-6.49_beta2.ebuild | 154 -------------------------------
 2 files changed, 307 deletions(-)

diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild
deleted file mode 100644
index 9109549..0000000
--- a/net-analyzer/nmap/nmap-6.47-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( lua )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-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 zenmap) \
-		$(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}

diff --git a/net-analyzer/nmap/nmap-6.49_beta2.ebuild b/net-analyzer/nmap/nmap-6.49_beta2.ebuild
deleted file mode 100644
index 4c6d397..0000000
--- a/net-analyzer/nmap/nmap-6.49_beta2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
-		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
-		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
-
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! use linguas_${lingua}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-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 zenmap) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-11-14  8:07 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-11-14  8:07 UTC (permalink / raw
  To: gentoo-commits

commit:     af4c5cf5361f88c6430d859e9add1ce5b5e7a44a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 07:48:35 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 07:48:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4c5cf5

net-analyzer/nmap: Version bump (bug #565638 by Anton Bolshakov).

Package-Manager: portage-2.2.24

 net-analyzer/nmap/Manifest               |   1 +
 net-analyzer/nmap/nmap-6.49_beta6.ebuild | 154 +++++++++++++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index a81338c..a1b2c8f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,3 +1,4 @@
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-6.49BETA2.tar.bz2 8810504 SHA256 e2f2aaa872fec288b927ceb59500edba198d8767adbe3a83a939e7921b224b79 SHA512 f21f0e6677c5936d49aab0a7de083b1309c49a91289691636d5ad1dfa052426d657b0a1df30519fcda712007abee0a4cd1bf89963b2e6758b11d2c18d96d637e WHIRLPOOL 1fd1b57f6b95526fabfd30cdee3064b6626735b51fcd23b8b3e91609e1b7fc126f0fd97fc2f2d478f8035ae148830afb5ab5c6bc454ac518a3023b566e1c100d
+DIST nmap-6.49BETA6.tar.bz2 8904750 SHA256 9c548ee0e3f0db73c4b5f8434c0bc7c99188333562c4bc4e04fb721533ff1637 SHA512 ca8bfc2dfa7f9e892e8014eefaf8aa97cefcf6f05946177e07b4dcf8e82cb1c1c2db2cf3bacd2fef1e5c4c93d7b73607e1367880e01a26f3a32c77fed09ead28 WHIRLPOOL 82e6c89b71405372b443600ab9da49fde2c2af63ab9d1990b5c6011ac52426ed28206175ae715c8e31f3d4c2acbe0536be535b878a0837578e41aff5c2c90a2c
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313

diff --git a/net-analyzer/nmap/nmap-6.49_beta6.ebuild b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
new file mode 100644
index 0000000..7013913
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.49_beta6.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	system-lua? ( >=dev-lang/lua-5.2[deprecated] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
+		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
+
+	if use nls; then
+		local lingua=''
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! use linguas_${lingua}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	epatch_user
+}
+
+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 zenmap) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	--with-liblinear=/usr \
+	#	Commented because configure does weird things, while autodetection works
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-10-27  3:46 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-10-27  3:46 UTC (permalink / raw
  To: gentoo-commits

commit:     36b6f04e3677f51e0d1ccca84b1a100f38e9ef28
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 03:45:26 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 03:46:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36b6f04e

net-analyzer/nmap: Build liblua first (bug #564072 by Macintosh).

Package-Manager: portage-2.2.23

 net-analyzer/nmap/nmap-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index f72ca71..694b1eb 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -120,6 +120,7 @@ src_configure() {
 
 src_compile() {
 	local dep deps="build-dnet build-nbase build-nsock build-netutil"
+	use system-lua || deps="build-lua ${deps}"
 
 	for dep in ${deps}; do
 		emake makefile.dep ${dep}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-10-16  4:38 Jeroen Roovers
  0 siblings, 0 replies; 183+ messages in thread
From: Jeroen Roovers @ 2015-10-16  4:38 UTC (permalink / raw
  To: gentoo-commits

commit:     6312082dd25ab32a275d33330a18bee445486957
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 04:37:13 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 04:37:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6312082d

net-analyzer/nmap: Work around Makefile fail in ebuild (bug #563038 by Macintosh).

Package-Manager: portage-2.2.23

 net-analyzer/nmap/nmap-9999.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 1e02fc0..f72ca71 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -64,12 +64,10 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-4.75-nolua.patch \
 		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
 		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch \
-		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch
+		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''
@@ -121,6 +119,12 @@ src_configure() {
 }
 
 src_compile() {
+	local dep deps="build-dnet build-nbase build-nsock build-netutil"
+
+	for dep in ${deps}; do
+		emake makefile.dep ${dep}
+	done
+
 	emake \
 		AR=$(tc-getAR) \
 		RANLIB=$(tc-getRANLIB )


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-10-05  9:08 Julian Ospald
  0 siblings, 0 replies; 183+ messages in thread
From: Julian Ospald @ 2015-10-05  9:08 UTC (permalink / raw
  To: gentoo-commits

commit:     eb8057024eb5d1150df901cdfdcb246b788349cd
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 08:51:49 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 08:51:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb805702

net-analyzer/nmap: add libressl support

 ...{nmap-9999.ebuild => nmap-6.49_beta2-r1.ebuild} | 28 +++++++++++++++-------
 net-analyzer/nmap/nmap-9999.ebuild                 |  7 ++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
similarity index 81%
copy from net-analyzer/nmap/nmap-9999.ebuild
copy to net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
index 1185730..a3d9dc0 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
@@ -6,21 +6,23 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P=${P/_beta/BETA}
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="http://nmap.org/"
-
-EGIT_REPO_URI="https://github.com/nmap/nmap"
-SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -41,7 +43,10 @@ RDEPEND="
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -56,6 +61,11 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-4.75-nolua.patch \
@@ -65,8 +75,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
 		"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
 		"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-		"${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch \
-		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch
+		"${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
+		"${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
 
 	if use nls; then
 		local lingua=''

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 1185730..1e02fc0 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
@@ -41,7 +41,10 @@ RDEPEND="
 	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
 "
 DEPEND="
 	${RDEPEND}


^ permalink raw reply related	[flat|nested] 183+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
@ 2015-09-29  9:09 Justin Lecher
  0 siblings, 0 replies; 183+ messages in thread
From: Justin Lecher @ 2015-09-29  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     f4c2e777b46361a25c2e4e1b2a47ade43329c54d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 09:08:47 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 09:08:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c2e777

net-analyzer/nmap: Set subslot for dev-libs/liblinear dep

Package-Manager: portage-2.2.22
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 net-analyzer/nmap/metadata.xml           | 22 +++++++++++-----------
 net-analyzer/nmap/nmap-6.47-r1.ebuild    |  2 +-
 net-analyzer/nmap/nmap-6.47-r2.ebuild    |  2 +-
 net-analyzer/nmap/nmap-6.47-r3.ebuild    |  2 +-
 net-analyzer/nmap/nmap-6.49_beta2.ebuild |  2 +-
 net-analyzer/nmap/nmap-9999.ebuild       |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index ff34d48..97a75ac 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<use>
-<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
-<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag>
-<flag name="ncat">Install the ncat utility</flag>
-<flag name="ndiff">Install the ndiff utility</flag>
-<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
-<flag name="nping">Install the nping utility</flag>
-<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
-<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
-</use>
+	<herd>netmon</herd>
+	<use>
+		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
+		<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag>
+		<flag name="ncat">Install the ncat utility</flag>
+		<flag name="ndiff">Install the ndiff utility</flag>
+		<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag>
+		<flag name="nping">Install the nping utility</flag>
+		<flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag>
+		<flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag>
+	</use>
 </pkgmetadata>

diff --git a/net-analyzer/nmap/nmap-6.47-r1.ebuild b/net-analyzer/nmap/nmap-6.47-r1.ebuild
index a500bf0..f52aa60 100644
--- a/net-analyzer/nmap/nmap-6.47-r1.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-libs/liblinear
+	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap[ipv6?]
 	zenmap? (

diff --git a/net-analyzer/nmap/nmap-6.47-r2.ebuild b/net-analyzer/nmap/nmap-6.47-r2.ebuild
index 3def624..9109549 100644
--- a/net-analyzer/nmap/nmap-6.47-r2.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r2.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-libs/liblinear
+	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap[ipv6?]
 	zenmap? (

diff --git a/net-analyzer/nmap/nmap-6.47-r3.ebuild b/net-analyzer/nmap/nmap-6.47-r3.ebuild
index a340410..c464439 100644
--- a/net-analyzer/nmap/nmap-6.47-r3.ebuild
+++ b/net-analyzer/nmap/nmap-6.47-r3.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-libs/liblinear
+	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap[ipv6?]
 	zenmap? (

diff --git a/net-analyzer/nmap/nmap-6.49_beta2.ebuild b/net-analyzer/nmap/nmap-6.49_beta2.ebuild
index b29f5b8..4c6d397 100644
--- a/net-analyzer/nmap/nmap-6.49_beta2.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta2.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-libs/liblinear
+	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap[ipv6?]
 	zenmap? (

diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 5315131..1185730 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-libs/liblinear
+	dev-libs/liblinear:=
 	dev-libs/libpcre
 	net-libs/libpcap[ipv6?]
 	zenmap? (


^ permalink raw reply related	[flat|nested] 183+ messages in thread

end of thread, other threads:[~2024-09-01  9:04 UTC | newest]

Thread overview: 183+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-24 12:50 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2024-09-01  9:04 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-05-10 23:07 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  6:42 Sam James
2024-04-30  4:38 Sam James
2023-07-06  5:59 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-06-25  7:05 Sam James
2023-05-21 19:41 Sam James
2023-05-21 19:35 Sam James
2023-05-21 18:36 Sam James
2023-04-02 21:57 Sam James
2023-01-12 17:18 Ulrich Müller
2023-01-10  8:36 Sam James
2023-01-10  8:34 Sam James
2023-01-10  8:34 Sam James
2022-12-16  4:03 Sam James
2022-10-28 19:53 Sam James
2022-10-11  6:48 Agostino Sarubbo
2022-10-11  6:47 Agostino Sarubbo
2022-10-11  6:46 Agostino Sarubbo
2022-10-11  6:45 Agostino Sarubbo
2022-10-11  6:44 Agostino Sarubbo
2022-10-11  6:43 Agostino Sarubbo
2022-10-11  6:41 Agostino Sarubbo
2022-09-04 23:56 Sam James
2022-09-03  3:49 Sam James
2022-07-19 15:09 Sam James
2022-07-14 11:06 Sam James
2022-04-17 17:22 Sam James
2022-03-20 18:43 Sam James
2022-01-22  4:42 Sam James
2021-11-19  8:34 Sam James
2021-09-27 14:53 Marek Szuba
2021-09-14  5:17 Sam James
2021-09-14  5:15 Sam James
2021-09-14  5:15 Sam James
2021-09-12 23:01 Sam James
2021-09-12 23:01 Sam James
2021-09-12 23:00 Sam James
2021-09-12 23:00 Sam James
2021-08-09  3:47 Sam James
2021-07-31 13:40 Michał Górny
2021-04-29 18:28 Mikle Kolyada
2021-04-23 13:34 Sam James
2021-04-16  4:47 Sam James
2021-04-16  0:40 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:05 Sam James
2021-04-13 16:03 Sam James
2021-04-03 15:57 Sam James
2021-03-11 18:15 Sam James
2021-03-06 20:35 Ulrich Müller
2021-03-04  4:58 Sam James
2021-02-18  8:22 Sam James
2021-02-18  8:22 Sam James
2021-02-16 12:34 Sam James
2021-02-16 12:34 Sam James
2021-02-14  2:10 Sam James
2021-02-14  2:10 Sam James
2021-02-05 12:31 Sam James
2021-02-05 12:31 Sam James
2021-02-05 10:40 Sam James
2021-02-05 10:40 Sam James
2021-02-05  6:36 Sam James
2021-02-05  6:36 Sam James
2021-02-05  6:34 Sam James
2021-02-05  6:34 Sam James
2021-01-25 22:23 Mikle Kolyada
2021-01-06 14:35 Fabian Groffen
2020-12-27  0:05 Marek Szuba
2020-11-25  7:44 Agostino Sarubbo
2020-11-24 14:40 Sam James
2020-11-24 12:57 Agostino Sarubbo
2020-11-24 12:56 Agostino Sarubbo
2020-11-24 12:55 Agostino Sarubbo
2020-11-24 12:54 Agostino Sarubbo
2020-11-24  3:16 Sam James
2020-11-04 11:41 Andreas K. Hüttel
2020-11-04  7:29 Sam James
2020-11-04  0:44 Sam James
2020-10-15  9:53 Jeroen Roovers
2020-10-15  9:53 Jeroen Roovers
2020-10-04  6:58 Jeroen Roovers
2020-05-22 11:38 Andreas Sturmlechner
2020-05-22 10:51 Andreas Sturmlechner
2020-03-25 19:15 Thomas Deutschmann
2020-03-17 18:00 Sergei Trofimovich
2020-03-15 18:41 Agostino Sarubbo
2020-03-15 18:37 Agostino Sarubbo
2020-03-15 18:34 Agostino Sarubbo
2020-03-15 18:31 Agostino Sarubbo
2020-03-15 18:29 Agostino Sarubbo
2020-03-15 18:27 Agostino Sarubbo
2020-03-15 18:26 Agostino Sarubbo
2019-09-18  8:31 Fabian Groffen
2019-08-10 22:40 Jeroen Roovers
2019-05-31 13:00 Jeroen Roovers
2018-04-15  8:21 Jeroen Roovers
2018-04-14 11:40 Markus Meier
2018-04-08  4:58 Matt Turner
2018-04-08  4:58 Matt Turner
2018-04-01 10:00 Tobias Klausmann
2018-03-22 23:01 Sergei Trofimovich
2018-03-22 22:25 Sergei Trofimovich
2018-03-22 16:08 Jeroen Roovers
2018-03-22 14:25 Mikle Kolyada
2018-03-21 21:00 Jeroen Roovers
2018-03-21 21:00 Jeroen Roovers
2018-01-08 13:58 Ulrich Müller
2018-01-06 18:32 Ulrich Müller
2017-08-26  9:00 Jeroen Roovers
2017-08-08 12:18 Jeroen Roovers
2017-08-08 12:17 Jeroen Roovers
2017-06-20 11:58 Jeroen Roovers
2017-06-11 11:49 Jeroen Roovers
2017-06-10 15:10 Agostino Sarubbo
2017-03-25 10:08 Jeroen Roovers
2017-03-21 12:31 Michael Weber
2017-03-17 10:42 Agostino Sarubbo
2017-03-17 10:15 Agostino Sarubbo
2017-03-17  7:08 Jeroen Roovers
2017-02-10 17:40 Michael Weber
2017-01-23 17:15 Richard Farina
2017-01-22 16:48 Jeroen Roovers
2017-01-22 16:43 Jeroen Roovers
2017-01-21 11:04 Jeroen Roovers
2017-01-06 14:33 Tobias Klausmann
2017-01-04 17:09 Agostino Sarubbo
2017-01-04 16:56 Agostino Sarubbo
2017-01-03 14:09 Fabian Groffen
2016-12-23 21:09 Jeroen Roovers
2016-10-22  9:58 Jeroen Roovers
2016-09-30  9:15 Jeroen Roovers
2016-09-09  5:02 Jeroen Roovers
2016-09-03 10:56 Jeroen Roovers
2016-07-27 15:57 Jeroen Roovers
2016-07-22  5:47 Jeroen Roovers
2016-07-04 11:45 Jeroen Roovers
2016-06-30 19:24 Jeroen Roovers
2016-06-01 10:46 Tobias Klausmann
2016-05-31 19:19 Markus Meier
2016-04-07 11:41 Jeroen Roovers
2016-03-24  5:33 Jeroen Roovers
2016-03-19  7:23 Jeroen Roovers
2016-03-04  2:16 Stephen Klimaszewski
2016-02-04 20:24 Tobias Klausmann
2016-01-09 16:08 Markus Meier
2015-12-27  9:30 Mikle Kolyada
2015-12-26 10:06 Jeroen Roovers
2015-12-25 19:42 Mikle Kolyada
2015-12-25 15:55 Agostino Sarubbo
2015-12-25 15:02 Jeroen Roovers
2015-12-16  8:15 Jeroen Roovers
2015-11-24  6:05 Jeroen Roovers
2015-11-24  6:05 Jeroen Roovers
2015-11-14  9:55 Jeroen Roovers
2015-11-14  8:56 Jeroen Roovers
2015-11-14  8:07 Jeroen Roovers
2015-11-14  8:07 Jeroen Roovers
2015-10-27  3:46 Jeroen Roovers
2015-10-16  4:38 Jeroen Roovers
2015-10-05  9:08 Julian Ospald
2015-09-29  9:09 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox