From 7837a76c344b64e925519dd5e26233bb3b648beb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 3 Apr 2023 11:20:10 +0100 Subject: gentoo auto-resync : 03:04:2023 - 11:20:10 --- dev-python/Manifest.gz | Bin 257597 -> 257598 bytes dev-python/calver/Manifest | 2 +- dev-python/calver/calver-2022.06.26.ebuild | 2 +- dev-python/cffi/Manifest | 2 + dev-python/cffi/cffi-1.15.1-r1.ebuild | 65 +++++++++++++++++++++ dev-python/cffi/files/cffi-1.15.1-hppa.patch | 59 +++++++++++++++++++ dev-python/hatchling/Manifest | 2 +- dev-python/hatchling/hatchling-1.14.0.ebuild | 2 +- dev-python/trove-classifiers/Manifest | 2 +- .../trove-classifiers-2023.3.9.ebuild | 2 +- 10 files changed, 132 insertions(+), 6 deletions(-) create mode 100644 dev-python/cffi/cffi-1.15.1-r1.ebuild create mode 100644 dev-python/cffi/files/cffi-1.15.1-hppa.patch (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 5ae3cbc90b17..11ae58d6f791 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/calver/Manifest b/dev-python/calver/Manifest index 3f71f10c21bf..7045d1c63825 100644 --- a/dev-python/calver/Manifest +++ b/dev-python/calver/Manifest @@ -1,3 +1,3 @@ DIST calver-2022.06.26.gh.tar.gz 7601 BLAKE2B e4bea1dc8954b4f65003cb06dadebfa6a7ad0554d64c23e5339652955d2e4659ffc093b8d11d284e03bc74267059a10043a45dd1eb7717378fb22327d6409428 SHA512 4d436cead8930cae1a71eddef9f0ecd2881f8cb632c3814dc75390b061a909e7ca969a604a5fded1c66647947856d540e2180bd3ce4bed5087b4dbc9d5edb393 -EBUILD calver-2022.06.26.ebuild 593 BLAKE2B be19d16fcf6e94e88238ef6a8043a7de1b631b236a1db628ce855b77c6314f551218ab3764d43758ff4566359324492c95d01eb4b1af13d10424207b01274802 SHA512 96c8ad8c3bf31d6b45c2a6109591791b2139d1fb0febe264b61ceeb0c5761a39f80326167a8a902f9fe8551eb125e0aa14df0c60bbe3615e7093d933cdb91707 +EBUILD calver-2022.06.26.ebuild 614 BLAKE2B 3316b70d38aa1178d63c748e7caac7cd7df96c027baec6afeb32117d5e86aa8ca6ed4a8d71faf60c535e66dd2b0b1f52a2509c0f1f9422e83cca20dc56718adc SHA512 e9662d51fa88b1ecc8780ae0f44c88dfc337542a54dd21cbd2a81e3093133a30cdd9c22b97c21a8146acc51ff79f39bcca2780f99448c535302b467dc64f1afc MISC metadata.xml 337 BLAKE2B d1215a2b0ec479b37caa4b8474201c18ad555e344d49ce25ff7c2cab6f117ec3b2b3d14320e8d91706be93f6dfd09f87df4794a729512ac5f88cf70b4f158fd9 SHA512 d37ecb1686abb7257053e2ec74b26f00d9640c63f590776a3c43c440d7ec7ecf9733506f95ce096439f44030f172307d3624d5e9c825a776ee6d8d04c455a4c3 diff --git a/dev-python/calver/calver-2022.06.26.ebuild b/dev-python/calver/calver-2022.06.26.ebuild index 0f8fa7d3c92d..a638e4f4bea2 100644 --- a/dev-python/calver/calver-2022.06.26.ebuild +++ b/dev-python/calver/calver-2022.06.26.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc" BDEPEND=" test? ( diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest index 45d7480918e1..f58bc7b367e8 100644 --- a/dev-python/cffi/Manifest +++ b/dev-python/cffi/Manifest @@ -1,4 +1,6 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79 +AUX cffi-1.15.1-hppa.patch 2097 BLAKE2B 2cd3a1b155b71bcb3d70e3659950c45c36959f0c2090fe560d47bf60e53aa8a2df50dc3b713602c589e6bccecdef27230ee6cb800259bf275dbd052beff03da3 SHA512 ba320e8cb56b58066a44162c8a176d167b4a05a760451a0e0821969cd2ad8fff50e54d54ec8f8c4f93ee1a2e3e71467c7c2d6d94c593ec21892e7d03fdf7c50d DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5 +EBUILD cffi-1.15.1-r1.ebuild 1560 BLAKE2B 2b7d2e7a0861bbbcd45c0b0b3e5d879e7c1e4e7bd16aae0f98a0c6e61b76ccfb98b932e4ec8da51d5500e9cab6bc1f480c6a1e4df251bb1829e810b5c72172b8 SHA512 1e3ebcd9233c2ce0a4b8ea4ff25c7c48e52b7d8f0491b704791d184048437857e09a28214735f0946c35cc7f49a3af4a5b1d4177dc7f8509be3bc8cb9d1e1beb EBUILD cffi-1.15.1.ebuild 1521 BLAKE2B 53a54cc90257d8c11f9f72fd1b68c839ea7faa16a395a7a479ca19dfbb6f252e74bafdb97ac710de5c1807545bf89d381f8265e9103b132f51a85ab3bf75f36f SHA512 d5a0c25b2a443dfca09fa34cfe8f1a0228e47d025a7ae5a7421ed26be2ba6243b6068f9a13412277d94d273b60cc3c1c852adaa4f469472179b328180ef85f8d MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0 diff --git a/dev-python/cffi/cffi-1.15.1-r1.ebuild b/dev-python/cffi/cffi-1.15.1-r1.ebuild new file mode 100644 index 000000000000..fc58f4f7e3fb --- /dev/null +++ b/dev-python/cffi/cffi-1.15.1-r1.ebuild @@ -0,0 +1,65 @@ +# 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 + "${FILESDIR}"/${P}-hppa.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 +} diff --git a/dev-python/cffi/files/cffi-1.15.1-hppa.patch b/dev-python/cffi/files/cffi-1.15.1-hppa.patch new file mode 100644 index 000000000000..e185e7b93929 --- /dev/null +++ b/dev-python/cffi/files/cffi-1.15.1-hppa.patch @@ -0,0 +1,59 @@ +https://foss.heptapod.net/pypy/cffi/-/commit/ab11bfa551697cd2b61fdaa571c7975c06e6912c + +From ab11bfa551697cd2b61fdaa571c7975c06e6912c Mon Sep 17 00:00:00 2001 +From: John David Anglin +Date: Sun, 18 Dec 2022 14:52:04 -0500 +Subject: [PATCH] Fix the test failures on hppa + +A couple of years ago the libffi port for hppa-linux was changed from using a +trampoline executed on the stack to the function descriptor technique used by +ia64. This doesn't require an executable stack and is simpler. However, +function pointers need to have the PLABEL bit set in the pointer. As a result, +a simple cast can't be used to convert closure pointers to function pointers. + +python-cffi uses its own closure allocation so the problem can't be fixed in +libffi. + +I added a macro CFFI_FN to do the conversion. It shouldn't affect other +architectures. There is a similar define in libffi. + +Fixes: https://bugs.debian.org/1024271 + +--HG-- +branch : hppa +--- a/c/_cffi_backend.c ++++ b/c/_cffi_backend.c +@@ -60,6 +60,13 @@ + # endif + #endif + ++/* Convert from closure pointer to function pointer. */ ++#if defined(__hppa__) && !defined(__LP64__) ++#define CFFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2)) ++#else ++#define CFFI_FN(f) ((void (*)(void))f) ++#endif ++ + + /* Define the following macro ONLY if you trust libffi's version of + * ffi_closure_alloc() more than the code in malloc_closure.h. +@@ -3191,7 +3198,7 @@ cdata_call(CDataObject *cd, PyObject *args, PyObject *kwds) + + Py_BEGIN_ALLOW_THREADS + restore_errno(); +- ffi_call(&cif_descr->cif, (void (*)(void))(cd->c_data), ++ ffi_call(&cif_descr->cif, (void (*)(void)) CFFI_FN(cd->c_data), + resultdata, buffer_array); + save_errno(); + Py_END_ALLOW_THREADS +@@ -6394,7 +6401,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) + goto error; + Py_INCREF(ct); + cd->head.c_type = ct; +- cd->head.c_data = (char *)closure_exec; ++ cd->head.c_data = (char *)CFFI_FN(closure_exec); + cd->head.c_weakreflist = NULL; + closure->user_data = NULL; + cd->closure = closure; +-- +GitLab diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest index 9769a862d45b..87a629cf166f 100644 --- a/dev-python/hatchling/Manifest +++ b/dev-python/hatchling/Manifest @@ -1,5 +1,5 @@ DIST hatch-hatchling-v1.13.0.gh.tar.gz 383610 BLAKE2B 0a3dc20f6c1c504c94c09897e23e6ade844318488093cf849e332cf08f7be178ddb3ae61d8ff01af93438c01216b056a3566e9d8758a0151e4d7498447a9524f SHA512 fb14e1d088676dfc2b76dda207aa514232c3c5b8472d7332c0d53e0bd4dbd1d0e3bd1ac9f261f72e1a32610c565485f5e382fc7071e80066735a04eb8cade13e DIST hatch-hatchling-v1.14.0.gh.tar.gz 378144 BLAKE2B e4fe0b22053e5be1ff330e96ad053e0461aa4e2ad1566313f03f265d42c7b63de8e3e7e7a52fa68639c4bdf4815e22e4040e8511eb43185cb3e7c8cf4d85ff92 SHA512 79a446c327022337c8c9e090c0aea0471fdad0a6c6d384797832bca09ece66c3b854c9626afccbb4fc49a9204ebb1e59a2ee55ff358b0eb1b10b16ddf7b4952a EBUILD hatchling-1.13.0.ebuild 2094 BLAKE2B 2e7a1d5a394a93f6d58a50b039fc9297393513803b0ae7bb551680a32321ed5940577acc02e6988865b0b026e0538f9b6efe24a9770e8c771ea5138e1de16aec SHA512 1cbe612df37be3a58213f1defd8df82469313a009cd77a9774e7ea16c615efe8fb0fd4127dc7e349daac0d9c1dd49fc3ff7629f14719f5d63dd4382c05514477 -EBUILD hatchling-1.14.0.ebuild 2080 BLAKE2B 80d140ec7b421eb4ebd35a32a8aee833750d73e57f0258cf4e270212b17859e62772f3d3f0bc135b53f8298e974cd6c263f47d89136eae7cf6b8ea2b34f353a0 SHA512 913e53cd274f3110a11a78152343abf001ab7ceaa77bd96506db2742365fab144107129404a417bc361cb5a57f7736e8de0784c27d3eebb4b20296c360879289 +EBUILD hatchling-1.14.0.ebuild 2101 BLAKE2B 08c56b5c5f8eb41e865f486e4e350333c9608a7b4c627f9846d7c802447d7ec0acbc2c363fe5c5f7d3cc799eb001bd5023b6b85b5db4697f2ddd094f8cbb37f0 SHA512 db291daf663a9f733189a6a3c7e66a8413c151823ebb540911da143b856399cab3f2c7ab1c90f8d9fb4c2474648b5783c7f28f50adff9560b6e6d1f56b42e352 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e diff --git a/dev-python/hatchling/hatchling-1.14.0.ebuild b/dev-python/hatchling/hatchling-1.14.0.ebuild index 5dc0e0dceb0d..d0719a953da8 100644 --- a/dev-python/hatchling/hatchling-1.14.0.ebuild +++ b/dev-python/hatchling/hatchling-1.14.0.ebuild @@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc" # deps are listed in backend/src/hatchling/ouroboros.py RDEPEND=" diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest index 040218cc317f..fe96597ab794 100644 --- a/dev-python/trove-classifiers/Manifest +++ b/dev-python/trove-classifiers/Manifest @@ -1,3 +1,3 @@ DIST trove-classifiers-2023.3.9.tar.gz 15792 BLAKE2B 1b96dae0f4a141ab5a5e4f3ebe5fbede972b6d09cd289bded3192dfffb26dd68d85bdd46bec20c1b9fb83dc3f8c521e4512a995fe5950c07c9ccf8d53986aca3 SHA512 a94b4c6d7102934677c4debd55274770d4de7db9ad641a253e4718f65dd4b624a4b0c8f6e83cdaf5ea484cecc975baf8dcee0e50824fc373760b8c5cc2e25f89 -EBUILD trove-classifiers-2023.3.9.ebuild 610 BLAKE2B de4785c556c6447b7e41aa2bb0377d22849d5cea5c1b17ec363ab449388c928caa1a0b1c56abab943ae82ace7f158ca67ac80a2cebe536a8c905ae12b47fec19 SHA512 cf9de698336995dee663e1da866d57e874cb4b6bb39c27b737687a6166ecb7f9ce29720b2e9e606525aa8bd8c72990ab5de23b14344c4fef6ef2f21a8595e819 +EBUILD trove-classifiers-2023.3.9.ebuild 631 BLAKE2B 88a374e17d4a9ddcebe98170b30d797df26784ee2b0c7b42f93d1ae2781e997eacdfee2a5f2854e19e6264bb094cbd13a2432665fa223687b88314cb2f28112f SHA512 c210b8f266fb0f4c0fd9f2857e7cd09dc35a1643526e88cfa47cef45beab75d03431ac57575be775841a43cc24fddb7b9516586302c3302993bfb513ab48d6c5 MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7 diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild index 0046c1328231..2b46fcabbe00 100644 --- a/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild +++ b/dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc" BDEPEND=" dev-python/calver[${PYTHON_USEDEP}] -- cgit v1.2.3