17 files changed, 840 insertions, 15 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 03b57270bd4e..9135f4da5f0d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index ed2b64d21d24..8d2e34d1c94d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,12 @@
 DIST ansible-2.7.15.tar.gz 10205890 BLAKE2B 30b0c83ad646cdcd918472be4512ee8cf00e966b9c7ed0431bcf915e858dae6aeb26cdff4eee5d480b751a4c33f30c2b213d8bc67d17bc8774c5ca2bcf897632 SHA512 7140fdb80456f5dd9f34226a9f38ce567ad13e4cd6b4058ae22012867554c9ed19e3cfa0ae7e745bf56d109fbe8dde8e264efce2f537b5bdae48cf606ee38f52
 DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f54ba7ad8e3a700d61e030fd0b5850055b83861d3ad76e614d3e786a2ed719f63b7f452ce24d7e27d79d386b8eed SHA512 166009780c8bb5b35beb9604412d4e5e3874e13b04f3ce694d726dc5bfb064f73a17ec3c814c8a67e28d57e7c327276b6cb66a9a0dba7138d702427ec13b4de3
+DIST ansible-2.8.8.tar.gz 12703583 BLAKE2B 0352646b495514d5a7a88fcd8e8437ef323f6d754f4704923b357c0f11c47932a2671a342e24f2de88479436f6f36664dbb0b26ee46fa98bc2d53d4f681595d0 SHA512 fb7705f3d0b8c0ee87d2954cccb7d00e12851693bbe995c062316577f66488f48d8180f11c8d87e025f4082a48ec27f25cb877be4c0ce96ed39951360e8679bd
 DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
+DIST ansible-2.9.3.tar.gz 14170666 BLAKE2B bb27d249e2390888ee3c28fdb48c1ceff346d2903089c70b451f793742238498aed7c33be056cce9790f44f5cdb74b5020b6decf4f1242904bd9c8f7b5077ea0 SHA512 02cfa2c7c43506dc602e92aed66c920243222b82bc4852f1a4d786cd3ff26fe17eda18d35ac7301cd9bf26366df9b18776e2a27e8d54fc92c3128f52ec7f58e8
 EBUILD ansible-2.7.15.ebuild 1671 BLAKE2B 5fbb74fe6c33b1e297c19df0618d9a346125870bb57187233603bec3cf616b69807890a5393dd69915cc64eca46fe1dc09780cea804ae59235a9deab2403e43a SHA512 86d1d029bda1b698d87886e4875ba2b91fccc8eb2f79b90e40275b933b6adb0edd8f6f6e8ceef8900530bf56e08f85604f8f41a53d0a2bed10bf30a5bf0a58f9
 EBUILD ansible-2.8.7.ebuild 1752 BLAKE2B 05d56b05388ccb2020705dd23c8a51cb141df460722fc344e3083d91aa22f2cdd8bcb55f52d2ec6b207f7541e8a8a7b0c2ebb1782ab2cf6634c7bf1e700e8e3e SHA512 9840b22517c1eb13baa3b7b52aadd4ab8efbcaf104617a04f60c67fd4c4090b76d291125b2e63e3a3e9f58f5c9cf53b30ebbc4b837b907cc3ac99b322381127f
+EBUILD ansible-2.8.8.ebuild 1754 BLAKE2B c0be69f43c80e4fff28db82e36a15e61bb4340252c6221a260ed502a816750891b5a3b435fd6f4fa162bcd9aeaa04d47d13f806a1fd7eff2388392ee7a9945ad SHA512 f08ccf37cff72f1421086078dff02ce34a3f8b61c5a2f0dabc4be961b42c9c3bbc3bf9eb8cad3c48fa40ff37a9e37246d45c18d13c1ba3add420afbd0a1e278f
 EBUILD ansible-2.9.2.ebuild 1714 BLAKE2B 1dd408ae0157d82b85fcd659404dff44cd34ead6a54be9a2e1f454f83e4a37d3e65b176ddac21946514ffedf9de21d9ac41d3bfd7666372bd841b622324e4d24 SHA512 8a9010be11260d51a182719acf81058941e062aceb1d8d80cd696529ec37fbae1b8aa33d247be2ec9b6063fd5c3550c9ef16b9aa233c1975e7ae35239441b733
