gentoo resync : 20.03.2022

3 files changed, 2 insertions, 94 deletions

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index bab978e45e0b..8d101bc0f0f7 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,9 +1,7 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
-DIST puppet-agent_7.12.0-1focal_amd64.deb 20971412 BLAKE2B afb9af877e578b6ae24566e0688d14fa67fdb133a3fd9e15dc2473ea76f61a6551bd69a6fad18b6b555eea2afa8fd858a005f2c1cf6681c28f4422129211dea9 SHA512 f5fdab728baa7813f31ba174b0ee7e9dee3f5f954ed46a2f6740cf6ad075c8f36a1b6cb28e7c6223eb4aad02400252114a5dcede0085f7a7e7ba079bad2aedf9
 DIST puppet-agent_7.13.1-1focal_amd64.deb 20985856 BLAKE2B b5e3a2ac94af1f45f0ea5131cff74be1ded6efd9d0951624cec49fa00bc98fb4711e1593be46871c96cac130a636e3d217d6e7515082ca5c409858d982f25a78 SHA512 b5a8ebd99028b859a5100b8cc64684c2fa8257b27259f0ee1c87ddfcbfd9d3c2af48bafbdad524ffeeff743d8da6e46979a84555942ca9b9e4d93a12c08bc552
 DIST puppet-agent_7.14.0-1focal_amd64.deb 20339972 BLAKE2B 3e7a230e73c1eb7d96317e7877fc1bf5dbfb44f2e8faa65a1ba08ca3c7c22115458797e1bf33450d5f45c11ed0a96c2973a0d6a0a83d98739ad52c90fe45f3af SHA512 08cd94e1d5ed1a8827f43a60c80ab64a8370ecebab01cd9d8b6c36e99007a84d9b6d39a8a8eb6370b2e78f2360d4fc0b95bf85f8b59a38b44b4d94a4e266d4b7
 DIST puppet-agent_7.14.0-1focal_arm64.deb 19534676 BLAKE2B a809b4beb8c20ce2e45f1c2c552585403494ed2c0eca719077597106fcb91478bfe7cb12bcb420e5b093840fe41f4ae101c978df48690ea47940216dda7b293e SHA512 4d57fe41d6943b3b6d643f55aead3264ed4f4aedd280e8fc0ed8504a1f7e0da1e9a06e9d7e2b4916f2de2c6726b3dcff3ce8096d02503443ad6e74b0528177bc
-EBUILD puppet-agent-7.12.0.ebuild 2475 BLAKE2B fe0abbb691d683c9edbd966eb3676c2b0c0a05535f179af030a1392030aef2a0ae9da5aa1948f79390b364c64befc90cf785cf656f504e315a5d86ddac278f21 SHA512 49117ad9d47ea1d293db51c7cf4fecc68700aed007df48a76b3585fd195fadca8d0e3a6341c8fa586bbab35359b1ccffde4020eb734d8f06644105eb6dfa4b2b
 EBUILD puppet-agent-7.13.1.ebuild 2475 BLAKE2B e1c745a1ddec31aa829f2236512d07032fd17943fefc411e054a7b7c22d279263cc44852b4024b97165a174f3ced504a550a41f4dc292976f4719260eedb5c72 SHA512 27b5971f3b673a590e04e73e936d2b4cb1224e634e619f73787fd9b5da9a4321212c882e119bb05fec7b5c27fe6bb24c52dab9f17faf2871b1fc0e3f28bd3d02
-EBUILD puppet-agent-7.14.0.ebuild 2594 BLAKE2B 50cf4300e0420105383d9ce375f643b6122562bb5cf6841db7b8009107bc752827be49288a30c9ccce030b854c3dcbedde3d86bf64e9af37cef7cf5b2e521faa SHA512 9c4e4599785c65a32bdf31a7257862c953bd3c7ee1b7db2279bd1bceb9082ec20dd3f020a3592f5bd211e27b55fa8a5ed7b116c67d11c73151015f326a66bb81
+EBUILD puppet-agent-7.14.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.12.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.12.0.ebuild
deleted file mode 100644
index 77dd8d3fbcfa..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.12.0.ebuild
+++ /dev/null
@@ -1,90 +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"
-
-# virtual/libcrypt:= is in here despite being a pre-built package
-# to ensure that the has_version logic for the symlink doesn't become stale
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet
-	virtual/libcrypt:="
-
-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[compat]
-	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
-
-	# Handling of the path to the crypt library during the ongoing migration
-	# from glibc[crypt] to libxcrypt
-	# https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
-	if has_version "sys-libs/glibc[crypt]"; then
-		local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
-	else
-		local crypt_target='../../../../usr/lib/libcrypt.so.1'
-	fi
-	dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
-
-pkg_postinst() {
-	tmpfiles_process puppet-agent.conf
-}
diff --git a/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild
index 3ef55d1516d2..0776db0b3b8b 100644
--- a/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"