gentoo resync : 17.01.2010

7 files changed, 48 insertions, 4 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e278691079fd..4d5643257684 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 a0ddd67a0541..3541eab0139f 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,4 +1,6 @@
 DIST diskimage-builder-2.32.0.tar.gz 435328 BLAKE2B 78f306430819d94045e3b8c424cdf7a0fee9a306a317e44cd363d53bbbcd1af1f06731b83b63e490bb8ad3903630daf84a544878b87d6c7f377786778229f276 SHA512 357b56aba979cabd7a857d6646412893361c05a83e4260d1ef468de1d6fb0fbc2582ab8bf37428c56a52fafcf708b86be470f2c885008b10368bc92a2b679a09
+DIST diskimage-builder-2.33.0.tar.gz 434041 BLAKE2B 16d14c68e7a54b785426516ecced4adb53b4e84f36d36846732ef7c4823644375373249ceacd1371e39262ebc9050f2f86184718dc3fb17b44eaa20f561410c0 SHA512 125bdcc0a2d4249918485115c49482746e4f86cb7883d3689afd4288a0d18ca97bcb669b811034ccb159879520172ca37bd9f9d7ba4ea509f788be0f3cf2259b
 EBUILD diskimage-builder-2.32.0.ebuild 1263 BLAKE2B 53663b8d1dbc080a1cf1336ad650fd556981670841a74086ad9f9ca05be86b2fd76c22d5564440b845a4f74fb3465d10934e133f9285a7d75ed16496b16c7e33 SHA512 ff48e15306d9354abc4782b6c375d0c06cff65c61c253d1802f98ef23e2bff87d4c40ec71ef4025e848dcc37f38e6e5eeadc6e81302c9dac170e0765497b954a