+EBUILD ansible-2.9.3.ebuild 1716 BLAKE2B 736ef648249219ba0d2608c81be3a6a1906950a489f605b09a888ea11c085691f58cd4b4f2ad680962e48eb04676d77f150202c93bf72565b4087360574643bd SHA512 4ab16cca06ef9809533d262a07165afbe8c6b31a68eaac7901701c30549fe39609776fb5890e9cadaeb454a62e027e0b46baaacd2d747a7bc20cdd54316171e6
 EBUILD ansible-9999.ebuild 1707 BLAKE2B d4991ca92a5b102d9f48a08a1be24e1fa4e02d60eaa7535044d5df52bb620c6c88b30440094c80e411a06bd33b296d94adae6172c0ca40d7dd401884a6a47892 SHA512 6a0660f8cc0bb3db7c526764b4fa8761c55b345c4e51f7d12044133690a422b1e8fbb904a5593eb6bac73e3c91ae056e0a656bb72a63bbec53f922fb8863e278
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.8.8.ebuild b/app-admin/ansible/ansible-2.8.8.ebuild
new file mode 100644
index 000000000000..feb3f71a3ac7
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${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}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.9.3.ebuild b/app-admin/ansible/ansible-2.9.3.ebuild
new file mode 100644
index 000000000000..87aa8f15ecba
--- /dev/null
+++ b/app-admin/ansible/ansible-2.9.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${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}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 2b8750d1b34b..cfb44b6e71f9 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,6 +3,9 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.11.1-1stretch_amd64.deb 19948710 BLAKE2B 256588922cfacb1d8146cd1142c43d893a55dfb67d7f70ca311df6178e7f9a82a0702d8306e0575d3f817e53c091fd3010027512cb4ce95956bdfa968372cc21 SHA512 90c39d55a8761185f82c9ac106d696ae48a170679e6043b6b3db32254e918b1b9c1b32c4e9721e5751189f84f002415f21a627daa22738a8c1ae3cb5df514eb3
 DIST puppet-agent_6.11.1-1stretch_i386.deb 20327410 BLAKE2B c2a105139df97395f54bb54d7ac971d914dcd3b69614dca55fe443d9fe5360118b899610a6d2d85b96b8b45715864df608d0783a3aabad3a2ae5555a0d510a2e SHA512 5d1173534beb53325d3c7c2fd500a7bd82a389fa8cbc9e867f6acbb6c2647190339d3b096e8a054aff268f27c5bd7de65c371a474b9c8263e8fa36bab75452bd
