gentoo resync : 29.12.2022

4 files changed, 2 insertions, 85 deletions

diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 15a4d4368a86..297928180fe9 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,5 +1,3 @@
-AUX certifi-3021.3.16-setuptools.patch 828 BLAKE2B 937861655700a4e988fb377e25ae3865c678655c51b16d6ffc3594d80106dd4ab0b45557639c233388a8f9268413c9344eb68f18e82d45a15f70b06c238b76d2 SHA512 d8a2952e6317d1d30948fe1e7f77fadba1b3a489fdd1732b644249f0c5d54802c253721c233d30f676673ed3dad3d1cc442c6222181f7257b9a743cde6bb02fe
 DIST certifi-system-store-3021.3.16.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668
-EBUILD certifi-3021.3.16-r1.ebuild 1548 BLAKE2B 475498a5d5a47d0995f03eb4bd2b37d685711f80cc4f444ce7f0b766e884dc6a62aa7f1c632ae4320906b94d55c028aa0f926b1ac3ceac6619da45571c946d03 SHA512 ffa9e8ed8b033c58305f6bf42a9e01d82badca8e8de800d77841906b15d14bea26c377ae7f2810f3e4062080fdae667e4db513f9f7d0b2ce388a3e0d223b3e10
-EBUILD certifi-3021.3.16-r2.ebuild 1382 BLAKE2B 8fdecf54ec42554d681c55b486e0a1dfe173ab2adcb6cc1530025f776cabe67893ec08f0e50022bd1a4fbd5f28debb2cc676fed3e9ab50fd22232ea5eed5bc9d SHA512 bad39bd003266f5d0f1904f83ff772939d3b43e8f92420f717f76fd615f4a54529f8ab413747d6426a5e38a556b0f8698d2a0fac1701efc92eb7d9d4fb31bb7d
+EBUILD certifi-3021.3.16-r2.ebuild 1374 BLAKE2B d38b75478478579e47e2318722fc870be0d69327960a7cc7e4eb2db86ae2c6baf3c08b36c0144d3bdfad31326d62f044fc8207c8fb32788a1616e22e40538b20 SHA512 59de47ac00ae7ce9fc36021c1bf784a8aec1886c3f037a9f206bfcaa19147ca0c9e72ab61e5bacf4c0e2074eb322a25ad8316e2e0a32e5d413046dc6f8d46b99
 MISC metadata.xml 427 BLAKE2B 12dfba937658c8ecdf591eef8803d721aec4be7f4f78e819d8add5ea85b5b73a9c071ae8d79d7abcedf6876ea53ea5365a7fd9adffc1c04ac4738e9f05ef58af SHA512 b4a027b08e92241cd0eb000e3220eaa4008f3e7b49f52b00b4b6abeaf7d66cfc92597a9633e1e29ff98758f258678ae09c213d332614d3f94e003ff0e59ad74b
diff --git a/dev-python/certifi/certifi-3021.3.16-r1.ebuild b/dev-python/certifi/certifi-3021.3.16-r1.ebuild
deleted file mode 100644
index cc5fde7ec874..000000000000
--- a/dev-python/certifi/certifi-3021.3.16-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-MY_P=certifi-system-store-${PV}
-DESCRIPTION="A certifi hack to use system trust store on Linux/FreeBSD"
-HOMEPAGE="
-	https://github.com/tiran/certifi-system-store/
-	https://pypi.org/project/certifi-system-store/"
-SRC_URI="
-	https://github.com/tiran/certifi-system-store/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3021.3.16-setuptools.patch
-)
-
-EPYTEST_IGNORE=(
-	# requires Internet
-	tests/test_requests.py
-)
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die
-	distutils-r1_src_prepare
-}
-
-symlink_info() {
-	pushd "${1}" >/dev/null || die
-	local egginfo=( certifi_system_store*.egg-info )
-	[[ -d ${egginfo} ]] || die
-	ln -v -s "${egginfo}" "${egginfo/_system_store}" || die
-	popd >/dev/null || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	symlink_info "${TEST_DIR}"/lib
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	symlink_info "${D}$(python_get_sitedir)"
-}
diff --git a/dev-python/certifi/certifi-3021.3.16-r2.ebuild b/dev-python/certifi/certifi-3021.3.16-r2.ebuild
index a64adff0fb94..279faf00eb84 100644
--- a/dev-python/certifi/certifi-3021.3.16-r2.ebuild
+++ b/dev-python/certifi/certifi-3021.3.16-r2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch b/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch
deleted file mode 100644
index 57154fd0eed9..000000000000
--- a/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/tiran/certifi-system-store/pull/17
-https://bugs.gentoo.org/822777
-
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 23 Nov 2021 15:56:33 +0100
-Subject: [PATCH] Add missing install_requires on setuptools
-
-This package is using pkg_resources explicitly, it should therefore
-declare an explicit dependency on setuptools.  The missing dependency
-has lead me to actually miss the runtime dependency which caused issues
-for Gentoo users for whom setuptools were cleaned.
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -40,6 +40,7 @@ zip_safe = True
- setup_requires = setuptools
- # hack to prevent installation on unsupported platforms Windows and macOS
- install_requires =
-+    setuptools
-     certifi-system-store > 4000; sys_platform == "win32" or sys_platform == "darwin"
- python_requires = >=3.6
-