[gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/

[Sam James]

commit:     6e3cb0fb48db41a73bc6c2981f80315923002138
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 09:31:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 18:50:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3cb0fb

net-misc/ntpsec: drop epatch

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

 net-misc/ntpsec/ntpsec-1.1.9.ebuild    | 6 +++---
 net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild | 8 ++++----
 net-misc/ntpsec/ntpsec-9999.ebuild     | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild 
b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
index 9ac6c89d595..0cfaff72ab5 100644
--- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit epatch flag-o-matic python-r1 waf-utils systemd
+inherit flag-o-matic python-r1 waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -66,9 +66,9 @@ WAF_BINARY="${S}/waf"
 src_prepare() {
        default
        # Remove autostripping of binaries
-       sed -i -e '/Strip binaries/d' wscript
+       sed -i -e '/Strip binaries/d' wscript || die
        if ! use libbsd ; then
-               epatch "${FILESDIR}/${PN}-no-bsd.patch"
+               eapply "${FILESDIR}/${PN}-no-bsd.patch"
        fi
        python_copy_sources
 }

diff --git a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild 
b/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
index f63dc7958aa..efc382f1edd 100644
--- a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit epatch distutils-r1 flag-o-matic waf-utils systemd
+inherit distutils-r1 flag-o-matic waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -68,12 +68,12 @@ WAF_BINARY="${S}/waf"
 src_prepare() {
        default
        # Remove autostripping of binaries
-       sed -i -e '/Strip binaries/d' wscript
+       sed -i -e '/Strip binaries/d' wscript || die
        if ! use libbsd ; then
-               epatch "${FILESDIR}/${PN}-no-bsd.patch"
+               eapply "${FILESDIR}/${PN}-no-bsd.patch"
        fi
        # remove extra default pool servers
-       sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf
+       sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
 
        python_copy_sources
 }

diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild 
b/net-misc/ntpsec/ntpsec-9999.ebuild
index c1244770794..361635d422b 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit epatch flag-o-matic python-r1 waf-utils systemd
+inherit flag-o-matic python-r1 waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -61,9 +61,9 @@ WAF_BINARY="${S}/waf"
 src_prepare() {
        default
        # Remove autostripping of binaries
-       sed -i -e '/Strip binaries/d' wscript
+       sed -i -e '/Strip binaries/d' wscript || die
        if ! use libbsd ; then
-               epatch "${FILESDIR}/${PN}-no-bsd.patch"
+               eapply "${FILESDIR}/${PN}-no-bsd.patch"
        fi
        python_copy_sources
 }