+DIST puppet-agent_6.12.0-1stretch_amd64.deb 20011636 BLAKE2B f83b795f07771d70220cac71d9b6d8ac7270a20fd5b78471ccef1c8ff802af3c035477f7741e775b10bc609d016a6e9fb79b199987e34b7d4f9a427c4adcd39f SHA512 dda8fa45b961d4a775da7eb128887eee3ceb9887d1062bc2fc748f6055811600162dfb2c4fbf87e401ad404813d2de0cc58ce7aade0aa23af637bb3707896126
+DIST puppet-agent_6.12.0-1stretch_i386.deb 20369446 BLAKE2B f01e39a1b307657569084e2ade1d41f17eefaa2048035f635437159e4373386c6413fa71756594d4a8748ffa0bbbdc2c54c72e696a390380bc9c57721ef010b3 SHA512 fc58e5ea22bd3dd36278db37e46d20809e284db5645ab680fb2c461ee9e4f9e635550f924278905ec13a8f9a71fbf604959e8522e4c0da52709c42f309a04921
 EBUILD puppet-agent-6.11.1-r1.ebuild 2046 BLAKE2B 25710cb43fa1df4e83a2e3fc6d54305685303bfbb8de9eb30a9d98789479a31139eaebad70e1ee85ca2a84f4a4fbe67d8101c83522b1d362d10e64bf2233f309 SHA512 1a7efcbef24345ba3ef59c0621e9efdc9ef898b8976a0efdd4525f2201f3e297be4f9f6d73456029cb560bdc0569635f0af7b6d8ef117337cb3b0eaea3b706d3
 EBUILD puppet-agent-6.11.1.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.12.0.ebuild 2046 BLAKE2B 25710cb43fa1df4e83a2e3fc6d54305685303bfbb8de9eb30a9d98789479a31139eaebad70e1ee85ca2a84f4a4fbe67d8101c83522b1d362d10e64bf2233f309 SHA512 1a7efcbef24345ba3ef59c0621e9efdc9ef898b8976a0efdd4525f2201f3e297be4f9f6d73456029cb560bdc0569635f0af7b6d8ef117337cb3b0eaea3b706d3
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild
new file mode 100644
index 000000000000..36e4354f6f34
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+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
+	dodir var/log/puppetlabs/puppet/
+	fperms 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.initd" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 72af5749bd1d..d2afc512f192 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,10 +10,14 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
+DIST puppet-5.5.18.tar.gz 2984835 BLAKE2B d5a1d023d3d26e04ccc81efa772131c06fc7ace8ec59c7efa97bddb775bb492d3256290824a87d54df5c28862cbba98c58cf41bb4a0c27a4128701652c06eee0 SHA512 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6
 DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56
 DIST puppet-6.11.1.tar.gz 2816525 BLAKE2B c4b188d5bf76b70a2748b86df78f1ca6ab99951cbc3a16377d3f2d38e165bc78ef8e5648cb09264a25ae81ac4d379b9323b1f2bbdea6679292c2cf38cabee662 SHA512 f44196206331448651e0ff0e865b09c6ccbb19115edeba4c58c8a29aa35e7d76676d5a3cb35c51cd511a44115c9c9434f1f90d5cbb0a5551a4004741d305c879
+DIST puppet-6.12.0.tar.gz 2825392 BLAKE2B fdb7007ca337654f5ee89cd6f3beae300c3eb952570eaf1aa9baad407b84b418916e42aed63855bbb250f1d367be12f98261df54253f6438d33950134ef01cce SHA512 bcb77699f4a4a058ea0fa47ee2b449f19053e3ae859e3e30c65a57ad65fc052a4f05d7a932b9cc4b9974b36dc343ac482258ad8d5a44a151362df474b82c11fe
 EBUILD puppet-4.10.12.ebuild 5091 BLAKE2B 4a556264af256eaa8a13a33048fd0a2d372381da9f63b63e148848a1094a85e948eb0f99728f8b3fe037aec57fcb9693dd96961f24fc8042d7fa25ab9e4d30f7 SHA512 ae33aae116ab8477644bf84d438ad7e301ba168a92e857b79a35dd33b6f2d853b1074f1122b180d4f6cff9cad0d802d58936f7162a30ce6f1ea341032ff1fcc0
 EBUILD puppet-5.5.17.ebuild 3737 BLAKE2B fdef57a527cacfe399a1acc5cf6a098c0de6a6676d51e2da0c11c37036f7d3e55d98140f5c7cbf52c610edcd6cc9e35b2a0bb1ccf92d52aef7d0de08e4b3c805 SHA512 b83747415c59389373f07ddb32f70fa22d8baf89f1d229dbea3931e1a41e03592e66ddeab2be2a21810d17097e205f1db035007376e692c68ba1682d6ee36a2c
