6 files changed, 3 insertions, 77 deletions
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
deleted file mode 100644
index daa065dabb5c..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -158,16 +158,6 @@
-       handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      expect(handler).to receive(:check_authorization).with(anything,
--                                                            anything,
--                                                            excluding(:environment))
--      expect { handler.uri2indirection("GET",
--                                       "#{master_url_prefix}/node/bar",
--                                       {:environment => 'bogus'})
--      }.to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
- 
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init
index f7106e6f0294..9821134c8ae3 100644
--- a/app-admin/puppet/files/puppet.init-4.x
+++ b/app-admin/puppet/files/puppet.init
@@ -2,7 +2,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}"
 
 pidfile="${PUPPET_PID_DIR}/puppet.pid"
 PUPPET_LOG_DIR="/var/log/puppet"
@@ -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/files/puppetmaster.confd b/app-admin/puppet/files/puppetmaster.confd
deleted file mode 100644
index afecf479a6a1..000000000000
--- a/app-admin/puppet/files/puppetmaster.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Location of PID files
-PUPPETMASTER_PID_DIR="/var/run/puppet"
-
-# Where to log general messages to.
-# Specify syslog to send log messages to the system log.
-#PUPPETMASTER_LOG="syslog"
-
-# You may specify other parameters to the puppetmaster here
-#PUPPETMASTER_EXTRA_OPTS="--noca"
-
-# You may specify an alternate port on which puppetmaster should listen.
-# Default is: 8140
-#PUPPETMASTER_PORT="8140"
-
-# To start multiple servers:
-# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
-# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
-# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)
diff --git a/app-admin/puppet/files/puppetmaster.init-4.x b/app-admin/puppet/files/puppetmaster.init-4.x
deleted file mode 100644
index 286f7e67579a..000000000000
--- a/app-admin/puppet/files/puppetmaster.init-4.x
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-	PUPPETMASTER_PID="master"
-else
-	PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPETMASTER_EXTRA_OPTS}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
-}
-
-reload() {
-    ebegin "Reloading $RC_SVCNAME"
-    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
-    eend $?
-}
diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d
deleted file mode 100644
index cd33231df7f7..000000000000
--- a/app-admin/puppet/files/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/puppet 0755 puppet puppet -
diff --git a/app-admin/puppet/files/tmpfiles.d-2 b/app-admin/puppet/files/tmpfiles.d-2
new file mode 100644
index 000000000000..b36eec4dbdfc
--- /dev/null
+++ b/app-admin/puppet/files/tmpfiles.d-2
@@ -0,0 +1 @@
+D /run/puppet 0755 puppet puppet -