diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2a854e9c7a2e..bd2a6ad239d9 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 56c28d1773ed..20407bc3754d 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/collectd/metadata.xml b/acct-group/collectd/metadata.xml
index 542a8a19f0f6..c07e13d4a6bd 100644
--- a/acct-group/collectd/metadata.xml
+++ b/acct-group/collectd/metadata.xml
@@ -2,7 +2,7 @@
- whissi@gentoo.org
- Thomas Deutschmann
+ conikost@gentoo.org
+ Conrad Kostecki
diff --git a/acct-group/dehydrated/metadata.xml b/acct-group/dehydrated/metadata.xml
index a442f39eb095..0885e8a081b0 100644
--- a/acct-group/dehydrated/metadata.xml
+++ b/acct-group/dehydrated/metadata.xml
@@ -4,8 +4,4 @@
mschiff@gentoo.org
-
- whissi@gentoo.org
- Thomas Deutschmann
-
diff --git a/acct-group/fcron/metadata.xml b/acct-group/fcron/metadata.xml
index 87336d400336..489e730c1c90 100644
--- a/acct-group/fcron/metadata.xml
+++ b/acct-group/fcron/metadata.xml
@@ -1,10 +1,6 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
blueness@gentoo.org
Anthony G. Basile
diff --git a/acct-group/fritzbox_smarthome_exporter/metadata.xml b/acct-group/fritzbox_smarthome_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/fritzbox_smarthome_exporter/metadata.xml
+++ b/acct-group/fritzbox_smarthome_exporter/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-group/mysqld_exporter/metadata.xml b/acct-group/mysqld_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/mysqld_exporter/metadata.xml
+++ b/acct-group/mysqld_exporter/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-group/nginx/metadata.xml b/acct-group/nginx/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/nginx/metadata.xml
+++ b/acct-group/nginx/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-group/pipewire/metadata.xml b/acct-group/pipewire/metadata.xml
index 818bc8df5664..6d27fca777f7 100644
--- a/acct-group/pipewire/metadata.xml
+++ b/acct-group/pipewire/metadata.xml
@@ -13,8 +13,4 @@
asturm@gentoo.org
Andreas Sturmlechner
-
- whissi@gentoo.org
- Thomas Deutschmann
-
diff --git a/acct-group/sabnzbd/metadata.xml b/acct-group/sabnzbd/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/sabnzbd/metadata.xml
+++ b/acct-group/sabnzbd/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-group/unbound/metadata.xml b/acct-group/unbound/metadata.xml
index a3bdd9f74bf4..f63250c09310 100644
--- a/acct-group/unbound/metadata.xml
+++ b/acct-group/unbound/metadata.xml
@@ -5,8 +5,4 @@
mschiff@gentoo.org
Marc Schiffbauer
-
- whissi@gentoo.org
- Thomas Deutschmann
-
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 88275cb4f163..25d978a67870 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/collectd/metadata.xml b/acct-user/collectd/metadata.xml
index 542a8a19f0f6..c07e13d4a6bd 100644
--- a/acct-user/collectd/metadata.xml
+++ b/acct-user/collectd/metadata.xml
@@ -2,7 +2,7 @@
- whissi@gentoo.org
- Thomas Deutschmann
+ conikost@gentoo.org
+ Conrad Kostecki
diff --git a/acct-user/dehydrated/metadata.xml b/acct-user/dehydrated/metadata.xml
index a442f39eb095..0885e8a081b0 100644
--- a/acct-user/dehydrated/metadata.xml
+++ b/acct-user/dehydrated/metadata.xml
@@ -4,8 +4,4 @@
mschiff@gentoo.org
-
- whissi@gentoo.org
- Thomas Deutschmann
-
diff --git a/acct-user/fcron/metadata.xml b/acct-user/fcron/metadata.xml
index 87336d400336..489e730c1c90 100644
--- a/acct-user/fcron/metadata.xml
+++ b/acct-user/fcron/metadata.xml
@@ -1,10 +1,6 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
blueness@gentoo.org
Anthony G. Basile
diff --git a/acct-user/fritzbox_smarthome_exporter/metadata.xml b/acct-user/fritzbox_smarthome_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/fritzbox_smarthome_exporter/metadata.xml
+++ b/acct-user/fritzbox_smarthome_exporter/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-user/mysqld_exporter/metadata.xml b/acct-user/mysqld_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/mysqld_exporter/metadata.xml
+++ b/acct-user/mysqld_exporter/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-user/nginx/metadata.xml b/acct-user/nginx/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/nginx/metadata.xml
+++ b/acct-user/nginx/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-user/pipewire/metadata.xml b/acct-user/pipewire/metadata.xml
index 818bc8df5664..6d27fca777f7 100644
--- a/acct-user/pipewire/metadata.xml
+++ b/acct-user/pipewire/metadata.xml
@@ -13,8 +13,4 @@
asturm@gentoo.org
Andreas Sturmlechner
-
- whissi@gentoo.org
- Thomas Deutschmann
-
diff --git a/acct-user/sabnzbd/metadata.xml b/acct-user/sabnzbd/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/sabnzbd/metadata.xml
+++ b/acct-user/sabnzbd/metadata.xml
@@ -1,8 +1,5 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
diff --git a/acct-user/unbound/metadata.xml b/acct-user/unbound/metadata.xml
index a3bdd9f74bf4..f63250c09310 100644
--- a/acct-user/unbound/metadata.xml
+++ b/acct-user/unbound/metadata.xml
@@ -5,8 +5,4 @@
mschiff@gentoo.org
Marc Schiffbauer
-
- whissi@gentoo.org
- Thomas Deutschmann
-
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4869eaae2cc8..44ab909562f5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 68e2471a1171..f4d6af7d81e2 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,6 +1,4 @@
DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
-DIST ansible-core-2.12.3.tar.gz 7757271 BLAKE2B 02c8c2c09b778de9775384471f0b485237a8074468d437d41a6879e85769444c91ed4571e17de9aa4024fb2b6c29b4e90b4c31b6714d633ef7028e9711f5ecf3 SHA512 dedac2546881442f5e904c485bdc464d0ced847520879fd10c2454a2055ada4d051416d450f01ae5a1e2f5073f1633cb4db5265855199bb32c0acb41092d6f05
-DIST ansible-core-2.12.4.tar.gz 7756536 BLAKE2B f2820db0c8a3b618b8dc37670709185ed26d21dc96bb3e8ea34a011d8f2c006ca541a74cd4196ea5cf8d420f9f57efc1bc256a76320b860c1b3a8e3f4304163f SHA512 a196a4f75834b5951330a1ea201aca41581c88a3cedbdd1c9e00acd5d3f06b4fd1948ddb2acea32bc2b758587baf9bd75572d150d6d47a3a957f5d8c4fc06d2f
DIST ansible-core-2.12.5.tar.gz 7757691 BLAKE2B 04be15e932221dfbc8435c703efe3803d4de5f1f94b3205c220f4ea105ffd703df5dff680a4812f1230b77f21ee78b9f6b1020122442aac333aa26304d4d62c0 SHA512 795001257d8b2ffdca00c13a018ebfc822c11f1d8a0eb83df30a1670c19bdc995325da1c87414b672a4fcf8bf57215ff8b7a7b85325ad561d5123c549b18dbe9
DIST ansible-core-2.12.6.tar.gz 7761844 BLAKE2B 37fe58bd04fcd59bb8085c31d8d7b4d4298c7911acb2a5988afa7a3b9d856769f0a737179f8d4828fd94a1a6c5e029385a7514a5f1b5155fffd6b8aa7ae7427f SHA512 55138701f3733b1ea2049783d9d0246beb7cc778090785eada756c9ef540b248bc345e07a261d5542648fc22088bc25e3ab57f7b904bba615264d5556baae456
DIST ansible-core-2.13.0.tar.gz 7383065 BLAKE2B 14c9c30a1d04c4235877da9a2d866bae229fa0bb28815dccc2cbc37ca7a767a6a15b2ae1824849cb2c7031b3c3bdcac433b04bf353265228ab2beec7650aa7b9 SHA512 37e17d73477ba88c62af94a6912f9b4b91ebf2ac967c2845875e293fe2ed09307e414644899714e604883973e241eed571d61b7a093a6c212446a1f5b702af6f
diff --git a/app-admin/ansible-base/ansible-base-2.12.3.ebuild b/app-admin/ansible-base/ansible-base-2.12.3.ebuild
deleted file mode 100644
index e8c2a3cb1c45..000000000000
--- a/app-admin/ansible-base/ansible-base-2.12.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-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/packaging-16.6[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-python_compile() {
- export ANSIBLE_SKIP_CONFLICT_CHECK=1
- distutils-r1_python_compile
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible-base/ansible-base-2.12.4.ebuild b/app-admin/ansible-base/ansible-base-2.12.4.ebuild
deleted file mode 100644
index e8c2a3cb1c45..000000000000
--- a/app-admin/ansible-base/ansible-base-2.12.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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
- MY_PN="${PN/-base/-core}"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
- S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-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/packaging-16.6[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-python_compile() {
- export ANSIBLE_SKIP_CONFLICT_CHECK=1
- distutils-r1_python_compile
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 7b358f228148..a32f3e73decd 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,3 @@
DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
-DIST ansible-5.4.0.tar.gz 38255326 BLAKE2B a7a840d9c8f6f260c8fc2b488b7d8c4b59fa1eeb68751f1cfe4cbf2cc68644ac0d716fd59e0df29f671e8bd3719b37d529ecbf008025988d38eb202fe7a41c75 SHA512 7065c7d16a3bb13db27a3ec99c33c48e9d4abb4bec8267751e3d8df89da7d0948a8415b50b8fabd05f6a97fba661714f08f8473ae145fcb323dd83f6c7349a6d
-DIST ansible-5.5.0.tar.gz 42044944 BLAKE2B f82b31ca7f329d408efdfdcbd0e281815efc618bb6d0dfa634fc66d0ad0113ab93941a1418dd2a5058a4bd63604e154e99d6b25eb3289b155fe76a9aec3ac045 SHA512 1a7b2021a2d5223c82eb05b517f61b0da62f6f33aef5dd7dd006527d71f41d18491634f156ab3a654bcdd4e03be5de4d6809c79e1b1053cbc577510e5ba47578
DIST ansible-5.7.0.tar.gz 35864998 BLAKE2B 9bee56b3c1aec3af8fec68a80f97431d8c610a8646b755974cf6365d68e57a4adefb4f678ed76da1dd25802eec1abb45b596030b9ebca8337e4b9bf8c18b469b SHA512 2e2f88948e875a1ce5a6cac58ae0d918adf903848c60e125728314e935cbf29aae6db6ec87d9aad14fd5406751251a681b441f1209c789f14a1df6e68b91c3d9
DIST ansible-5.7.1.tar.gz 35657258 BLAKE2B e13d294327ff6e6ca42a5fe95d5795c984319bace80da1d9e62b0eca861ac60cc9e6551c3bef6eddd8629670bb85b1f9ebc48fd093880248988831de2056908d SHA512 cba20da1a87e96600214b89539b5dd9ea0439edb6ccd757717c4041506b7ccb8ca046cd11840b2418bf0f6e725b21e56c8ac057f13604baba610d3716deee268
diff --git a/app-admin/ansible/ansible-5.4.0.ebuild b/app-admin/ansible/ansible-5.4.0.ebuild
deleted file mode 100644
index 21e85e45cd01..000000000000
--- a/app-admin/ansible/ansible-5.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-base-2.12.0
- =app-admin/ansible-base-2.12.0
- ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # do not rely on bundled deps in botocore (sic!)
+ find -name '*.py' -exec sed -i \
+ -e 's:from botocore[.]vendored import:import:' \
+ -e 's:from botocore[.]vendored[.]:from :' \
+ {} + || die
+ # strip overzealous upper bounds on requirements
+ sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # integration tests require AWS credentials and Internet access
+ epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/cli53/metadata.xml b/app-admin/cli53/metadata.xml
index 69248b68c261..690d0d4af10c 100644
--- a/app-admin/cli53/metadata.xml
+++ b/app-admin/cli53/metadata.xml
@@ -1,10 +1,7 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+
https://github.com/barnybug/cli53/issues
barnybug/cli53
diff --git a/app-admin/gentoo-retirement-scripts/Manifest b/app-admin/gentoo-retirement-scripts/Manifest
new file mode 100644
index 000000000000..1990713be9b1
--- /dev/null
+++ b/app-admin/gentoo-retirement-scripts/Manifest
@@ -0,0 +1,2 @@
+DIST gentoo-retirement-scripts-2.tar.gz 6614 BLAKE2B 9ad448c57cbfc51214023d49b5c36f65071aa27bdcad5146d2f78ff457465f35f3430699c51befffe7a22a47057891c085b1b7cc77fbf76877c5fd99fc3cbe9f SHA512 d884d5a11d498fd7e0bca3d72f915002c43de1bebe283d6628229de0c0d8af3b819e0410cc12269c06c7fcd7af087faa9366590e13aa5db3eae353e7d35c1438
+DIST undertaker-scripts-1.tar.gz 6608 BLAKE2B 82aaf4395f480b2ac7194c9d0022a1001e0f6e3fd137db030bac8d0d0fa80e7f51a086dbdc611c6698a765b467178d9c85518947fd26cc062904142babec3d72 SHA512 a946e669628f1dba4ff6846fa79a5eb1ea44cf19b3ec2d5d24d6792f0d621e262514d346379be88c1abc529373e0cfadb83eed9ba1cd4d4e2f73a078fc20fe04
diff --git a/app-admin/undertaker-scripts/undertaker-scripts-1.ebuild b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-1.ebuild
similarity index 80%
rename from app-admin/undertaker-scripts/undertaker-scripts-1.ebuild
rename to app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-1.ebuild
index 3531d7b8d0ea..739728fb2bac 100644
--- a/app-admin/undertaker-scripts/undertaker-scripts-1.ebuild
+++ b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-1.ebuild
@@ -6,11 +6,11 @@ EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1
+MY_P=undertaker-scripts-${PV}
DESCRIPTION="Scripts to help retiring Gentoo developers"
-HOMEPAGE="https://github.com/mgorny/undertaker-scripts"
-SRC_URI="
- https://github.com/mgorny/undertaker-scripts/archive/v${PV}.tar.gz
- -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/mgorny/gentoo-retirement-scripts/"
+SRC_URI="mirror://gentoo/40/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
LICENSE="BSD-2"
SLOT="0"
diff --git a/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild
new file mode 100644
index 000000000000..4267e6014067
--- /dev/null
+++ b/app-admin/gentoo-retirement-scripts/gentoo-retirement-scripts-2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-single-r1
+
+DESCRIPTION="Scripts to help retiring Gentoo developers"
+HOMEPAGE="https://github.com/mgorny/gentoo-retirement-scripts/"
+SRC_URI="
+ https://github.com/mgorny/gentoo-retirement-scripts/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/python-bugzilla[${PYTHON_USEDEP}]
+ ')"
+
+src_compile() {
+ python_fix_shebang .
+}
+
+src_install() {
+ exeinto /opt/gentoo-retirement-scripts
+ doexe *.py
+ insinto /opt/gentoo-retirement-scripts
+ doins *.template
+}
diff --git a/app-admin/undertaker-scripts/metadata.xml b/app-admin/gentoo-retirement-scripts/metadata.xml
similarity index 100%
rename from app-admin/undertaker-scripts/metadata.xml
rename to app-admin/gentoo-retirement-scripts/metadata.xml
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 0d3f9532f640..8f3cc293f9d0 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,2 +1,4 @@
DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
DIST github-backup-utils-3.0.0.tar.gz 104088 BLAKE2B f01229e6b152231eb832dec8bef41bb158cc200bbdd3c59c1abab299c572902efe6d27d093491bd8b0bf8f3e834d2938eb0127d5f28700ba75dcbdbcc8a21bb8 SHA512 e86420ef9d86d44560e27e00361ff1bb8ba7c15fb116ad9981e3196bc4c7c25bcff9a9f7dc8dae9bbbb9b2f3380b434199dbbe1ef7db5b1ba04ec1233aec320d
+DIST github-backup-utils-3.3.2.tar.gz 109517 BLAKE2B b9c48de60f10d1d20eda96d0fa69c7d1835c0cdca7dbb3a3659e2a527706d6d793c426d5032e2bd1ead58255cdca6cdf424da0cb6a06484c4a5b5a9b0d4bcbba SHA512 c8013d5775a0ad8193266c36b0afa91bd452dfd70499c74239c6e62a0c9d88ecd92e16495ad4bd64319e42ad7b781125c136b1a9945146d09add5a2165d31b16
+DIST github-backup-utils-3.5.0.tar.gz 113871 BLAKE2B e6835c3efe04332df792827e2fdc54449e73a1fec055e7677174a1eaf2b4c9d43a2bc4c82741b056265fbf4eeea75ad62819d9d357d800ff3d4befcf5fcd4e39 SHA512 d77e30fe426b231c8d8aa1ca7867861a3427a5829d46184283a1beaea22b697dd6cf7343d1e65f40c9f6f9bcd05fea0c45892080292707b6b897599d4cbb566b
diff --git a/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild
index b30ac5390545..542fb1e0b0e1 100644
--- a/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# Python3 support: https://github.com/github/backup-utils/pull/627
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-any-r1
DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
diff --git a/app-admin/github-backup-utils/github-backup-utils-3.3.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.3.2.ebuild
new file mode 100644
index 000000000000..fd36dcb57253
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-3.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="app-misc/jq
+ app-arch/pigz
+ net-misc/rsync
+ sys-apps/moreutils"
+
+# tests invoke parallel & rsync
+DEPEND="test? (
+ ${RDEPEND}
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+
+ dodoc -r docs/*
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-3.5.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.5.0.ebuild
new file mode 100644
index 000000000000..fd36dcb57253
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-3.5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="app-misc/jq
+ app-arch/pigz
+ net-misc/rsync
+ sys-apps/moreutils"
+
+# tests invoke parallel & rsync
+DEPEND="test? (
+ ${RDEPEND}
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+
+ dodoc -r docs/*
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 115c3ac9b1c7..f1a644093812 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,2 +1 @@
-DIST kpcli-3.6.pl 232478 BLAKE2B 2c7ea808e840954d2661d7c89dbc7cd7f955d2bfba2c70034d95f480bdfbce8e5e3533105aa4f78c2c4386c1414ca78d678e0487571d93e23381e697054a7c01 SHA512 12c7fdeb613451d1bfcbed18fdec0b555a1ec2ce28ffd7969313a9a5acac582d1c019ea660a550ab2a28d947c5d14a63fcdea252757291aeb44ceae63c205b0f
DIST kpcli-3.7.pl 241191 BLAKE2B a3a851ab9d5244dc2c17c084f116fd8b7adc6770715011c119e8238a7f5ecc0fd894d98c47c4762413dadfff83798f1a134a21d9e156d12ae76aac51259ee58b SHA512 2f66686e6f563e9ef5a2ae1fe23085c2563455e6041ce60eaedbb87492ae517a19163393e640e58b3a8d761cefd924bad605762ad6ba045de8f45fad4fb90abc
diff --git a/app-admin/kpcli/kpcli-3.6.ebuild b/app-admin/kpcli/kpcli-3.6.ebuild
deleted file mode 100644
index d274b38218b7..000000000000
--- a/app-admin/kpcli/kpcli-3.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="A command line interface to KeePass database files"
-HOMEPAGE="http://kpcli.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-perl/Clone
- dev-perl/Crypt-Rijndael
- dev-perl/File-KeePass
- dev-perl/Math-Random-ISAAC
- dev-perl/Sort-Naturally
- dev-perl/Sub-Install
- dev-perl/TermReadKey
- dev-perl/Term-ReadLine-Gnu
- dev-perl/Term-ShellUI"
-
-src_unpack() {
- mkdir "${S}" || die
- cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
-}
-
-src_compile() { :; }
-
-src_install() {
- dobin kpcli
-}
-
-pkg_postinst() {
- optfeature "time-based-one-time-only password support" "dev-perl/Authen-OATH dev-perl/Convert-Base32"
- optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
- optfeature "password quality check" dev-perl/Data-Password
- optfeature "better password quality check" dev-perl/Data-Password-passwdqc
- optfeature "importing Password Safe v3 databases" dev-perl/Crypt-PWSafe3
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index a51907050c14..5ae22a4eccaf 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,3 +2,5 @@ DIST puppet-agent_7.15.0-1focal_amd64.deb 20342292 BLAKE2B 4d8a322182b10462353b4
DIST puppet-agent_7.15.0-1focal_arm64.deb 19533904 BLAKE2B 234fc85f20df8bba9d1f33e84ac725326201984c041ab371dd645df2e6cce12b6c81481ceff01819dc884d3c8f6191d6e98aafbb78a6856733b4cc3255d0e905 SHA512 70f389bc29270317fc621ef7be2eea9764b490ae2da32fb3968bd2c966eec53ef7e65469ea7fd5069676e23feede48557575b9020783b50292b146cc17ae840e
DIST puppet-agent_7.16.0-1focal_amd64.deb 20349200 BLAKE2B 73a5bc404b988fc009b95e25ab906afdc56cf8a9b977d0974177bdd5dcf9c0882f10d7e56f05c054f2ff1ea89824879671f857d1f1bf41d4f725ae90994d24ac SHA512 57d58b0a4ea74f461e7820e1f99838eb3c357f1be5277623ce8bb5cdf6aa46696d53db7c64c16ede972bc01660f30ea19111d2495087032d412672564b8612f8
DIST puppet-agent_7.16.0-1focal_arm64.deb 19543124 BLAKE2B 2a946462ddf1344f05f21c5c5f0a3ad4a1b92fa0b386d405b6cb563b0cb3de0a06ad8212d6001f10ed7afe2d7787d1107732a5890e48de99a32cec802d78d16d SHA512 74db9defefe8aa91daaac8337dd500cf2582c017eab34f61992630a30dc9b2ef62ae5aba21b9ee94f30b6f92e99557e61da742711bba7df8200b3eca5a06f748
+DIST puppet-agent_7.17.0-1focal_amd64.deb 20397624 BLAKE2B 8304f937e6eb3f1a3c2a72ba34fce029ecec99decaf1a78b08b556c1ebe3073fa159e70e43baf468e833ede2e9a659f6384f52969e16932ac24a2a997da14eee SHA512 f493298af50e6eed61c7ffb0cf4234b1eb69594caedd24826bc9bcb5d85e736101bfa98b14dcfdceab5ee98e8bc228f25743fdcce440398ff9e0019c6861bde2
+DIST puppet-agent_7.17.0-1focal_arm64.deb 19595304 BLAKE2B 719473363cb24dcd58a864c9ce4d24cb8d8f328d6179ec666d3f3ba1dbf8df53746b9dba37a820c782b6b7b56639c068da1a7db4813e44c5520dfc74ff026008 SHA512 5d74f2fca8fe214c70931b099582d5861ae95a3f11be69e33ee4a10b5135cde43d57b117fa3492983b13e023f9138584d72df6ea788015e058124e4578ae1e39
diff --git a/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
new file mode 100644
index 000000000000..3ef55d1516d2
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
+arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+# virtual/libcrypt:= is in here despite being a pre-built package
+# to ensure that the has_version logic for the symlink doesn't become stale
+CDEPEND="!app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ app-emulation/virt-what
+ acct-user/puppet
+ acct-group/puppet
+ virtual/libcrypt:="
+
+DEPEND="
+ ${CDEPEND}
+ app-admin/augeas"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/libselinux
+ sys-libs/glibc
+ sys-libs/readline:0/8
+ sys-libs/libxcrypt[compat]
+ sys-libs/ncurses:0[tinfo]
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/pxp-agent
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/pxp-agent
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ keepdir var/log/puppetlabs/puppet/
+ chmod 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd2" puppet
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+
+ # Handling of the path to the crypt library during the ongoing migration
+ # from glibc[crypt] to libxcrypt
+ # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
+ if has_version "sys-libs/glibc[crypt]"; then
+ local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
+ else
+ local crypt_target='../../../../usr/lib/libcrypt.so.1'
+ fi
+ dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index a87a6733c648..36c3ba9122c2 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,4 @@
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
DIST puppet-7.15.0.tar.gz 2817137 BLAKE2B ce76ad71251a9202d31e858706eb994c6210cbe97f31e56d95b8c36d541d0ce8d1e65ab33d399e7dca1c5ea8e7f4dfccb3a2a4d36baaed6ca31516b7e449bf2a SHA512 0d68bda85a5f61fdb74c3e70304d414afef238dff4f7a4cd60c17f5cc26fcb18ba7f81065d6295adde33bc181031b458d259daa84a41156c9589f5c0e3cb8951
DIST puppet-7.16.0.tar.gz 2817116 BLAKE2B d367005ea69ceb0f89f4294e74639ad61305f23929e5edf0385eb2cce5da76fa157c5bc7408599dcca4d9adba39c3b29250e78d8f584873f72bb34452a90a74d SHA512 b1f3c6072821225c9068089f44ad9ab955534f2d91bf88b44f762e0588442b9d6191eb89909dc05b7efc3a82302d2d3dc5a5a040fbc84f81645817d695b4db72
+DIST puppet-7.17.0.tar.gz 2812615 BLAKE2B 80b5115b8825a87427a688ca7a9337334180fcb7722d437f44009b5cf74ede16dac52f1648a2e7595558abb5fa92322095e71dcf0d7d8d06a2275e13caf79163 SHA512 f691b6d3e931c5cc879c8e5129af2a935bedc891964ba5cbb873d6d69e0ec61bd82ca7d413a94389cda13cb6c8c536aae6f11dade4c6e2597abc7756a74f4df0
diff --git a/app-admin/puppet/puppet-7.17.0.ebuild b/app-admin/puppet/puppet-7.17.0.ebuild
new file mode 100644
index 000000000000..98baf706218d
--- /dev/null
+++ b/app-admin/puppet/puppet-7.17.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ dev-ruby/hiera
+ dev-ruby/json:=
+ dev-ruby/semantic_puppet
+ >=dev-ruby/facter-3.0.0
+ dev-ruby/concurrent-ruby
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # fix systemd path
+ eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ newtmpfiles "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+ keepdir /etc/puppetlabs/puppet/ssl
+
+ keepdir /var/lib/puppet/facts
+ keepdir /var/lib/puppet/files
+ fowners -R puppet:puppet /var/lib/puppet
+
+ fperms 0750 /var/lib/puppet
+
+ fperms 0750 /etc/puppetlabs
+ fperms 0750 /etc/puppetlabs/puppet
+ fperms 0750 /etc/puppetlabs/puppet/ssl
+ fowners -R :puppet /etc/puppetlabs
+ fowners -R :puppet /var/lib/puppet
+
+ # ext and examples files
+ for f in $(find ext examples -type f) ; do
+ docinto "$(dirname ${f})"
+ dodoc "${f}"
+ done
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet.conf
+
+ elog
+ elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+ elog "cause puppet to hang while installing packages."
+ elog
+ elog "Portage Puppet module with Gentoo-specific resources:"
+ elog "http://forge.puppetlabs.com/gentoo/portage"
+ elog
+ elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+ elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+ elog "not already done so."
+ elog
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 4f7d2ac8c6bd..dee4df1a6fed 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,2 +1,3 @@
DIST puppetserver-7.6.1.tar.gz 64646806 BLAKE2B 4905504e68ee2dbbe0705553da3ee73826dc6bd50cc9ea8e62f3a4f9b5f67e53e829a0faa465fcf3b76dd85288eef71e472f272b0506c5e951b5d88df4274c9f SHA512 5a76e0053f41bf51cb0c4f79a6785e7759ba4ecaeadb84ce3dc777a288910d355bbeb0efc438eb3fddc09b7f7471526124bbfd076bff9091eecb341f3958130b
DIST puppetserver-7.7.0.tar.gz 64646018 BLAKE2B 7ce0dfc469705093107f3761c25119a488fffd0bf95112108b86fd0bbaf923d090712c0612d0efb8226059645b15386593fcc5b5c13b0881a9ffd36b714a7d50 SHA512 f56a94cfb75f2e95aef4947b2e755cda1ba4b3a1f646f14525c2ed2434c49da7d71b5dc2766bae727dcc307e06e2c56df80682b2376d8379b7c291a319a37ed1
+DIST puppetserver-7.8.0.tar.gz 64651673 BLAKE2B 7bd53e3a15128eb4405b47edc066e702a3ea702a22258d039a4be5a7fecb509c724dcf21d893e9d76a99e9c94ca8a514d48bcd7085bcf429dd318defdf9fbd8d SHA512 82503c79e3d24ae2700537c8acdd410ddd3b400993d51f392f30664f6d259c224ba782c8ebeaf21e49c4acfb503b2f1a8ac880359a67c8d008797abcaa3210ab
diff --git a/app-admin/puppetserver/puppetserver-7.8.0.ebuild b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
new file mode 100644
index 000000000000..6877b38e3a99
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents"
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords in puppet-agent (puppet-agent now has arm64)
+KEYWORDS="~amd64"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+ acct-group/puppet"
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/metrics.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/ca
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli
+ doins ext/cli_defaults/cli-defaults.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ keepdir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ systemd_dounit ext/redhat/puppetserver.service
+ insinto /etc/default
+ newins ext/default puppetserver
+ # normal init type tasks
+ dosym ../default/puppetserver /etc/conf.d/puppetserver
+ newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+ insinto /opt/puppetlabs/server/data
+ doins ext/build-scripts/jruby-gem-list.txt
+ doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+ newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ tmpfiles_process puppetserver.conf
+
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+ elog
+ elog "# install puppetserver gems"
+ elog "cd /opt/puppetlabs/server/apps/puppetserver"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/pwman3/pwman3-0.10.0-r1.ebuild b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
index a725bb6405be..2e7f722ba09a 100644
--- a/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
PYTHON_REQ_USE="sqlite"
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 optfeature
@@ -27,6 +27,6 @@ distutils_enable_tests setup.py
pkg_postinst() {
optfeature "Support for mongodb" dev-python/pymongo
- optfeature "Support for postgresql" dev-python/psycopg
+ optfeature "Support for postgresql" dev-python/psycopg:2
optfeature "Support for mysql" dev-python/pymysql
}
diff --git a/app-admin/pwman3/pwman3-0.11.1.ebuild b/app-admin/pwman3/pwman3-0.11.1.ebuild
index be7e32f50438..57f062d5fbe8 100644
--- a/app-admin/pwman3/pwman3-0.11.1.ebuild
+++ b/app-admin/pwman3/pwman3-0.11.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1 optfeature
@@ -26,6 +26,6 @@ distutils_enable_tests setup.py
pkg_postinst() {
optfeature "Support for mongodb" dev-python/pymongo
- optfeature "Support for postgresql" dev-python/psycopg
+ optfeature "Support for postgresql" dev-python/psycopg:2
optfeature "Support for mysql" dev-python/pymysql
}
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index bc281d24c94e..3040f8d2a2a1 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -1,10 +1,7 @@
-
- whissi@gentoo.org
- Thomas Deutschmann
-
+