gentoo auto-resync : 09:04:2023 - 05:33:50

10 files changed, 133 insertions, 93 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 505027ec63a2..4570f6857fed 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index a0fae54f750a..308d7b56ea66 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,8 +1,9 @@
+AUX resolvelib.patch 5731 BLAKE2B fdc0660ea786e02475e7e9735de6493cd6b96048c238ee050d1751a46cce12048112e495e1de48e1d1bb41d5d4415b16dfe294621bd0f6bbb0786c3df52dd35b SHA512 baf5f8c42c85628dffda987dc81b98f56f1a60857f4cc9e6f1b9938f4978d1ba4d84dc7904685dbe02e19a4b91a7a2f979772bbdd42268e6754bcd5208e40d37
 DIST ansible-core-2.13.8.tar.gz 13985893 BLAKE2B c0fd9ebde2dacd590588a654df29ed56e681ee67f3df41f1d1e91351259c22a0b01f0eb108763596198133e4d980c2130317f79d4f8f25ea1e36dac9325a8b40 SHA512 a3abeaca7076a590892b31735c901447654b5f1db59ca3095ad1d98c8de11b982e1375a22f1814712545fe84a870f57132d87c2ca47fa6a779bd53cd99d17ba4
 DIST ansible-core-2.14.3.tar.gz 11516886 BLAKE2B 95c209842c1ccd090467e529f8c84def76cb3df69863b02c01f61a1ac6d4fa911134cc336e51e087215939efa91883ad51d4c01d2b3f4c124b82c540ab0e3be0 SHA512 95278d9c55d3eef2f66db1ee62648b5493e138f19513c32780684c55631c1ec49f94988a8d0f5eede44dbcceca7b4dd34aca10fa67d17dbe90ef8cf37051581d
 DIST ansible-core-2.14.4.tar.gz 11589961 BLAKE2B ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371 SHA512 86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762
 EBUILD ansible-core-2.13.8.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
 EBUILD ansible-core-2.14.3.ebuild 1306 BLAKE2B 6305f4d4d83b581a94f7bb9e8501e541327c489215eeb2db26dd99086d25b8109a4cba21f982c67f04e978b7fd39d46a0ddb922ec503e60d6ff967ee1fcb9a18 SHA512 96b4ed14b611917f26c5eef7a618c9b6aeb3d84eda44f3292bdc448d50259a4c8618137ab655f326f49824695e0fb8e057109e68b5129c89e1d05df75e868958
-EBUILD ansible-core-2.14.4.ebuild 1309 BLAKE2B f3adc97a33c27b02a57ffa48d078f19368f12e659fd5c9e27b101df8018931866b6885c7312ffea16fab79f7657fa0558f0c0d6bbc8fb978366c7a42ad83dddc SHA512 dc7eb766d7e3cb23400df9fd194bd5745cec05d73869ea900378d4ef1495e5722d96188cd8f1ff44d53df2759a8738c7d50584a71f0b8a7de5f1e981b34c9cd4
-EBUILD ansible-core-9999.ebuild 1309 BLAKE2B f3adc97a33c27b02a57ffa48d078f19368f12e659fd5c9e27b101df8018931866b6885c7312ffea16fab79f7657fa0558f0c0d6bbc8fb978366c7a42ad83dddc SHA512 dc7eb766d7e3cb23400df9fd194bd5745cec05d73869ea900378d4ef1495e5722d96188cd8f1ff44d53df2759a8738c7d50584a71f0b8a7de5f1e981b34c9cd4
+EBUILD ansible-core-2.14.4-r1.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
+EBUILD ansible-core-9999.ebuild 1309 BLAKE2B 5288758a95f5be33854ed6093801b954adbd067213b825eefb2ac56945f15cef99aae4d82e87de8af26b48068b0a98f424a12861efff111c2007e2f1f1d61420 SHA512 c9c81036d86440c692ccf304c229caa8929d1e34519831d62b627141192d33cf832462b3ef2fbe65ac8351f4b56cd3b3f898e0c829b45b5440a0753a88f0fc1e
 MISC metadata.xml 1042 BLAKE2B bf5f9a6d7f2b7a0465332ce47a343566749ac3e6b8c29d37c21140c69e56a3c58ba2bc6335b6839da43993dc427a12350506dc55b0f727856f16b173c0df90a4 SHA512 4adc7776bc6f02d91f2229ea96566e94b1e8155f75bac27d7391f87d6fc3100da425235f2c02dccd1ce7534abc9c30be0ab5a15ec9dc4278463f10dcf95e8b4d
