gentoo resync : 25.11.2020

4 files changed, 27 insertions, 49 deletions

diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 9aa14a58ceb2..620ea1be1e23 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,3 @@
-DIST oslo.context-2.22.1.tar.gz 29315 BLAKE2B 89c7dacfe42a9c3cd8d7fde8a77e3654f48788909cea725151e833a305c6916534919496393e603084311625cc9242661e72cbf1a2bdb72bedca3127e77ca9d9 SHA512 d0a3b9e41d23e8f642f8aacd998f6d6f4ad1fbf103947fc7403a57c4e3d9ae51b3cf73dfb79139d541875a0e412ed8600c4ce6b19cc207697429f48a7fb72887
-EBUILD oslo-context-2.22.1.ebuild 1271 BLAKE2B 7c90620d1478dff470d3331f442488edcb5ee9224c9e2a84421759731b884b9444b37e70760aa60a0a735039465540541bcfe0b5cd60ef848f6e57ba25167fc0 SHA512 4008caea05cf43592beed2a1aea0b88e9da14bcdbadb51da0ce4993d5feb7fff51ff87a0943f1aff3757670e33b597c9d997148b66d248cf024ab8dcc594c039
-MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
+DIST oslo.context-3.1.1.tar.gz 29335 BLAKE2B 2179e5c273b5e387806fc4a8b1ac2f0641f4cc9f2345cb00e6ef9c2e7c8b69709c0c14dd11254d026283b2be7e032044b6f753a13f062915db9f000ae1873f1a SHA512 a9d16475bac5aa96d086019632f417fa5b496f615b814527e547a43362f1e36ed47c47266032e72194f88716237ccff7a24bf941d66bf36afe09b846a810583b
+EBUILD oslo-context-3.1.1.ebuild 682 BLAKE2B 518ad43344d452271e64ce78d368de0f803968d11eedc2437ddf34f93a189c232caefba839a529ba36202ba0fdfd3221085cc8c5ed16e6f813008bbcd2f702fe SHA512 fba12ba63ded93e31933c75cd9eba159ce43929a517ddd747adfb57897486ab39b0ccdf8657b267b266d4b02fa238bd4f02aac82a463859a0cb4e3fc16a6df5a
+MISC metadata.xml 725 BLAKE2B fb817231aed63e38c9e093cdbfe155521da1c3b7fb3b1d8ea6b7d2b0b1fd4fe8afd647819e1a216f3a591ef8c1f67af78bdfaf0ea75e83cd72617a4dfd679ca9 SHA512 b399412459dbff332edd84c87867cd95bb8cf5dd3b91b15b79f4eecbd577076c4b83fa251f4410a9cf9fa5608287048442786d6f90a0a7d5a3ead11b0a9a4548
diff --git a/dev-python/oslo-context/metadata.xml b/dev-python/oslo-context/metadata.xml
index b621cf95e226..1126ed1837f2 100644
--- a/dev-python/oslo-context/metadata.xml
+++ b/dev-python/oslo-context/metadata.xml
@@ -12,6 +12,7 @@
   <longdescription lang="en">
     The Oslo context library has helpers to maintain useful information about a request context. The request context is usually populated in the WSGI pipeline and used by various modules such as logging
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">oslo.context</remote-id>
   </upstream>
diff --git a/dev-python/oslo-context/oslo-context-2.22.1.ebuild b/dev-python/oslo-context/oslo-context-2.22.1.ebuild
deleted file mode 100644
index 945f4d2d90c1..000000000000
--- a/dev-python/oslo-context/oslo-context-2.22.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.context-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# This time half the doc files are missing; Do you want them?
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
new file mode 100644
index 000000000000..6fdb9232b6e0
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Helpers to maintain useful information about a request context"
+HOMEPAGE="https://pypi.org/project/oslo.context/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
+S="${WORKDIR}/oslo.context-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"