gentoo resync : 02.12.2017

3 files changed, 4 insertions, 66 deletions

diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 93785ccc574d..da0c6bc8ee02 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,8 +1,6 @@
 AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
-DIST mcollective-2.11.2.tar.gz 1516590 SHA256 aa3664d5ba2d4d20e448c374c315c91d55b5bb43918a04092747a4052bc3f969 SHA512 1dc393fa1a09c5151b64b84086ef9af934feeebd2700a00cc4c84696fa2a25d90a410a373b553198f5fda6e1e36808ffb8dc38edcb15bb9e4253998aa7504439 WHIRLPOOL f808d4f9ffbf733842dd29f8e0548b90a4705f8b502dcc62509380b013d69de786204025490d4fb67d657e5c6597fb0d3ffdac2724e8dbca6347511ef50be54a
-DIST mcollective-2.11.3.tar.gz 1516665 SHA256 b9080779fa56c2b77a3f37404b3ac933183e0b0940e6086b0060be2c44aa38d3 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8 WHIRLPOOL 69e384489c8138aecc0c404dc9a08e5d92e09deab05a43ab4781b77506f4fe6f3bbd1a9ec9399a59e8a7c89d3462d3062d73a50fae490215628826c2794bd9ff
-DIST mcollective-2.11.4.tar.gz 1517194 SHA256 2bf8425a50023744e28f26efd64931d6383b216e9918e1df49276bc5477e4493 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b WHIRLPOOL 4e6bed8bbfbd9bf08c3380891321dd2fb673ffd4408acdd0e63c14ca3896d07014f6b034814f98ba89b52818522d49f4ad95d114cb940966ae13409f16ce9365
-EBUILD mcollective-2.11.2.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
+DIST mcollective-2.11.3.tar.gz 1516665 BLAKE2B 1610ee73bc44bce3da458c150837c1462a7a1168e8d96acd4ed0fa1a29d1f08bd20fb263cc219f3485e813c669937d8f4ea6243070e8e9bb5a6112e9cdcb5b89 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8
+DIST mcollective-2.11.4.tar.gz 1517194 BLAKE2B 8723d433e4b8e07b4aecd8c9d13c322ba3e3b6cb7153dbcbbc2e2463fe0ddf48c7b1c1d659e8a28278bb2fa4ec6b3da2f148117b3633b8148f9ba5a0aaabc4b4 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b
 EBUILD mcollective-2.11.3.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
-EBUILD mcollective-2.11.4.ebuild 1643 BLAKE2B 0cb1d859671f6295f0d7d5d6bb9a7855966843fa2e643db13796fdc53ecf8d9f4a01a0f7024a270dbfa99448a90737c517ad2dc304828d506a8ddbce948cce5a SHA512 1b57aebd8141f77295a4fbae23c5a25889373e41752f4eefeeb96a856f0c7b78390687eb38bce1d901e5a348f3e55ed6af4dc648d89a19e0168a1de8f30b55ec
+EBUILD mcollective-2.11.4.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
 MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.11.2.ebuild b/app-admin/mcollective/mcollective-2.11.2.ebuild
deleted file mode 100644
index 1e7cca4d5674..000000000000
--- a/app-admin/mcollective/mcollective-2.11.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="https://docs.puppet.com/mcollective/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-each_ruby_install() {
-	cd "marionette-collective-${PV}"
-	doruby -r lib/*
-	insinto /usr/share/mcollective
-	use client && dosbin bin/mco
-	dosbin bin/mcollectived
-	if use doc ; then
-		dohtml -r doc/*
-		insinto /usr/share/doc/${P}/ext
-		doins -r ext/*
-	fi
-	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
-	insinto /etc/mcollective
-	cd etc
-	for cfg in *.dist ; do
-		newins "${cfg}" "${cfg%%.dist}"
-		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
-			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
-	done
-	insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
-	einfo "Mcollective requires a stomp server installed and functioning before"
-	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
-	einfo "any other stomp compatible server should work."
-	einfo
-	einfo "It is recommended you read the \'getting started\' guide [2] if this"
-	einfo "is a new installation"
-	einfo
-	einfo "[1] https://activemq.apache.org/"
-	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.11.4.ebuild b/app-admin/mcollective/mcollective-2.11.4.ebuild
index 795e37902641..1e7cca4d5674 100644
--- a/app-admin/mcollective/mcollective-2.11.4.ebuild
+++ b/app-admin/mcollective/mcollective-2.11.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +client"
 
 DEPEND=""