commit: 35649487cfe6fbc975d7337e4c9e1faab14de1d9
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 9 17:51:40 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 9 17:58:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35649487
dev-python/tooz: allow usage of renamed msgpack
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --force
dev-python/tooz/Manifest | 1 -
.../{tooz-1.48.2.ebuild => tooz-1.58.0-r1.ebuild} | 10 +++++--
dev-python/tooz/tooz-1.58.0.ebuild | 34 ----------------------
.../{tooz-1.60.0.ebuild => tooz-1.60.0-r1.ebuild} | 6 ++++
4 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index a139543bf7e..71677dbd3d7 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1,3 +1,2 @@
-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
diff --git a/dev-python/tooz/tooz-1.48.2.ebuild
b/dev-python/tooz/tooz-1.58.0-r1.ebuild
similarity index 85%
rename from dev-python/tooz/tooz-1.48.2.ebuild
rename to dev-python/tooz/tooz-1.58.0-r1.ebuild
index 70e4801997b..f1c631a6d9c 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 70e4801997b..00000000000
--- 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
similarity index 88%
rename from dev-python/tooz/tooz-1.60.0.ebuild
rename to dev-python/tooz/tooz-1.60.0-r1.ebuild
index 63b851ef4d9..1d97d2da641 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
+}
