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

[Matt Thode]

commit:     98cfdb2ae67db0db92a3b7438eceb9e17a7a9d25
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 00:02:37 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 00:22:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98cfdb2a

app-admin/puppet-agent: 1.9.3 stable amd64 and x86

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/puppet-agent/Manifest                    |   6 --
 app-admin/puppet-agent/puppet-agent-1.7.2.ebuild   |  99 -------------------
 .../puppet-agent/puppet-agent-1.8.2-r1.ebuild      | 103 --------------------
 app-admin/puppet-agent/puppet-agent-1.9.0.ebuild   | 105 ---------------------
 app-admin/puppet-agent/puppet-agent-1.9.2.ebuild   | 105 ---------------------
 app-admin/puppet-agent/puppet-agent-1.9.3.ebuild   |   2 +-
 6 files changed, 1 insertion(+), 419 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e5ac3adccd3..dd82bf409c5 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,14 +1,8 @@
-DIST puppet-agent_1.7.2-1xenial_amd64.deb 13870204 SHA256 1d95b0d658b93acf09dc712b983b0def38bfa22d8f6da381fcb56caae787a67e SHA512 5369e675e3c18d8f9eef654b1567fe4564cbea33628d9b18148e6d1ba37cd60fd2b7ef450d127123cccb57d699e8c166a297d68411b6a81d88d573eb246a5afe WHIRLPOOL 0a0831f9384df9671abf8405f10a4ca3f217c0e9167e8e3ce793d8297ce057aa6f9da522d065072e4b9239475fec5dd8a5042a5323c05139dca6f3d66db4facd
-DIST puppet-agent_1.7.2-1xenial_i386.deb 15247880 SHA256 967e68ac690f8b15af7a9683bc8c3045acb4cf35f4950b3d2fdfdd8e4b3795e1 SHA512 01c0de5bd14d755222c85192cff48e8606b7e08ce75879824b885962e167ba6dcea29ecb3347e4985efe1a16fef36c1c2b7592acfe15396efbed5f643f81cbd6 WHIRLPOOL 0972b735237c963f203072d8fa2b6b08120dc1e333aabf73c78063bca4816d56d7d0f6d7fc48931c03bec9058d01eaef508ae4cce71bbd7367d6fca1bbd913c1
 DIST puppet-agent_1.8.2-1xenial_amd64.deb 15179348 SHA256 5195af288ca014bcf65705c3fb83a1da8caf02eb1f431396380951480fb7e2dc SHA512 6093012994faaa3e7248c3e705e2dcb9269c85cfd4405c7ac66ab0adf3a547bc37ad3f5d44530514ed30a4edb01c01522eae1bced8d7ebade9ceb737ee600449 WHIRLPOOL 9905c00b16b12b75b331faf60c5ba3ad948a04db1ad4ef9b11aa413442fd464b836cc295cb4e0d85c34ebb3f97f470141cf207491fbeedb7964409ab75420f44
 DIST puppet-agent_1.8.2-1xenial_i386.deb 16609778 SHA256 48d4588ae8c87a3a3e41c5c4e6159cba7bf6484578ce0761b4abd76854f7bdad SHA512 b96e239906e75773a22c37a28c3c794b7293cab1a970ba5067064b120e12e0a6f0b620f06dfb3cc5b83e9140467fa552aa05ea46a33f3fb8b489ac7790cb7734 WHIRLPOOL 6daf05a7ae5e50ecb922ffa260101cc62e64267fd40ca6dd8d684ab1b3760eb45a4f797f9644b7fb351f70a86e88d5c88cd1cc5dd4d68341912846466ba72257
 DIST puppet-agent_1.8.3-1xenial_amd64.deb 15531434 SHA256 2a468846e4b31f07dce9bbbf96c3fe06a528512cbc37bedc7ab44715a6833e94 SHA512 11958f51b75e012484f332b49d66bba225fdc19634f3972dfe5117ce7971d187bd7bca36dff079cd898e48c3545d560f34ee57a3acb710427154875d9d99100a WHIRLPOOL 895050da0f52a1e977d58802dcc5e5db11c331d5ad30732b1ac80e799d8b3312034efa800e3489b789cc40e9c156a5fe66050264d01a33c4a85e489a647b6324
 DIST puppet-agent_1.8.3-1xenial_i386.deb 16564720 SHA256 c2d5a1fd91941031b375b59f85f323a38977cc526b33e73f93eae50ee036fd65 SHA512 bb617c351ba26d431a6f0d6aa150c8888ee822feb63ebb56557586547e8afc9d387c5af6a6c59e6a885bc6ab195c89b3ea9317de74440abe6df76870c3dca345 WHIRLPOOL cdfd414d9113add49f9b60d5efcd5f16ce0f71a1bb094a4e98c31486b8ff86b1f9dbe1b5da0724358aa78d8f75c3aed9c8247a62595cdde92eab74519b9d06ef
