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

[Matthew Thode]

commit:     193003e2b1001ac392a11044100436f41df4e47c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 23:31:07 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 23:53:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193003e2

app-emulation/diskimage-builder: 3.1.0 stable amd64 with cleanup

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

 app-emulation/diskimage-builder/Manifest           |  2 --
 .../diskimage-builder-2.37.3.ebuild                | 39 ----------------------
 .../diskimage-builder-3.0.0.ebuild                 | 39 ----------------------
 .../diskimage-builder-3.1.0.ebuild                 |  2 +-
 4 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 7e7403aa956..ce27588ce8d 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1 @@
-DIST diskimage-builder-2.37.3.tar.gz 444207 BLAKE2B 602a5063d54d3d4bce1a2b5a3e941ef5ad69709733c9aa9543c6b3f7e7ef1bd45399d0fd7e5b2f6dc3dc8f38fba1bf108473f89252c4b9b181f97c4dc02af18e SHA512 fff684c348f5b2ba0d3ae5ce955be4b1d47cead934c96eddcd137b1568961661c949cb53d3134359d0fa8ab753c559b7f83d5555cb6dc8fbd121cb9d05a4a66a
-DIST diskimage-builder-3.0.0.tar.gz 434880 BLAKE2B 1b51540c023852ef363788821844c34dacc33021412cf94aad5078adc526ff66693a1d7109610b4aeb0aecf3fbfa0725f7caecc471e7c6df56d266723d1411fe SHA512 dd45f8dbfd8d3af3b5862564af1a5585adeb3536fc701cd186453eba82ef85d5b2f6a95abb820f658e0332b466fec097c52f041dfe61127d58da80a0c4d9e84c
 DIST diskimage-builder-3.1.0.tar.gz 434813 BLAKE2B 7a9fa54353f9b7edc2f1f1dab965b8241cb8b046ef56f12ed3562c04a8c6e236a7be41fbe75c385b48c4f2b8b30e961d8b86499e79999c391dde9c2f294f1193 SHA512 0b8a0b6cee9c7fcee08d8e5d706add2e54dfe1b7726b169f357022a48a37e351b159a7426771a001b703ca4360905f318ff91d0e72cb2d92e3486607186d03c4

diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild
deleted file mode 100644
index 3f1829944be..00000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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/pyyaml-3.12[${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-3.0.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.0.0.ebuild
deleted file mode 100644
index 720474e33c4..00000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-3.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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/pyyaml-3.12[${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-3.1.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.1.0.ebuild
index 138f062d668..eb2fd2aa7c2 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.1.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.1.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"