commit:     0b3fd12a42498e1d941da3eaea227104bb5f950c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 23 16:06:29 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 16:13:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3fd12a

app-admin/puppet-agent: 6.7.2 stable amd64/x86 w/ cleanup, 6.8.0 bump

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

 app-admin/puppet-agent/Manifest                    |  4 +-
 app-admin/puppet-agent/puppet-agent-6.4.2.ebuild   | 79 ----------------------
 app-admin/puppet-agent/puppet-agent-6.7.2.ebuild   |  2 +-
 ...gent-6.7.2.ebuild => puppet-agent-6.8.0.ebuild} |  0
 4 files changed, 3 insertions(+), 82 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e38471c621f..99a6098867e 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,6 +1,6 @@
-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
 DIST puppet-agent_6.6.0-1stretch_amd64.deb 19177382 BLAKE2B 
c8034e4a943394da7fd97756b3dfb59897f3d787a8f49743a4c42ed47db4411f6d0e125cf6984728a108e5070cc8e42ca0a203d2afdcce99e08ae38a6ebb9293
 SHA512 
f0d129b357feb6e5d05c080437910e119bbce0e97e36927c2f97d3d7fb8f54a0eb1503a74ffec3cef7fd29785fe97ffd53f04a4be6a35b558ee278af8871289b
 DIST puppet-agent_6.6.0-1stretch_i386.deb 19443284 BLAKE2B 
c017abc3166b3cb04a98c511b5ab05dd7076906a38edd8ee919848c130ae5b1cb6c7542b6c6c3da267fa801e152ad963c84293083c709dd769185f943a4bebcb
 SHA512 
adadc3201dae261f2000282b67b8c4735eeb588c4c6c5dcbcde2e655772bebb1c343611607d84ba1b019279480445dc44cd4e3cc3d64e89b70e93b85a37678d5
 DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 
6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e
 SHA512 
1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
 DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 
1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c
 SHA512 
8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
+DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B 
ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448
 SHA512 
707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
+DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 
0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51
 SHA512 
f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b

diff --git a/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild 
b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
deleted file mode 100644
index c648209a4a7..00000000000
--- a/app-admin/puppet-agent/puppet-agent-6.4.2.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.7.2.ebuild 
b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
index a72df734d6b..c648209a4a7 100644
--- a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.7.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"
 

diff --git a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild 
b/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
similarity index 100%
copy from app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
copy to app-admin/puppet-agent/puppet-agent-6.8.0.ebuild

Reply via email to