[gentoo-commits] repo/gentoo:master commit in: licenses/, net-analyzer/nmap/

[gentoo-commits] repo/gentoo:master commit in: licenses/, net-analyzer/nmap/

[Sam James]

commit:     8017c2d0743c4c615c43241b1f3574a2e95f768d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 08:21:08 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=8017c2d0

licenses: rename NPSL -> NPSL-0.92

This is less confusing going forward as we want to keep older versions
in tree for a while.

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

 licenses/{NPSL => NPSL-0.92}          | 0
 net-analyzer/nmap/nmap-7.92-r2.ebuild | 5 +----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/licenses/NPSL b/licenses/NPSL-0.92
similarity index 100%
rename from licenses/NPSL
rename to licenses/NPSL-0.92

diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
index 699b452ebd6e..9ed09a572931 100644
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild
@@ -13,9 +13,6 @@ 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
@@ -25,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 GPL-2 )"
+	LICENSE="|| ( NPSL-0.92 GPL-2 )"
 fi
 
 SLOT="0"