gentoo resync : 31.05.2021

3 files changed, 2 insertions, 78 deletions

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 3875c0a8d602..308f72817acf 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,10 +1,8 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
-DIST puppet-agent_7.4.0-1focal_amd64.deb 20897448 BLAKE2B 1ed2ad91dcba1851b5759591033cfd74ec9dc644b3da416f2c1f5598b89e7cfa1048f09331717fc2b72a479ae8a7137f8f0a074debfbc183aea1197ae31b5df4 SHA512 bd58032f38f349938843550bc1e238f1cadec685ab6f90969e12e47e021fcdf4ffd4aa7be98fd797976d7873045444ba20b4ad3d05f543897a8d3594949c55f4
 DIST puppet-agent_7.5.0-1focal_amd64.deb 20900560 BLAKE2B a1f0e3da38cc98e677f66fd8887e4db1e1bd9d2af0b89597c0b1f2e569b78ccd8eb2d7c84c9cf5c8d03097dd6b22ae323ad7e9f989b06692a6ca7fbd28d5cf46 SHA512 250839f7d4a09545ae509273cbfb1ba004b8d0c5559b5312642b7483c605d32b7575c52b5e9a2b9d3f65e2fcfbf00f4ed85ee498ae9dc39629f1618aaab79361
 DIST puppet-agent_7.6.1-1focal_amd64.deb 20894772 BLAKE2B 235f62750c1e7a42b8b4fa013b969926c4c168fd6a6d9cfc8f243ef5571360593572faad57326019c09cd1d1e67fcc985d699acbd07c3279ac350712828eb26f SHA512 36b9f69cbef0b51a80375231472e4bab195a08b14bb860419d2ad01f13d90cba377d796b3253643f77ff415f43d2f9598dc18c37d76d844a3ea98299e5d43e65
 EBUILD puppet-agent-6.19.1-r1.ebuild 2056 BLAKE2B fe832ee23a2cb2b94bdcc943524144dfb9f64c3442c874722a67f43b8edfa16b63bc74ef3fdf96844abd68a709b34dcb13d04deec3bb896bf22daa5475a4016a SHA512 e7f35d13d653e4a2f3d6890434ddd9b409809fbe36232b2a309089757909547497b401c33369a229d75dab6e55a0068afc41f079966bedbb9f5d3a242caeebed
-EBUILD puppet-agent-7.4.0.ebuild 1909 BLAKE2B 433ad14094e7f585ed7c427740189d35314bb28aee0a282f26f7d26bdb661e0197b4925b254730f60213bb5f989638181074df5dbb4b7dd285b53aae1e99b90e SHA512 6059d73491ded91c2caada66e5722206170994caa7f025f60ddd32900dc837ace0b2257786f4224b83b5b3db3b5f1d5244bd0495bb77c80b240800c99fd89cb2
 EBUILD puppet-agent-7.5.0.ebuild 1909 BLAKE2B 433ad14094e7f585ed7c427740189d35314bb28aee0a282f26f7d26bdb661e0197b4925b254730f60213bb5f989638181074df5dbb4b7dd285b53aae1e99b90e SHA512 6059d73491ded91c2caada66e5722206170994caa7f025f60ddd32900dc837ace0b2257786f4224b83b5b3db3b5f1d5244bd0495bb77c80b240800c99fd89cb2
-EBUILD puppet-agent-7.6.1.ebuild 1910 BLAKE2B 22b2c613a3b7fec6f110241cd1a928094ad7ff4858c81b7b2282d81046ad60cd90baa1c7d2fdb3f78656889b84227834babd9c99ba065f1b1a980829c5c3abd1 SHA512 4d0c9acb5973d191f78a2e93903b6286dbf95a688cdc264c777f2133d4e8156d9e3da04562037cc0af85ac4b082f16bcd840e9ecf1318a191a020f46a1c2830b
+EBUILD puppet-agent-7.6.1.ebuild 1909 BLAKE2B 433ad14094e7f585ed7c427740189d35314bb28aee0a282f26f7d26bdb661e0197b4925b254730f60213bb5f989638181074df5dbb4b7dd285b53aae1e99b90e SHA512 6059d73491ded91c2caada66e5722206170994caa7f025f60ddd32900dc837ace0b2257786f4224b83b5b3db3b5f1d5244bd0495bb77c80b240800c99fd89cb2
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
deleted file mode 100644
index b9cc527c3117..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-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
-	keepdir var/log/puppetlabs/puppet/
-	chmod 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.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	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 ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
diff --git a/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild b/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild
index 4a86bc593571..b9cc527c3117 100644
--- a/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild
@@ -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"