gentoo resync : 15.01.2020

10 files changed, 8 insertions, 505 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index a92248993898..72af5749bd1d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,9 +1,6 @@
 AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
-AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
-AUX puppet-fix-tests-5.5.14.patch 1005 BLAKE2B ebe103e8408c2015e431966a637521b673ed79b97c318699d34efffadfe311143382eb5e961d626574072c346c984206dc3f93863b2484d3fa838c2dbf51d18e SHA512 d07598d6ef8631e718e5c4b4d61db87b2651cd1f246791778def5561f0262b23b0b8f2244e326dcef33dcc083fa96438ac138b21d5fdc246642e35b81829d2ef
 AUX puppet-fix-tests-6.10.1.patch 1163 BLAKE2B c2b0dd51aca250b06bdcefcf59fe0e33244aaaca90ead498fc7254a148ee4f4a5b89e8fd99259fce380517827f75720728610ffb79b90c3416f86de2988126db SHA512 2c97b9929c8a66ffb1ae4a16600e1ffea40b04e13f8cfc320a1d681317b3b348918d8e6c66c9be746db19cfb65b615afe94a4e30a8f6a350cb64cf437415e4ae
-AUX puppet-fix-tests-6.4.1.patch 1178 BLAKE2B 6767555c3f43519238b2e539267a40977cc460800644f2807fd1fe27fa49f805e62d5aa0a74e4c1a58160bad1fe1f1628873195a60b5b2e0a83d484e26b72bce SHA512 88a25ad9bb809f06d4af618b1da2711d84e18a63d2368c7191c6cc3170e0d85930fc235057babc92e26315312636d61d69f54cd8a3a2c8acac13ccebd187c258
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
 AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
@@ -12,17 +9,11 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
 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.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
-EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
-EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
-EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
-EBUILD puppet-5.5.17.ebuild 3739 BLAKE2B 2f2e21bf61b695a74ccd42c19cd0138249f14141b8461a28a9ba26d473fe2b9635d7b2e2dcb36f2e2aba8e0fc1d1b5e9af93f363f903e2e3c845a5df68339e92 SHA512 e8a73db5ba89b73c3e92c1d5a9277ad0d7872a7d14898a52a7309393285479434b5609ef04e48615a76d17cff9388143600f3d06c55831c7f94ff31c2a311174
+EBUILD puppet-4.10.12.ebuild 5091 BLAKE2B 4a556264af256eaa8a13a33048fd0a2d372381da9f63b63e148848a1094a85e948eb0f99728f8b3fe037aec57fcb9693dd96961f24fc8042d7fa25ab9e4d30f7 SHA512 ae33aae116ab8477644bf84d438ad7e301ba168a92e857b79a35dd33b6f2d853b1074f1122b180d4f6cff9cad0d802d58936f7162a30ce6f1ea341032ff1fcc0
+EBUILD puppet-5.5.17.ebuild 3737 BLAKE2B fdef57a527cacfe399a1acc5cf6a098c0de6a6676d51e2da0c11c37036f7d3e55d98140f5c7cbf52c610edcd6cc9e35b2a0bb1ccf92d52aef7d0de08e4b3c805 SHA512 b83747415c59389373f07ddb32f70fa22d8baf89f1d229dbea3931e1a41e03592e66ddeab2be2a21810d17097e205f1db035007376e692c68ba1682d6ee36a2c
 EBUILD puppet-6.10.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
