commit:     977b339ab03179649eb73b657a2d7db58494f271
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 15:49:05 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu May 18 15:49:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977b339a

app-admin/puppet: cleanup

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/puppet/Manifest               |   2 -
 app-admin/puppet/puppet-3.8.7.ebuild    | 188 --------------------------------
 app-admin/puppet/puppet-4.4.2.ebuild    | 174 -----------------------------
 app-admin/puppet/puppet-4.7.0.ebuild    | 174 -----------------------------
 app-admin/puppet/puppet-4.9.1-r1.ebuild | 177 ------------------------------
 app-admin/puppet/puppet-4.9.1.ebuild    | 174 -----------------------------
 6 files changed, 889 deletions(-)

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 3ff1527a1bf..92661991a7b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,4 @@
 DIST puppet-3.8.7.tar.gz 2650247 SHA256 
50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 
f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618
 WHIRLPOOL 
6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
 DIST puppet-4.10.1.tar.gz 2954351 SHA256 
271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 
d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032
 WHIRLPOOL 
1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
-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
 DIST puppet-4.8.1.tar.gz 2873371 SHA256 
8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 
9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1
 WHIRLPOOL 
d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
 DIST puppet-4.9.1.tar.gz 2912770 SHA256 
db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db SHA512 
db2bd324e4f58c583debe417ca233c613c296aa8824520c5373c8da45056ae9d09e54ceecba5c6b7d0250ea7228d6e1b83e5b690b1203de43dca8942c8f24ce2
 WHIRLPOOL 
fd5554d5de319f8534fbada7ae6f4100d6de5a98f6646985e21c250a52a3d415ac31fc46c15c987bd7bcbc688bc8bb4d7dc9d37ebd93ecd183b3bd01d3426687

diff --git a/app-admin/puppet/puppet-3.8.7.ebuild 
b/app-admin/puppet/puppet-3.8.7.ebuild
deleted file mode 100644
index 4a2dbbdaa6d..00000000000
--- a/app-admin/puppet/puppet-3.8.7.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}

diff --git a/app-admin/puppet/puppet-4.4.2.ebuild 
b/app-admin/puppet/puppet-4.4.2.ebuild
deleted file mode 100644
index bc270802153..00000000000
--- a/app-admin/puppet/puppet-4.4.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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 ~x86"
-IUSE="augeas diff doc emacs 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
-               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
-
-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
-
-       # can't be run within portage.
-       epatch "${FILESDIR}/puppet-fix-tests-4.4.2.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
-}
-
-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
-#      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 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 [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-       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.7.0.ebuild 
b/app-admin/puppet/puppet-4.7.0.ebuild
deleted file mode 100644
index d673fb3ccab..00000000000
--- a/app-admin/puppet/puppet-4.7.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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 ~x86"
-IUSE="augeas diff doc emacs 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
-               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
-
-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
-
-       # can't be run within portage.
-       epatch "${FILESDIR}/puppet-fix-tests-${PV}.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
-}
-
-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
-#      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 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 [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-       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.9.1-r1.ebuild 
b/app-admin/puppet/puppet-4.9.1-r1.ebuild
deleted file mode 100644
index d283790d1bb..00000000000
--- a/app-admin/puppet/puppet-4.9.1-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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 ~x86"
-IUSE="augeas diff doc emacs 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
-               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
-
-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
-
-       # can't be run within portage.
-       epatch "${FILESDIR}/puppet-fix-tests-4.7.0.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
-}
-
-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
-#      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 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 [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-       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.9.1.ebuild 
b/app-admin/puppet/puppet-4.9.1.ebuild
deleted file mode 100644
index 49da570056a..00000000000
--- a/app-admin/puppet/puppet-4.9.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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 ~x86"
-IUSE="augeas diff doc emacs 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
-               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
-
-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
-
-       # can't be run within portage.
-       epatch "${FILESDIR}/puppet-fix-tests-4.7.0.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
-}
-
-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
-#      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 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 [ "$(get_major_version $REPLACING_VERSIONS)" = "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
-
-       use emacs && elisp-site-regen
-       use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-       use xemacs && xemacs-elisp-site-regen
-}

Reply via email to