gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 35 deletions

diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 5502a35252ec..5f24882e51f8 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,4 +1,3 @@
 DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
-EBUILD certifi-10001-r1.ebuild 938 BLAKE2B 9eaabb0e1d9286b69fa318a8bfd051f146e1bdb585dd4de9f1c5ba5a6b4bcbc73cbc22bf37d4f8b0b75aeae69d5ad6e1ef18986880a14150ecbbb8a2e30f1aac SHA512 802ef5073c00a7edfccf882d3d7046ede2772a4521046c51ab8597ae99449a21cffc9bd1780923df9b88f528687413468a039d7264ea4819925f0ebc904a81fa
-EBUILD certifi-10001.ebuild 948 BLAKE2B 96903071c2d78f4fa556b36c8f2e367adc1e24face20abe6e4e872dfd94f17ebce210bb30defd61aab1b3f9937bf350c06a1f83214e83a4b6c989a436c9c9801 SHA512 84892fb0678dd12aecde7aef383d23996bea4aac62aca46bb71a4c10597e1f81391a3fce66ecbde94ce5706b549eba4b3c4e96929f521519b9dc5fdc211ddb20
+EBUILD certifi-10001-r1.ebuild 918 BLAKE2B 1d5fb8f4ece7952cbf6351e6d669aed66bac77f9308087c4e570cfeb8572ea197dea765cbd04e7b3b2fd83168b22ed6fb8cbbbbca415b5a21b00bccbcdab939e SHA512 2328bb34018e8659a94ae8468fb635cdbd630676c4981d58aab6013299d0ff519b02e7227d41116ccdb188379ccefea42d4fe4c17ec3de1dcb3999d69e521a65
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-10001-r1.ebuild b/dev-python/certifi/certifi-10001-r1.ebuild
index 9a81b8332522..c29ad3179425 100644
--- a/dev-python/certifi/certifi-10001-r1.ebuild
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="app-misc/ca-certificates"
 
diff --git a/dev-python/certifi/certifi-10001.ebuild b/dev-python/certifi/certifi-10001.ebuild
deleted file mode 100644
index 11944fbf8606..000000000000
--- a/dev-python/certifi/certifi-10001.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_P=certifi-shim-${PV}
-DESCRIPTION="Thin replacement for certifi using system certificate store"
-HOMEPAGE="
-	https://github.com/mgorny/certifi-shim
-	https://pypi.org/project/certifi"
-SRC_URI="
-	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-misc/ca-certificates"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
-	distutils-r1_src_prepare
-}