gentoo resync : 03.12.2017

4 files changed, 7 insertions, 396 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 10cb0b273abd..ba95497cb153 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,17 +10,14 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX puppetmaster.init-r1 921 BLAKE2B e8918248f91d7699f4cdfdd49ebf11401f0ea82c59ead3fcc9b954493a0afce19d597328a8a097009472add04c39b7892e9d940a29a549afaae0a5a88c1ad227 SHA512 cb73ee391fc493648504af8eee2595af102ed9dcd9043f4316fb93749b37d0492e28f0082fc43bb8266357d1c298246e75f3d8b99d195dd169e3a5761f06fbba
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
-DIST puppet-3.8.7.tar.gz 2650247 BLAKE2B 20728a12c9c123f4a366ee89b25235fd73215a764ebe7fbd5f618d99f8db06935845778d3759722ccaf6f6a68536ea6de34a413824afba777d72e11d0543e864 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618
 DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c77818797e5101d03e099850b75fcfa35ec19bd351bcb51fb1d5071541f4f2b8b3be9eada3d21c00c8d8108aa95 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
-DIST puppet-4.10.6.tar.gz 2977099 BLAKE2B fea4ece994c9ee639bdc4a079760b04286e8d9804dc502c7598add658cd7abc975d74fcce49dc63223a6696565e8be6f6a2c495bf4cf40aded314d36f1ce839e SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
+DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f SHA512 0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
 DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225 SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
 DIST puppet-5.3.3.tar.gz 2843386 SHA256 45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe WHIRLPOOL 19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
-EBUILD puppet-3.8.7-r1.ebuild 5301 BLAKE2B 5231721b0463360d6f7d9e576ebff1ace8b0aa21110f2b4e73b95de377efc96272f76659ec03a3f6d3738b3d55c099d84b2b6c1e50da89369cadeff928933afb SHA512 f098685cae0f9e2a77da1e8b82fb2d1c28fa0d28214449e628ac1f3a02b4c07c53eedd000b4ac94154d8ecb2e899fac61d0660fad6cc780f5944349a513f84ba
 EBUILD puppet-4.10.1.ebuild 4911 BLAKE2B 9b7b3b8cb8a6aae28b460efadda66f84df31ed7458e9055e1242eb99854c817039e0ddf6874ede9c9204d2bc3bdb2c62adae2faf14778eec3c71140de024bf84 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa
-EBUILD puppet-4.10.6-r1.ebuild 5573 BLAKE2B 4c703278b5fbc875d9fd84d8fa6101554f604c12e21ffbdc490624c664075b0ad35537a1d482e64915aec6bd8be059c71ff2daf63c6356a727de2bce09f66998 SHA512 3ca9a12e808f70aef8b02975804012a7fbe96484b12ccb0a871a3f79686d71f24eda5342d41ce555aa65a827c645631f3f0e9f943b1ce93d6fe4c60eb910dd84
-EBUILD puppet-4.10.6.ebuild 5529 BLAKE2B 29fd8870fb1d377e89e4cad4c47fa32a3dcd6992ff525e2d5b7018beef6568ee96a916e886728936ea175b4970b1a9f7641372f8081b945ad53dfe49bde01d42 SHA512 1c0728ea0ea361c1c551629349ad36e3191a1279400130e4a5fa067a2b9e9022c0537056e78425c9f49abba905972d5607265e7516c302e4c09360a9f344fa74
 EBUILD puppet-4.10.8.ebuild 5566 BLAKE2B ef297d5556d0e44111d05cd81917b4715fe40d3b70adabcb1369ed442a24930d3b165b28501fe7c82343aa3cbcf9f42d26cbc5ae1062db19cc4572db6b2f546a SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528
