From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- dev-python/certifi/Manifest | 5 +- dev-python/certifi/certifi-2999.ebuild | 33 ------------ dev-python/certifi/certifi-3021.3.16-r1.ebuild | 60 ++++++++++++++++++++++ dev-python/certifi/certifi-3021.3.16.ebuild | 55 -------------------- .../files/certifi-3021.3.16-setuptools.patch | 21 ++++++++ 5 files changed, 83 insertions(+), 91 deletions(-) delete mode 100644 dev-python/certifi/certifi-2999.ebuild create mode 100644 dev-python/certifi/certifi-3021.3.16-r1.ebuild delete mode 100644 dev-python/certifi/certifi-3021.3.16.ebuild create mode 100644 dev-python/certifi/files/certifi-3021.3.16-setuptools.patch (limited to 'dev-python/certifi') diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest index f7e079752a09..cdb25711c47a 100644 --- a/dev-python/certifi/Manifest +++ b/dev-python/certifi/Manifest @@ -1,5 +1,4 @@ -DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c +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-2999.ebuild 971 BLAKE2B e78f80fc5929124cb231c587adc292b976ec2518464cd91edc00e213bc9fb6ffcad8c11032e49ab3a36a33b4cf238d601dc005da6442932096bc3d1f23932fb1 SHA512 b3b1d795d4926b82a02f2c32a5c0f4fae6e3a0b9770b2c562cf64329bf49e4b351418571dd67841e3e21a8c241bb1804f63b831821d2cac6d45b6fd841625b9f -EBUILD certifi-3021.3.16.ebuild 1455 BLAKE2B ee0fad9191801ad11d1f570e0ecfe14234aaf8e34eeb19fc3defd843ada620ffb7cd84781466ec50096d7180aa9ba7d17108cc77ce98421d0fdb5785ba207b9a SHA512 c88eeeaad446fdfd1c12f180cdaf05f0ed4ccc92feeb88de80afcdd83419623a36cf78874613a68a01f8278995eeafeb34fd1a33608528fbdaf3ea6deb8ba587 +EBUILD certifi-3021.3.16-r1.ebuild 1541 BLAKE2B 6d59da5ee0ec485f96d50542d905911b69f58ef2ea04ea1a5d5236209764e5973802e71098cdb132f93547074f89b59f2942bc41066d26cfbdce91529ec7258f SHA512 3ee5e0bbf029900d8bc1968dfcc309645507b4a97f092ee494f458594d2fd58e36c7c8d19e354b058a7ac9aa1d76c7c2ccd9c7896bde6824a64dd23d2f545db5 MISC metadata.xml 427 BLAKE2B 12dfba937658c8ecdf591eef8803d721aec4be7f4f78e819d8add5ea85b5b73a9c071ae8d79d7abcedf6876ea53ea5365a7fd9adffc1c04ac4738e9f05ef58af SHA512 b4a027b08e92241cd0eb000e3220eaa4008f3e7b49f52b00b4b6abeaf7d66cfc92597a9633e1e29ff98758f258678ae09c213d332614d3f94e003ff0e59ad74b diff --git a/dev-python/certifi/certifi-2999.ebuild b/dev-python/certifi/certifi-2999.ebuild deleted file mode 100644 index c78d9961bb3b..000000000000 --- a/dev-python/certifi/certifi-2999.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 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 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{8..10} pypy3 ) - -inherit distutils-r1 - -MY_P=certifi-shim-10001 -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 -} diff --git a/dev-python/certifi/certifi-3021.3.16-r1.ebuild b/dev-python/certifi/certifi-3021.3.16-r1.ebuild new file mode 100644 index 000000000000..6019af2a84af --- /dev/null +++ b/dev-python/certifi/certifi-3021.3.16-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 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 ~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.ebuild b/dev-python/certifi/certifi-3021.3.16.ebuild deleted file mode 100644 index 9fb5fa1b8014..000000000000 --- a/dev-python/certifi/certifi-3021.3.16.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 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 ) -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 ~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" - -distutils_enable_tests --install pytest - -EPYTEST_IGNORE=( - # requires Internet - tests/test_requests.py -) - -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/files/certifi-3021.3.16-setuptools.patch b/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch new file mode 100644 index 000000000000..57154fd0eed9 --- /dev/null +++ b/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch @@ -0,0 +1,21 @@ +https://github.com/tiran/certifi-system-store/pull/17 +https://bugs.gentoo.org/822777 + +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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 + -- cgit v1.2.3