gentoo auto-resync : 28:04:2023 - 23:13:34

13 files changed, 8 insertions, 183 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c17523ecd22c..25d75cc9d700 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 a954df37900d..44743efdc7f5 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,13 +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.13.9.tar.gz 14025835 BLAKE2B 831f04f1d4872d2e7a9801e69e450ed48c65f95121dc56f124c932169e44c12da672dd4ba9320a4e40270afd044d38c0774e79980977322260f110986d06a65e SHA512 74514d98fb3f7f24fb0b4e95ee20c76f26234d1f5067ca2801e9ac92baabed0f2f2c89bf577510be7403041405951271e7749279c9fa04fab57018cbdf2c52c7
-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
 DIST ansible-core-2.14.5.tar.gz 11620295 BLAKE2B d006f773e1c2b28582143a4f08f699e5744fba492130388fa5463053cdf8f0cc7056296daa213c72884ea0c0ba454a3e04ef118c184faba8c8d3c281ae65345a SHA512 130a0de925c7229dee350ddbf4382d87802d86aab4817ed595105db8ed5071153847dac0478f20a994670e59e53a07b77d0bf35855d309ebc222fbb61233b7db
-EBUILD ansible-core-2.13.8.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
-EBUILD ansible-core-2.13.9.ebuild 1328 BLAKE2B 80846b2634fa068a5194947e74fba62825738df1de99e890b1923ede0fc33594e3f6d4fadcdddcfb44e73b27671f17698c9062f8cefe008d01603d14cb1e5038 SHA512 bc4a5ce71b0bc318652216ff7a147ffcb78cf0221de26fadc5d1d4ad9bf617252485f0f0e61903d508cf4ee025b647f6003b38461ff9a5845cd9477dc8fb6bb3
-EBUILD ansible-core-2.14.3.ebuild 1306 BLAKE2B 6305f4d4d83b581a94f7bb9e8501e541327c489215eeb2db26dd99086d25b8109a4cba21f982c67f04e978b7fd39d46a0ddb922ec503e60d6ff967ee1fcb9a18 SHA512 96b4ed14b611917f26c5eef7a618c9b6aeb3d84eda44f3292bdc448d50259a4c8618137ab655f326f49824695e0fb8e057109e68b5129c89e1d05df75e868958
-EBUILD ansible-core-2.14.4-r1.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
+EBUILD ansible-core-2.13.9.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
+EBUILD ansible-core-2.14.4-r1.ebuild 1351 BLAKE2B b00902f00b8f1371777e41651460ecd2925d20a165ee8e491ff7e4d7cd902d380eed501556bc8c393e2236f79818eeffff05f8e2f093408ca61cee70d0ee8642 SHA512 94e9821734f241f745301bea4676c7d7aee48628d61b910cd694d6d541a660fe226bf9e5b50129b5263221ef9986898f656831a63531ada6916ba63d4b620724
 EBUILD ansible-core-2.14.5.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.13.8.ebuild b/app-admin/ansible-core/ansible-core-2.13.8.ebuild
deleted file mode 100644
index ee8d323e90b5..000000000000
--- a/app-admin/ansible-core/ansible-core-2.13.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	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}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
diff --git a/app-admin/ansible-core/ansible-core-2.13.9.ebuild b/app-admin/ansible-core/ansible-core-2.13.9.ebuild
index 84f6bffd432f..ee8d323e90b5 100644
--- a/app-admin/ansible-core/ansible-core-2.13.9.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.9.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible-core/ansible-core-2.14.3.ebuild b/app-admin/ansible-core/ansible-core-2.14.3.ebuild
deleted file mode 100644
index 3c7933de840a..000000000000
--- a/app-admin/ansible-core/ansible-core-2.14.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	inherit pypi
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	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}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
diff --git a/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
index 66c67a2e2ac7..c9e4dbcd003a 100644
--- a/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b18300ef7dd5..cf5b9b978356 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,5 @@
 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
