[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     30fa0b72cf3ae1b3fe2b35fe41dc63a636fb5c1b
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 09:11:37 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 09:13:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fa0b72

app-admin/puppet: cleanup; drop stable ppc, sparc, x86 keywords, bug 575610

Package-Manager: portage-2.3.0

 app-admin/puppet/Manifest               |   4 -
 app-admin/puppet/puppet-3.7.3-r1.ebuild | 189 -------------------------------
 app-admin/puppet/puppet-3.7.4-r3.ebuild | 191 --------------------------------
 app-admin/puppet/puppet-3.8.4.ebuild    | 191 --------------------------------
 app-admin/puppet/puppet-3.8.5.ebuild    | 189 -------------------------------
 5 files changed, 764 deletions(-)

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 2c52b94..5289a93 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,7 +1,3 @@
-DIST puppet-3.7.3.tar.gz 2594007 SHA256 4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637 SHA512 74baae5525090ac6213cc8ef27ad74cde5372ac08f8d5c11ed2a4bd2f6ed2b9940fa141ddb705328785611cbd0d32d70a40f1b44dbc9b167e11f0ad1051efc8b WHIRLPOOL 7ff9909c6bfb4d83caf8fbfcac11dff27c3a7583a68336040d404745bf35f4676933b6494d2c65c1f87fc9de5928ac9ae79f81e0b0a356088c0be5d8526ad42a
-DIST puppet-3.7.4.tar.gz 2600191 SHA256 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745 SHA512 868a80df0e07b68f0de2fe31dcc55ab1f9da160d66e151298ecb11c17382c13939a88f2925e387a14d2713be5375c2606f26ff52c11dd214874d71f17b3c0617 WHIRLPOOL d5dfb53a062532427ed32acb834517d8eaeba9f53e85bccb79de93f5f947e7d4df472b40c0bed91703b8977ac99c9764944290627815dc60430a8cfe2098519b
-DIST puppet-3.8.4.tar.gz 2639537 SHA256 19e83ebbbf0933a9df6696255d7ff4d65e3daba1ed8dacf87f16a87ae40a7ad7 SHA512 bcd4251f56292529973c1694d4c1b0673e01cc6525c3fda8415e3b69b03861f0c1c168911b47c1372eeecd54c5eb2efc67ae23fd9ca0329b821b6f1b1e4e641a WHIRLPOOL 8088df2bcfa2f2ed5be8f0769c45d70d5b8496c59f84217299d0df9b143f7551c2fb3a86edc467dfdaca6574a57e7fe4a8b89e9a376e991385650f6ce4dc9f21
-DIST puppet-3.8.5.tar.gz 2640987 SHA256 ecba7c70e32c3da6682f9c4706c01cc588a5614759a864446e9fbd2449c6305c SHA512 9c17508032ab4306c0ec1d2e79e1c3548a1da6c875c61155e597642cc901d0639eb99543084a6f88c5826b5faa5af83eaf936672e80a32bf27cf45f545e7d859 WHIRLPOOL 46a227365316c913f16a3b02bc13fd3b47ace497c406a14309d480c49881665d0ca9a0d86fae8a3761d6beb159b222dfdd033e0c1cdb2aaeadd62741c232a50f
 DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
 DIST puppet-4.4.2.tar.gz 2680253 SHA256 90ea74703b415965def15566a6d709fbd781a1e21589688c22d2f1bab4688860 SHA512 38c4e4e94693e8f3131aba44ad8b03437cd6896f8266e6f9d6434e355f044c87173034bbd336c33e5848692de60c5b4612141128a95a3d088947e72f90d13bc1 WHIRLPOOL c7d06954d1a9b46cc7f56e73da88dd3297179f1f7ede646601b6305940e200f29bf7047e494df3be12e76b0640673d616058055bc4887d3e296a5372daeab0fd
 DIST puppet-4.7.0.tar.gz 2822807 SHA256 9b5c00da165ba8570607097d5d494ecc8988829d9e066b0bd6103cf1fa903e4d SHA512 667b96c66f63befccc19cdd0e88d5c7b29feb2f3ba29f0faa74ac77b4e4f16e06a34b19114b27b36329a5964b37031e8c1430849c1673760a782d4e80b8df296 WHIRLPOOL 949cecc001179bfc81b589756718deb6a3b298ea314a9fb9eeb7d660ea9baa22f9f2c183b8992f70f95158db80a3a996075e36d365da845aef795b0ab897b9f8

diff --git a/app-admin/puppet/puppet-3.7.3-r1.ebuild b/app-admin/puppet/puppet-3.7.3-r1.ebuild
deleted file mode 100644
index 7988c9f..00000000
--- a/app-admin/puppet/puppet-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20"
-
-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.6.5 =dev-ruby/rgen-0.6*
-	>=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"
-
-DEPEND="${DEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	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() {
-	# 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
-
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-	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-3.7.4-r3.ebuild b/app-admin/puppet/puppet-3.7.4-r3.ebuild
deleted file mode 100644
index fbc3b74..00000000
--- a/app-admin/puppet/puppet-3.7.4-r3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-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.6.5
-	>=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:0.10 )"
-
-DEPEND="${DEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	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() {
-	# 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
-
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-	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-3.8.4.ebuild b/app-admin/puppet/puppet-3.8.4.ebuild
deleted file mode 100644
index 2618d22..00000000
--- a/app-admin/puppet/puppet-3.8.4.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-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}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	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() {
-	# 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
-
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-	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-3.8.5.ebuild b/app-admin/puppet/puppet-3.8.5.ebuild
deleted file mode 100644
index 104bf83..00000000
--- a/app-admin/puppet/puppet-3.8.5.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby20 ruby21"
-
-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() {
-	# 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
-
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}