+EBUILD puppet-5.5.18.ebuild 3739 BLAKE2B 180f08d4120e872353af7efec593fe400552a642ada66bb3ade49a2cfc4b58b012a2bcde6c85b61f029b633c67e455e081e37260e50aad9ba5275447bc45181c SHA512 57023e9d13e829f71ddbc790dfc3b9a334ceb707050ba728b954c6f7b2e534173c86abf7f53834847be0b873dd1e4b9cde493f43be7fd2269daf128449582fe8
 EBUILD puppet-6.10.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
 EBUILD puppet-6.11.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
+EBUILD puppet-6.12.0.ebuild 3681 BLAKE2B c5252e97bbd5db75358f4a22dd9a01a89b69a44e9deef3f024bc13b65077ca838fc6aa529e37d57efc575a57508a8e3ceaab12beac80f5d469edecdff0a1e08f SHA512 d61b57c3203e71e5b086a0d1fafe3796cd2235ef4a1772ecc8e9641193e098702a993a0aa39d10384871de4908c075f5176648d78df9be66bc6969711e8ed5e2
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.18.ebuild b/app-admin/puppet/puppet-5.5.18.ebuild
new file mode 100644
index 000000000000..003415b6fd8f
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.18.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+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 ~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/facter-3.0.0
+	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"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+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
+	epatch "${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
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	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
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	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
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-6.12.0.ebuild b/app-admin/puppet/puppet-6.12.0.ebuild
new file mode 100644
index 000000000000..6c3ebe7649a8
--- /dev/null
+++ b/app-admin/puppet/puppet-6.12.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+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 ~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"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
+
+	# fix systemd path
+	epatch "${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
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${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
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	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/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 3adf49d130ea..5800fe400708 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,5 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.7.2.tar.gz 43566885 BLAKE2B b90376330cb084c2c14154d647ce334673c526e6f9b9d4430e0be4b420132a0c4c518a0c8ed98b15cfacc6716044f78c384123f3ff87ea1463736a352744b840 SHA512 2e32f7a5a3daf37d74082aa3a66c26fa23643e456dbf80cd16815687f289093c96defc9bfa10c3502f9a9f9a7674cef83b838163f11339c13d4b12c82f8e0664
+DIST puppetdb-6.8.0.tar.gz 44216021 BLAKE2B ac5641ee0bceef3948d108c725e2ff53d76e897cafd75c9bc6978462f4b157c3d30146ce2f57fd2aa7610b2defc4e074c168847d8aba5501cde16ee0ab7b5aaf SHA512 2dd01058edbd8a4bb3f4717dc518e58ac57139ccc0651e8e39c721a32651bd932fe4ec747c7da23561ab33d7d4d7ddc448fe9b05734d1562f799e183c5e236d5
 EBUILD puppetdb-6.7.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.8.0.ebuild 2765 BLAKE2B 81a1ebaccdf046d634138d9f14c86faaaee14d4c1fa6c1c96eb0b8958de155ab7b081290ed9abf5b963e42ce48a6ce0b72ecea1a40e746746292ad1cf01c15c1 SHA512 a10cb89b0fc91505e3952589b0a8153002bad6b162f63d4f7c8f2b0189a2bf78c913bb319335ebd90da325bee1015c1586b1f299e09497cd8c4fab45c6595ca0
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.8.0.ebuild b/app-admin/puppetdb/puppetdb-6.8.0.ebuild
new file mode 100644
index 000000000000..93e0bdc2929c
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.8.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index ec2bdf31fc53..87e26c0f7f6c 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,5 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.7.2.tar.gz 59340246 BLAKE2B 635312cb2ea2f638617c10e05b9e1e8efa58caf3da8786155f44081f040a7b167d923e2266c57b43d855feb4bfd5280da85b5100a188e7f0f7dfde847f5abc45 SHA512 e2015554648dc861d513b5778c274e2b09c4ea2ebd53141d152a5bba1046ac6ef163083296c176008a7606581b8368df99aa72907e0edd59e687aa9991209fb5
+DIST puppetserver-6.8.0.tar.gz 59370389 BLAKE2B 227512d3a054980867730882459bff32559f8baa5fb0c807a14fcc827b8f41fc1da2cceab6bdbd6162bb4e6e6e4312f5d47d478f6887a978c359c6a4225d663d SHA512 9e4d0ea1aad1209342151cfcfd304e4a296df0e95fefde46d4e4a28a9da62422194492d430c3492cc717a7c872ee0f448a89a40fe1e1cb565f865fc0aca7089b
 EBUILD puppetserver-6.7.2.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
+EBUILD puppetserver-6.8.0.ebuild 5393 BLAKE2B 64edbd4b7f7227c3893bf3fb174ac93457c1ac2d75ecb22feb119ff263d555b9b9c4afe842c07a65bb1c2bd1b7fabafcb433951ef7f298223811e959e9f001d7 SHA512 68f06b847a448dcae327e5ae7960f1d16438e5945f0eafcd6be6814c96941f96257160fbebbe683d343afb0e1e87712eba06c153f42b9dcdf90555b09450b38b
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.8.0.ebuild b/app-admin/puppetserver/puppetserver-6.8.0.ebuild
new file mode 100644
index 000000000000..18d113cb5e6f
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.8.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+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 as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "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
+	dodir /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
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	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-ri --no-rdoc \$(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-ri --no-rdoc \$(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/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index dd6b05588720..c852c367a806 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -20,4 +20,5 @@ DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce994
 EBUILD sysklogd-1.5.1-r1.ebuild 1703 BLAKE2B 1b5f75d79a86e05f3b7f71523f794a1bcf4cce6b0242dd8564204edcb886c1c9e7a450f25e00e3899f159643dc9d65da38d8c40fbe25becda0522359485b4347 SHA512 f7355db8d66f1b73b09381aa43f9d7112646229bf2a68facc9cf2a5fdf290f95adbc7bd48203473f7d2a21ba608c23aba267d0a5875c5f6b464bff5d1b2752de
 EBUILD sysklogd-2.0.3.ebuild 1820 BLAKE2B af54756110e0528f3c5f59e1e9fd7ab890f305903649a22a4d3c37bd6b90e0a9eb93c5f4319c232bcf2726891a38b800478dcb8d3a585f55ec0308b72dc14c35 SHA512 c1c8f47062fcf0adfbde35a7d711744f5fcec56d922b057cc56dd6ec404e327643db70df3d4d1d7fc3ca630ecf27ba96a0d2fc08f6766429b7b05eefe3f63bce
 EBUILD sysklogd-2.1.ebuild 1885 BLAKE2B 766fc16c3ddbb0bcbe7eb260878988254b308a3f3bd0cb67949786a470ef2ecb2f03baa9235730dff4aab25a1414715b4f43cbe23af6b13c0100a1187be4a0ab SHA512 13721c80d8c9e2f8b7f07abd4e2f1868c7f0915b27bbc4cfb54e0ec9d88d4bfed8b64ebbef83a3d58361bd40132ceddeebb028cb1d18059b3e68ddbfcf3cfb7c
+EBUILD sysklogd-9999.ebuild 2081 BLAKE2B 319de960e0b50c64d623d5f787dee51cc01e35a5c9ab9847710bc1765e3493c4805ca4afa13cfaa997f43e93b1ef3eb43cad9aa9e06dfff180d96e402bd16454 SHA512 f49ab7183a8779dc1015e12ee52b8128a610f3a34af9af2650060884592fd9508432f1bec623987ed6d9ac21038a5b5a4a3ed9f2775c79a982699c8cc4df3dba
 MISC metadata.xml 513 BLAKE2B dbb65f1982fba7751a6c64809adcbe4d44ee4313693b9999dbd8d4e6596325fcbea9d8eef294821967f5ccef4f3f5da32510474dbfcc0d29743d42237e1efa85 SHA512 76e47e89a7eef4aa7156145447003085cea5670881e2228c2b8baad238a4bb1b0efe95c3829656119d9f6d291fd49ca0b424f66d17e8989ec71f39355c504218
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
new file mode 100644
index 000000000000..bd1e8726ca4d
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
+else
+	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="logger logrotate systemd"
+RESTRICT="test"
+
+DEPEND="
+	logger? (
+		!<sys-apps/util-linux-2.34-r3
+		!>=sys-apps/util-linux-2.34-r3[logger]
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.md README.md )
+
+pkg_setup() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--runstatedir="${EPREFIX}"/run
+		$(use_with logger)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
+		elog "Starting with version 2.1 sysklogd no longer provides klogd."
+		elog "syslogd now also logs kernel messages."
+	fi
+}
diff --git a/app-admin/systemdgenie/Manifest b/app-admin/systemdgenie/Manifest
index 2e144c0d0eb5..c7c6202b7591 100644
--- a/app-admin/systemdgenie/Manifest
+++ b/app-admin/systemdgenie/Manifest
@@ -1,3 +1,3 @@
 DIST systemdgenie-0.99.0.tar.xz 29104 BLAKE2B f2da14ae035fa04bd775dedb8bdd7fe41612c019a47fe02e1994a7304677970193ba54aacbb7d0fd8e31832eb01ae1f12b8dc7a869b0c6529dcd18b1fece2b52 SHA512 9600ffa05737bbf8d7deaece3fc78392dbb4228aa2f001ca3e34fb6390c1a9104884f61eec90ae204550a8cee0281b92f34f64652f9881967430fb695f6bb3f4
-EBUILD systemdgenie-0.99.0.ebuild 736 BLAKE2B e7b7c0dc5d2eeb1b271f7f4c6e158b6e6a882eb6a6da18f8e148c2a1af402d4eb712fcdc29c2870d2a751c0cbc6fc69c285d944bc95aeb9b6dd86bcaac623c44 SHA512 584f901bddcb91e4ca06491d6c0c81ff14f3127eea84bc07fcac83367c5fca64b4c16c3825df9a4a00be8720a712afde05e1d42f1ea004b4707b37c8b16dde74
+EBUILD systemdgenie-0.99.0.ebuild 831 BLAKE2B b7225baf60a9367fd60f24542f9956fb63e63e8af7a6bdf9b471d882e2a341d1b2d46dfed9663def94938ede7ca1ee1fd260b55a610be6b0bc49c9b31cf4392c SHA512 d9b0f0bb0627abfff428c96e1d10be21a0767e2e3da3943b5517d3d5c07f69a49a6ccbd15e4e175c1f4d8ed89ccc2d4513e0d1f2f2c39475fbd19c6b930c4a7e
 MISC metadata.xml 686 BLAKE2B 30d737327ef735c3b38e8c5940372dd1004d15206aeda7a1c18b7088fb0b0d31bf4c740ec2cbf9747f10d86c2c594af695a3f5e6e1a9b4aee2c42af198682358 SHA512 cf49cfa73a7798aa4a5c568df4afc5fdf3d66c43b9df5569ae38f4d590aefe6161e78e8314be92dbd4366d1413258a6a55c24e9783f1df870ad27a2f2c87cb9d
diff --git a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
index 39e93608049b..269737db81ed 100644
--- a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
+++ b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64"
 fi
 
-DESCRIPTION="systemd managment utility"
+DESCRIPTION="Systemd managment utility"
 HOMEPAGE="https://cgit.kde.org/systemdgenie.git"
+
 LICENSE="GPL-2+"
-IUSE=""
+SLOT="5"
 
 BDEPEND="sys-devel/gettext"
 DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	sys-apps/systemd:=
 "
 RDEPEND="${DEPEND}"