gentoo resync : 10.03.2018

4 files changed, 16 insertions, 40 deletions

diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index df1d07087c43..501d6294a28d 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,7 +1,5 @@
-DIST tooz-1.48.2.tar.gz 78227 BLAKE2B 22155e51f52db5139ddf3156731071f77abc25192b86a9f758e775b966eee745d46da3ce4fb425c002a7fb56dbce0a168416087e453a35e2083b95fe523b8ed6 SHA512 47d3212e082c509fc44ac8baff6e66c490f065652f7fb1ae7791efcfb228d7ef4c17450727e81140810b9912bc2ab5bc18cac5f72c010e705bda0b2ee1b47d9c
 DIST tooz-1.58.0.tar.gz 81688 BLAKE2B 06e282850c549261a312d5381ac9004d13c96a90b10b3f682f2edbe3df5a1b4516a2e618d40d4625242fc18408bb38de56d1c9a58a998b843dd5c98f3d89917c SHA512 44886aed3b37e2a9cb2896fa30e22c7101f19fa766c75a2d7c82c9bcd13b47804ba6d140fe65d2b7c7f3ce3e12bf2f19fa1e92a8e147103204a608aba28f5ccd
 DIST tooz-1.60.0.tar.gz 85364 BLAKE2B 7c1f8cca02830accd5c72d09333f027a02d79944402affc80bb645c11a5a6ecbf94dc8acb62a1d1e98773458763a289134fe8603291e32b25dac507c68571a7d SHA512 610b7d30ce68954a687237c02d5529e93c1babe79bcf16de3674ae3c1d395202738a01dea91f8ffcb184717d884f777300152f54e6f971a4a42fc8bd500ad982
-EBUILD tooz-1.48.2.ebuild 1124 BLAKE2B 7c93a38f093ed6da5380d84150dc159847639fbaf18894983adfae4ec65f9845a51b5f62c68ffc34cc987088adfe01126e6b913c79f86fa1df929a170098821e SHA512 3f973f5897bfc5abdf1a43e15dba4c76b125e059d975999ba3c5e537f6ed1f9678213400c73c46afc3a2a8abe61cf45cb6866690890692ba203c02fa9b64987a
-EBUILD tooz-1.58.0.ebuild 1124 BLAKE2B 7c93a38f093ed6da5380d84150dc159847639fbaf18894983adfae4ec65f9845a51b5f62c68ffc34cc987088adfe01126e6b913c79f86fa1df929a170098821e SHA512 3f973f5897bfc5abdf1a43e15dba4c76b125e059d975999ba3c5e537f6ed1f9678213400c73c46afc3a2a8abe61cf45cb6866690890692ba203c02fa9b64987a
-EBUILD tooz-1.60.0.ebuild 1124 BLAKE2B 6bb3713c4d5fa535a14527e41efd6d5f449c5696bbdf08e7845fc0d553943b804d9571afbde0d3a2dbc837d619efa556ed3a72c4aff7e332a719191a535f58eb SHA512 769c015a79e6a92e5d06e5f9e20af9e59ae290da99d69a28d16456020ed4f380568577c13c99b226415d6ea22fa2ab7f66961324e540e49eca2badb2040f6f6b
+EBUILD tooz-1.58.0-r1.ebuild 1263 BLAKE2B ca34f0ecbf42876e1a4a862abb48dd2aa7881ea64f3d3dee11a9746b17b9ace9da37001b63df9b3463ea0e1fe3d6f751d824a527d4be178d0c18f57da4798eb7 SHA512 a6f2d3710582f9de384c2e95f8dab9ad91a8233db536b32a21e94ff4e0655966048ea8394a32daf5d20b4d755ad6ddae8c0e778bb69e6c9a429c64bca0f7e1be
+EBUILD tooz-1.60.0-r1.ebuild 1264 BLAKE2B 3e6be13bf6fe8ca059def056bd0f6a353580b516bfd2ad218eb6d3ae0a59e0f07f9ecdabf11f4f54e78814c04be231ca50914342afb8f82fff453000e2a58577 SHA512 0e68d141b012e69de7c732f87a9da91cc06ad42e10821ed01d0cd83576396df93cd1579d39190a542e19f4593042154c5d43da24ed228624b815ccf45f44e700
 MISC metadata.xml 614 BLAKE2B b93f65d4b322a9cdd753886cfa8d506676fcbea6c8ab9656c310b245b42aa296667db500584fd19295fa978543834724c17358591f8450cf761907a83cd04d22 SHA512 2185ff992babb09b9c51b350c94237ac4d48e3b10ee118871f59aeb2a265f34b86f798b46c272db76a976d83f1cd005a01e4c965476227334084b0e1ff10d1d6
diff --git a/dev-python/tooz/tooz-1.48.2.ebuild b/dev-python/tooz/tooz-1.58.0-r1.ebuild
index 70e4801997bc..f1c631a6d9ca 100644
--- a/dev-python/tooz/tooz-1.48.2.ebuild
+++ b/dev-python/tooz/tooz-1.58.0-r1.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
@@ -31,4 +31,10 @@ RDEPEND="${CDEPEND}
 	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	"
+"
+
+python_prepare_all() {
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/tooz/tooz-1.58.0.ebuild b/dev-python/tooz/tooz-1.58.0.ebuild
deleted file mode 100644
index 70e4801997bc..000000000000
--- a/dev-python/tooz/tooz-1.58.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library centralizing the most common distributed primitives"
-HOMEPAGE="http://docs.openstack.org/developer/tooz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
-	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	"
diff --git a/dev-python/tooz/tooz-1.60.0.ebuild b/dev-python/tooz/tooz-1.60.0-r1.ebuild
index 63b851ef4d9d..1d97d2da6418 100644
--- a/dev-python/tooz/tooz-1.60.0.ebuild
+++ b/dev-python/tooz/tooz-1.60.0-r1.ebuild
@@ -31,3 +31,9 @@ RDEPEND="${CDEPEND}
 	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}