From 35ed7204c7e08cc8ed2aaee87bb045701827beba Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 15 May 2019 12:00:19 +0200
Subject: net-misc/chrony: Fix patch filename

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---
 net-misc/chrony/chrony-3.4.ebuild                  |  4 ++--
 net-misc/chrony/chrony-3.5_pre1.ebuild             |  2 +-
 net-misc/chrony/chrony-9999.ebuild                 |  2 +-
 .../chrony/files/chrony-3.4-systemd-gentoo.patch   | 28 ++++++++++++++++++++++
 net-misc/chrony/files/chronyd-systemd-gentoo.patch | 28 ----------------------
 5 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch
 delete mode 100644 net-misc/chrony/files/chronyd-systemd-gentoo.patch

(limited to 'net-misc/chrony')

diff --git a/net-misc/chrony/chrony-3.4.ebuild b/net-misc/chrony/chrony-3.4.ebuild
index 2b17b91c999e..749bf8e23efe 100644
--- a/net-misc/chrony/chrony-3.4.ebuild
+++ b/net-misc/chrony/chrony-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
-	"${FILESDIR}"/chronyd-systemd-gentoo.patch
+	"${FILESDIR}"/${PN}-3.4-systemd-gentoo.patch
 )
 
 src_prepare() {
diff --git a/net-misc/chrony/chrony-3.5_pre1.ebuild b/net-misc/chrony/chrony-3.5_pre1.ebuild
index d32f046f9da9..72eeaef1fb95 100644
--- a/net-misc/chrony/chrony-3.5_pre1.ebuild
+++ b/net-misc/chrony/chrony-3.5_pre1.ebuild
@@ -37,7 +37,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
-	"${FILESDIR}"/chronyd-systemd-gentoo.patch
+	"${FILESDIR}"/${PN}-3.4-systemd-gentoo.patch
 )
 
 src_prepare() {
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 188564043dd7..dfe5253524d6 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -35,7 +35,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
-	"${FILESDIR}"/chronyd-systemd-gentoo.patch
+	"${FILESDIR}"/${PN}-3.4-systemd-gentoo.patch
 )
 
 src_prepare() {
diff --git a/net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch b/net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch
new file mode 100644
index 000000000000..63d6b7ed3398
--- /dev/null
+++ b/net-misc/chrony/files/chrony-3.4-systemd-gentoo.patch
@@ -0,0 +1,28 @@
+From ba3ddefc90f58d30a365104cf6e930333e3a2704 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 4 Sep 2018 13:01:06 -0400
+Subject: [PATCH] Tweak chronyd.service for Gentoo
+
+---
+ examples/chronyd.service | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/examples/chronyd.service b/examples/chronyd.service
+index 1777413..ceed830 100644
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -7,9 +7,8 @@ ConditionCapability=CAP_SYS_TIME
+ 
+ [Service]
+ Type=forking
+-PIDFile=/var/run/chrony/chronyd.pid
+-EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd $OPTIONS
++PIDFile=/run/chrony/chronyd.pid
++ExecStart=/usr/sbin/chronyd
+ PrivateTmp=yes
+ ProtectHome=yes
+ ProtectSystem=full
+-- 
+2.18.0
+
diff --git a/net-misc/chrony/files/chronyd-systemd-gentoo.patch b/net-misc/chrony/files/chronyd-systemd-gentoo.patch
deleted file mode 100644
index 63d6b7ed3398..000000000000
--- a/net-misc/chrony/files/chronyd-systemd-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ba3ddefc90f58d30a365104cf6e930333e3a2704 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 4 Sep 2018 13:01:06 -0400
-Subject: [PATCH] Tweak chronyd.service for Gentoo
-
----
- examples/chronyd.service | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/examples/chronyd.service b/examples/chronyd.service
-index 1777413..ceed830 100644
---- a/examples/chronyd.service
-+++ b/examples/chronyd.service
-@@ -7,9 +7,8 @@ ConditionCapability=CAP_SYS_TIME
- 
- [Service]
- Type=forking
--PIDFile=/var/run/chrony/chronyd.pid
--EnvironmentFile=-/etc/sysconfig/chronyd
--ExecStart=/usr/sbin/chronyd $OPTIONS
-+PIDFile=/run/chrony/chronyd.pid
-+ExecStart=/usr/sbin/chronyd
- PrivateTmp=yes
- ProtectHome=yes
- ProtectSystem=full
--- 
-2.18.0
-
-- 
cgit v1.2.3-65-gdbad