gentoo resync : 16.09.2020

4 files changed, 2 insertions, 26 deletions

diff --git a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch
index 0ea3c921980b..a3a2962ddd18 100644
--- a/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch
+++ b/net-misc/chrony/files/chrony-3.5-r3-systemd-gentoo.patch
@@ -6,7 +6,7 @@
  PIDFile=/run/chrony/chronyd.pid
 -EnvironmentFile=-/etc/sysconfig/chronyd
 -ExecStart=/usr/sbin/chronyd $OPTIONS
-+ExecStart=/usr/sbin/chronyd -u ntp -F 1
++ExecStart=/usr/sbin/chronyd -u ntp -F 0
  PrivateTmp=yes
  ProtectHome=yes
  ProtectSystem=full
diff --git a/net-misc/chrony/files/chrony-3.5-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.5-systemd-gentoo.patch
deleted file mode 100644
index addba4ca1a9d..000000000000
--- a/net-misc/chrony/files/chrony-3.5-systemd-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/examples/chronyd.service
-+++ b/examples/chronyd.service
-@@ -8,8 +8,7 @@
- [Service]
- Type=forking
- PIDFile=/run/chrony/chronyd.pid
--EnvironmentFile=-/etc/sysconfig/chronyd
--ExecStart=/usr/sbin/chronyd $OPTIONS
-+ExecStart=/usr/sbin/chronyd
- PrivateTmp=yes
- ProtectHome=yes
- ProtectSystem=full
diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
index fc43a95c40fe..d017660d5998 100644
--- a/net-misc/chrony/files/chronyd.conf
+++ b/net-misc/chrony/files/chronyd.conf
@@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf"
 # The combination of "-s -r" allows chronyd to perform long term averaging of
 # the gain or loss rate across system reboots and shutdowns.
 
-ARGS=""
+ARGS=" -u ntp -F 0"
diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1
deleted file mode 100644
index 2783f29e6844..000000000000
--- a/net-misc/chrony/files/chronyd.conf-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/chronyd
-
-CFGFILE="/etc/chrony/chrony.conf"
-
-# Configuration dependant options :
-#      -s - Set system time from RTC if rtcfile directive present
-#      -r - Reload sample histories if dumponexit directive present
-#
-# The combination of "-s -r" allows chronyd to perform long term averaging of
-# the gain or loss rate across system reboots and shutdowns.
-
-ARGS="-u ntp -F 0"