app-admin/puppet-agent: stable wrt bug 597684 amd64 and x86

Package-Manager: portage-2.3.0

3 files changed, 1 insertions, 103 deletions

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 1d2fbf898e97..7527811810ba 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,4 +1,2 @@
-DIST puppet-agent_1.7.0-1xenial_amd64.deb 13880620 SHA256 804cce57baca64f50d1f78a1fa2b7668aec99a78ea4d19e12935f1c9811c44b6 SHA512 2414a42c86a84ab3235b99a6e824bcbd93b432572a64e7faab29ca9b027da27aefd168d060f9bac73663639cbf5213a74bb14e152a60a307efea6704a183424b WHIRLPOOL 1fec15a704f1a836bca4fc58dbb369b3e5e6c171f998a08e78ba642c96b9cce84de0bb22435c230038714f4b7be405154856ebb39aa96a7733b7c8f02974c587
-DIST puppet-agent_1.7.0-1xenial_i386.deb 15233100 SHA256 bb602489cff71e228496b819242dde362f6486290ef60ff500025294dfb072ff SHA512 720572147d4808045960ab630ab23b7de9ea0eb6d0c388c0ad814eebc07fbe466bf7161c9d357e4562a0a92a41e348f7cf247364acae63f831787b3e0daa3de2 WHIRLPOOL 0dd236d25d99e9aa5c5c3611568fc42945e537b4e9f65e89e7b8b27aa48b64e9a9108e682adcb71982b101f8ccfb78abe695e66f9d850cdba9b13439f9d655ef
 DIST puppet-agent_1.7.1-1xenial_amd64.deb 13901688 SHA256 f9f0cedcb29f054064bc2b94e59c0a380ff01467c1c622e2b38f0957c7bea758 SHA512 018f99aab356cd597ecb1e94c22fd55f9e19e7ea0ced4b36c829ec9b45b7ba1c5188a3097cb0e837634a39eceb810b11e377b5c80decf94dd11b43b687f100ff WHIRLPOOL bc7ccbaf37e619fd89c0c6c4cb57db13a10cef5c030e48b25bb5d6e041a7a916af6d1d01f7fd4f7b8d047065e555aaebd1c3c81c6a91d17ca1bdda91e1dc48a5
 DIST puppet-agent_1.7.1-1xenial_i386.deb 15252694 SHA256 0e2c94907bcd0174e5518a72eb91b4e66639ffa2829292044782658b7762fd19 SHA512 b1f85586848cff2b6790c93a320a7c8ee226d78dca14ddcf947e9d01c1b105b379cb0e044280640e95873e7abd31c3873d6e90117c249c314ae948bca36bad17 WHIRLPOOL b2460598fd12fdd565e6cc131a8e14d4eb411b233ce5125e436d09432fa5f9fca9d9065c515b53d0a26811a18d120cc0bcae0e9c848ed19820d89903d27340c3
diff --git a/app-admin/puppet-agent/puppet-agent-1.7.0-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.7.0-r2.ebuild
deleted file mode 100644
index 271798b36ea0..000000000000
--- a/app-admin/puppet-agent/puppet-agent-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.7.1.ebuild b/app-admin/puppet-agent/puppet-agent-1.7.1.ebuild
index 6576e17b0551..271798b36ea0 100644
--- a/app-admin/puppet-agent/puppet-agent-1.7.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"