gentoo resync : 03.03.2021

5 files changed, 4 insertions, 109 deletions

diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 86d6834242b9..f9d1d8ef69b2 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,6 +1,3 @@
-AUX jaraco-context-3.0.0-useless-deps.patch 2133 BLAKE2B 8db1fea20763661a3d6786536de6ed956a1e3f2952a96f7242b5735f2ed782496dcc662259921e4eb2967655da4f94ad7262f282caf3bf15428c704f4a38890c SHA512 16608605a401fbd002714043da0a7a28fc770f8972a808d71da19733fe1992f7f1f27f1d87462900c980bd14ba4c493349e5802f735e795a2e2c3d7012d2773f
-DIST jaraco.context-3.0.0.tar.gz 12901 BLAKE2B b0a18d8799de211c9827a708302798372dff06767fbac08f4bff8ed48e1dde4cca8d3896a3c4dccd186efdc4d80ffe2b972a05e8f351ec53dcd0c7dec45cfcea SHA512 fd48a9af65edea3212c194758ba1a8fc2d7efc35f7eaec959a7f327ad46d1bf15f295af29d62726f813d35baaeaff35bc3fcd6e27a0e0f272232772e1cb87c17
 DIST jaraco.context-4.0.0.tar.gz 11257 BLAKE2B 38faeb6036ebd2fc6cea9f29dc7fbd89b0ea60819e280e36c8c4f0f90e9ba2552524bfc0f3fc16601cd43276d19e166d9de4107ced885f88dea11efbe0a79913 SHA512 ec76e03d3d5a2148dd49159b303ee278501b9744d3e4d096d6aca516658fb04da020d1cbb1c8eb3dcb58097266e0419883d23e4064c295ced3846540177e57ee
-EBUILD jaraco-context-3.0.0-r1.ebuild 952 BLAKE2B bd9b7fc0713917e034fc2a820cdbf664955a901e9a6e0ffdd5185fb935963aca72d1820b8e8b6dd67a01167058476cb44bdf0a9bf307e81bced6191ef94c249c SHA512 27a3d05a5764908a70575eeafd9e0f58fb9ca61b4128b5693366e32aa990d264513b2fc5100f1d6e77d89ee331c7865bd8ad052931bf8270d010ef131c72dbb3
-EBUILD jaraco-context-4.0.0.ebuild 582 BLAKE2B 37a6a83d0b98850f6a78575cf127dff19e5a54413b5f2307c67bdc7bbae671906aa07424f5ad2bd03ae821f2358c5e869fef11efd144f7f8bda34383cee25522 SHA512 3fd0d6021e91ac74d51a7f3c2b04e7612a240beb48ae3d1681835683d4b65adca88798a7ac36ee393e88a478dc14942ebc9e923da852175b794a96c9cd256344
-MISC metadata.xml 317 BLAKE2B cfd50bbe9635fc0ceb2d21cf84d762cf58fd40f66e9ede979905602ff5d2845795f28df6064478076030f3b56ed4799cb92604f1be2a81bb55201295d5e98b75 SHA512 b519a157b94749a5fcf760018711e956b2bb7dfe776843493afa04dc37e7c46c659f47ce4d4b8e220fd57f26e030576b5f4acfd8c6e76d1fe97609046419e721
+EBUILD jaraco-context-4.0.0.ebuild 577 BLAKE2B f5fe7fcdef462188996a0567ee395984701b223d4cff64c39f5fdb62a1b7801ab6f5e3c3cf975afe604c5e4b8b65c93f6ab8d0665495806f34c469dfbbbcae8f SHA512 2c1d3f1bd972e21e0d32a81a737b1286177f9250306b5e902c12028f157b145d0ce28c3a61bcbe89317b20a259314a8f0f77cbd5c0c914e39d92cfcfdaa33734
+MISC metadata.xml 341 BLAKE2B 5bd7c572c056011422868ab3b241750093ae67ba18da6734d7c32fa420ce9c5c2bf9176f8cd17efab2267a999342b16367bdf566c8d91edc02cf55430e86d7c0 SHA512 4b51ee5ca8dd65994777696c640dde59564bb124c4cd759e6a2462391c3f98fb0410e1744c2863ef5b19e47c8e54a23904336e3e9ae35e8a17b5c351fcc6f734
diff --git a/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch b/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
deleted file mode 100644
index 3b69581ab2b5..000000000000
--- a/dev-python/jaraco-context/files/jaraco-context-3.0.0-useless-deps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e3a1f344c296f9d6193f4bf2ac1e0cdafcddce0e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 20 Jul 2020 18:11:31 +0200
-Subject: [PATCH] Make jaraco.apt & yg.lockfile imports optional
-
-Handle missing jaraco.apt & yg.lockfile modules more gracefully,
-delaying the error until dependency_context is actually used.  These
-two modules are only used by the dependency_context, and this context
-can only work on apt-based systems, so there is no point in forcing
-the extraneous dependencies on systems that do not use apt where
-jaraco.context is being installed for other context managers.
----
- jaraco/context.py | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
-diff --git a/jaraco/context.py b/jaraco/context.py
-index 0b5b1bc..13dfdf6 100644
---- a/jaraco/context.py
-+++ b/jaraco/context.py
-@@ -13,8 +13,15 @@ try:
- except Exception:
-     import contextlib as contextlib2
- 
--import jaraco.apt
--import yg.lockfile
-+try:
-+    import jaraco.apt as apt
-+except ImportError:
-+    apt = None
-+
-+try:
-+    import yg.lockfile
-+except ImportError:
-+    yg = None
- 
- 
- __metaclass__ = type
-@@ -131,6 +138,12 @@ def dependency_context(package_names, aggressively_remove=False):
-     """
-     installed_packages = []
-     log = logging.getLogger(__name__)
-+    if apt is None:
-+        log.error("jaraco.apt not found installed")
-+        raise ImportError("jaraco.apt not found installed")
-+    if yg is None:
-+        log.error("yg.lockfile not found installed")
-+        raise ImportError("yg.lockfile not found installed")
-     try:
-         if not package_names:
-             logging.debug('No packages requested')
-@@ -144,7 +157,7 @@ def dependency_context(package_names, aggressively_remove=False):
-                 stderr=subprocess.STDOUT,
-             )
-             log.debug('Aptitude output:\n%s', output)
--            installed_packages = jaraco.apt.parse_new_packages(
-+            installed_packages = apt.parse_new_packages(
-                 output, include_automatic=aggressively_remove
-             )
-             if not installed_packages:
--- 
-2.27.0
-
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
deleted file mode 100644
index f709277cbf50..000000000000
--- a/dev-python/jaraco-context/jaraco-context-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Context managers by jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.context"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-useless-deps.patch
-)
-
-python_prepare_all() {
-	# used only for apt support that's irrelevant to Gentoo
-	sed -i -e '/jaraco\.apt/d' -e '/yg\.lockfile/d' setup.cfg || die
-	# pytest plugins
-	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	distutils-r1_python_install
-}
diff --git a/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
index a854993fe130..dfde80be8dc2 100644
--- a/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-4.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
index 1450a0c4f114..9cf411ba05a9 100644
--- a/dev-python/jaraco-context/metadata.xml
+++ b/dev-python/jaraco-context/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.context</remote-id>
 	</upstream>