diff --git a/app-admin/ansible-core/ansible-core-2.14.4.ebuild b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
index e9f5858cfb36..66c67a2e2ac7 100644
--- a/app-admin/ansible-core/ansible-core-2.14.4.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
@@ -25,6 +25,10 @@ LICENSE="GPL-3"
 SLOT="0"
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/resolvelib.patch"
+)
+
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -35,7 +39,7 @@ RDEPEND="
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
diff --git a/app-admin/ansible-core/ansible-core-9999.ebuild b/app-admin/ansible-core/ansible-core-9999.ebuild
index e9f5858cfb36..31aa6a3c7556 100644
--- a/app-admin/ansible-core/ansible-core-9999.ebuild
+++ b/app-admin/ansible-core/ansible-core-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
diff --git a/app-admin/ansible-core/files/resolvelib.patch b/app-admin/ansible-core/files/resolvelib.patch
new file mode 100644
index 000000000000..c38f10945d52
--- /dev/null
+++ b/app-admin/ansible-core/files/resolvelib.patch
@@ -0,0 +1,124 @@
+From e30959723a9603ff94bc18ba58ee3adbf305a6b6 Mon Sep 17 00:00:00 2001
+From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+Date: Sun, 12 Mar 2023 23:27:41 +0800
+Subject: [PATCH] ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0`
+
+<https://pypi.org/project/resolvelib/1.0.1> released on 2023-03-09:
+
+-   <https://github.com/sarugaku/resolvelib/blob/main/CHANGELOG.rst#101-2023-03-09>
+-   <https://github.com/sarugaku/resolvelib/releases/tag/1.0.1>
+
+Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+---
+ changelogs/fragments/80196-resolvelib_lt_1_1_0.yml    | 2 ++
+ lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
+ requirements.txt                                      | 2 +-
+ test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
+ test/sanity/code-smell/docs-build.requirements.in     | 2 +-
+ test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
+ test/sanity/code-smell/package-data.requirements.in   | 2 +-
+ test/sanity/code-smell/package-data.requirements.txt  | 2 +-
+ 8 files changed, 10 insertions(+), 8 deletions(-)
+ create mode 100644 changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
+
+diff --git a/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
+new file mode 100644
+index 00000000000000..6fd419f0d4f929
+--- /dev/null
++++ b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
+@@ -0,0 +1,2 @@
++minor_changes:
++  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.1.0``.
+diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
+index d52006b24d7a77..1dcaf1c8d2cff1 100644
+--- a/lib/ansible/galaxy/dependency_resolution/providers.py
++++ b/lib/ansible/galaxy/dependency_resolution/providers.py
+@@ -42,7 +42,7 @@ class AbstractProvider:  # type: ignore[no-redef]
+ 
+ # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
+ RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
+-RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
++RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
+ RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
+ 
+ 
+@@ -220,7 +220,7 @@ def get_preference(self, *args, **kwargs):
+             Mapping of identifier, list of named tuple pairs.
+             The named tuples have the entries ``requirement`` and ``parent``.
+ 
+-        resolvelib >=0.8.0, <= 0.8.1
++        resolvelib >=0.8.0, <= 1.0.1
+ 
+         :param identifier: The value returned by ``identify()``.
+ 
+diff --git a/requirements.txt b/requirements.txt
+index d096901ec2bcdb..a07aa985063b6a 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
+diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
+index d096901ec2bcdb..a07aa985063b6a 100644
+--- a/test/lib/ansible_test/_data/requirements/ansible.txt
++++ b/test/lib/ansible_test/_data/requirements/ansible.txt
+@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
+diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
+index 80e8f66bc7f6fb..9209dd34ebecdf 100644
+--- a/test/sanity/code-smell/docs-build.requirements.in
++++ b/test/sanity/code-smell/docs-build.requirements.in
+@@ -1,6 +1,6 @@
+ jinja2
+ pyyaml
+-resolvelib < 0.9.0
++resolvelib < 1.1.0
+ sphinx == 4.2.0
+ sphinx-notfound-page
+ sphinx-ansible-theme
+diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
+index 663e2c6c53d28a..7b4d563574c595 100644
+--- a/test/sanity/code-smell/docs-build.requirements.txt
++++ b/test/sanity/code-smell/docs-build.requirements.txt
+@@ -27,7 +27,7 @@ Pygments==2.14.0
+ pytz==2022.2.1
+ PyYAML==6.0
+ requests==2.28.1
+-resolvelib==0.8.1
++resolvelib==1.0.1
+ rstcheck==3.5.0
+ semantic-version==2.10.0
+ sh==1.14.3
+diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
+index acec62eff91ff8..50e8568c5cf8bc 100644
+--- a/test/sanity/code-smell/package-data.requirements.in
++++ b/test/sanity/code-smell/package-data.requirements.in
+@@ -1,6 +1,6 @@
+ docutils < 0.18  # match version required by sphinx in the docs-build sanity test
+ jinja2
+ pyyaml  # ansible-core requirement
+-resolvelib < 0.9.0
++resolvelib < 1.1.0
+ rstcheck < 4  # match version used in other sanity tests
+ antsibull-changelog
+diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
+index 6411020e47c67b..afc3cd6418e84d 100644
+--- a/test/sanity/code-smell/package-data.requirements.txt
++++ b/test/sanity/code-smell/package-data.requirements.txt
+@@ -5,7 +5,7 @@ Jinja2==3.1.2
+ MarkupSafe==2.1.1
+ packaging==21.3
+ pyparsing==3.0.9
+ PyYAML==6.0
+-resolvelib==0.8.1
++resolvelib==1.0.1
+ rstcheck==3.5.0
+ semantic-version==2.10.0
+ types-docutils==1.5.0
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 503bb5ac2ef6..dbd8e65cedf2 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,9 +1,5 @@
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 760 BLAKE2B 1803b602178f711cb4a0784a8e74e5bc63b66db11ce4a9855f76c1b51956eea6f2fa9d3ee898f5219ad2648e34c6d60e700f67dcfcaef85f586f3f6d5a44b8fd SHA512 f70660aad14fd9690f83a2689fa46370fdda0f04601146956d9436d1363a9a12739f0d1c0d4540c239c8cffe29149e2464787a5bbadda80453128a2a843d84bb
-AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
-AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76655a4897fdf128fb38950ff8e62abfa806785906fdae648c544310b75f9a33694ce1fbc0c31fe4f04a8 SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d
-AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
-AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 AUX tmpfiles.d-2 35 BLAKE2B 333994788552e5c52273752f4e3c2947666737d03f9d340e16ada790607efe77da1ba9bb4852bc8274174fbb96ce0c7ae81062f7197e63ea4701e539b2650b3b SHA512 fdf00147c497bd822a14f0e42bad825a43ce0977ec6c0265d267dedeef56295e3ce319f7972d0ec2ab9f04f2407856947f4261d6e62054a36c6e1672b45f86f0
 DIST puppet-7.21.0.tar.gz 2819997 BLAKE2B 96de8ceefeea12c51288e05af5d7b126811d23388492053b0d581856f11976f0492064eb89bc585ff7f455df537d5c04fb318814945a158d531d32efdd54ff02 SHA512 b0fbdf63391054d0496c67be963f98e3d85e3a1536e50d6a3f09d0c49110bb4c92bebdc38a48cd50e824e27268150cda0643c6df0edb01b3587f00a591645ee6
 DIST puppet-7.23.0.tar.gz 2820654 BLAKE2B c9e2b544400c7fa9e59dd1d40bf89d1444ee62664b11e7aafa30aecd5fd14aa217dfe0bc24795a951c5e04b04762adb0239f6d7289b431b8f2a040716e95c642 SHA512 a66ef2bdbe38741a176e825cf7cdf117616459548731d4f5482b49263b08dcb3550305e5f0e35d228f873b330b730b682c02d38b4243f5f8bb4a190ed0f60310
diff --git a/app-admin/puppet/files/puppet.init-4.x b/app-admin/puppet/files/puppet.init-4.x
deleted file mode 100644
index f7106e6f0294..000000000000
--- a/app-admin/puppet/files/puppet.init-4.x
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# 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}"
-
-pidfile="${PUPPET_PID_DIR}/puppet.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
-
-depend() {
-	need localmount
-	use dns logger puppetmaster netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
-	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-}
-
-reload() {
-    ebegin "Reloading $RC_SVCNAME"
-    start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
-    eend $?
-}
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 -