gentoo resync : 02.11.2017

3 files changed, 2 insertions, 181 deletions

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index dd9b86ebd180..61ba4ca15299 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -14,14 +14,12 @@ DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd
 DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
 DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640
 DIST puppet-4.10.8.tar.gz 2979824 SHA256 2a11f9230f2b681173107fcfe6574dc38d8061c7d369fa88525dfb652fb7f198 SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d WHIRLPOOL 06ed0f915786e6d0c5698a8bebfb68628d96b236b667ec44c994c043949cb4a47c8d42b2fbe8391178f38862fe816237d28501b4e39a6326d74ef2d62eb438eb
-DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
 DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50
 EBUILD puppet-3.8.7-r1.ebuild 5301 SHA256 62c457fdbe347a1237427fbcca093e205e8aa5f0a0a82d848015efce50bde0ae SHA512 f098685cae0f9e2a77da1e8b82fb2d1c28fa0d28214449e628ac1f3a02b4c07c53eedd000b4ac94154d8ecb2e899fac61d0660fad6cc780f5944349a513f84ba WHIRLPOOL d1b96ec8d9c38baefe15a5b77fa6f18ee0dfd40a030425050bcca09bad8bb9316a4c3815a8c027eae1c4c1a51755a88b67cbbd0351a4ef228e7cf6b539803b0e
-EBUILD puppet-4.10.1.ebuild 4911 SHA256 5027b773b1f78cd11cee723f431c9254d3bcf5a28da47e6866daa6b491355fa9 SHA512 5ea1902e13577a934344565db53ad42face48b08def199f32c2fbb38b2747f7f7e1b52882bce5289894e462431fe39f75c7f63f0271878e732cd2263e52b8eaa WHIRLPOOL f178c02748737602a6f277a29d54a1808f63b0c5cd3aee0c9dc39b2a0dec1c30a5b6093cce9b8cf7a13c52b10f8f1c7c38edb908ac575c0a6587fa86cbda20d2
+EBUILD puppet-4.10.1.ebuild 4910 SHA256 241f0c08173142728990233133226beb34fc8604ef950f93700b9e11947a89c7 SHA512 8ca0293dca3b31c6883da7965aa884030fdef7b2e2d8feaa8d5511f697def3819d90243ec0fb136feb30fab35a013b91dc5e6a3ee969ef00312ad24f00c2ab8a WHIRLPOOL 7ab3c198ccab35623991a7998bd421a37b8ec1af653131ed79a3e6728db0b358dc43e0dba31f916aeedff4222ecc3557d6ceabec843bb8f9b87db3d571a883c4
 EBUILD puppet-4.10.6-r1.ebuild 5573 SHA256 49daf4ffbc0311cb92b30b10219da4b421eb4d3d67958394d5078c3b0e22ddc9 SHA512 3ca9a12e808f70aef8b02975804012a7fbe96484b12ccb0a871a3f79686d71f24eda5342d41ce555aa65a827c645631f3f0e9f943b1ce93d6fe4c60eb910dd84 WHIRLPOOL 01521b31871c76e5de3dffc5bb91fb22a9392977976971e69219ea052499aafb7893988e40e746c12c95025306ce2b10e76d1531fd9f1ef93d750c9e209f8fd3
 EBUILD puppet-4.10.6.ebuild 5529 SHA256 f9a004fbb4a13514101692d29cbf23e96d05c91cd5b77bf47ce68f9c0ea58fff SHA512 1c0728ea0ea361c1c551629349ad36e3191a1279400130e4a5fa067a2b9e9022c0537056e78425c9f49abba905972d5607265e7516c302e4c09360a9f344fa74 WHIRLPOOL b55127045d5778b3daf4fc4bc7b82d57a5668bd382d6b3fd0fa73b1a9320fb60c50acdd096aa371521383cb17259c42b5518c95fc448ea438be6ccd2b44d4474
 EBUILD puppet-4.10.8.ebuild 5566 SHA256 d4810b6e8b5a23d4de3290943ff28ed2c76d7585d566529a0ffb0083970ced2b SHA512 ecbad4f16a4789ee47039279fd5a7247f2600d50e80c8a69b2a1c6c1b8988db7e819ae01eb92660029a08b1f442054a41c53666b10ab084c857bfcc3b230d528 WHIRLPOOL eadcc24108873db026d1294a3b9b293eed5bc0ef609a083bc83f8cb38f3dc0e013e90f08a7cd478c660e32f31299fe37bc123cdd7f1daef61d55f9d1cb052dc9
-EBUILD puppet-4.8.1.ebuild 4732 SHA256 4ee2c0ea64544ba7993687e6405f716f51b6f486bb10f23d4bdad763f968b0a1 SHA512 7dcfecdb30c78d673de700786036b0328588d93175ed419e4b84a5a57f4c76b9c09e59f85c3e14bb24c5a0883b5885b4fb9f6878e604a5a939b0c33ecd398f14 WHIRLPOOL b4811641f59d9663fef5c72f07e4a220608fff5a5c60ab3a594d992b2707795d7975088e260c8a5fcacb1c7381708de8cc19e036bb1ace78b9bf1e9429df5ff2
 EBUILD puppet-5.1.0-r1.ebuild 3818 SHA256 6b8f56ce122a09f24f1752fd18d21d67dbbdc0e2b065a240e42838dec5da153c SHA512 cd1fc1ad13ab691c76bbc814285316fb14867ba606dad3e8900f314470e6bce143c77f920a468f7787a6b48e52352aa12884b84ad952ca0c29d67f954157dad1 WHIRLPOOL 5b41c22e086ca783dc3a33bbe3d20664f808508ebf960847dc0616067e948341b91735867624b7c6eed16364a8c60104d279e7dc364d820007609ab8a7b9d780
 EBUILD puppet-5.1.0.ebuild 3865 SHA256 87a9da9798d6ce26a1135e14b287922d8658852a357f1a56c4ad235094db377c SHA512 6a62c22b405fe4b5ef9df3d8878a8ef401e97e4f62d00a681d95c16502805b8e505be0beb9362c7dff361f722de6bcf322fbcde5d45bef5fe4b0f23212bb99ec WHIRLPOOL 4744be2477265de9abda387530b4b28ec49b47a606019f634cb0465a96d35630936c1472e9ad5468fb7b5220415f02a71701e7a135e340cca6a119e43fc2ad39
 MISC ChangeLog 7719 SHA256 ebfd68981bbfd64b0ff92511b97749e56ab20d4663b4190a4ce89fc458a3a40b SHA512 98f3a66da3959b16036bf32851f8881d1928092c5ce64c02819dd9bf8578a2eb142e8f2ced5a85aa6d5b5cf1f15842e8ac9d6b9a851b2efdcab59eca9f2df1bd WHIRLPOOL 6fb9b83691125722682f433be9c49a75d7ee4e9eccc26ab6d273a379508f830b3ba7bf67a87924b4c0722590003f20530e2d9ddb1d29f2d5a0458d070672cef3
diff --git a/app-admin/puppet/puppet-4.10.1.ebuild b/app-admin/puppet/puppet-4.10.1.ebuild
index 77b1ce4bfcd7..0b1f70e67d94 100644
--- a/app-admin/puppet/puppet-4.10.1.ebuild
+++ b/app-admin/puppet/puppet-4.10.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild
deleted file mode 100644
index e2846fe6aefd..000000000000
--- a/app-admin/puppet/puppet-4.8.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#		dev-ruby/rspec-collection_matchers
-
-DEPEND+=" ${DEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}