From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1273646-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D327013835A for <garchives@archives.gentoo.org>; Wed, 21 Apr 2021 18:51:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69031E0887; Wed, 21 Apr 2021 18:51:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3F63AE0885 for <gentoo-commits@lists.gentoo.org>; Wed, 21 Apr 2021 18:51:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D01E340EE4 for <gentoo-commits@lists.gentoo.org>; Wed, 21 Apr 2021 18:51:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1457E73A for <gentoo-commits@lists.gentoo.org>; Wed, 21 Apr 2021 18:51:09 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1619031018.6e3cb0fb48db41a73bc6c2981f80315923002138.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntpsec/ntpsec-1.1.9.ebuild net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild net-misc/ntpsec/ntpsec-9999.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6e3cb0fb48db41a73bc6c2981f80315923002138 X-VCS-Branch: master Date: Wed, 21 Apr 2021 18:51:09 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3947b0ac-8f50-4504-9d0b-4948b7d4218c X-Archives-Hash: 3fe7ca416cd173b7e44576e419abca64 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 }