Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/diskimage-builder/
Date: Sat, 01 May 2021 16:54:28
Message-Id: 1619888061.5abb12c3fe4a792549aa9642b6ebcd5ea6e913bb.prometheanfire@gentoo
1 commit: 5abb12c3fe4a792549aa9642b6ebcd5ea6e913bb
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 16:52:52 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 16:54:21 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5abb12c3
7
8 app-emulation/diskimage-builder: 3.10.0 stable amd64/x86 with cleanup
9
10 3.11.0 bump too
11
12 Package-Manager: Portage-3.0.18, Repoman-3.0.2
13 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
14
15 app-emulation/diskimage-builder/Manifest | 4 +--
16 .../diskimage-builder-3.10.0.ebuild | 2 +-
17 ....8.0.ebuild => diskimage-builder-3.11.0.ebuild} | 0
18 .../diskimage-builder-3.7.0.ebuild | 39 ----------------------
19 .../diskimage-builder-3.9.0.ebuild | 39 ----------------------
20 5 files changed, 2 insertions(+), 82 deletions(-)
21
22 diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
23 index b6570b705db..d3456d246d0 100644
24 --- a/app-emulation/diskimage-builder/Manifest
25 +++ b/app-emulation/diskimage-builder/Manifest
26 @@ -1,4 +1,2 @@
27 DIST diskimage-builder-3.10.0.tar.gz 474514 BLAKE2B 75e54b58be31a1d175ea97fd587040d2d8a69619fa66f7283866241c8a38b898c7e863b484be1199b61fe5fce76f51a4e5bf72d42fbd5d5456b1402501c337f0 SHA512 678718eb12e024899d0020c0219899e213a69a445afe3352a49a99dc786d7388e0af37c0fb1273eeb2176ad3b24f62f8299b4f15e9f7fc9714f03be3bf3b4f7c
28 -DIST diskimage-builder-3.7.0.tar.gz 472703 BLAKE2B 4c3bf294f33556525f65d29e999cccaa4066d42f8e17742041666872ac01f5c6acab77d20b5d4281cc385a3f6988086e43c36f5330a656e5d2cb73c2e63e346d SHA512 c4453840f043774446e8dcb88bdc841d2fee8fb60432168fe48048171896932f2be9048fb0af9c5b777978218ec51f24bdfd6484a8e6cbe7a195b6df2508a1e1
29 -DIST diskimage-builder-3.8.0.tar.gz 473795 BLAKE2B 86ce05ac649ff0faef90d9dd6f2677d6cc609e2fa4613ab00b88f75b861e586650f4a74ea01d1fb68745581d043b0dc7d8f3c9e8437ee16003a34ffc617ab513 SHA512 f3e553746f77545cf6cfe7fad706000bfa9761878f4481bae5fe8d06118c2e0360a7af220e89fe3d65320a6a2ae8b4f4ae69259fa9455bebe8bae8b07acff455
30 -DIST diskimage-builder-3.9.0.tar.gz 473797 BLAKE2B 79654b7d5673d084e81850be102174b509c43fc598b54455256309abe9e503db779be03a440cd5bc6c37fd890bba9412cd8850dfc2bf855f7d8bf69e1e26ee6e SHA512 8be45bef3680b7a5c7aeb1a301a09ace26db51b4f842a7fdb19194a82cc3436e18296e9a3b88a75cfeccbd14e9098d6ad83f50ca44f7eaeba85accf4ef54e7da
31 +DIST diskimage-builder-3.11.0.tar.gz 475123 BLAKE2B 2d286193c99077b943ddc2342871878d78380c27b247cca895d14e9ca1ca69c3d260fe0061e9f09a80156cee327234ce0a8c129f2008422d0db1bd736175f490 SHA512 083a3dff0ec32cd35cb5a95f25b115778aa4b74ab47796c13ac007fa6af5940140117eb4c2b5f44674316f65b0c0b53b6e077787e8018f6d7735906d333d2da0
32
33 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild
34 index 4c39e9fb0b8..3e9683aa3bc 100644
35 --- a/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild
36 +++ b/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild
37 @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
38 EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
39 else
40 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
41 - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
42 + KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
43 fi
44
45 LICENSE="Apache-2.0"
46
47 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.8.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild
48 similarity index 100%
49 rename from app-emulation/diskimage-builder/diskimage-builder-3.8.0.ebuild
50 rename to app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild
51
52 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild
53 deleted file mode 100644
54 index 3e9683aa3bc..00000000000
55 --- a/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild
56 +++ /dev/null
57 @@ -1,39 +0,0 @@
58 -# Copyright 1999-2021 Gentoo Authors
59 -# Distributed under the terms of the GNU General Public License v2
60 -
61 -EAPI=7
62 -
63 -PYTHON_COMPAT=( python3_{7,8} )
64 -DISTUTILS_USE_SETUPTOOLS=rdepend
65 -inherit distutils-r1
66 -
67 -DESCRIPTION="Golden Disk Image builder."
68 -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
69 -if [[ ${PV} == 9999* ]]; then
70 - inherit git-r3
71 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
72 -else
73 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
74 - KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
75 -fi
76 -
77 -LICENSE="Apache-2.0"
78 -SLOT="0"
79 -IUSE=""
80 -
81 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
82 - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
83 -DEPEND="${CDEPEND}"
84 -RDEPEND="${CDEPEND}
85 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
86 - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
87 - >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
88 - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
89 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
90 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
91 - app-emulation/qemu
92 - sys-block/parted
93 - sys-fs/multipath-tools
94 - sys-fs/dosfstools
95 - sys-apps/gptfdisk
96 - !dev-python/dib-utils[${PYTHON_USEDEP}]"
97
98 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild
99 deleted file mode 100644
100 index 4c39e9fb0b8..00000000000
101 --- a/app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild
102 +++ /dev/null
103 @@ -1,39 +0,0 @@
104 -# Copyright 1999-2021 Gentoo Authors
105 -# Distributed under the terms of the GNU General Public License v2
106 -
107 -EAPI=7
108 -
109 -PYTHON_COMPAT=( python3_{7,8} )
110 -DISTUTILS_USE_SETUPTOOLS=rdepend
111 -inherit distutils-r1
112 -
113 -DESCRIPTION="Golden Disk Image builder."
114 -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
115 -if [[ ${PV} == 9999* ]]; then
116 - inherit git-r3
117 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
118 -else
119 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
120 - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
121 -fi
122 -
123 -LICENSE="Apache-2.0"
124 -SLOT="0"
125 -IUSE=""
126 -
127 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
128 - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
129 -DEPEND="${CDEPEND}"
130 -RDEPEND="${CDEPEND}
131 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
132 - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
133 - >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
134 - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
135 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
136 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
137 - app-emulation/qemu
138 - sys-block/parted
139 - sys-fs/multipath-tools
140 - sys-fs/dosfstools
141 - sys-apps/gptfdisk
142 - !dev-python/dib-utils[${PYTHON_USEDEP}]"