commit:     0a90803ce39ae30f24431b7d4461800f970f95c8
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 22:09:29 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 22:16:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a90803c

app-admin/mcollective: 2.12.4 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-admin/mcollective/Manifest                  |  1 -
 app-admin/mcollective/mcollective-2.12.2.ebuild | 60 -------------------------
 app-admin/mcollective/mcollective-2.12.4.ebuild |  2 +-
 3 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 9f1b417b808..13326e96434 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,3 +1,2 @@
-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

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 e5ded06a825..00000000000
--- 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 866f8f6e1fb..60b5f9e5224 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=""

Reply via email to