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

["Matt Thode" <prometheanfire@gentoo.org>]

commit:     c816ace3ec15ac677c57643984ab64c42c5c3366
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 01:57:38 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 01:57:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c816ace3

app-emulation/diskimage-builder: 2.10.1 stable amd64 and x86

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/diskimage-builder/Manifest           |  2 --
 .../diskimage-builder-1.28.0.ebuild                | 33 --------------------
 .../diskimage-builder-2.10.1.ebuild                |  2 +-
 .../diskimage-builder-2.9.0.ebuild                 | 35 ----------------------
 4 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 0682a9a03e6..7fa901bbb5d 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1 @@
-DIST diskimage-builder-1.28.0.tar.gz 267409 BLAKE2B eec9e9bfba8ddbd31ec1af8fac401c64019c72c19982e7d74eb20f1056571873f5ed8198809b7ebd2ef87deb757a9a81b5a1ec23c83876abed659c1196df2cb0 SHA512 ae13e29563f90a4aaa4f2bee889bca4fd662da41fcffb957ca8a4380907e5d89fbc25ecb93aeda2cb5597776b51417388e8a5e39741250d68a8f7f67239ebc7f
 DIST diskimage-builder-2.10.1.tar.gz 338370 BLAKE2B d2417af55924971ac6c8ee803c7c9bf788ecd9a16affe90077eff51a58924c81e82728eef344749b5687cc26ff9e355a7611f4e2a0a5501217344eb9bca2bb00 SHA512 4c9ff1b7182b3c207d769bdcd142f23a6d9e2a8f040694ab75d41284bb96ad07305ae78e486343f22d13d8c8cbef5c66eaaf4638f0fd8f7158cf3520da587e88
-DIST diskimage-builder-2.9.0.tar.gz 319035 BLAKE2B 846b2f35533efb66c22adb461b849352f17a8555998cf689756c513093d244c714a8e7b8ad7da4fada2b5da9ef3c2ac42f3247568b207e342a71d2ba677abda3 SHA512 ebaeb1d5396977d8391f7c718ff13e7b0d37aca58ff14719e2b5f17adc376e85f15f516f63c245c2374e363d4037bc358192aa87ce0515d0a69cb00ac5b616af

diff --git a/app-emulation/diskimage-builder/diskimage-builder-1.28.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-1.28.0.ebuild
deleted file mode 100644
index c5371ab9162..00000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-1.28.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${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}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools"

diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
index b7ce708c688..dfe685ce809 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.10.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.10.1.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}]

diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.9.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.9.0.ebuild
deleted file mode 100644
index 1bd01d9d336..00000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.9.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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.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/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"