-DIST ansible-7.3.0.tar.gz 37218246 BLAKE2B 04a1a4d00c8f33fa81b907d71f76988ea58e66bb88817475ed4f53fd0fef61468e9e2623ff9224e37f7ea06301aad34ebc39f68e51bdfe049e110d683e6b0171 SHA512 078bda71b6de438c083068902da1543b97f160265a6607fdbf9a386361b0932ba673cf46192c5a3521bc52724489ea9fc0900b0f742756ff4dbf5d2b7d4471bc
 DIST ansible-7.4.0.tar.gz 37352820 BLAKE2B 33d3affa052e509348c981920597ab13f3181dee1ab46eda764e0a68df2edeefbcb62cec57e62da559bfe2b5e7efdb95eba1b602efe198bfad8dd0301e66c7df SHA512 c77aebb54676b669305905c969fa5afac9e1262bfefa358de7fee0fb3ef89d0306c599acb2225cdb4209c53df16c307d438cc628299aec494c70cba166eb3cbb
 EBUILD ansible-6.7.0.ebuild 702 BLAKE2B dc001693f809edd51a506b788ee1f3755d7cef610a8755c50d47f56ab9733a4ac65ccf3239d79d3a79cf4ff80e0f8ecef4e99c8e5528f6f4ad155768a0e0d303 SHA512 d0c71d92fdfdc1f588d045fab3a19971d994071bbdcba6038d72b3225833180a16ff7477367cee73011169a91f50788879ddd5dd0342a3a34e40fc51feeb74b5
-EBUILD ansible-7.3.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
-EBUILD ansible-7.4.0.ebuild 658 BLAKE2B ffe6100a7745a7e1fc7f35564eda5985b002948292a58e199d608223dc7ca37879b02a3e71a40c7f005e8e33c153489ede0643d9a014205eef23467625b9d9c4 SHA512 8e5e4242bcdaf4169e87d19e82e91b80938134544309f67fad49148798ab20922eb17ccdef4752ef840674bd04d74123c7c15a105816181928247f1dce761780
+EBUILD ansible-7.4.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097
diff --git a/app-admin/ansible/ansible-7.3.0.ebuild b/app-admin/ansible/ansible-7.3.0.ebuild
deleted file mode 100644
index 0cefb7045e40..000000000000
--- a/app-admin/ansible/ansible-7.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.14.0
-	<app-admin/ansible-core-2.15"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
diff --git a/app-admin/ansible/ansible-7.4.0.ebuild b/app-admin/ansible/ansible-7.4.0.ebuild
index b74fccd0afab..0cefb7045e40 100644
--- a/app-admin/ansible/ansible-7.4.0.ebuild
+++ b/app-admin/ansible/ansible-7.4.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.ansible.com/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-core-2.14.0
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 89a5d4e23325..4b36bdc84d8f 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,4 +1,3 @@
-AUX lnav-0.11.0-conditional-ssh-keygen.patch 1109 BLAKE2B 9abe69b110a0119f9900cb6776baada9f1c708589372437e3f3d2a0f298a91f502a152b2754c06a3b7c7c8fe0e3dbdaa1272cf08992bc53547f892112ceeb3f8 SHA512 f702dc9f1ac1c650dc1bd562e48df9d43dedf30e962cc77032ecbab4d1ccd76d651eb58a3c09feba43ad99d7fce75359c260eb002cc3ec080d8a3b1ad774d5f8
 AUX lnav-0.11.0-disable-tests.patch 1784 BLAKE2B e4c0184793b19eff53dea12a81f0e8c7fab6fee44a77304f268365cdec0fa13fb916b35e25fb032a992147338a8028ffb799d9cd14db147f2396f5d54c74173c SHA512 e4c3ddee7c0747196a4ec5cdd409f1c088e06938762677d05757113ff8c8a1834a8ee2d132befef4fa84f4e34633d1d9a64d39f06e423f2a262e79ac121ea202
 AUX lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch 668 BLAKE2B 1c02dd2bb64bd42b8c3483732b0a2e282c82ad08fe02e704be6393d36783d56c429c99fbd03d938e747b790a75f80d4ca795a5e489054c6bb8c3494c8de062ba SHA512 30a8e13e22a5282cacc3d47e1f2c88c54361b93953bacfd4fc3f481b5e9ed1fa21fe75943c0573bdcd92bed73f96097d494dec9093d9b312c066ad7b813b0ba5
 DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
