commit:     2594aa7ab2df41c5f66c9b81410cac725635f5e5
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 17:10:06 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 17:14:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2594aa7a

app-admin/puppet-agent: 7.1.0 stable amd64

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

 app-admin/puppet-agent/Manifest                   |  1 -
 app-admin/puppet-agent/puppet-agent-6.18.0.ebuild | 76 -----------------------
 app-admin/puppet-agent/puppet-agent-7.1.0.ebuild  |  4 +-
 3 files changed, 2 insertions(+), 79 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 1df9ce22a91..0248f80bc63 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,3 +1,2 @@
-DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 
547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129
 SHA512 
00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 
22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed
 SHA512 
4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.1.0-1focal_amd64.deb 20881084 BLAKE2B 
1f16533e9f2da9971bfeaaab696bd0631d058928491c52e7cadba2c710af8373cfb89b4eaa4e293121857dfdad9bc694d562ebd9db8213198191c56fe94dd119
 SHA512 
3356810dd08baad373fd62669995cea17fed6baad3d3ae54dfd00c88a69602b5d4b8917b5e54aacc41fbd011a4e6877d1fd6c4a62d09648ddfaf26d898c3e7d6

diff --git a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild 
b/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
deleted file mode 100644
index c33a9ee73c4..00000000000
--- a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/";
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-       !dev-ruby/hiera
-       !dev-ruby/facter
-       !app-emulation/virt-what
-       acct-user/puppet
-       acct-group/puppet"
-
-DEPEND="
-       ${CDEPEND}
-       app-admin/augeas"
-RDEPEND="${CDEPEND}
-       app-portage/eix
-       sys-apps/dmidecode
-       sys-libs/libselinux
-       sys-libs/glibc
-       sys-libs/readline:0/8
-       sys-libs/libxcrypt
-       sys-libs/ncurses:0[tinfo]
-       selinux? (
-               sys-libs/libselinux[ruby]
-               sec-policy/selinux-puppet
-       )
-       puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-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 ../../../../usr/lib64/xcrypt/libcrypt.so.1 
/opt/puppetlabs/puppet/lib/libcrypt.so.1
-}

diff --git a/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild 
b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
index b8c6c3f40ea..c5679f7b83b 100644
--- a/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 
SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 

Reply via email to