gentoo resync : 01.10.2021

5 files changed, 2 insertions, 82 deletions

diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 1f6410691736..281656ed7b9c 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,8 +1,3 @@
-AUX apipkg-1.5-pytest-4.patch 801 BLAKE2B 4fe40fb766f4e8654ef37f0796a88f74b81e2a1d237382f87745f33ac80e505c9e764f8b83d467c7f5051ce7eb3a80add369595556b5b6abf3e1a569d33cc071 SHA512 d50ecac0382e70124634a403c5010bc929f92f7a6768979497a5d2646626c6244f3c213f18989f71dda137bd4376f81d5d97a5f4979ff0e937046bffeef75b04
-DIST apipkg-1.5.tar.gz 11186 BLAKE2B f703a37b38b412228348520a9daa0276a69c3be47a9586e1c2797cf525a024bb0fda81dbfad7d4b1404e1ebcd3eec0e9ce2231beef5072bf9915240e2e5fb445 SHA512 828937ca5e203915248fac54db8e7c13f941e006403f2a415c27fa4d1aa114790be3d7b5dd892f528611e5e6dfe75114ee80f4f4589a03c3f789ae6ddfcae0bf
 DIST apipkg-2.0.0.gh.tar.gz 11724 BLAKE2B 3ad0ab8915bef0632b522de662c9c2424e0ba9c13c0d9bb415d66112ccd0621a226b546c9d248939e83f16311069fbe8170224b8e2e373f194df8d6654671347 SHA512 d1c336f835d28a11640904a6ae63b15a01c3bde2e100eb2ed31877fc7037e538e0fe1d107556d48fb288c3b72a53586122c4ec17e089179aadc222ae80938c53
-DIST apipkg-2.0.0rc1.gh.tar.gz 11737 BLAKE2B 5c2c109dcab512f4154f275fb0bac42c626d753ca0b9f7c5bec91a0f7d0048c4ddadb8ea580626e51a2a879ac487ea9fcb06109d271a0b214dea3c5a1758126a SHA512 2bdfda86bb8d3a5d57868adf5e44de895f95d37b1928f4e24796bdde3a02eb9f8c51a017060c8b9c4a918c85d5d2d8348c634fc11f5eea9a9e333c14cabb1c23
-EBUILD apipkg-1.5-r1.ebuild 618 BLAKE2B 8e338e8165372297627850cd0e2cf02db600d2ecb336ecf6dcf2eb7b9f121f739e397cbc85deaa4a5dc94a0fe1e17cd59cf1e91a02732cc69953add572fe400f SHA512 9c9a07460a0282395802d5b6c1b6edef9d70042331c3916c22f710eeaa2a388e9f5f50518cbc1b43b8baee9b27dc8bc00b553c060d7a5d9fae86078b539c1671
-EBUILD apipkg-2.0.0.ebuild 663 BLAKE2B cb07cff0677a3cf0ed13bed0d610d7c1322e3dfc13abdf7bbe5226662bbd47cb48922597e148ceee8dc666ac5e66c99207ab7e8d0cd6c3d7644a7785a7e0cf32 SHA512 b8364b4957acad127efd8f180c0615775abe6bf0ebc71d59edaf18792d9abb6058f51bbcbee875354f26d0e97d063bd277717f1942b114ef7d3eaa1635e155a9
-EBUILD apipkg-2.0.0_rc1.ebuild 663 BLAKE2B 1807763151e977e3dc34bce13fb38358eb475b63d92eef52e9e434cbcb110fe5a29ca595b266a4514bf180a2f4cc9e9d93e2b46a7180ce95e96921bd01f3d764 SHA512 40c8981d4f05a7521f22516c4f653cba5111938ba49b196b8d0a3207412be6cec676b7083cdc6324ce0580f7c1cd34e3e68c9bca6f38418ca6532bcd769413ab
+EBUILD apipkg-2.0.0.ebuild 655 BLAKE2B 90893a142083e3b483f15c8f4de5edfee1bf393d9153085fa103e91394194c7f909cd74af8edd2e911ad2f1413dafc780a5bb48b64b6a49cd874e84fb229a2c6 SHA512 e097ef51e0c9249b8d4bdd8af4a3deea23ebdb69a4dad9567d2f91e367ac1daf41731b5701a41784b7dea98f47b839975dfe6798fc3d6ae53f78aec7af349ebc
 MISC metadata.xml 334 BLAKE2B 7b3573186acb7b108054095d3cc12f73e1cafe1d4c9d7045a9ad7ee31f69b35991a5f958e745cb1561d373b8be441c037578c2954fdd2a4e6b9695477f91e026 SHA512 b397fd16a42820122aea8c0f4eae08d135eaf21bff99b7c0d5499505f03cad03d280a1b35770f54b2ec26388565a33d8762cbef879755dd81f00a2eff7f9f49d
diff --git a/dev-python/apipkg/apipkg-1.5-r1.ebuild b/dev-python/apipkg/apipkg-1.5-r1.ebuild
deleted file mode 100644
index a32262c3cb97..000000000000
--- a/dev-python/apipkg/apipkg-1.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-4.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/apipkg/apipkg-2.0.0.ebuild b/dev-python/apipkg/apipkg-2.0.0.ebuild
index 521b20593649..206dfdab2e08 100644
--- a/dev-python/apipkg/apipkg-2.0.0.ebuild
+++ b/dev-python/apipkg/apipkg-2.0.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild b/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
deleted file mode 100644
index 76108e8d3a41..000000000000
--- a/dev-python/apipkg/apipkg-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch b/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
deleted file mode 100644
index 0053e7078e2b..000000000000
--- a/dev-python/apipkg/files/apipkg-1.5-pytest-4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 81dc0f46754afd44358b8c97ea832030436ac7cb Mon Sep 17 00:00:00 2001
-From: Andy Postnikov <apostnikov@gmail.com>
-Date: Sun, 27 Jan 2019 03:27:18 +0200
-Subject: [PATCH] testing/py-apipkg: fix tests
-
-https://github.com/pytest-dev/apipkg/issues/14
----
- testing/py-apipkg/14.patch | 11 +++++++++++
- testing/py-apipkg/APKBUILD |  7 ++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
- create mode 100644 testing/py-apipkg/14.patch
-
-[inner patch extracted for Gentoo use]
-
---- a/test_apipkg.py
-+++ b/test_apipkg.py
-@@ -13,7 +13,7 @@
- class TestRealModule:
- 
-     def setup_class(cls):
--        cls.tmpdir = py.test.ensuretemp('test_apipkg')
-+        cls.tmpdir = py.path.local('test_apipkg')
-         sys.path = [str(cls.tmpdir)] + sys.path
-         pkgdir = cls.tmpdir.ensure('realtest', dir=1)
-