From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1476380-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id F128015800F
	for <garchives@archives.gentoo.org>; Thu, 12 Jan 2023 17:18:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 0D174E0952;
	Thu, 12 Jan 2023 17:18:30 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id E5794E0952
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Jan 2023 17:18:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id ACEE9335D99
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Jan 2023 17:18:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CE520779
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Jan 2023 17:18:26 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1673543902.7a0075bffbf7e96b999bd888ed399a34f46ea4cc.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/nmap/nmap-7.92-r2.ebuild net-analyzer/nmap/nmap-7.93-r1.ebuild net-analyzer/nmap/nmap-7.93-r2.ebuild net-analyzer/nmap/nmap-9999.ebuild
X-VCS-Directories: net-analyzer/nmap/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 7a0075bffbf7e96b999bd888ed399a34f46ea4cc
X-VCS-Branch: master
Date: Thu, 12 Jan 2023 17:18:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f97f71e3-4f68-4dc2-88d6-abcd33ff1c55
X-Archives-Hash: 8e31edb06c182be4eb043b4b4be71226

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="