-DIST puppet-agent_1.9.0-1xenial_amd64.deb 15324700 SHA256 acdcdc314b39e404102b8e6d0a7d1fdeb5710efeb34f60c447afd95a17a230c4 SHA512 068e27aa59b7e60eb296a7d41435ae821559822f4e4136dae0af20445490a209baabfd0bbe5f91c8981091c999170c251310c5a6fdc0ffd9825f1d0ee7128e06 WHIRLPOOL b949befa1ad7f61877188828a90687f2a5957831af8a71723ab7424172d5df04b923f5241681a816f28382e3ac832fab2c7982c34f1f12db6f31ca9440f0ec2d
-DIST puppet-agent_1.9.0-1xenial_i386.deb 16775966 SHA256 c7c5303e411278d19eee798ab7ae68b51edc7256935e6637a58fbb8c035df6ed SHA512 00a29cf00840e8d75e5d858fe03a15338f21e9eead123a1bae5e2a8cca66e06a6bbdc4671a06a986ee8807851997459fc134c6ebb196674e6993fd12af5bbd47 WHIRLPOOL ebac057af1efeb692b6b56fe2a697a79ab45872639add7db903b24f176651e86dfc18651c25acef3b33682dda255562e357e0942b9121b232474dcf1f6617176
 DIST puppet-agent_1.9.1-1xenial_amd64.deb 15458462 SHA256 ed7a124842b48a3ec16875dfbdf8942437d1d137768003918ef681838f2bcfc6 SHA512 1eaba0dabc7000b873dc776f74f7f0ea2084cdb0ffb39f4d344798458e20b36f233256d4648676954ecaad7dd1f0762823febe4e948c622dd8e1a599cb23cb7c WHIRLPOOL d1ba1ebc8519eb7329203d9fffd8447c7d3a141cfad798c09dc7011442f7a38da41b9b275778e6c5d5929fae94bd89ee9033f847bb1116d3afe7be90bd4525e0
 DIST puppet-agent_1.9.1-1xenial_i386.deb 16870810 SHA256 6739a03ab3ffa69680c84aed79f50e3e0383a50055b1e5f5545a24aec68c3791 SHA512 421b32d2eba33af0bbbbbd41f3615222c1907107023f6cb80bb23a9378f5ba9cc26bac24749c611cc41fc52bca25df92377ba76cfd2d09d1328067138d2a8db3 WHIRLPOOL e9abd1b50856577e7892511b94f9ca64b023f41ff39c6fd106874305380522cf7fd98e0d659eb896d400fd8865510dec7144a7915fa4f3bb069069d74302612f
-DIST puppet-agent_1.9.2-1xenial_amd64.deb 15684862 SHA256 97d5cbe6743c7d9dd67289fda74795e4c82b45464560606654c26eea78a72872 SHA512 9a1cb959e174992b1dfc51db5c4c75f0a855469caa41d3e9f8da9c8cbf0b987f222d0cf2105df37a61edc190633f9407f7717379124619dab8650df9ae356f16 WHIRLPOOL e8ddebcab3ae8ba4429c0855792f0b35043cce4d9d10bfc18e0b1a73c1eb43894b54c8743739d8c6b3d2b174684af6b9b620dc7863ea34ccfe9ec475b112247a
-DIST puppet-agent_1.9.2-1xenial_i386.deb 16767542 SHA256 5cb35fd22ab2922963192120d3f48d9a92fa7c3b1d25d80c8f0c4c92269cc62a SHA512 7f2e0277ba074b532bcf95e21b4faac7b6699b133202b3abd004337de3a9d3f07e3ed0213c125552878d75d642f7d824ac73314cf83da1ede943e930062aa824 WHIRLPOOL fd200eec4d71331d7b199b1b32c8c8b27d9375f2747c3b871c72bddb2d3a867cb9d46921c052dac72fba4add67aab57b710d4638136d580653d79539f5d69a8e
 DIST puppet-agent_1.9.3-1xenial_amd64.deb 16045528 SHA256 db73567754514595b729c299bea34289fbf108282dcc3ca2b2bda8946b1a9b01 SHA512 1142bb008569ebd26e70c89705539eee89ef1d886fee9c18ee19b563ba280c96295a77b30af2c3b149e2e8fb5cd953f55300d3c3bea1d63cb4e6a4c4103a1cfb WHIRLPOOL 193d8ece0997c66f0e0a0c70df6e41243fabbda7bdc944f1c9940476e7cfa01bbff80e739cd5e3b95d4027b8d13b3186823b2035251c57c69a7a2e188c4a5801
 DIST puppet-agent_1.9.3-1xenial_i386.deb 16072786 SHA256 eb9476d55cc769608a3b5a3a971a4c005ae1042c0f3f3f5748b14aa40b6251ea SHA512 b9bb7579fc3106b0b701ef2cdac9dc72a5e663b360e7e10816698fed85337c9aa0b77b392353d70682f2cea057d52ebf1c356474e9ec6ccd8e85302d938666af WHIRLPOOL 2acdd44be0fa1665be34f10d3967185acf49388460af6291ac9cb53c7296af78630d82e6c3fce456bdfd7fbd06d1956d9c592ad17dc0f1cf2ee0aa9c008965ef

diff --git a/app-admin/puppet-agent/puppet-agent-1.7.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.7.2.ebuild
deleted file mode 100644
index 2bc4faf5122..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.7.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}

diff --git a/app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild
deleted file mode 100644
index 3d620d353c2..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}

diff --git a/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
deleted file mode 100644
index 2d099b35fe0..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	>=sys-libs/readline-6.0
-	<sys-libs/readline-7.0
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}

diff --git a/app-admin/puppet-agent/puppet-agent-1.9.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.2.ebuild
deleted file mode 100644
index 2d099b35fe0..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.9.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	>=sys-libs/readline-6.0
-	<sys-libs/readline-7.0
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}

diff --git a/app-admin/puppet-agent/puppet-agent-1.9.3.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.3.ebuild
index 2d099b35fe0..6c086d53b70 100644
--- a/app-admin/puppet-agent/puppet-agent-1.9.3.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"