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

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     af05514163ff7966b762a83650b9638385601cdf
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May  6 17:30:15 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May  6 17:36:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af055141

app-admin/puppet-agent: 6.4.2 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/puppet-agent/Manifest                  |  4 --
 app-admin/puppet-agent/puppet-agent-5.5.8.ebuild | 85 ------------------------
 app-admin/puppet-agent/puppet-agent-6.3.0.ebuild | 79 ----------------------
 app-admin/puppet-agent/puppet-agent-6.4.2.ebuild |  2 +-
 4 files changed, 1 insertion(+), 169 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 49d8e11ec93..8600ad3d36d 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,9 +2,5 @@ DIST puppet-agent_5.5.14-1stretch_amd64.deb 17369338 BLAKE2B bc0544d49f704b07fe0
 DIST puppet-agent_5.5.14-1stretch_i386.deb 18294894 BLAKE2B 928ea0c7113dc6789a37b83f4499485d17f09cf7ac1ace5c3aad87f0a93e4143cd4763f61e42d35a7561d5438d7b5d70d6181ab7233f72eaccb67cc4d5388d18 SHA512 8ae02257cf729ce41e6437d9ee2f221884b0e49dda7b3fc04ef200487c937f258075f563817bb064a19c30ec19b790f4d9d03e240d8a363f2942cd613c579c1b
 DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e
 DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4
-DIST puppet-agent_5.5.8-1stretch_amd64.deb 17302932 BLAKE2B 4ff925477f74e5ecb7737cd41712bcd8b0b54d244784fd874ad160bc7cd33327af615ec117fc28cd45d59f275c51aa71f80de204f1f395ef89c7162d5acc3cef SHA512 f30cf250855c4f5adfe58f8c3c7dcdcf155ba97a9a805449555134fb9fedcf6c4d4ab54483d4c1530ae09583e6ca78d1af446cc7fc62760c4aa839c1e9d42bc8
-DIST puppet-agent_5.5.8-1stretch_i386.deb 18221644 BLAKE2B fcacbae34bdb6fa18eff344123908880de2e5025ccddd25ee751c5c2b229ff8b63c66d482d4e8139b0d263edeff78771459cd90beff36136a553b039a7c417a9 SHA512 e00c04eacea360619f9fa4e016b8421fbf44127f979ed772e06cef21a15261a7d201abb9bcde30d8bb4e36a4b37d38d67814b2c1077b33ee6e6404c898c53e32
-DIST puppet-agent_6.3.0-1stretch_amd64.deb 18716014 BLAKE2B 914686e0229b40ea2e4f29c31556fdd289e7f556c471ea3e3a8cec887e1e1175ab5e23fc2605e3c156f9f571a8ff47b1a77b4f1173e41b923d7bd59592b575ed SHA512 fd5f39c4cb2fb040e45a0b2316857ad9da311532a9d1659f9df07ad57f85daec2e7674109c63885325c809e839b017b7b3d5ac57f9439e03b569203bf301851d
-DIST puppet-agent_6.3.0-1stretch_i386.deb 19243158 BLAKE2B 52c36e54ecb2e1fcc9ef5add8393533f68a21fde0f449b558d1fe58b066519138092e15c851e33580e9c2b943ef7a58b323cdd7bc1997faa273db4f518292465 SHA512 aba93bb2290879f5512f2429af658b137a3b5ae51ce9817fb701086be7abe4043b54d242fdc1310876b42124819885f8ab97c9fb6cc9113a50115bc071d42736
 DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c
 DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41

diff --git a/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild
deleted file mode 100644
index 388141a5324..00000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-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:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-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/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
-}

diff --git a/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild
deleted file mode 100644
index c648209a4a7..00000000000
--- a/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-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/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:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	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
-	systemd_dounit lib/systemd/system/puppet.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/puppet /usr/bin/puppet
-	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
-}

diff --git a/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
index a72df734d6b..c648209a4a7 100644
--- a/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"