gentoo resync : 17.05.2018

5 files changed, 7 insertions, 210 deletions

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index d970e523299c..aef670ba2203 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -4,16 +4,10 @@ AUX mcollective.service 390 BLAKE2B 3d032bfbcc0499af0beafae05c008b420f3b598c4906
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_1.10.10-1stretch_amd64.deb 15422814 BLAKE2B 77d23e6b66620ab9718316f9c273cef86ed2c194cb234ab55765fd28178bbdbff963f9117a5fe904ebea4ffdb901f7e5386e1b75781fe497217e261d087bb57e SHA512 49d391f63197122f2d9e1505091e09d167873255172edb6843e4e6ce28d257ca1d99ca2ec72647c349eb8367c43ef1d4390bbaa0d1aa46cab9b8bd4474c12376
-DIST puppet-agent_1.10.10-1stretch_i386.deb 16281012 BLAKE2B f03f59649724797b1f2366ce95ed1684dcfa5fa765840a7107d6b1803def4c4925a6913e44e10b72d4eac5235efb1565dadd995ac1a865c2a21e0d791d9e29d5 SHA512 2e6115b8fe16f888d315a940bed77b4a310528c5cba3d21a2d52013a6d5081f38f1120c5d5e5e19bdcab69c2836920687ac259320a1ca45d9e56210c86061e63
 DIST puppet-agent_1.10.12-1stretch_amd64.deb 15443166 BLAKE2B 74c8465fd8cc98ca114acdc600c3f259072d64765cdd8308092b7177233d44656f429407520ead2e02494951f57f1c79b5dfe8c76b2dd7bba7c1316426746df8 SHA512 1391530be340ad0439260f7bd3df8ad251ffaa02fc2f358e4ff2189b8c64a0b2d0caab9f84b84b26ebe2176decef2a39d3114f6433ba6eacd962ff45e1e04c43
 DIST puppet-agent_1.10.12-1stretch_i386.deb 16308082 BLAKE2B 6606c15aac51b28e9e8011168563dff9069b6b065f861c01f4fc768064fe266f83211fbc8fefebfe4bdf81c6220b5daa19f66a9214bd1f2ff53a3b1a2e87128a SHA512 fce0a3ac12afcc293fbdf3cc990407b82592228ed8ed609f4b98c17cea35c8e5ff5f47287880601fa80ac2f7fa608dfe00b3594a906d52bc2bd2e04117ccb856
-DIST puppet-agent_5.5.0-1stretch_amd64.deb 16911686 BLAKE2B c80fdd9aa00a060abb8a6ff5def8cba23e61766701bbded1290f559328a5f097742f47c2ed14ac18121002de3599ef50606b1cde82085148ea17836fdac98e35 SHA512 3fe56f65c01ca23e110d9f1e4ebeefd5fec00ad248c3e1ae663fa04918272f5e4077dde819b3343ab4142233b4e3f7c5b589bc5d52c409b78c5d00ab3aa21646
-DIST puppet-agent_5.5.0-1stretch_i386.deb 17631262 BLAKE2B bc67729d4222933f7f589e3ca1db2f0e8cddcf6cecb92293070db545a95b6c1552ce2b6b3365ea19ec87565e8cbff0112f801d217eb335644454f5eb01199362 SHA512 8daa15c589726c391f34908b7e6543ef7dd2e86724d40ae6a1a38803247e2cc41775211378dcdc04dbd5b43af50ac350b9b209a969488fae3c679056763b28c2
 DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05da91a4a9645644915493b2117ff29b8ba258edab18084394c8054f37c5bcbee9bf903dabce5741d7ef4be0a94a0ec8c13ac4b825b8bca SHA512 c4c7ce50cf576a6b12ecee8b9a6c7969512b3625e7ea0f16cc4cd367cebee5271cdaf7cc084fe4d344b42ab6e200664fe7b167acd9cd0da23d2ff3cd9028d6f7
 DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602
-EBUILD puppet-agent-1.10.10.ebuild 3501 BLAKE2B 6b18e594c1769f47944a469d44a5f033c5cfd5b4c6cc45905b838c50ab0b3c8586f723f7b12639b29dc299ec08cd7efbb0843150371ef7cdb292ace77a81c1d6 SHA512 55dd791106fb8b79442185a26eb0c8aa58307e837c634cb0b94f58634ef9e9243d0236cc5fc68b09c157a6232141276bb78f818db385bf2f5f70c893b1f000a1
-EBUILD puppet-agent-1.10.12.ebuild 3503 BLAKE2B af093dfa7ef8b54f6e82f6047a0fc6d908b9341cabb273388856284a26c57e141dce71ca59e1ecc5764191a04cd0616d31a3458667eaf30e0ff698015645fc6f SHA512 8f54b9257f935fa3ed49b29cd4c78949e24bbe52ac31a072b3d83fc982f372eae62f5dabe7bfcd9968ca9c7eb59320113e5eca7d2894997aa811963d7f2b931f
-EBUILD puppet-agent-5.5.0.ebuild 2516 BLAKE2B 06148b9a47075b3833544cd3e5affbe2e445ca31ad5ccce81bc1c6714ac7a74316bdf33155803876401b1bae6ded1c0793aa65c1ed48c887090e6efa25917ff4 SHA512 f09cf5b9bdcf694fee0227ba055b7368ac1ad1701eaf372e9e669d3480a24560dcf6ea423f95f0fda51f43774a036dce1a6ec4fa08482cebdbdacedff21a0427
-EBUILD puppet-agent-5.5.1.ebuild 2483 BLAKE2B 30390ed9d7b832b2b24714d560d38d4a454e27729118e9593e584d985db035e46cce2467288c655cb5326b31f98c3766506a4d389840c47e9b74d61dc37afc84 SHA512 aa6d6d9548eb31f0deac21d6a682231bcd1028b0e5b85694d0f936f9327fbdd70502c0c7063c24bf188f4fbf377879daf4f2316e70d40fc0361295bfb51ce25a
+EBUILD puppet-agent-1.10.12.ebuild 3479 BLAKE2B 6db65113a8203216068167672257270fefdcad43a897c6b25400be1949beb573b335feca32c268223ab288e340ae2edf53e4fc39a445d1c9bfc5ad37f9c7340a SHA512 1be819f7fb14d2d3aa47d23919feba678445cd605fe31f43b090bfbe3ab9a3ee4db7868553f7cf3a5c85b49d5cca0caa2580e1347ec278df91fe8495df42873c
+EBUILD puppet-agent-5.5.1.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
 MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild
deleted file mode 100644
index 63e1635600f4..000000000000
--- a/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 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/stretch/PC1/${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="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.12.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
index 053bc1d011da..22bc1d19c4ac 100644
--- a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils systemd unpacker user
 
 DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="experimental puppetdb selinux"
 RESTRICT="strip"
 
@@ -67,6 +67,7 @@ src_prepare() {
 	if use experimental; then
 		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
 	fi
+	eapply_user
 }
 
 src_install() {
@@ -76,7 +77,6 @@ src_install() {
 	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
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
deleted file mode 100644
index 657676c3b82d..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 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/stretch/puppet5/${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/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: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/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
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
index f006c5cc9d5d..784b06891e1d 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils systemd unpacker user
 
 DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"