summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-06-14 08:47:12 +0100
committerSam James <sam@gentoo.org>2024-06-14 09:02:25 +0100
commitd86bc0181c2ae3ed0391fab1c66d27a43faaa709 (patch)
tree9e26b78d248677cf38d1625b7581778976a943c7 /net-misc
parentnet-misc/ntpsec: add missing dies, inherit for multiprocessing (diff)
downloadgentoo-d86bc0181c2ae3ed0391fab1c66d27a43faaa709.tar.gz
gentoo-d86bc0181c2ae3ed0391fab1c66d27a43faaa709.tar.bz2
gentoo-d86bc0181c2ae3ed0391fab1c66d27a43faaa709.zip
net-misc/ntpsec: fix verify-sig w/ downloaded waf
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild13
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild13
-rw-r--r--net-misc/ntpsec/ntpsec-1.2.3.ebuild2
-rw-r--r--net-misc/ntpsec/ntpsec-9999.ebuild13
4 files changed, 37 insertions, 4 deletions
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index aae9eef1da0d..a14653efe462 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
else
@@ -77,6 +77,17 @@ PATCHES=(
WAF_BINARY="${S}/waf"
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ # Needed for downloaded waf which is unsigned
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
src_prepare() {
cp -v "${DISTDIR}/waf-2.0.27" "${WAF_BINARY}" || die
chmod -v ugo+x "${WAF_BINARY}" || die
diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
index ae86968c45db..7bf78aa18efb 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
else
@@ -76,6 +76,17 @@ PATCHES=(
WAF_BINARY="${S}/waf"
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ # Needed for downloaded waf which is unsigned
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
src_prepare() {
default
diff --git a/net-misc/ntpsec/ntpsec-1.2.3.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
index 29d8829e72d7..2fd6e5cad45b 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
@@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 flag-o-matic waf-utils systemd
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
else
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index ae86968c45db..7bf78aa18efb 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
else
@@ -76,6 +76,17 @@ PATCHES=(
WAF_BINARY="${S}/waf"
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ # Needed for downloaded waf which is unsigned
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
+
+ default
+}
+
src_prepare() {
default