gentoo auto-resync : 25:04:2023 - 18:13:05

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 625ad7e0bbea..aa078c35879f 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,6 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 AUX cffi-1.15.1-hppa.patch 2097 BLAKE2B 2cd3a1b155b71bcb3d70e3659950c45c36959f0c2090fe560d47bf60e53aa8a2df50dc3b713602c589e6bccecdef27230ee6cb800259bf275dbd052beff03da3 SHA512 ba320e8cb56b58066a44162c8a176d167b4a05a760451a0e0821969cd2ad8fff50e54d54ec8f8c4f93ee1a2e3e71467c7c2d6d94c593ec21892e7d03fdf7c50d
 AUX cffi-1.15.1-python3.11-tests.patch 3023 BLAKE2B e25bd9d22b81187b0eab65073930980a2975eec3086462396cfc4796fd5273edab9af2324884c2e55880825ddd046b7ebc5054adfe57574ee691f0fa2145dcd2 SHA512 4d202f8c943bf33ea359f47aa3e53e007bc3dbeb3320a6efa302b1b1ec309b2dde72f6cfe1a591c594f3321ed5c65d61e9f79a03ba3107cd7008699686719497
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
-EBUILD cffi-1.15.1-r2.ebuild 1660 BLAKE2B a402399d20b34db2cc1f9bf8dbd077943fb2ac03af6c004595ba4c2a4f16e34fc30b47e4dd43f84991f3d9282e302595ddbc543f4a983b221bc8d0ffa02510f7 SHA512 ded1ba0078cc83cffb82b6a652258c458dd517ae89e0ab2785b1d970b0b31bec8b9a5da3f8e4818e2fa71afc159f96133dce7d0b06b8d3ef50a8be25b19c59ca
-EBUILD cffi-1.15.1.ebuild 1521 BLAKE2B 53a54cc90257d8c11f9f72fd1b68c839ea7faa16a395a7a479ca19dfbb6f252e74bafdb97ac710de5c1807545bf89d381f8265e9103b132f51a85ab3bf75f36f SHA512 d5a0c25b2a443dfca09fa34cfe8f1a0228e47d025a7ae5a7421ed26be2ba6243b6068f9a13412277d94d273b60cc3c1c852adaa4f469472179b328180ef85f8d
+EBUILD cffi-1.15.1-r2.ebuild 1659 BLAKE2B 22b1abbd525bb9385fc542927e56ab876f24c2563e0ad8fc7c7e3ca4bfead977f6803d04ebf8575e087e448d210de2deaba1beb0ef118c0edaf2940041783ff1 SHA512 d8fc99c0a42933e391344b4b8d4534ebdd5b84427605796ef570ddb5e3ed5d5cd11d43ead9ac3c6b0a4060855c25b6f2ba1324899700bf3fa0062bcc707522eb
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.1-r2.ebuild b/dev-python/cffi/cffi-1.15.1-r2.ebuild
index 912fcdbb8949..e3f103bdc292 100644
--- a/dev-python/cffi/cffi-1.15.1-r2.ebuild
+++ b/dev-python/cffi/cffi-1.15.1-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/cffi/cffi-1.15.1.ebuild b/dev-python/cffi/cffi-1.15.1.ebuild
deleted file mode 100644
index 0077be4351b0..000000000000
--- a/dev-python/cffi/cffi-1.15.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 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_PEP517=setuptools
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 toolchain-funcs pypi
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="
-	https://cffi.readthedocs.io/
-	https://pypi.org/project/cffi/
-"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-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"
-
-DEPEND="
-	dev-libs/libffi:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pycparser[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		# Don't obsessively try to find libffi
-		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these tests call pip
-		testing/cffi0/test_zintegration.py
-	)
-
-	"${EPYTHON}" -c "import _cffi_backend as backend" || die
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest c testing
-}