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

[Jeroen Roovers]

commit:     8d991738f61ad43a6b58cda7388ae33e341f93d4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 07:02:57 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 07:05:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d991738

net-misc/chrony: Run config(!) changes in src_configure()

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/chrony/chrony-3.5.1.ebuild | 4 ++--
 net-misc/chrony/chrony-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-misc/chrony/chrony-3.5.1.ebuild 
b/net-misc/chrony/chrony-3.5.1.ebuild
index fa28cf69009..067eb1c8836 100644
--- a/net-misc/chrony/chrony-3.5.1.ebuild
+++ b/net-misc/chrony/chrony-3.5.1.ebuild
@@ -53,7 +53,9 @@ src_prepare() {
        # Copy for potential user fixup
        cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
        cp examples/chronyd.service "${T}"/chronyd.service
+}
 
+src_configure() {
        # Set config for privdrop
        if ! use caps; then
                sed -i \
@@ -66,9 +68,7 @@ src_prepare() {
                        -e 's/-F 1//' \
                        "${T}"/chronyd.conf "${T}"/chronyd.service || die
        fi
-}
 
-src_configure() {
        tc-export CC
 
        local CHRONY_EDITLINE

diff --git a/net-misc/chrony/chrony-9999.ebuild 
b/net-misc/chrony/chrony-9999.ebuild
index 0338e59678b..a2dcdd4d2bd 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -73,7 +73,9 @@ src_prepare() {
        # Copy for potential user fixup
        cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
        cp examples/chronyd.service "${T}"/chronyd.service
+}
 
+src_configure() {
        # Set config for privdrop
        if ! use caps; then
                sed -i \
@@ -86,9 +88,7 @@ src_prepare() {
                        -e 's/-F 1//' \
                        "${T}"/chronyd.conf "${T}"/chronyd.service || die
        fi
-}
 
-src_configure() {
        tc-export CC
 
        local CHRONY_EDITLINE