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

[Matthew Thode]

commit:     40cadb96635fc158e77e2622d408b06c7f38d8f4
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 15:13:51 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 15:25:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cadb96

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

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

 app-emulation/diskimage-builder/Manifest           |  1 -
 .../diskimage-builder-2.23.0.ebuild                | 42 ----------------------
 .../diskimage-builder-2.24.0.ebuild                |  2 +-
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index c7ea608b636..6b0c7996087 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,2 +1 @@
-DIST diskimage-builder-2.23.0.tar.gz 403817 BLAKE2B 14b67dc456bd9dab13a534f0f6df27b8a74514966ad965b401d33274d37ee2f201fa1dcd64b2c04a7503ab1f6a893dc40b5145c9559a7be74a029e2da226758a SHA512 89b2ee7eda56c610b9c343edd51276d54eb129ce319cf7f0fdebbccd1bba52903d16a71f1558bb76d2011d5267ffbc62bde94f5d7fd5aabdab2bc82abf10c685
 DIST diskimage-builder-2.24.0.tar.gz 408702 BLAKE2B 069083aef6214d59d9731a13691c2b48cb354085b698c8f711b3cd93c54d44acb08487510b2b9b038a53c533ea17f41b2521c36eee643c09dc409ea13c21fa6b SHA512 90bf13059f9310f3b45bf7c1a550d837e4d73920efa2af2ae30ec3cd5118d3db223b6953d5209ef0f7029c23f17772de1a36cfba87d7e86bbe8a481aa4ee0639

diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild
deleted file mode 100644
index 2d515286fbc..00000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 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/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-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.3[${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.24.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild
index 86d3bb124b3..20cf3dfed3a 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.24.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"