gentoo resync : 10.01.2018

5 files changed, 41 insertions, 4 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1d7dd47aa3e8..9b11ca030ef4 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 03e931c3d7c9..f3c7f9b75f21 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,5 +1,7 @@
 DIST diskimage-builder-1.28.0.tar.gz 267409 BLAKE2B eec9e9bfba8ddbd31ec1af8fac401c64019c72c19982e7d74eb20f1056571873f5ed8198809b7ebd2ef87deb757a9a81b5a1ec23c83876abed659c1196df2cb0 SHA512 ae13e29563f90a4aaa4f2bee889bca4fd662da41fcffb957ca8a4380907e5d89fbc25ecb93aeda2cb5597776b51417388e8a5e39741250d68a8f7f67239ebc7f
+DIST diskimage-builder-2.10.0.tar.gz 338388 BLAKE2B c30f81f4cf2b0668d96dce49cab3aa79c484b7ee8a7c214bbc6f6f8e405d86e7240309bc266b4ac1cba14f19c82b2d67bd123d3e3e8af073ad8d4831301ae879 SHA512 37c3a6894ed30c69a6abe87524c08aa814158a01b1a5f17bf39ca9e905dd93eaab5a3f821ddddef73eafa5cf33b6cf0b8e30c6067b005c92c6029cdd7af5e8eb
 DIST diskimage-builder-2.9.0.tar.gz 319035 BLAKE2B 846b2f35533efb66c22adb461b849352f17a8555998cf689756c513093d244c714a8e7b8ad7da4fada2b5da9ef3c2ac42f3247568b207e342a71d2ba677abda3 SHA512 ebaeb1d5396977d8391f7c718ff13e7b0d37aca58ff14719e2b5f17adc376e85f15f516f63c245c2374e363d4037bc358192aa87ce0515d0a69cb00ac5b616af
 EBUILD diskimage-builder-1.28.0.ebuild 915 BLAKE2B d638fe4c224637b57c370154ba190f9e6ef0a1e6ff33db7d9699238fea253d6833fa82a012a16bd33add79ec251e12a4a097812de2af579955ed042b7c800c5b SHA512 eb129f8527f64dbaf9f207512b4cb0b5384c546bdda76f9b3c5df4f23b276c6c33ffc4ca7dce9441db97af3cb7216d87c1040dbc85aa6dbb33edc15e24996955
+EBUILD diskimage-builder-2.10.0.ebuild 1102 BLAKE2B e46754ab805eb5ee798c4b5d1e0e1670d67e7c7f9ec3b6baad90786d5552ee914f31f3603f33b9f641629ab3860bcfbd84a1b4b73c95f3b3159d13a3967741fc SHA512 7e6d8694f39a60ad0d9f732af70ee37374361fcad94747caaabf83093b6c85daee790bac5c618770e8efcbcda53999cf6528efa523da6090666c7f14573f5f36
 EBUILD diskimage-builder-2.9.0.ebuild 1099 BLAKE2B 597d2d906519e42687e8ba98c6bbd203d10a8cde757de9c26282f3b6995fad231ca69d6fe6351d2568644b4fd25e3dbd3b3e67b4ac2d3363ffda8600f040e3fa SHA512 0b928a1ca2490eb143bea0d10e9bacf9dd63b8aa82340c72ddad7b3cd6aabe23673390878a75e80aafea6e00b0c19f344dfd5b957780b6e5371012e5b8e6bc1b
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.10.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.10.0.ebuild
new file mode 100644
index 000000000000..b7ce708c6881
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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.10.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}]"
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 19d8e28417f2..9d3824b68f69 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,5 +1,5 @@
-DIST kompose-1.5.0.tar.gz 5184512 BLAKE2B e9b1f7d778e0128add41218c5cef8dc4e0272e85d1345948b73c3529ff6d7e17b05e8a821812e3a5f12f076d5c6c0411fa50be86ebaac54a300b263f705d10a1 SHA512 2b366ed84b5368ab8c8921a989462931edf8f4fe751e3f0ee18f1d6fd6f5bce1534e962e92d7c0d3474ed1c87f8c40b8e2e4eb1d63892ac84a41be79e527a6a1
 DIST kompose-1.6.0.tar.gz 5227025 BLAKE2B e24e5d142db7a1e55c8e2c05db2a7717a6bc178c3ed73ec2732fb10ae39c90dd2da41ce604fc590e8888ef1b92d5ba68821f66f54e2285d90c2bc9e3af3f1da0 SHA512 57e8b3530ad260d0ed6a679119c559f616c45d407db8929797dbf321e32917bc236ac41e1042f65aa8460026d54cb03180e8b8264dadb6fe05ec6d21293140a3
-EBUILD kompose-1.5.0.ebuild 889 BLAKE2B 2b06310bd56dbab18a9a8e8391fb9e3a992dda295f3c4c55e16b2933591b1c20a2ac544080990c3abf09b4d3191c6f8279898025d89475c9364ed2f86ff056bc SHA512 84fa902004e779a8bf0e3bac6d75233a62b12968774d580f4d68b10183f7a024e6e8a4f8d3f563eb6edeccb9e1c975e239b37f1f7ef2c7b893df080ed0b9c3f2
+DIST kompose-1.7.0.tar.gz 5230263 BLAKE2B c2e50ceadaa3f88b5d6a9c6fbca93a0a45a16fb4d208a9194578174d9b67697f70d52f8f7a517609b56acf0cb646a9ca4e9137e1a830646e1084c10aabfd1cc0 SHA512 bcda4d891cdc8a0e331aad3baca9e88be32d302ed1ab89a561874881ec9e1dd04f7158f9315ee59a49d4906cc9d08821a417ff04a8ebe9871edece842b2e85b9
 EBUILD kompose-1.6.0.ebuild 889 BLAKE2B c3dbaa96f72b9bcecfe6bab9ce40c33ab61dc588bae8db80374d0383c7b746d36b15afd5094b67783ef950659cd15d6a3e92e74d111c6cbc702bc156a7d802d3 SHA512 6201ae62bd4bbd69e844e9c4d691414cce1e3fb4792a96813fd4e7060aa987fd23235e40eae20f70b0b96189d6a010957212c1d266bfb59e62f85df3d9bd24ef
+EBUILD kompose-1.7.0.ebuild 889 BLAKE2B 575e0b5251fd3f41ee591cffc6cac87702171d45dc6018ba077db331d069aa0cf6617e3d3bb9a7b474590e9707354c860321b081a5dc6bdf7c8d6f2ad722f7b4 SHA512 b935247e6d46a5fd34c4205da74719b28e31f7329f89f78f8ab5e97b2ba3d3704307500ac5e99face463814763284ab79e66c78b874d80432d116f6e69da1cd8
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.5.0.ebuild b/app-emulation/kompose/kompose-1.7.0.ebuild
index 9c0e44646e8e..db671c77f93b 100644
--- a/app-emulation/kompose/kompose-1.5.0.ebuild
+++ b/app-emulation/kompose/kompose-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/kubernetes/kompose"
 EGIT_COMMIT="v${PV}"
-KOMPOSE_COMMIT="999278f"
+KOMPOSE_COMMIT="767ab4b"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"