+EBUILD diskimage-builder-2.33.0.ebuild 1264 BLAKE2B 82964cc0c5c2883113358048b5beff59606d615eae7572c21243285654d2009809632272e39c3a11d3bf6c4f595d9ae321345687f09477300d00117c26d3ff72 SHA512 f0a6446ac4eacbfc442bd8a9e09f5058ae559ff75de85b0864ce3716b3b81fe51e804b3dd127fe4fb5e290de690fb8a18069ffd323c1708d1dd854f01d381137
 EBUILD diskimage-builder-9999.ebuild 1264 BLAKE2B 00d93d1b48edced670654a2f26195f67ae67db5befd49a7092401cfb707ad7ae54275598788fe6dbf554fd4f745985bbcd7bf0739ce4aede410183b0666e76c4 SHA512 2d3d369188dbca871170f564506a71cfc5d55cfc34fd219de00124cbafbfc680158b6d545b473f3829176f1bb9625f27ce0617d51a6da602a77a6c471d78b5f2
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild
new file mode 100644
index 000000000000..17a0c622b03c
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.33.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+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/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${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/docker/Manifest b/app-emulation/docker/Manifest
index fa256684f35d..dc7e369ccbdb 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,3 +1,3 @@
 DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b SHA512 1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648
-EBUILD docker-19.03.5.ebuild 8425 BLAKE2B 1b0094f3a8060f4f4946a0a53617b126d02fca2f83da1f7199fd570429eb4e8da84276a05d5255ae521f51bfb5964d3918b5ea7d10a0d2a2533c3ee32ab545d2 SHA512 40f9e4c5ee615e5f4157322dcbf017190d48bc01f9e4f1c45f11c4c262da9c841ae49115c162030d1d6ce0623c3d2d3bda7586dfc5362ebe2037d1dfeef225bc
+EBUILD docker-19.03.5.ebuild 8470 BLAKE2B ea84d79fd664afb48a1574ae8a937234374b5b804944ed8f085ace1bf1b991e3f11d51a41421ac6464b40a06afbe8f2ff147fb6f96c21d4d5258234d89067da6 SHA512 1ae25d42dd049c5f892cffe257b8ac2371f42a53caed6cc70078accbdf44926f7486e0a6a8b7ae53b45f62d0d2f615004b4f0039e1083270069fb1643f39c6f7
 MISC metadata.xml 1476 BLAKE2B 08a8d9e0c4b4358c3322d2ec94e518bf366e8928c285d55268966e17f8ff96c517240c70fc3e6012e5480a36e573dee51f30fa5a60f5da0bcd9fcf266841987d SHA512 c32a9008ea8a9abcd2a679b21f9d93ee11854e623b89e94d4840d60d9f9e755fe0a57d40361c2c21fa5961fedfced10ba7bd8ee33c4f98b82842a127a8e8b405
diff --git a/app-emulation/docker/docker-19.03.5.ebuild b/app-emulation/docker/docker-19.03.5.ebuild
index b1fb15056e33..b38d5ab11efa 100644
--- a/app-emulation/docker/docker-19.03.5.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -14,7 +14,7 @@ else
 	DOCKER_GITCOMMIT="633a0ea"
 	MY_PV=${PV/_/-}
 	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
@@ -51,6 +51,7 @@ DEPEND="
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
 RDEPEND="
 	${COMMON_DEPEND}
+	!sys-apps/systemd[-cgroup-hybrid(+)]
 	>=net-firewall/iptables-1.4
 	sys-process/procps
 	>=dev-vcs/git-1.7
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index a97d0fb6e9db..a45a8723689f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -25,5 +25,5 @@ EBUILD virtualbox-guest-additions-5.2.36.ebuild 6144 BLAKE2B 481b5e31515681af45c
 EBUILD virtualbox-guest-additions-6.0.14.ebuild 6029 BLAKE2B 01ce31850fd68be3627d54e8a41961348af2c196804f7dd7d493b8327775597f266d864bc4d5cb3207774513564432ebe4b5e22e98b35cdc5ff9174e5fbf9d87 SHA512 38fbcf0f84665cc003cf188f82f846225e7c4dc9af232a360c1ca28c1dd5303f8df81cf857cfcf9df93ad57ddd4c875d717bba2d9b2355e82767f997957b85b3
 EBUILD virtualbox-guest-additions-6.0.16.ebuild 6024 BLAKE2B 73e9221ff3df2dc003942e83e20a16904ab250405a9727bba557b9b13be249c6fb6db14f82e080b85ba3726f76a4dbe553283f8b19299ed61c103b1ed4020002 SHA512 c60a8dd69d68f60f9fbac5671bdcd42f76ee4c241ae016b498d02b5a7e03af7658dea359c8461893cf3ecaf8e6e6433149b632c919112ba3ea2a903c036d0077
 EBUILD virtualbox-guest-additions-6.1.0.ebuild 6029 BLAKE2B 01ce31850fd68be3627d54e8a41961348af2c196804f7dd7d493b8327775597f266d864bc4d5cb3207774513564432ebe4b5e22e98b35cdc5ff9174e5fbf9d87 SHA512 38fbcf0f84665cc003cf188f82f846225e7c4dc9af232a360c1ca28c1dd5303f8df81cf857cfcf9df93ad57ddd4c875d717bba2d9b2355e82767f997957b85b3
-EBUILD virtualbox-guest-additions-6.1.2.ebuild 6027 BLAKE2B e7c8b68a41e81eeb4e2c744dbd5211ff2e0c6212914e58cb3f88aa94fc709144284b95610f538bd93b6f62a41af702d157afcc3f4f94aace1bd50eaf1da1ee27 SHA512 62c7cefc3b7b9c49a03933046665043682a5d670d19dce4a1a9ac4a6581557d70e3bc9d2b2cf5cfa6fdc3e3dc8f0dd8211f631a2462d4f0030a689df6abd9900
+EBUILD virtualbox-guest-additions-6.1.2.ebuild 5961 BLAKE2B 6da943ce0906fb71b92b0a0d976967005ba7a1604ef1b22fbbf7d314301c9510c302c295898d3370a395180c402ee12819bc6cfd4b866b0289c66491ffa2c3a0 SHA512 db4c607371499c767d0483e749ee0c03a69373077c0f0dae3c5629030c9c41ae8be8d1e4fb9c8b906ae23aacd7abeeda5ca99179e14a569f8623f3100e28818a
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.2.ebuild
index f8665c267102..49b1b01c1e52 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.2.ebuild
@@ -83,7 +83,6 @@ src_prepare() {
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 
-	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
 	eapply "${WORKDIR}/patches"
 
 	eapply_user