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: Thu, 28 May 2020 17:05:00
Message-Id: 1590685491.fdf191c3a5a075c1cd230f4ad11b6dc069591bd1.prometheanfire@gentoo
1 commit: fdf191c3a5a075c1cd230f4ad11b6dc069591bd1
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 28 17:04:38 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Thu May 28 17:04:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf191c3
7
8 app-emulation/diskimage-builder: 2.37.3 use stage3 to build gentoo images
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 RepoMan-Options: --force
12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
13
14 app-emulation/diskimage-builder/Manifest | 4 +--
15 .../diskimage-builder-2.36.0.ebuild | 39 ----------------------
16 .../diskimage-builder-2.37.1.ebuild | 39 ----------------------
17 ...35.0.ebuild => diskimage-builder-2.37.3.ebuild} | 2 +-
18 .../diskimage-builder-9999.ebuild | 2 +-
19 5 files changed, 3 insertions(+), 83 deletions(-)
20
21 diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
22 index 096268af0c3..170e92ebed2 100644
23 --- a/app-emulation/diskimage-builder/Manifest
24 +++ b/app-emulation/diskimage-builder/Manifest
25 @@ -1,3 +1 @@
26 -DIST diskimage-builder-2.35.0.tar.gz 439947 BLAKE2B 9b148948caef031f44992aaa2b0463b6cc9390b0591fdfe6e82d8258becda61eb5aa0d87ae91ed73523057ae357dcf327d7ca9d8d6a1b66da7f2d535d6c32dc1 SHA512 c5ad15c7a793a6c4b17e09fb119ad1444273f930741ae68491ce3a95f416cf8bb76ed0f6df4e34e03359355426c9189f2f5a8b730cb9ffd027a0bbd676f62310
27 -DIST diskimage-builder-2.36.0.tar.gz 441509 BLAKE2B 4f8ec1686df8438c53eb088e52b954d0b84c8f327108599970f987db8de0f5ea7491e123c5f41fa9ff058d8f9d30238a533357b01e1cb671dd1fb3eb96ad28cb SHA512 f3fc13195742b25b8cca72d8b5630900d77f5af69dd9d153c44875e9e8f8f27393a8478a4adcdc05ea9d5b73b742e066edb5ab636bfd8d88c404c8f0fe33f1e7
28 -DIST diskimage-builder-2.37.1.tar.gz 442597 BLAKE2B ea70b0ef7573ae7ccce93bf6792e9866e8799f746ab87db5b2fea4b4c5bb41c18bc4fd1b8fdc7b0bc401be6ed940cf0964391ed235507fd80ebb6a39c811da1c SHA512 5901a13db4a94418bfe0b0e6dde855e32d3286ad31ba922839cba390d1adb79eb36ea7b14133d8e71e712ca562f7ebaa65637c2535276c3ef10b72a3047c3eed
29 +DIST diskimage-builder-2.37.3.tar.gz 444207 BLAKE2B 602a5063d54d3d4bce1a2b5a3e941ef5ad69709733c9aa9543c6b3f7e7ef1bd45399d0fd7e5b2f6dc3dc8f38fba1bf108473f89252c4b9b181f97c4dc02af18e SHA512 fff684c348f5b2ba0d3ae5ce955be4b1d47cead934c96eddcd137b1568961661c949cb53d3134359d0fa8ab753c559b7f83d5555cb6dc8fbd121cb9d05a4a66a
30
31 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild
32 deleted file mode 100644
33 index 092a05de765..00000000000
34 --- a/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild
35 +++ /dev/null
36 @@ -1,39 +0,0 @@
37 -# Copyright 1999-2020 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI=7
41 -
42 -PYTHON_COMPAT=( python3_{6,7} )
43 -inherit distutils-r1
44 -
45 -DESCRIPTION="Golden Disk Image builder."
46 -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
47 -if [[ ${PV} == 9999* ]]; then
48 - inherit git-r3
49 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
50 -else
51 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
52 - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
53 -fi
54 -
55 -LICENSE="Apache-2.0"
56 -SLOT="0"
57 -IUSE=""
58 -
59 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
60 - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
61 -DEPEND="${CDEPEND}
62 - dev-python/setuptools[${PYTHON_USEDEP}]"
63 -RDEPEND="${CDEPEND}
64 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
65 - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
66 - >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
67 - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
68 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
69 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
70 - app-emulation/qemu
71 - sys-block/parted
72 - sys-fs/multipath-tools
73 - sys-fs/dosfstools
74 - sys-apps/gptfdisk
75 - !dev-python/dib-utils[${PYTHON_USEDEP}]"
76
77 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.37.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.37.1.ebuild
78 deleted file mode 100644
79 index 720474e33c4..00000000000
80 --- a/app-emulation/diskimage-builder/diskimage-builder-2.37.1.ebuild
81 +++ /dev/null
82 @@ -1,39 +0,0 @@
83 -# Copyright 1999-2020 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI=7
87 -
88 -PYTHON_COMPAT=( python3_{6,7,8} )
89 -inherit distutils-r1
90 -
91 -DESCRIPTION="Golden Disk Image builder."
92 -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
93 -if [[ ${PV} == 9999* ]]; then
94 - inherit git-r3
95 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
96 -else
97 - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
98 - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
99 -fi
100 -
101 -LICENSE="Apache-2.0"
102 -SLOT="0"
103 -IUSE=""
104 -
105 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
106 - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
107 -DEPEND="${CDEPEND}
108 - dev-python/setuptools[${PYTHON_USEDEP}]"
109 -RDEPEND="${CDEPEND}
110 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
111 - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
112 - >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
113 - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
114 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
115 - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
116 - app-emulation/qemu
117 - sys-block/parted
118 - sys-fs/multipath-tools
119 - sys-fs/dosfstools
120 - sys-apps/gptfdisk
121 - !dev-python/dib-utils[${PYTHON_USEDEP}]"
122
123 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.35.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild
124 similarity index 96%
125 rename from app-emulation/diskimage-builder/diskimage-builder-2.35.0.ebuild
126 rename to app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild
127 index be52861a223..3f1829944be 100644
128 --- a/app-emulation/diskimage-builder/diskimage-builder-2.35.0.ebuild
129 +++ b/app-emulation/diskimage-builder/diskimage-builder-2.37.3.ebuild
130 @@ -3,7 +3,7 @@
131
132 EAPI=7
133
134 -PYTHON_COMPAT=( python3_{6,7} )
135 +PYTHON_COMPAT=( python3_{6,7,8} )
136 inherit distutils-r1
137
138 DESCRIPTION="Golden Disk Image builder."
139
140 diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
141 index 092a05de765..720474e33c4 100644
142 --- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
143 +++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
144 @@ -3,7 +3,7 @@
145
146 EAPI=7
147
148 -PYTHON_COMPAT=( python3_{6,7} )
149 +PYTHON_COMPAT=( python3_{6,7,8} )
150 inherit distutils-r1
151
152 DESCRIPTION="Golden Disk Image builder."