From 027f61ab53740d605f10d5e72af3ccea9d2866cf Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 29 Feb 2024 00:18:32 +0000
Subject: [PATCH] app-admin/puppet: update init.d for nfsmount removal

Bug: https://bugs.gentoo.org/925459
Signed-off-by: Sam James <sam@gentoo.org>
---
 app-admin/puppet/files/puppet.init                              | 2 +-
 .../puppet/{puppet-7.24.0.ebuild => puppet-7.24.0-r1.ebuild}    | 2 +-
 .../puppet/{puppet-7.28.0.ebuild => puppet-7.27.0-r1.ebuild}    | 0
 .../puppet/{puppet-7.27.0.ebuild => puppet-7.28.0-r1.ebuild}    | 2 +-
 .../puppet/{puppet-8.4.0.ebuild => puppet-8.3.1-r1.ebuild}      | 0
 .../puppet/{puppet-8.3.1.ebuild => puppet-8.4.0-r1.ebuild}      | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename app-admin/puppet/{puppet-7.24.0.ebuild => puppet-7.24.0-r1.ebuild} (98%)
 rename app-admin/puppet/{puppet-7.28.0.ebuild => puppet-7.27.0-r1.ebuild} (100%)
 rename app-admin/puppet/{puppet-7.27.0.ebuild => puppet-7.28.0-r1.ebuild} (98%)
 rename app-admin/puppet/{puppet-8.4.0.ebuild => puppet-8.3.1-r1.ebuild} (100%)
 rename app-admin/puppet/{puppet-8.3.1.ebuild => puppet-8.4.0-r1.ebuild} (98%)

diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index ad7a638bebb8c..9821134c8ae39 100644
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -14,7 +14,7 @@ command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPP
 
 depend() {
 	need localmount
-	use dns logger puppetmaster netmount nfsmount
+	use dns logger puppetmaster netmount
 }
 
 start_pre() {
diff --git a/app-admin/puppet/puppet-7.24.0.ebuild b/app-admin/puppet/puppet-7.24.0-r1.ebuild
similarity index 98%
rename from app-admin/puppet/puppet-7.24.0.ebuild
rename to app-admin/puppet/puppet-7.24.0-r1.ebuild
index 491d52e9696ea..e6415c71f2b2b 100644
--- a/app-admin/puppet/puppet-7.24.0.ebuild
+++ b/app-admin/puppet/puppet-7.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/app-admin/puppet/puppet-7.28.0.ebuild b/app-admin/puppet/puppet-7.27.0-r1.ebuild
similarity index 100%
rename from app-admin/puppet/puppet-7.28.0.ebuild
rename to app-admin/puppet/puppet-7.27.0-r1.ebuild
diff --git a/app-admin/puppet/puppet-7.27.0.ebuild b/app-admin/puppet/puppet-7.28.0-r1.ebuild
similarity index 98%
rename from app-admin/puppet/puppet-7.27.0.ebuild
rename to app-admin/puppet/puppet-7.28.0-r1.ebuild
index 92afd365eb3fd..b23327410b343 100644
--- a/app-admin/puppet/puppet-7.27.0.ebuild
+++ b/app-admin/puppet/puppet-7.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
diff --git a/app-admin/puppet/puppet-8.4.0.ebuild b/app-admin/puppet/puppet-8.3.1-r1.ebuild
similarity index 100%
rename from app-admin/puppet/puppet-8.4.0.ebuild
rename to app-admin/puppet/puppet-8.3.1-r1.ebuild
diff --git a/app-admin/puppet/puppet-8.3.1.ebuild b/app-admin/puppet/puppet-8.4.0-r1.ebuild
similarity index 98%
rename from app-admin/puppet/puppet-8.3.1.ebuild
rename to app-admin/puppet/puppet-8.4.0-r1.ebuild
index 740979b2b82ca..da3eb9487a0c2 100644
--- a/app-admin/puppet/puppet-8.3.1.ebuild
+++ b/app-admin/puppet/puppet-8.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"