summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-05-21 20:41:25 +0100
committerSam James <sam@gentoo.org>2023-05-21 20:41:25 +0100
commit64620d3c640666e4e9a345d92babb5167b4e7692 (patch)
tree9c3335ee7fb9d80134337d42898cb4d637c2ba63 /net-analyzer
parentdev-libs/liblinear: add 246 (diff)
downloadgentoo-64620d3c640666e4e9a345d92babb5167b4e7692.tar.gz
gentoo-64620d3c640666e4e9a345d92babb5167b4e7692.tar.bz2
gentoo-64620d3c640666e4e9a345d92babb5167b4e7692.zip
net-analyzer/nmap: fix live ebuild
Closes: https://bugs.gentoo.org/906903 Fixes: 77eba6f506b1f629034647c8b7debcba8d599a6a Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/nmap/nmap-7.94.ebuild7
-rw-r--r--net-analyzer/nmap/nmap-9999.ebuild7
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