[gentoo-commits] repo/gentoo:master commit in: app-emulation/diskimage-builder/

[Matthew Thode]

commit:     9147cb08089c339804d889d83ca25750f67e14e1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 17:20:16 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 17:20:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9147cb08

app-emulation/diskimage-builder: 2.19.0 stable amd64/x86

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

 app-emulation/diskimage-builder/Manifest           |  1 -
 .../diskimage-builder-2.18.0.ebuild                | 37 ----------------------
 .../diskimage-builder-2.19.0.ebuild                |  2 +-
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 41d33edfafa..01a45d983b7 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,2 +1 @@
-DIST diskimage-builder-2.18.0.tar.gz 357151 BLAKE2B 0516a7028f3ad3d544f575ba61bf04a79d5227008471e6ce5637b762798d3947cb111312ddfd5ca73d39e6b7e01a98ff34925bb30857581e3c135f3da17a4ecd SHA512 64b329ba9494041cd432fa9ff42e15c4b409ed57edbb3c91b791ff2b0d0fce860c32d2d020c36c23c97d9cd100aa287abd98d5e537a02c38d81cd0f9a2578e02
 DIST diskimage-builder-2.19.0.tar.gz 359520 BLAKE2B 2ddbee82cc45267faa45e7fa8b80012096676ca792eed6aee766d24fd3a5297f7f21af94c84259308fd0a48b9c913ba94575333d792b7dcd67c09d6493ff3f2b SHA512 57da6f0507a96f873bc034862dd58649d8d9ff65c7ad83f8245658fed5919b47ac29c5f8d1bb9ff2d544304955c48fa1ff3a183d90ba47bcc8d1f88c09e4014c

diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.18.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.18.0.ebuild
deleted file mode 100644
index d4751815731..00000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.18.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"

diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild
index 4c5588077db..8188442a162 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.19.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]