+EBUILD puppet-4.10.9.ebuild 5619 BLAKE2B eb324da5789174f5a2228911a24459e37b5afb0769fcceb956f2082cd12137038c1a08881a2dddbfaa4629f494a147f1189c742234b16acf727ce00b32ba4c96 SHA512 c5ba1cd5154ad8c24b76afa44a7e2b56ea186a075bed569ea25db860f98f918c0bcfa4574d7e58086ef947cbd25002bef702bb758d85864438cef4a89761b6fa
 EBUILD puppet-5.1.0-r1.ebuild 3818 BLAKE2B 759137043cf2c99033635f117c71ca93b2806e7d3181d507e0bd4fa584a32040bb08a0b23305c84584e7f31f52672d11457f417fc50a30f4df9b4c6acf73974a SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1
 EBUILD puppet-5.1.0.ebuild 3865 BLAKE2B 10999d7fe76eb19c04fc54cdb995843091a8157fbbb90acac504baacc5cf9c411d351462497cfdac9594b40326b9d914f219be8ab3f1e31734211fd79262750e SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec
 EBUILD puppet-5.3.3.ebuild 3818 BLAKE2B 759137043cf2c99033635f117c71ca93b2806e7d3181d507e0bd4fa584a32040bb08a0b23305c84584e7f31f52672d11457f417fc50a30f4df9b4c6acf73974a SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1
diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
deleted file mode 100644
index f7e608e5bbfa..000000000000
--- a/app-admin/puppet/puppet-3.8.7-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.7.0
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	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"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-DEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-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"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Fix compatibility with ruby22 and later. Psych has been the 
-	# default YAML engine since ruby 2.0 and ruby22 and later no longer 
-	# define YAML::ENGINE at all.
-	sed -i -e '/YAML_ENGINE =/ s/syck/psych/' lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
-
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.rb || die
-
-	# 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 spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	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() {
-	each_fakegem_install
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
-
-	# Initial configuration files
-	insinto /etc/puppet
-
-	# Location of log and data files
-	keepdir /var/log/puppet
-	fowners -R puppet:puppet /var/log/puppet
-
-	if use minimal ; then
-		rm "${ED}/etc/puppet/auth.conf"
-	else
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-		insinto /etc/puppet
-
-		keepdir /etc/puppet/manifests
-		keepdir /etc/puppet/modules
-
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	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
-
-	# 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
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "2" ]; then
-			elog
-			elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-			elog "http://docs.puppetlabs.com/guides/upgrading.html"
-			elog
-		fi
-	done
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.6.ebuild b/app-admin/puppet/puppet-4.10.6.ebuild
deleted file mode 100644
index 90ba147596df..000000000000
--- a/app-admin/puppet/puppet-4.10.6.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5
-	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"
-
-# ruby_add_bdepend "
-# 	test? (
-# 		dev-ruby/mocha:0.14
-# 		=dev-ruby/rack-1*
-# 		dev-ruby/rspec-its
-# 		dev-ruby/rspec-collection_matchers
-# 		>=dev-ruby/vcr-2.9:2
-# 		>=dev-ruby/webmock-1.24:0
-# 	)"
-
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
-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 )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-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-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-
-	# Use working version of mocha
-	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
-
-	# 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 specs that need further investigation.
-	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
-		spec/integration/indirector/facts/facter_spec.rb || die
-	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
-	rm -f spec/unit/indirector/ldap_spec.rb \
-		spec/unit/parser/functions/create_resources_spec.rb || die
-
-	# Avoid specs that rely on tools from other OSs
-	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
-	   spec/unit/provider/user/directoryservice_spec.rb || die
-
-	# Avoid specs that depend on hiera-eyaml to avoid circular
-	# dependencies
-	rm -f spec/unit/functions/lookup_spec.rb || die
-
-	# Avoid specs that fail due to an unpackaged file
-	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
-}
-
-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() {
-	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 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
-
-	# 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
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.6-r1.ebuild b/app-admin/puppet/puppet-4.10.9.ebuild
index 62e5e757fb54..1c317f21c78d 100644
--- a/app-admin/puppet/puppet-4.10.6-r1.ebuild
+++ b/app-admin/puppet/puppet-4.10.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 #RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,12 +17,14 @@ 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 ~ppc64"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
 ruby_add_rdepend "
-	dev-ruby/hiera
+	>=dev-ruby/gettext-setup-0.10:0
+	>=dev-ruby/hiera-2.0
+	>=dev-ruby/locale-2.1
 	>=dev-ruby/rgen-0.6.5
 	dev-ruby/json:=
 	>=dev-ruby/facter-3.0.0