Merge updates from master

6 files changed, 34 insertions, 123 deletions

diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 56aa914eac6b..7f1c4f98c254 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,4 +1,2 @@
-DIST mcollective-2.8.0.tar.gz 718292 SHA256 47084f9285707f2e457850adcf90811f3d39d4f4baa950d822b20b45633db259 SHA512 edc3da334dbd3afd18fcedc675c6498edce1c799d9b472f70ebfe1b972e013cba5217ec492ea4128b15d886edaf283246ba70915180f9a10a67f7c0957fd1c8e WHIRLPOOL 0c6461a43c4533334dee420e7a0debfa8aa2e0079b83407c1313a28689b5ecbd891c94740553947bdce4023786eb0e95e497da73108e283619f358d67dac7c0c
 DIST mcollective-2.8.8.tar.gz 1500476 SHA256 503b26cb0beeb505bf9cd2abbb8724c67bc743ffff4fbaddc321e2a4d663b133 SHA512 fad2a277bdcb06adb56e87f545c4b85a4b8039263e7230c7b386c561a04d6f3bf80923733e1087c8090b43da734d6b7efe02e52a757191c3cb3ecab50cc97bb6 WHIRLPOOL 3e7a52b1ce3b705ed6f705067a4ab900a2faa226d19a36f106e2c2c1e4c4fc3e631630c04012ca456f0230f8fcb47dd5bd97f1d2e849af6edde67fac129301d4
-DIST mcollective-2.9.0.tar.gz 1503682 SHA256 93c97ee026986f8e966125551d7e481bd539a98f9f2f2ea94c98c024963ae331 SHA512 7d7dec7e68840bf9aea2890645f5d86389c6be8f84ad330b6ae342edf03d88cdef9f225aef741245a0f9606a46fe9394b9f740b4bf987c6f21ad018c05d84660 WHIRLPOOL 336673cdd5cfba14154435810fdbe3449646df8a85d057fc6a8bfe6d1f1d5fa5b3c4f9d9f470f0fd88d4170cbc1d6af646cfd959661720992dcffb08491657d1
 DIST mcollective-2.9.1.tar.gz 1504607 SHA256 89bc9fbd72846b22220074a57d19bbfac56473649078fc3ac8182cc728159249 SHA512 29fedacb61084e1952afd3b9deb302abde3e763d13630d85dc70f78b0853f5b353fb44ccbd00e48e5864d04bf2c7568d7cbe21b06af31e1da72e52aeef3c04cf WHIRLPOOL 8affee96fa344d12b34b5a4e120029ab315133df6fd6cd456d840ab608ceb2027b9411a6a1a74bc5b9d0b029968255a926de888b7a2a1183d1c7aed195f65f7a
diff --git a/app-admin/mcollective/mcollective-2.8.0.ebuild b/app-admin/mcollective/mcollective-2.8.0.ebuild
deleted file mode 100644
index d79fd3821afb..000000000000
--- a/app-admin/mcollective/mcollective-2.8.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-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}.tar.gz"
-
-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() {
-	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] http://activemq.apache.org/"
-	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.9.0.ebuild b/app-admin/mcollective/mcollective-2.9.0.ebuild
deleted file mode 100644
index 9fc033322655..000000000000
--- a/app-admin/mcollective/mcollective-2.9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="http://marionette-collective.org/"
-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] http://activemq.apache.org/"
-	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.9.1.ebuild b/app-admin/mcollective/mcollective-2.9.1.ebuild
index 9fc033322655..83438dcb2632 100644
--- a/app-admin/mcollective/mcollective-2.9.1.ebuild
+++ b/app-admin/mcollective/mcollective-2.9.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +client"
 
 DEPEND=""
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 31c83dc3ae59..8298634a37fd 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -2,3 +2,4 @@ DIST diskimage-builder-1.15.0.tar.gz 225527 SHA256 cf4d1678110d53c337e94d7968126
 DIST diskimage-builder-1.21.0.tar.gz 248236 SHA256 f40f9f6c5b1ceebe10344d94ad9a87f56fa1724815c755f983198e9eb5de41d8 SHA512 2965192f2148a22ca1eb7bb4ec5705ac9061337cefcb0b6154af7f8c6519ef9ea1d1577bbf1f24957152ff0497003843f58a0fd87a7921eb3d327c6d9a0a3b1a WHIRLPOOL 671a20b9b174ac7d98e5c12a67b7cf79612aa4d961e6e715621a2c42ce990cdf8615f20ba0f80a164889b7dc1693de46520026997ca4a48cdad66b2835ad1a5a
 DIST diskimage-builder-1.22.0.tar.gz 252581 SHA256 1fe46ee35eb764095edaf5d716daefd433b7b8912d7eccc937c6eab83d5ceeb8 SHA512 4bd3557a313f81c7481b9c49eac0a69c30e2b7b5d68eb5fba79e29b8e5bac09cc977ee887177e07fade7095e2fd1fda792287d003851bad5b55c94dc5aeb517b WHIRLPOOL e2721cc5bbc955c3ddd9cfd33ab0ef7e2d5b644ef74a270dcdf1149afb156561d4a2fc8aab3dfcafad1d12ea1d45aa57cd44dcf4fa9e00fec7865fd10a207434
 DIST diskimage-builder-1.22.1.tar.gz 254248 SHA256 cea51e7907a65ddb1f78dd624ec2a0e5f5115ad986ae6ad79586445e123c79cf SHA512 2cfa89e69f110a2cd7bdc90a4119b2d696350e8adac23f205828d36ae25eb7707f05e16e777a804251faf67d0e5c96bffde235831fb5e94e59279cd9ce67cdb1 WHIRLPOOL 9d70e2dca8fd0ad89144b3fcbb7deb1acedcac0a0bd2b55742df0a669a224b35c95313649faa1a93b8f9f590d6e05032bb762786c4b8b2c3e6208e0162f49864
+DIST diskimage-builder-1.22.2.tar.gz 254184 SHA256 17eb76633a2e68a34679f8b3689f44d4de0049e9cb940ae28fa33c28ddef84d8 SHA512 ac483b880a95109d0251b93d6c0e2685daa3cfb70ef685f018387886e554add44a7f6be5c089ed91c85509bb11ff78d762184ae236b64661f331442a5a9ecdc1 WHIRLPOOL fd2a752b5793592f74c489ada298495d94b8258a2f4e76ecb50ff5132ba1a570efb3b9dcc90ede1ef3c6ea257d638090b9bdb71cbbc4fd4c473ad440d73f00d0
diff --git a/app-emulation/diskimage-builder/diskimage-builder-1.22.2.ebuild b/app-emulation/diskimage-builder/diskimage-builder-1.22.2.ebuild
new file mode 100644
index 000000000000..4ea1d4d847b2
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-1.22.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	dev-python/dib-utils[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools"