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

[Matt Thode]

commit:     0ebf1db11da46142619c40d0095e68d92b271f5d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 20:55:25 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 20:55:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebf1db1

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

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-admin/puppet-agent/Manifest                   |   4 -
 app-admin/puppet-agent/puppet-agent-1.10.0.ebuild | 105 ----------------------
 app-admin/puppet-agent/puppet-agent-1.10.4.ebuild |   2 +-
 app-admin/puppet-agent/puppet-agent-1.9.3.ebuild  | 105 ----------------------
 4 files changed, 1 insertion(+), 215 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e476c7329f4..ac33995fa94 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,10 +1,6 @@
-DIST puppet-agent_1.10.0-1xenial_amd64.deb 16335972 SHA256 06549935539c28cba369e8aeabd415b88c7fb7f484f1491a79fb5ebf14485dfc SHA512 79d02adca4d053f7d60b1cf76c88695504f522e7f2c223bac9e6deefa9d4c081a4835477e6b30d27890f4bc1dab86edbad5410f4c3eb5c1407e7fdc98b3a41c2 WHIRLPOOL 060c579702ea1cc6a82c85e699358e233506899774c7d845fd2d88e4351765794590e945dbc6f61edf090260ad63f055bf5f1757721e329074404956d7685f0c
-DIST puppet-agent_1.10.0-1xenial_i386.deb 16086120 SHA256 6f491fb46c40be4a57d95e284116f1056779cad8a20ee31be5f27f02e720f2b0 SHA512 80f3ae5d0f43d4a9f73c578e6b07ce503d995133c45a63fc37395e9f3a3b60cd9628a071d0c00a11642afa531f732e42ec24d9823224257aeebbe2c6a0dd2177 WHIRLPOOL 2a41098ae48ceec4ba8d38c67fddccbea6860c4a1275236be4de002344c5f5fd765e9c51c59cf112e03ec631559680703d2d3228e0e57d306ec9078637a45946
 DIST puppet-agent_1.10.1-1xenial_amd64.deb 16276180 SHA256 e0dc22258c2f23302ed2f1f5dd024d9e780a7d3dc49646c24afd2560eb45a9e7 SHA512 308504915621c4ae28780e32877e672067a13f9bd6b5e2dac35bdb4ab62596099eaddd8da371cc97edb0ff15419d7f2fceda7aebd6e524198cc7d3ddfe3f15db WHIRLPOOL a40dc8a531af746c504c9fc0eabded6c8f06550d9b767a4c40e799aa75ddffc9464dca768b8544def89344ec4a9331e1f315e3d318668747b0c46b6415477a89
 DIST puppet-agent_1.10.1-1xenial_i386.deb 16205078 SHA256 22cdd5e41c82e63ae038f4c96ed8f19218f3eda600f1f6149eca9b1e7b60a560 SHA512 be310ae8db1bf1670b480a382866feb2fc247e69f0a4c26aac2b8f67f1b43984b581809ccfc1e0182fe71895aca8dadf20f6ff7b99506e84b787a62555e547c3 WHIRLPOOL 50563a4a85200e675d408e8a5618763821e7bf408f65172dadcf1b33ba3f4b9930bfaece3a21d744a8df513f9b91cce1f9ed45d770b1e9601e0d84642755e3b7
 DIST puppet-agent_1.10.4-1xenial_amd64.deb 16157840 SHA256 4e6ec3496e9d30b06b2064f066465ae268765760c0251390292e1fe2c0b5120e SHA512 25c1be6ebfdd2b2c9f8d10347c681af1cb7265b6d95f7e573f31c4b580bf5df046945cdf9d87841d792233b7227db0c46ae348bf6e6ff18b44f6f746794a3627 WHIRLPOOL 7fd01b43f627647960ee588eb20a8a8d35223e711d295f83a283d13d896bb93c251f51a20f082bdcb8830f4508ba28cdf7c0cd4d8e73e3f3c5cd15fd8ac8d071
 DIST puppet-agent_1.10.4-1xenial_i386.deb 16053584 SHA256 ef42df8facaffb47bd926842886b988276111b67a887619873d146c0dee8f55c SHA512 b2e519b2a24f40a8d099b2fa8690a706d9105693affad70e6f38c3b4cc3539044bc805462c45b828147349bfbdc04859e8563fca2588e3fb538de3798df8f262 WHIRLPOOL 51e5faed153d8aa8ee4b1acadc66f8be5e60534faad28cdf37504e91bdbd60441859cb00e2a8746c96c22cd88de3c58c8e188b2abc699758e0c3a02f01d480e8
-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
 DIST puppet-agent_5.0.0-1xenial_amd64.deb 15120014 SHA256 b2983d7a01c056c306e5a5534a9059515b68ff5f72f05dab8a3751fee4276ce4 SHA512 b1255a8db15e6c922d7a102ad3541c496c4fac1cc484e763c6083bb09cbb93db5abf185ea0a39d13d6bee1b18ba53803691d024dbaa64431cda5e9517f3c3c6a WHIRLPOOL 6c36343e5ee50941bab714d0ea8d7b7e7236c78c7f51ede2672b9fe7c883a897fe303d063dce37e411f9b4e89222f7affb38579f72b31ae0d2aa0e2c102be639
 DIST puppet-agent_5.0.0-1xenial_i386.deb 15619584 SHA256 820367b49827855f19d3094d156184c8da2958e00e7dda4a3da37bbac7696cf5 SHA512 9264b1143189c620cbf9dc7ff0b67939427c732c6bf27941a214066dcf88ed6570641a122f243774d01524607361129a777e50fa7b97addf15e9966d7701dee2 WHIRLPOOL 1cafcce45fb1072b8c4ba49192c0bd8da7a7cf60542530626468e12bb11f09fc7568b761403d1f03725c368e73209c0be00c07e5a5a007e9d653ef2e7cd32c41

diff --git a/app-admin/puppet-agent/puppet-agent-1.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.0.ebuild
deleted file mode 100644
index 2d099b35fe0..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.10.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.10.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.4.ebuild
index 669892ac4a9..96ad0defaf6 100644
--- a/app-admin/puppet-agent/puppet-agent-1.10.4.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.10.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="experimental puppetdb selinux"
 RESTRICT="strip"
 

diff --git a/app-admin/puppet-agent/puppet-agent-1.9.3.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.3.ebuild
deleted file mode 100644
index 6c086d53b70..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.9.3.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
-}