commit:     195031859531c3f55028eb9c8837a8cd3dc6cc99
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  6 18:04:00 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct  6 18:04:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19503185

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

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-admin/puppet-agent/Manifest                   |   2 -
 app-admin/puppet-agent/puppet-agent-1.10.6.ebuild | 111 ----------------------
 app-admin/puppet-agent/puppet-agent-1.10.7.ebuild |   2 +-
 3 files changed, 1 insertion(+), 114 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index a6919f346ad..a69a48466f9 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,5 +1,3 @@
-DIST puppet-agent_1.10.6-1xenial_amd64.deb 16459994 SHA256 
ebd680c4c35823298ffb6d2f322ebafce498775d9a864b76c62a879d8a1102a3 SHA512 
d607314c6e37180c9d1e8c88aa13dbd9e73f041f25152a3a1cc85e0afed0c401e163cdd08b7eea31ea8f26f33c183949358b50375fd84f025da4083f4a97c565
 WHIRLPOOL 
45720ada35ef741479d54283fc1a07ebe7c50e5c6ada4358bb321e6fa2acc07aa349c23160a458c114cd4a2fc48841515545c206f72c17c57a6c5c3b70752698
-DIST puppet-agent_1.10.6-1xenial_i386.deb 16131024 SHA256 
7e28145e6ca8847a1eb33bb443f1b55aa0700d4e4ddc65c74c605c075c312d55 SHA512 
488fbfee2c9f75cd97e88511ef36521f26c5e617792bdc5b145040c8f7ff58b14308d24542afe4fc7c8689cc0e0d7b03514309123dc0653484eacd3de938dc59
 WHIRLPOOL 
bb7b7a1efbddd88d4ddf382a543358af7f98ac4690fad3339f47b8ff71b8bf050acf9e0dea4ed376bac5e8b1929f4368504a1ae5ab2461e4f091abed66fb149d
 DIST puppet-agent_1.10.7-1xenial_amd64.deb 16449418 SHA256 
a23169ff2adeff419436f738a991d3026c3f06b993a9824922d26a125a53fd0f SHA512 
5c73eea444186cbd0d52e42a20858964db6e7f2b6e537274b5b0a44499cc2bb0622a4eb6a55fa10dcc3946bdae3bb00b9d228aa5d1d444cc53aeefddf11f7b5b
 WHIRLPOOL 
5eb0c71bc630ad878f2731353c93195b4e686ff0d48796fff0b700550f8f8ab69d039c818a557bdf231ecb08b85e8529706f280b19bae031a24f2687e50ae32b
 DIST puppet-agent_1.10.7-1xenial_i386.deb 16182468 SHA256 
ee60570ec29561adfded01fec2017756d5f921c08677a530149b0da2ead1f29f SHA512 
7d5a41af7619fe008fec5302e23482d688692affaeded4b0b2f4e693168c2ef6995beee5e2410a9cb2e7f99650119e9c5f8007ed65709ad623654bdd6c09e402
 WHIRLPOOL 
81d7a325d2c675f2392dfc16f1d3a411c6e7a2e449844b90358d0a97c31cc3ccdbf6a8a891bd818017b9504e898fe8aed2d12233dae4822f125f7ab2230ceb1d
 DIST puppet-agent_5.1.0-1xenial_amd64.deb 15141786 SHA256 
1a3ad0ef1a5e4026927f3ae010e9a48b9c1e31dfb8e0691d01383d29f3b14644 SHA512 
a210d225591328e2c041aad1dd7cfdac614531e1ceb524c3e35d3330962111bdc66408268550072e53190d6a10a7c8244b0bfa8a12b81f023883831c1fcbd070
 WHIRLPOOL 
34dc5cfcf6bb3500b89451078734d5d7a03a53a0be9e5501d6ded574cf2b6dbafe207db87aa919fd9cdadb6c2a0a05191854be3245d477e035fe7d52778cf527

diff --git a/app-admin/puppet-agent/puppet-agent-1.10.6.ebuild 
b/app-admin/puppet-agent/puppet-agent-1.10.6.ebuild
deleted file mode 100644
index 300ebc50b6d..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.10.6.ebuild
+++ /dev/null
@@ -1,111 +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="experimental 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_prepare() {
-       if use experimental; then
-               epatch 
"${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-       fi
-}
-
-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.7.ebuild 
b/app-admin/puppet-agent/puppet-agent-1.10.7.ebuild
index c36e4339205..300ebc50b6d 100644
--- a/app-admin/puppet-agent/puppet-agent-1.10.7.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.10.7.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"
 

Reply via email to