diff --git a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch b/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
deleted file mode 100644
index a0396182b8af..000000000000
--- a/app-admin/lnav/files/lnav-0.11.0-conditional-ssh-keygen.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b16833392b74826f8cd437675fc29e4a0b88efcd Mon Sep 17 00:00:00 2001
-From: Randy Barlow <randy@electronsweatshop.com>
-Date: Sun, 4 Sep 2022 00:03:33 -0400
-Subject: [PATCH] Only build ssh keys when needed
-
-I believe the test/remote folder only needs to be setup for
-test/test_remote.sh. Prior to this commit, it was being built during
-make, rather than just during make check. This commit adjusts things so
-that the test/remote folder is only generated during make check, and
-only when test/test_remote.sh is being executed.
-
-Fixes #1040
-
-Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
----
- test/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index fd09a656..457f3cb0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -478,7 +478,7 @@ DISTCLEANFILES = \
- 	empty \
- 	scripts-empty
- 
--all-local: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
-+test_remote.sh.log: remote/ssh_host_dsa_key remote/ssh_host_rsa_key remote/id_rsa
- 
- distclean-local:
- 	$(RM_V)rm -rf remote remote-tmp not:a:remote:dir
--- 
-2.37.2
-
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index bdb87313a830..ca4239f3276b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,5 +6,5 @@ DIST puppet-7.24.0.tar.gz 2823083 BLAKE2B f4a3862153a01b1d5ce1cc9d72a2446d91346c
 DIST puppet-8.0.0.tar.gz 2874596 BLAKE2B 64a609c0375c942520f17bd6281225568b9803cd7af3e9f4da8311eb4f2680184174b0b5c992b243ba9680912b77038934bb3506ae28a964c64b0f1f8feca62e SHA512 78ba9d603831874fbecca7ce3e2802ed54188a71ad7d6f7a24fa3390330e41a7b43b074c6c51e32cfdf10ff92f6b087f8fbe9220ea65efb917f517776451ef56
 EBUILD puppet-7.23.0-r1.ebuild 3667 BLAKE2B 596aba703f8e8154cde0c6dd8d11cde9118aac72546a3579bfbe43e69748b80e89ffed85baf5e0be36f5cb3e969837fe731523827581a60535df6f43ba9a5691 SHA512 9db45b40a7c9b7367583181a28dc5901c845fe814298a48fe1fe2ea9b3d7eec9c55ab3076f934902f1c8885deffc89eac90e8fa13d6a4fdf16e313f031d3cc6f
 EBUILD puppet-7.24.0.ebuild 3669 BLAKE2B 1d9bda9449626c6b1e23f33f2564557631cdd9236253e6b089544c29b89bb35691ca78dcc614f5bb80acbc5ba7f87280541eadb4112fe6b3c413db63abbf808d SHA512 52ed50c70e4e7580cd7d2df5430b07a0673841f53697fc60782855bf7dbaee53891fbfaa8995608e9447b8b2dd267977f5ccc27802e78e2638e622e670cb03c1
-EBUILD puppet-8.0.0.ebuild 3487 BLAKE2B de2093b1da3465e92cccde2faeeb3cc59618347d2cfe3fedf8b42668b9edca3c3c1f6898508928b2cc3c60d7b588687cba1ce8d9db6939e78b43f56d5fb14794 SHA512 f5e66a85e49e162508ea910e82f2e8fc93e381c83e46cda5f11a86fe01e523e0ae900345d676f7c4459dd8ca1b6be6303c63b6fe87329d0dc606476e83418435
+EBUILD puppet-8.0.0-r1.ebuild 3508 BLAKE2B c883b56902bbdb5580ca595c4496f3b4f8353da5099fb93a545d4b7617429c4bd6afd21db417a6582a4578a56c5a6c81cc1e70b2cd82754e8450c8d1f4a4723f SHA512 6725289f96f4f98278f41cbe4340cbd0a77a963c3309b1074c6927bef15b08f443457fbbe501f6b004abfa46403304c6d3ec2ef17fb333be25d129119c4646ac
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-8.0.0.ebuild b/app-admin/puppet/puppet-8.0.0-r1.ebuild
index 9a3ead6bacc9..724598bff245 100644
--- a/app-admin/puppet/puppet-8.0.0.ebuild
+++ b/app-admin/puppet/puppet-8.0.0-r1.ebuild
@@ -28,6 +28,7 @@ ruby_add_rdepend "
 	dev-ruby/json:=
 	dev-ruby/semantic_puppet
 	>=dev-ruby/facter-3.0.0
+	dev-ruby/deep_merge
 	<dev-ruby/concurrent-ruby-1.2
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )