gentoo auto-resync : 22:09:2022 - 23:28:46

4 files changed, 43 insertions, 2 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3b4dabfbfe76..3d2c4f9d6c89 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 2bb7050aa0ec..b70089f770f9 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -2,9 +2,11 @@ DIST diskimage-builder-3.22.0.tar.gz 507997 BLAKE2B 559203fb5e92ff6b32e3cda6e977
 DIST diskimage-builder-3.23.0.tar.gz 509773 BLAKE2B 5896571442b5e359cbae10df3c504c2a3df48ace6ec52294afbad6c03baf300336d955b0180a174395cad118da42dbacfb395df9b32a85976982ff5194ec9e18 SHA512 080bca891890a02a7a0c6910668ccc966a8f2282f62a8b89cd01d5165b4cb52e4bd198b7a2ff431d86a75acae86e7490389f7053f197947c820925d540a3c934
 DIST diskimage-builder-3.23.1.tar.gz 509516 BLAKE2B 05d0484b33bf965f6f534445a13be3771a486b586d36f13905d351e434a6d04732195b484ec29f5c5792e8343bbd56dffb7393641d3d2902e5bfadb2759d3a4b SHA512 0f881dba486f057e18ce81eeb3eca91fa421e6ad6fe59d5e7c4eda11721fde243e0e233863545d16010386defc23aebf195364615324296393a77bab1ce60359
 DIST diskimage-builder-3.24.0.tar.gz 511917 BLAKE2B 4db5132d449c932202ede7a4d9e9f5711b667c39f3dad51dcd68ec81f49a71bafc4bfb09de363a5d16cac89942385a0b43b1adb31424581ccf0c903c0df5f80e SHA512 1e98e8c8886f2d046ccb2b02a647e294ba2d8bd691168678ef81ddab889f8945bae3c46e5e26ad03e0b2311c367bf3dd5d4bd2f07baab6e2002433ca1dfe0f74
+DIST diskimage-builder-3.25.0.tar.gz 512950 BLAKE2B 3a0c5658df5bc2498d4656b77c152dba9bedbbc342b53b20b88e89327cbb98e9c8e5dd8de97cc0b7b0bd31f01cd4d425e8e2f158bde24746b08a460db4ac79da SHA512 e602a9e8e3a8cef1c3cc62fcb3074183a4028c70f2b9e9c27416b6244773eb7cf2aa33a5bf38dca5f10dcfbee5d80eaffa9287e14beccb065cec3ddaf7a76ff7
 EBUILD diskimage-builder-3.22.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
 EBUILD diskimage-builder-3.23.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
-EBUILD diskimage-builder-3.23.1.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
+EBUILD diskimage-builder-3.23.1.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c
 EBUILD diskimage-builder-3.24.0.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
+EBUILD diskimage-builder-3.25.0.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
 EBUILD diskimage-builder-9999.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4
 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
index bbd75fbe73fb..cfd2e2377172 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
@@ -14,7 +14,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"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.25.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.25.0.ebuild
new file mode 100644
index 000000000000..bbd75fbe73fb
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+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}"
+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}]"