-EBUILD puppet-6.11.1.ebuild 3681 BLAKE2B 8d64d23902331971a17c5868ff5a24b629c139fb9c03701f742ecab8f3c53f95cc12f919870300b98d96eca436799a0eb4e955cffa7faa808a77c6d11d2301bd SHA512 09fc378dddbd1d29abcf138dc13f4e08ada22de0f099790dc7136d82e80130f5d2b58467a1b96aabaeea8e7918884b527d016522c45fa1f1cc069b1b2162ea23
-EBUILD puppet-6.9.0-r1.ebuild 3678 BLAKE2B 2d18ebc4de1114501fc3bccfa0e91bc97e3c3616376154583da2040864234144fd66f7b7bb9caf2b979dca9d2feadc184fefc329b79c75c96ce82177b90dc01e SHA512 f861d29b8e6b2f6ddc86be8cfe2231847f5210b9bef1c1a4f75a7ef7bb13d11bd993a2e4292eb4b3880a90f3e188c9c9eb8ed95cb6b67c64a242d75fea92d532
+EBUILD puppet-6.11.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el
deleted file mode 100644
index 64c38ae5a31d..000000000000
--- a/app-admin/puppet/files/50puppet-mode-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; puppet-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
-(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
deleted file mode 100644
index 09ffe07da1ae..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- puppet/spec/unit/network/http/api/indirected_routes_spec.rb
-+++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb
-@@ -142,15 +142,6 @@
-       handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
--      expect(handler).to receive(:check_authorization) do |_, _, arg|
--        expect(arg).not_to include(:environment)
--      end
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
- 
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
deleted file mode 100644
index 6b7b5b484792..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
-@@ -144,15 +144,6 @@
-       handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
--      expect(handler).to receive(:check_authorization).with(anything,
--                                                            anything,
--                                                            excluding(:environment))
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
- 
diff --git a/app-admin/puppet/puppet-4.10.12.ebuild b/app-admin/puppet/puppet-4.10.12.ebuild
index 77c0ff21fd5d..7e3b54d90ab3 100644
--- a/app-admin/puppet/puppet-4.10.12.ebuild
+++ b/app-admin/puppet/puppet-4.10.12.ebuild
@@ -9,7 +9,7 @@ USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+inherit eutils user ruby-fakegem versionator
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="https://puppet.com/"
@@ -46,8 +46,6 @@ ruby_add_rdepend "
 # 		>=dev-ruby/webmock-1.24:0
 # 	)"
 
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
 RDEPEND+=" ${RDEPEND}
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 	selinux? (
@@ -106,13 +104,7 @@ all_ruby_prepare() {
 }
 
 all_ruby_compile() {
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
+	:
 }
 
 each_ruby_install() {
@@ -150,11 +142,6 @@ all_ruby_install() {
 	fowners -R :puppet /etc/puppetlabs
 	fowners -R :puppet /var/lib/puppet
 
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
 	if use ldap ; then
 		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
 	fi
@@ -187,10 +174,4 @@ pkg_postinst() {
 			elog
 		fi
 	done
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
 }
diff --git a/app-admin/puppet/puppet-5.5.14.ebuild b/app-admin/puppet/puppet-5.5.14.ebuild
deleted file mode 100644
index 75759e0d00b6..000000000000
--- a/app-admin/puppet/puppet-5.5.14.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 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/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
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.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
-	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-5.5.16.ebuild b/app-admin/puppet/puppet-5.5.16.ebuild
deleted file mode 100644
index b28efbe22bd9..000000000000
--- a/app-admin/puppet/puppet-5.5.16.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 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
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.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
-	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-5.5.17.ebuild b/app-admin/puppet/puppet-5.5.17.ebuild
index 83d26aad2806..846443f07d45 100644
--- a/app-admin/puppet/puppet-5.5.17.ebuild
+++ b/app-admin/puppet/puppet-5.5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.11.1.ebuild b/app-admin/puppet/puppet-6.11.1.ebuild
index 2fac345af4a8..477c81270a05 100644
--- a/app-admin/puppet/puppet-6.11.1.ebuild
+++ b/app-admin/puppet/puppet-6.11.1.ebuild
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.9.0-r1.ebuild b/app-admin/puppet/puppet-6.9.0-r1.ebuild
deleted file mode 100644
index 3b0aed940aba..000000000000
--- a/app-admin/puppet/puppet-6.9.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 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.4.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
-}