Version bump, ebuild cleanup

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 14 insertions, 69 deletions

diff --git a/app-admin/mcollective/ChangeLog b/app-admin/mcollective/ChangeLog
index 10e300e7d64e..872a242b2d61 100644
--- a/app-admin/mcollective/ChangeLog
+++ b/app-admin/mcollective/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/mcollective
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/ChangeLog,v 1.4 2011/05/26 22:53:12 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/ChangeLog,v 1.5 2011/07/18 08:07:40 ramereth Exp $
+
+*mcollective-1.2.1 (18 Jul 2011)
+
+  18 Jul 2011; Lance Albertson <ramereth@gentoo.org> -mcollective-1.1.3.ebuild,
+  -mcollective-1.2.0.ebuild, +mcollective-1.2.1.ebuild:
+  Version bump, ebuild cleanup
 
 *mcollective-1.2.0 (26 May 2011)
 *mcollective-1.1.4 (26 May 2011)
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 2d28f9ea3f27..2058cf0b97a9 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -3,19 +3,17 @@ Hash: SHA1
 
 AUX mcollectived.initd 621 RMD160 51220a4b6324e325ccaea7cdc6cb899425da62b0 SHA1 8460959b48f92a2d8230ca048ea74b3ab906dce7 SHA256 13a88ac2eaa9221a81fe99eafa3adce490fddd2433b5b3b2b6df89a5fb6aa64a
 DIST mcollective-1.0.1.tgz 169558 RMD160 2443c462db91f6d9af1840f65c49024b293280f3 SHA1 eda65ff7d38b97714ae2bf8b49ffaf8d6a9bd571 SHA256 4dec52151faedd2baa1226102237b894864716d200cb330274c21cc5981e80cb
-DIST mcollective-1.1.3.tgz 235458 RMD160 0f61b5e9dfc9466f48334464e012960aa7f04874 SHA1 32676fe0e2ecb8f95c2d048508942baf1d0445e4 SHA256 7a18e54c3bb0f549db02e7f1bf7d7a7a32f397c84ae128761eb90d86a69b8c2e
 DIST mcollective-1.1.4.tgz 918332 RMD160 a8580c80364e3af8b8eded18037c9e614c3ef0ad SHA1 c58a3d35d8f7f652bdb0ff8ea763620a4a69c822 SHA256 f7c911f17d6af5e98c30d212ee1dcb2829573b23c92a0ec7c2cd1e3f3d364265
-DIST mcollective-1.2.0.tgz 925599 RMD160 933ec0291bbb8f1a3e8be3ca78571136c354e4cb SHA1 1a16ff1cfcf3d360eab706658bfb2e352d6aa903 SHA256 ca77eeb9a151555e671e4bdc343330997f95a0445293a5f125a6e6d1fb2aff8f
+DIST mcollective-1.2.1.tgz 928316 RMD160 812328307885684697021c20dcd76bbc171105b3 SHA1 ebac6933a1938e3a4aa2933cf0afceb3fa6b5744 SHA256 45da06779a1cf9e4efc6f533fa93fe378c6427d6ecc519eea4b53c7ec087b578
 EBUILD mcollective-1.0.1.ebuild 1600 RMD160 6ac6281317e289ba2f2da397b791231a243f4e60 SHA1 1240aab9e65447b51b4d46615dcb2c8ce794d8bf SHA256 84a8e9849fb46f705cd90e1fc0c8c96534063b1365ab135421ab2158b86812e2
-EBUILD mcollective-1.1.3.ebuild 1604 RMD160 445c81652c88beee47daa953e8e4cdf95df1efb7 SHA1 4c858b199cd8bb836706ae35a6ad74179b26d654 SHA256 7a3693c9c3684eb7bc7c6fb2a85f4dfbc8c6a84c7d39f35cc9e804e79e160b2c
 EBUILD mcollective-1.1.4.ebuild 1649 RMD160 d6bbcd674247cd1e4a8d32e0555dc44433bfccf2 SHA1 3e87c62874db0b89a6e49ab9a4630445b5494c13 SHA256 3003e64112bc96516829d98ebba345981a09beb035aef72966574d5b77b3f1ce
-EBUILD mcollective-1.2.0.ebuild 1649 RMD160 cd2e5a255a16b1a0c82f838f5d85052732199bad SHA1 42580fabad51c94e28787c7db9e7e4aa9d7b5186 SHA256 3333ade1f479aa486752d2769a98e2462199bb7d73a5e8dd815c70b9370dca3c
-MISC ChangeLog 829 RMD160 a0b80aebb0bd61ffa1c09a8986c4553ede0db639 SHA1 0570dec1354148be814476365ca27c19e41372e0 SHA256 440ded4deb7571bf504e5617a2417ef57ae05159278148ede18a1c8c5fc6608a
+EBUILD mcollective-1.2.1.ebuild 1649 RMD160 236dc5894e911f40951d36c187105cb85529473e SHA1 5eef06090df0b2bbee0ea95c94352cf8cff580b4 SHA256 38effc1c0d0104ddf5ce100689646e05b37cc3b5295662d497a0cdc239c29ed0
+MISC ChangeLog 1031 RMD160 d2a43eb5532d72229035f55f49735326d2703e26 SHA1 1a08c92313ec66ff02598c247c1dc97670096329 SHA256 3944d752346b796d42d98f8eb8cdeb678edc1266baa5d78decafc51bba9c328a
 MISC metadata.xml 470 RMD160 2f2afc0ff5726560b6e84659c42814061078d7c2 SHA1 fa576d0b32eb70aa790c633991065157425a8fae SHA256 aa9d8a1c1b3f31e83b1bddf79eb516abf5ebf5aaf9d5c8dcccda8c55f658bc93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFN3tnTQW+hXSf0t0IRAoGpAKDh4N3QfhSwsPByKENB9sYUXaKEcwCg4crc
-K3trGojaMRvlX9No9/59IYQ=
-=Mg5e
+iD8DBQFOI+nUQW+hXSf0t0IRAsAhAJ9CAinF+khqf6LsgQ1ticn4/0hl9gCeMFs/
+oeq8+uGF8VD/0tCLyO2P+Jo=
+=7KGR
 -----END PGP SIGNATURE-----
diff --git a/app-admin/mcollective/mcollective-1.1.3.ebuild b/app-admin/mcollective/mcollective-1.1.3.ebuild
deleted file mode 100644
index a0ec3f848e7f..000000000000
--- a/app-admin/mcollective/mcollective-1.1.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-1.1.3.ebuild,v 1.1 2011/03/09 18:37:09 ramereth Exp $
-
-EAPI="2"
-
-USE_RUBY="ruby18 ree18"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-SRC_URI="http://puppetlabs.com/downloads/mcollective/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND="dev-ruby/stomp"
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-each_ruby_install() {
-	doruby -r lib/*
-	insinto /usr/share/mcollective
-	doins -r plugins
-	use client && dosbin mc-* mco
-	newsbin mcollectived.rb 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}"
-		dosed "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
-			/etc/mcollective/${cfg%%.dist}
-	done
-}
-
-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] http://activemq.apache.org/"
-	einfo "[2] http://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-1.2.0.ebuild b/app-admin/mcollective/mcollective-1.2.1.ebuild
index 6c3078c04327..b1b34bc33eb1 100644
--- a/app-admin/mcollective/mcollective-1.2.0.ebuild
+++ b/app-admin/mcollective/mcollective-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-1.2.0.ebuild,v 1.1 2011/05/26 22:53:12 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-1.2.1.ebuild,v 1.1 2011/07/18 08:07:40 ramereth Exp $
 
 EAPI="4"