commit: 40383a04ef95327b961084eecd00076f2e47233b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Apr 16 04:33:21 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 16 04:40:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40383a04
net-analyzer/nmap: use live template Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/nmap/nmap-7.91-r2.ebuild | 29 ++++++++++++++++++++++------- net-analyzer/nmap/nmap-9999.ebuild | 25 +++++++++++++++++++++---- net-misc/chrony/chrony-9999.ebuild | 11 +++++++---- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/net-analyzer/nmap/nmap-7.91-r2.ebuild b/net-analyzer/nmap/nmap-7.91-r2.ebuild index 6778cf91051..492355ccf04 100644 --- a/net-analyzer/nmap/nmap-7.91-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.91-r2.ebuild @@ -5,17 +5,29 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc -inherit autotools lua-single toolchain-funcs verify-sig +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"; -SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" +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=/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 )" + + 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 -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} )" @@ -35,7 +47,10 @@ RDEPEND=" system-lua? ( ${LUA_DEPS} ) " DEPEND="${RDEPEND}" -BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )" +fi PATCHES=( "${FILESDIR}"/${PN}-5.10_beta1-string.patch diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 0b9f3ddf365..fa6114906f2 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -5,15 +5,28 @@ EAPI=7 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" - -inherit autotools git-r3 lua-single toolchain-funcs +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=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig -EGIT_REPO_URI="https://github.com/nmap/nmap"; + 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 )" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi -LICENSE="NPSL" SLOT="0" IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" @@ -35,6 +48,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +if [[ ${PV} != *9999* ]] ; then + BDEPEND+="verify-sig? ( app-crypt/openpgp-keys-nmap )" +fi + PATCHES=( "${FILESDIR}"/${PN}-5.10_beta1-string.patch "${FILESDIR}"/${PN}-5.21-python.patch diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild index 0b13721b537..5287ba540c7 100644 --- a/net-misc/chrony/chrony-9999.ebuild +++ b/net-misc/chrony/chrony-9999.ebuild @@ -3,8 +3,7 @@ EAPI=7 -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc -inherit systemd tmpfiles toolchain-funcs verify-sig +inherit systemd tmpfiles toolchain-funcs DESCRIPTION="NTP client and server programs" HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"; @@ -13,6 +12,9 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"; else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"; SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P}-tar-gz-asc.txt -> ${P}.tar.gz.asc )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" @@ -37,13 +39,14 @@ RESTRICT="test" BDEPEND=" nettle? ( virtual/pkgconfig ) - verify-sig? ( app-crypt/openpgp-keys-mlichvar ) " if [[ ${PV} == "9999" ]]; then # Needed for doc generation in 9999 - BDEPEND+=" virtual/w3m" REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" fi DEPEND="
