gentoo resync : 24.12.2018

3 files changed, 2 insertions, 64 deletions

diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index bdb04132868b..abbe5243253a 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.12.2.tar.gz 1517725 BLAKE2B e5f2b94843b95fa0749ed7e3e1ae52aeb485bf6644b64d971efd7d7a0e7bc806de0d2b00997c7e36d004fd78c479b9cf19b927e717ad0f3e4c13e820e5481637 SHA512 83be835499adf836797a67adda9be6d1bbf32524560ae51533875a1e2507599c7a0a1d2a76513669b919cf1eeceabdf13162eedb8972c74ecdeba5427b1701e4
 DIST mcollective-2.12.3.tar.gz 1516461 BLAKE2B f8fa65ffadb98ae3511416aaf8b0875486b75f20e4da4007ad70820f453a6ecd81b57d7aa30ae38b014b984330f6c4d525002a54edb2c00d629b6fd4b2250049 SHA512 55798d4579a6be8a7790b046f8b4e72607935c83ec874b6147258d827e0bf279f08dfa121d7cc4a8ed922986aa6bad9ebd62b7e3cbc1e7ef526cf58edce1bcdc
 DIST mcollective-2.12.4.tar.gz 1517723 BLAKE2B e49a43ae7b99a5f22fe33549b26f938941f4e007c164c3c8de77daf2b3410c7db21e5023a400c87a2e4927a5a986e3b66bc3363a0c697ea06f0dd112825ae368 SHA512 f357297253f1cb5815738c8899a543642ce721c60ba023b13a7b14a99049d909622f8500ed82fc68c142cc1ffc106aed5a9bf8b1604a47c19a04a5ef4006b9e5
-EBUILD mcollective-2.12.2.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
 EBUILD mcollective-2.12.3.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
-EBUILD mcollective-2.12.4.ebuild 1648 BLAKE2B c82c9683d230f1201a414859f848a31ef471f932e49d899a9cf6d6da7901bafe0912b114a45e8566c0b5b4c1bb73f40ea1aa2e258a544642367d71dba7531860 SHA512 009f4331fc6e7a664d1c35358660e7e8c04bc8024bcad8a04c3e0cc7a7d15b16fa54887264b828d0dbb099369742ae0438f81cf342d472a1078e9e7c7a9c3eef
+EBUILD mcollective-2.12.4.ebuild 1646 BLAKE2B 36932cbac263d9e0c2d6c0ff41a78d902eb9608d2bbf7a819f97a439feab2e7dfce45d3fd7b5a726a8ff61e87a4c1659efb25ca4a713eb1c4d2fd9313c0bf0aa SHA512 1382a7674f73b359669965fa7c591d4e1c60276b918bb028c36edfead8f9cf7efdb1fa0907d757df5210561602bb4a2345e3d15dca86482335289a71eec1d705
 MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.12.2.ebuild b/app-admin/mcollective/mcollective-2.12.2.ebuild
deleted file mode 100644
index e5ded06a8259..000000000000
--- a/app-admin/mcollective/mcollective-2.12.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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-1.4.4"
-
-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.12.4.ebuild b/app-admin/mcollective/mcollective-2.12.4.ebuild
index 866f8f6e1fb1..60b5f9e52243 100644
--- a/app-admin/mcollective/mcollective-2.12.4.ebuild
+++ b/app-admin/mcollective/mcollective-2.12.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=""