From 09b8200f5df43db5d1baae0dfa65319e31f16aaf Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Tue, 25 Jul 2023 18:11:13 +0000 Subject: Adding metadata --- dev-python/boto3/Manifest | 1 + dev-python/boto3/boto3-1.28.10.ebuild | 66 +++++++ dev-python/botocore/Manifest | 1 + dev-python/botocore/botocore-1.31.10.ebuild | 79 ++++++++ dev-python/cairocffi/Manifest | 1 + dev-python/cairocffi/cairocffi-1.6.1.ebuild | 51 +++++ dev-python/clang-python/Manifest | 2 - .../clang-python-17.0.0_pre20230705.ebuild | 54 ------ .../clang-python-17.0.0_pre20230717.ebuild | 54 ------ .../clang-python/clang-python-18.0.0.9999.ebuild | 54 ++++++ dev-python/editables/Manifest | 1 + dev-python/editables/editables-0.5.ebuild | 25 +++ dev-python/elasticsearch/Manifest | 2 - .../elasticsearch/elasticsearch-8.7.0.ebuild | 66 ------- .../elasticsearch/elasticsearch-8.8.0.ebuild | 66 ------- dev-python/lit/Manifest | 2 - dev-python/lit/lit-17.0.0_pre20230705.ebuild | 42 ---- dev-python/lit/lit-17.0.0_pre20230717.ebuild | 42 ---- dev-python/lit/lit-18.0.0.9999.ebuild | 42 ++++ dev-python/markdown2/Manifest | 1 + dev-python/markdown2/markdown2-2.4.10.ebuild | 31 +++ dev-python/more-itertools/Manifest | 1 + .../more-itertools/more-itertools-10.0.0.ebuild | 24 +++ dev-python/podman/Manifest | 1 + dev-python/podman/podman-4.6.0.ebuild | 52 +++++ dev-python/pydantic-core/Manifest | 6 + .../pydantic-core/pydantic-core-2.4.0.ebuild | 138 +++++++++++++ dev-python/pydantic/Manifest | 1 + dev-python/pydantic/pydantic-1.10.12.ebuild | 91 +++++++++ dev-python/pypy3/Manifest | 4 +- dev-python/pypy3/files/cryptography.patch | 17 -- dev-python/pypy3/files/openssl_cleanup.patch | 42 ---- dev-python/pypy3/files/openssl_ct.patch | 23 --- dev-python/pypy3/files/openssl_dh.patch | 14 -- dev-python/pypy3/files/openssl_evp.patch | 19 -- dev-python/pypy3/files/openssl_hmac.patch | 23 --- dev-python/pypy3/files/openssl_ocsp.patch | 23 --- dev-python/pypy3/files/openssl_proto.patch | 12 -- dev-python/pypy3/files/openssl_ssl.patch | 44 ----- dev-python/pypy3/files/openssl_x509.patch | 21 -- dev-python/pypy3/files/openssl_x509name.patch | 12 -- dev-python/pypy3/files/ssl_python.patch | 12 -- dev-python/pypy3/metadata.xml | 13 +- dev-python/pypy3/pypy3-7.3.10.ebuild | 215 --------------------- dev-python/pypy3/pypy3-7.3.11.ebuild | 215 --------------------- dev-python/pypy3/pypy3-7.3.11_p1.ebuild | 205 ++++++++++++++++++++ dev-python/pypy3/pypy3-7.3.12.ebuild | 26 +++ dev-python/pyside2/pyside2-5.15.10.ebuild | 2 +- dev-python/sphinx/Manifest | 1 + dev-python/sphinx/sphinx-7.1.0.ebuild | 130 +++++++++++++ dev-python/survey/Manifest | 2 +- dev-python/survey/survey-4.5.3.ebuild | 23 --- dev-python/survey/survey-4.5.4.ebuild | 23 +++ dev-python/virtualenv/Manifest | 1 + dev-python/virtualenv/virtualenv-20.24.2.ebuild | 107 ++++++++++ dev-python/zeroconf/Manifest | 1 + dev-python/zeroconf/zeroconf-0.71.4.ebuild | 56 ++++++ 57 files changed, 1228 insertions(+), 1055 deletions(-) create mode 100644 dev-python/boto3/boto3-1.28.10.ebuild create mode 100644 dev-python/botocore/botocore-1.31.10.ebuild create mode 100644 dev-python/cairocffi/cairocffi-1.6.1.ebuild delete mode 100644 dev-python/clang-python/clang-python-17.0.0_pre20230705.ebuild delete mode 100644 dev-python/clang-python/clang-python-17.0.0_pre20230717.ebuild create mode 100644 dev-python/clang-python/clang-python-18.0.0.9999.ebuild create mode 100644 dev-python/editables/editables-0.5.ebuild delete mode 100644 dev-python/elasticsearch/elasticsearch-8.7.0.ebuild delete mode 100644 dev-python/elasticsearch/elasticsearch-8.8.0.ebuild delete mode 100644 dev-python/lit/lit-17.0.0_pre20230705.ebuild delete mode 100644 dev-python/lit/lit-17.0.0_pre20230717.ebuild create mode 100644 dev-python/lit/lit-18.0.0.9999.ebuild create mode 100644 dev-python/markdown2/markdown2-2.4.10.ebuild create mode 100644 dev-python/more-itertools/more-itertools-10.0.0.ebuild create mode 100644 dev-python/podman/podman-4.6.0.ebuild create mode 100644 dev-python/pydantic-core/pydantic-core-2.4.0.ebuild create mode 100644 dev-python/pydantic/pydantic-1.10.12.ebuild delete mode 100644 dev-python/pypy3/files/cryptography.patch delete mode 100644 dev-python/pypy3/files/openssl_cleanup.patch delete mode 100644 dev-python/pypy3/files/openssl_ct.patch delete mode 100644 dev-python/pypy3/files/openssl_dh.patch delete mode 100644 dev-python/pypy3/files/openssl_evp.patch delete mode 100644 dev-python/pypy3/files/openssl_hmac.patch delete mode 100644 dev-python/pypy3/files/openssl_ocsp.patch delete mode 100644 dev-python/pypy3/files/openssl_proto.patch delete mode 100644 dev-python/pypy3/files/openssl_ssl.patch delete mode 100644 dev-python/pypy3/files/openssl_x509.patch delete mode 100644 dev-python/pypy3/files/openssl_x509name.patch delete mode 100644 dev-python/pypy3/files/ssl_python.patch delete mode 100644 dev-python/pypy3/pypy3-7.3.10.ebuild delete mode 100644 dev-python/pypy3/pypy3-7.3.11.ebuild create mode 100644 dev-python/pypy3/pypy3-7.3.11_p1.ebuild create mode 100644 dev-python/pypy3/pypy3-7.3.12.ebuild create mode 100644 dev-python/sphinx/sphinx-7.1.0.ebuild delete mode 100644 dev-python/survey/survey-4.5.3.ebuild create mode 100644 dev-python/survey/survey-4.5.4.ebuild create mode 100644 dev-python/virtualenv/virtualenv-20.24.2.ebuild create mode 100644 dev-python/zeroconf/zeroconf-0.71.4.ebuild (limited to 'dev-python') diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest index bfe84fbd5b3c..2cdaf97e3bb4 100644 --- a/dev-python/boto3/Manifest +++ b/dev-python/boto3/Manifest @@ -1,2 +1,3 @@ +DIST boto3-1.28.10.gh.tar.gz 678958 BLAKE2B 55356d6234a12a09cb03bc8907d5c8c3810a8ab62bdebd9cc005d557dd54c85a749c2b2cd35e11e0f933f2ee02e48962b4e4971259792b2eb9dc4ff08745f215 SHA512 13f889f312e1f8cb4c8c4921892c60342a4bc31021505fc42b659da2ad5d44806029a3c9acd1e8a509d587771d3f9ed42b8ec7bc3ebf1ca2a45525c57153e4f9 DIST boto3-1.28.3.gh.tar.gz 675019 BLAKE2B 93b29307fbfec4e61dc60d28e4f20392ae2a730f048a0b2e8cb99fd515a036fc4ca889ddd564e09b1f3eab4cb9499c5918b4e7430d63148dd2854d126719a468 SHA512 514d0f373f25bb691abf5f1f8b0209a07097191b2ad8fb6339739e7a0bd2b8e6d5a88f1250e928ca89b1f1aa5e27a44bf2cab38a57680c01214d370d11944ded DIST boto3-1.28.9.gh.tar.gz 677993 BLAKE2B a800de94cfb0d317b41091fb1d2bb0fd6449df85da434879c0689bf36998b2a52331ba077c65cae9967fcce998a15d2a6f6a758931fa12a00b95487adaf81dfa SHA512 6e1e5e74d20d2e67f29597ddcda70475cbea863978ca93ec77a0f478690477c9782111701771d5b8354f4402c21496e7f5627b1398cbd6fd87627fd978f5e360 diff --git a/dev-python/boto3/boto3-1.28.10.ebuild b/dev-python/boto3/boto3-1.28.10.ebuild new file mode 100644 index 000000000000..03c610b184f7 --- /dev/null +++ b/dev-python/boto3/boto3-1.28.10.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit distutils-r1 multiprocessing + +DESCRIPTION="The AWS SDK for Python" +HOMEPAGE=" + https://github.com/boto/boto3/ + https://pypi.org/project/boto3/ +" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/boto3" + inherit git-r3 + BOTOCORE_PV=${PV} +else + SRC_URI=" + https://github.com/boto/boto3/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + + # botocore is x.(y+3).z + BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)" +fi + +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + # don't lock versions to narrow ranges + sed -e '/botocore/ d' \ + -e '/jmespath/ d' \ + -e '/s3transfer/ d' \ + -i setup.py || die + + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + + distutils-r1_python_prepare_all +} + +python_test() { + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index c02b60eab12f..bcc054937493 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -1,2 +1,3 @@ +DIST botocore-1.31.10.gh.tar.gz 11793022 BLAKE2B 8c9f2a0439916ecb4af94b7e55347e4eda7a2b9e1202f15bb14ddc48feb1ff1f79e7c2f665995f2bcabb48acc5434f9809cb2c00016138f6f2aa8d242896078a SHA512 00fc9b7a09543ae2f0a1b02ad34544bcc7e421cd6094a210f781ac461f84b33afaedb6711360d112e23cf3f7eb502232298906119e635c56e09ed1980a77f188 DIST botocore-1.31.3.gh.tar.gz 11769948 BLAKE2B 452c494faa430b6782685b9960cc9ea15ce3dedfe1b5343ee7bdbd7544e108bbfc7bb58d527419b5dc5f4077dd806752eec927196b82ac286903992fef339e52 SHA512 0f2853c14d7695ea4eeacea6fed93e77436df143bd0b9bec967490eb88e3d6531c916dca91c1a3bde4b57253d77acabe2413acde4d1473d01e15ef69b45621e0 DIST botocore-1.31.9.gh.tar.gz 11785638 BLAKE2B 23f2c010f98b5ca8414c9a031524b1cb7d75366bf84d34df980ef4085a73bc62643cca5255519f891f7a9468abbf0d97adddf6684c3c0a751b0f9f390122c19d SHA512 b2bf0089a81c5389d86c9f7b2545358f23a1219d7e5bf152285f58293a171210b46c22c814ab3f8da460a2acbdd5127193fa7a2e19a021db511f9d08931037bf diff --git a/dev-python/botocore/botocore-1.31.10.ebuild b/dev-python/botocore/botocore-1.31.10.ebuild new file mode 100644 index 000000000000..509d06dedf97 --- /dev/null +++ b/dev-python/botocore/botocore-1.31.10.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit distutils-r1 multiprocessing + +DESCRIPTION="Low-level, data-driven core of boto 3" +HOMEPAGE=" + https://github.com/boto/botocore/ + https://pypi.org/project/botocore/ +" +LICENSE="Apache-2.0" +SLOT="0" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/boto/botocore" + inherit git-r3 +else + SRC_URI=" + https://github.com/boto/botocore/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + dev-python/six[${PYTHON_USEDEP}] + =dev-python/urllib3-1.25.4[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + # unpin deps + sed -i -e "s:>=.*':':" setup.py || die + + # unbundle deps + rm -r botocore/vendored || die + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + + distutils-r1_src_prepare +} + +python_test() { + local EPYTEST_DESELECT=( + # rely on bundled six + tests/functional/test_six_imports.py::test_no_bare_six_imports + tests/functional/test_six_threading.py::test_six_thread_safety + # fails on unrelated warnings + tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME + tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME + # TODO + tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider + # urllib3-2 compatibility, mock relies on implementation details + tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server + tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned + tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307 + tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header + tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase + tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close + ) + + epytest tests/{functional,unit} -n "$(makeopts_jobs)" +} diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest index d10ed0156653..d37f0915f789 100644 --- a/dev-python/cairocffi/Manifest +++ b/dev-python/cairocffi/Manifest @@ -1,2 +1,3 @@ DIST cairocffi-1.5.1.tar.gz 86924 BLAKE2B 51bbd85ed486d8a324255d7b328fc44490097f0eeb0568d0e9436350e627ee2da7770323d0cfa547da2f007dc097327962d80d0a9a96a2f119bac0bb4aa4d7f4 SHA512 58b33e921866a3db7dfa464514f935f7c615ae3463b852d888e9d221256e91efaa7639001781999bdf68619a725a90de06300973f9e635c7974e8c48729705dc DIST cairocffi-1.6.0.tar.gz 86649 BLAKE2B 1ffea1196f9c833f43bfb7e826a634748c3aad47e3b0adbaaf410be74a2e76aa803aa025cf7e0001dafa03cf6425c91614516881c788e1ca740351051b119bb2 SHA512 d46602231f443d8a0b3d46a7e63bb9c8daaee6c24e1c65b071c8b6d22cb96abec7e6c08d38c072f54d223e247e80cef4a562590818e01c8f0b5357bd9c2f29d9 +DIST cairocffi-1.6.1.tar.gz 87436 BLAKE2B 54f7f3db31ab52aac6ebce1c830c4c0ff2f5ffde1f6a803bf8453b0ab3307414732c2e43b5b931ff77c9cbf6fe3229150e49254f13891f5e75e88eeef73970b9 SHA512 5489263b7e7e2aca7291860a90a6339d35e819cc03a9add47cd21b4ec0cb0274445c3e852ee3be127c42d8b5d9fcb98b02ff7eb66e3d9d243bd33527ce6ddf5c diff --git a/dev-python/cairocffi/cairocffi-1.6.1.ebuild b/dev-python/cairocffi/cairocffi-1.6.1.ebuild new file mode 100644 index 000000000000..8a3108eb4b2b --- /dev/null +++ b/dev-python/cairocffi/cairocffi-1.6.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 ) + +inherit distutils-r1 pypi virtualx + +DESCRIPTION="CFFI-based drop-in replacement for Pycairo" +HOMEPAGE=" + https://github.com/Kozea/cairocffi/ + https://pypi.org/project/cairocffi/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +DEPEND=" + >=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}] + x11-libs/cairo:0=[X,xcb(+)] + x11-libs/gdk-pixbuf[jpeg] +" +RDEPEND=" + ${DEPEND} + $(python_gen_cond_dep ' + >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] + ' 'python*') +" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] + ' 'python*') + test? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pikepdf[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.0-tests.patch +) + +src_test() { + virtx distutils-r1_src_test +} diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest index a3024e906654..a119694951c6 100644 --- a/dev-python/clang-python/Manifest +++ b/dev-python/clang-python/Manifest @@ -4,6 +4,4 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447 -DIST llvm-project-3cd3f11c174baa001b337b88c7a6507eb5705cf2.tar.gz 194446197 BLAKE2B ba2ac8334f90fddfd9b8f97abd2f77bd1f1ad00c97f2b7daf6b799fe49755a9bd07e017e93cc634163ad7499e70d886556715e26e9d7ed9017018861c3522735 SHA512 b12d02a7b4df08e8decf99ac86875bef72ff2fa546699e7a94bfd2b2ad1e1256aec66185f9e2f7c2f5d06b1eeb3faae44a2c457b33e5c7416d3bd9921759b39d -DIST llvm-project-5ae7fde004cbc640c2f60207791ac36574e5f5c6.tar.gz 193410766 BLAKE2B 50287f1ad41a895040934f8f19fd8aa2e91065b930ab14125dbbc3977273655d11482b6229577c11a8ad2bdd854ca109449b603bbc2e30cee20e95e4fe11e8b7 SHA512 f24f7a3b0661d2d4533b24c295c114817aff22c8f1d473ffa639cee547d31502719f8e1be4f25b970d450ecb9dcaa809c0e12b1bb380774f52cda82a4769d7bc DIST llvm-project-5f1a388a11ae67c2e5d7a4d1fe45e369a393c572.tar.gz 194911977 BLAKE2B d7277591ddca0046dcc244f591732440a6c63c06557d96d18792c2544797a3bcea4af241ad1e9c0106a9751f52bfbcec0544020cc20874e8c64a31a8055d07d0 SHA512 b38aed6a21a3dd4325faf45475b843dcebab89d8ad9683e0f7699701f9645fa9467e032b822473c53a3242930d681caba9dd9530560636cf093108640470bbbe diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230705.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230705.ebuild deleted file mode 100644 index f37802f5c2d7..000000000000 --- a/dev-python/clang-python/clang-python-17.0.0_pre20230705.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit llvm.org python-r1 - -DESCRIPTION="Python bindings for sys-devel/clang" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# The module is opening libclang.so directly, and doing some blasphemy -# on top of it. -DEPEND=" - >=sys-devel/clang-${PV}:* - !sys-devel/llvm:0[clang(-),python(-)] - !sys-devel/clang:0[python(-)] -" -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-devel/clang:${LLVM_MAJOR} - ) -" - -LLVM_COMPONENTS=( clang/bindings/python ) -llvm.org_set_globals - -python_test() { - # tests rely on results from a specific clang version, so override - # the search path - local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir) - local -x CLANG_NO_DEFAULT_CONFIG=1 - "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" -} - -src_test() { - python_foreach_impl python_test -} - -src_install() { - python_foreach_impl python_domodule clang -} diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230717.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230717.ebuild deleted file mode 100644 index f37802f5c2d7..000000000000 --- a/dev-python/clang-python/clang-python-17.0.0_pre20230717.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit llvm.org python-r1 - -DESCRIPTION="Python bindings for sys-devel/clang" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# The module is opening libclang.so directly, and doing some blasphemy -# on top of it. -DEPEND=" - >=sys-devel/clang-${PV}:* - !sys-devel/llvm:0[clang(-),python(-)] - !sys-devel/clang:0[python(-)] -" -RDEPEND=" - ${DEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-devel/clang:${LLVM_MAJOR} - ) -" - -LLVM_COMPONENTS=( clang/bindings/python ) -llvm.org_set_globals - -python_test() { - # tests rely on results from a specific clang version, so override - # the search path - local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir) - local -x CLANG_NO_DEFAULT_CONFIG=1 - "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" -} - -src_test() { - python_foreach_impl python_test -} - -src_install() { - python_foreach_impl python_domodule clang -} diff --git a/dev-python/clang-python/clang-python-18.0.0.9999.ebuild b/dev-python/clang-python/clang-python-18.0.0.9999.ebuild new file mode 100644 index 000000000000..f37802f5c2d7 --- /dev/null +++ b/dev-python/clang-python/clang-python-18.0.0.9999.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) +inherit llvm.org python-r1 + +DESCRIPTION="Python bindings for sys-devel/clang" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0" +KEYWORDS="" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# The module is opening libclang.so directly, and doing some blasphemy +# on top of it. +DEPEND=" + >=sys-devel/clang-${PV}:* + !sys-devel/llvm:0[clang(-),python(-)] + !sys-devel/clang:0[python(-)] +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} +" +BDEPEND=" + ${PYTHON_DEPS} + test? ( + sys-devel/clang:${LLVM_MAJOR} + ) +" + +LLVM_COMPONENTS=( clang/bindings/python ) +llvm.org_set_globals + +python_test() { + # tests rely on results from a specific clang version, so override + # the search path + local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir) + local -x CLANG_NO_DEFAULT_CONFIG=1 + "${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}" +} + +src_test() { + python_foreach_impl python_test +} + +src_install() { + python_foreach_impl python_domodule clang +} diff --git a/dev-python/editables/Manifest b/dev-python/editables/Manifest index d2582ac082d0..31b4cfa249e9 100644 --- a/dev-python/editables/Manifest +++ b/dev-python/editables/Manifest @@ -1,2 +1,3 @@ DIST editables-0.3.gh.tar.gz 12493 BLAKE2B 95e05e7553efa4856ee5bde2c18a2566f1e65318bfc46c8ecd732f4d6b42f10ce54cc3aecc4d53bcfc627e6938c4155d48a39ced5f64395dbafb9187cb009e4f SHA512 493f20d1e6b39f8ed6668adc208723d447a31ae3c3087f7db9a9a0de617958e8afebd3b3a1836638f749fb0ec911e51256b727deb4c0ce08327356238df0a3f3 DIST editables-0.4.gh.tar.gz 15248 BLAKE2B 331686fb4e4f912f88c7565ffe4788adbd738be779a9d0c18b786f3fc81f7429fc71050c65afb324f482fb6a12cec512eec99f6eb30b770e297f512c5496ba78 SHA512 59c72544198668d6022a133a0e7a8f559ba23e618a0359c810dde2665177224704d409fac973d05869215007f118faaa7678e7ef83b7f44b50a5e283b26eec92 +DIST editables-0.5.gh.tar.gz 15469 BLAKE2B 9bbbc61a4e0a57edc6b7ba463da0d6c2f40090e347e67f203f16163bec70b63a2289332e9d69a46919f8aa009be1ec96e1b1cd2708ce5eb6ab33af6eb36360e0 SHA512 ac39d2e6a51625697c517b85fec11b525b1a41f82cf4f55c7595fed19da867065a62eee5e3656706f7402d0499754f4a142da77d699c59dffc8b769fa1c3dbe2 diff --git a/dev-python/editables/editables-0.5.ebuild b/dev-python/editables/editables-0.5.ebuild new file mode 100644 index 000000000000..d86425da5a64 --- /dev/null +++ b/dev-python/editables/editables-0.5.ebuild @@ -0,0 +1,25 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="A Python library for creating 'editable wheels'" +HOMEPAGE=" + https://pypi.org/project/editables/ + https://github.com/pfmoore/editables/ +" +SRC_URI=" + https://github.com/pfmoore/editables/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +distutils_enable_tests pytest diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest index c204319ef904..773adfacaf64 100644 --- a/dev-python/elasticsearch/Manifest +++ b/dev-python/elasticsearch/Manifest @@ -1,3 +1 @@ -DIST elasticsearch-py-8.7.0.gh.tar.gz 523141 BLAKE2B bbc6c59e921c5e8db3b7815a3086abe42690733d6719dcf3e167a521b1e7b38e68bf29ff2b1e0e48839be36c11feb9cb5bd9da507c35f508063ccfe9f3c24c59 SHA512 8f28d51cde600069692c8bef810e7949165a5f7a3ec440513a5f69e5c392ecb928dbd0317a9424d1845f523230a421e7d53db41a03b1bd3cc232c4b04ee0c894 -DIST elasticsearch-py-8.8.0.gh.tar.gz 526860 BLAKE2B 81d747c6ff3a552bcb279bc6ae4ede6a20c9516610f375dc11183eb38b759b4a8b4a9d0af9747300f483f3df403d918d938e50ae8bec91d09b67b7e81b11a114 SHA512 8bbbbfdcb658b648f2b3c7bd41c0d83cc66385eb8e5a118714c146c7ee8fb247f606098cc3ddacb679e009495dc8dbc0e3159fb0cae38ee49399e27c868940f1 DIST elasticsearch-py-8.8.2.gh.tar.gz 527409 BLAKE2B e7768150e22995b4ae4a5b0898a252c46e90b224e8c4132a7035d726db9367facfe2cd006c0d319454c61c075d180776f567e45791d731bf1fc1d40a78d284a2 SHA512 5e5610425fe3727b817fbeafb411fa3e455a1f08c4992774c95c93c5b0d01880198d39febb18baee7a1da85bd126d9679fb6a2aac4602df8ec49cfff0b5bd3be diff --git a/dev-python/elasticsearch/elasticsearch-8.7.0.ebuild b/dev-python/elasticsearch/elasticsearch-8.7.0.ebuild deleted file mode 100644 index f0335a71fa7b..000000000000 --- a/dev-python/elasticsearch/elasticsearch-8.7.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit distutils-r1 - -MY_P="elasticsearch-py-${PV}" - -DESCRIPTION="Official Elasticsearch client library for Python" -HOMEPAGE=" - https://ela.st/es-python - https://github.com/elastic/elasticsearch-py - https://pypi.org/project/elasticsearch/ -" -SRC_URI="https://github.com/elastic/elasticsearch-py/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.gh.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~x86" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/aiohttp-3[${PYTHON_USEDEP}] =dev-python/elastic-transport-8[${PYTHON_USEDEP}] =dev-python/requests-2.4[${PYTHON_USEDEP}] - - typedef STACK_OF(SCT) Cryptography_STACK_OF_SCT; -@@ -65,7 +65,7 @@ int SCT_set_log_entry_type(SCT *, ct_log_entry_type_t) - """ - - CUSTOMIZATIONS = """ --#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER -+#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER || CRYPTOGRAPHY_IS_LIBRESSL - static const long Cryptography_HAS_SCT = 1; - #else - static const long Cryptography_HAS_SCT = 0; diff --git a/dev-python/pypy3/files/openssl_dh.patch b/dev-python/pypy3/files/openssl_dh.patch deleted file mode 100644 index b653872eff5b..000000000000 --- a/dev-python/pypy3/files/openssl_dh.patch +++ /dev/null @@ -1,14 +0,0 @@ -Do not redefine a constant available in LibreSSL's headers. - -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/dh.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/dh.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/dh.py -@@ -110,7 +110,7 @@ int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_ - } - #endif - --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER - #ifndef DH_CHECK_Q_NOT_PRIME - #define DH_CHECK_Q_NOT_PRIME 0x10 - #endif diff --git a/dev-python/pypy3/files/openssl_evp.patch b/dev-python/pypy3/files/openssl_evp.patch deleted file mode 100644 index 07092e740609..000000000000 --- a/dev-python/pypy3/files/openssl_evp.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/evp.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/evp.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/evp.py -@@ -212,14 +212,10 @@ int (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, cons - #endif - - #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 --static const long Cryptography_HAS_ONESHOT_EVP_DIGEST_SIGN_VERIFY = 0; -+static const long Cryptography_HAS_ONESHOT_EVP_DIGEST_SIGN_VERIFY = 1; - static const long Cryptography_HAS_RAW_KEY = 0; - static const long Cryptography_HAS_EVP_DIGESTFINAL_XOF = 0; - int (*EVP_DigestFinalXOF)(EVP_MD_CTX *, unsigned char *, size_t) = NULL; --int (*EVP_DigestSign)(EVP_MD_CTX *, unsigned char *, size_t *, -- const unsigned char *tbs, size_t) = NULL; --int (*EVP_DigestVerify)(EVP_MD_CTX *, const unsigned char *, size_t, -- const unsigned char *, size_t) = NULL; - EVP_PKEY *(*EVP_PKEY_new_raw_private_key)(int, ENGINE *, const unsigned char *, - size_t) = NULL; - EVP_PKEY *(*EVP_PKEY_new_raw_public_key)(int, ENGINE *, const unsigned char *, diff --git a/dev-python/pypy3/files/openssl_hmac.patch b/dev-python/pypy3/files/openssl_hmac.patch deleted file mode 100644 index 51f1b2264ab1..000000000000 --- a/dev-python/pypy3/files/openssl_hmac.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix build with opaque HMAC_CTX in LibreSSL 3.5. - -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/hmac.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/hmac.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/hmac.py -@@ -24,7 +24,7 @@ void Cryptography_HMAC_CTX_free(HMAC_CTX *ctx); - - CUSTOMIZATIONS = """ - HMAC_CTX *Cryptography_HMAC_CTX_new(void) { --#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER -+#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER || defined(LIBRESSL_VERSION_NUMBER) - return HMAC_CTX_new(); - #else - /* This uses OPENSSL_zalloc in 1.1.0, which is malloc + memset */ -@@ -36,7 +36,7 @@ HMAC_CTX *Cryptography_HMAC_CTX_new(void) { - - - void Cryptography_HMAC_CTX_free(HMAC_CTX *ctx) { --#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER -+#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER || defined(LIBRESSL_VERSION_NUMBER) - return HMAC_CTX_free(ctx); - #else - if (ctx != NULL) { diff --git a/dev-python/pypy3/files/openssl_ocsp.patch b/dev-python/pypy3/files/openssl_ocsp.patch deleted file mode 100644 index 2dd70863b032..000000000000 --- a/dev-python/pypy3/files/openssl_ocsp.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix build with opaque OCSP in LibreSSL 3.5. - -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/ocsp.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/ocsp.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/ocsp.py -@@ -109,7 +109,7 @@ struct ocsp_basic_response_st { - }; - #endif - --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && LIBRESSL_VERSION_NUMBER < 0x3050000fL - /* These functions are all taken from ocsp_cl.c in OpenSSL 1.1.0 */ - const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *single) - { -@@ -148,7 +148,7 @@ const ASN1_OCTET_STRING *OCSP_resp_get0_signature(cons - } - #endif - --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110J -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110J && LIBRESSL_VERSION_NUMBER < 0x3050000fL - const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs) - { - #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 diff --git a/dev-python/pypy3/files/openssl_proto.patch b/dev-python/pypy3/files/openssl_proto.patch deleted file mode 100644 index 22e2e7a3283d..000000000000 --- a/dev-python/pypy3/files/openssl_proto.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN pypy2.7-v7.3.8-src.orig/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py pypy2.7-v7.3.8-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py ---- pypy2.7-v7.3.8-src.orig/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py 2022-03-27 20:40:31.151380366 +0200 -+++ pypy2.7-v7.3.8-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py 2022-03-27 20:45:26.044401605 +0200 -@@ -739,7 +739,7 @@ - int (*SSL_get_min_proto_version)(SSL *ssl) = NULL; - int (*SSL_get_max_proto_version)(SSL *ssl) = NULL; - #endif --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_IS_LIBRESSL - int (*SSL_CTX_set_min_proto_version)(SSL_CTX *ctx, int version) = NULL; - int (*SSL_CTX_set_max_proto_version)(SSL_CTX *ctx, int version) = NULL; - int (*SSL_set_min_proto_version)(SSL *ssl, int version) = NULL; diff --git a/dev-python/pypy3/files/openssl_ssl.patch b/dev-python/pypy3/files/openssl_ssl.patch deleted file mode 100644 index 1c6f32460958..000000000000 --- a/dev-python/pypy3/files/openssl_ssl.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix build with opaque SSL_CTX and COMP_METHOD and do not redefine -DTLSv1.2 and TLSv1.3 related defined vailable in recent LibreSSL versions. - -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py -@@ -552,7 +552,7 @@ int SSL_CTX_set_max_early_data(SSL_CTX *, uint32_t); - CUSTOMIZATIONS = """ - /* Added in 1.0.2 but we need it in all versions now due to the great - opaquing. */ --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_IS_LIBRESSL - /* from ssl/ssl_lib.c */ - const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx) { - return ctx->method; -@@ -681,8 +681,8 @@ static const long Cryptography_HAS_SET_CERT_CB = 1; - - /* In OpenSSL 1.0.2i+ the handling of COMP_METHOD when OPENSSL_NO_COMP was - changed and we no longer need to typedef void */ --#if (defined(OPENSSL_NO_COMP) && CRYPTOGRAPHY_OPENSSL_LESS_THAN_102I) || \ -- CRYPTOGRAPHY_IS_LIBRESSL -+#if (defined(OPENSSL_NO_COMP) && CRYPTOGRAPHY_OPENSSL_LESS_THAN_102I) && \ -+ !CRYPTOGRAPHY_IS_LIBRESSL - static const long Cryptography_HAS_COMPRESSION = 0; - typedef void COMP_METHOD; - #else -@@ -729,8 +729,6 @@ const SSL_METHOD *(*DTLS_client_method)(void) = NULL; - static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; - #endif - #if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 --static const long SSL_OP_NO_DTLSv1 = 0; --static const long SSL_OP_NO_DTLSv1_2 = 0; - long (*DTLS_set_link_mtu)(SSL *, long) = NULL; - long (*DTLS_get_link_min_mtu)(SSL *) = NULL; - #endif -@@ -836,7 +834,7 @@ static const long Cryptography_HAS_CIPHER_DETAILS = 0; - static const long Cryptography_HAS_CIPHER_DETAILS = 1; - #endif - --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 && !CRYPTOGRAPHY_IS_LIBRESSL - static const long Cryptography_HAS_TLSv1_3 = 0; - static const long SSL_OP_NO_TLSv1_3 = 0; - static const long SSL_VERIFY_POST_HANDSHAKE = 0; diff --git a/dev-python/pypy3/files/openssl_x509.patch b/dev-python/pypy3/files/openssl_x509.patch deleted file mode 100644 index 3714cf926a3a..000000000000 --- a/dev-python/pypy3/files/openssl_x509.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py -@@ -282,7 +282,7 @@ int X509_get_signature_nid(const X509 *x) - - /* Added in 1.0.2 but we need it in all versions now due to the great - opaquing. */ --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !defined(LIBRESSL_VERSION_NUMBER) - /* from x509/x_x509.c */ - int i2d_re_X509_tbs(X509 *x, unsigned char **pp) - { -@@ -308,7 +308,7 @@ X509_REVOKED *Cryptography_X509_REVOKED_dup(X509_REVOK - - /* Added in 1.1.0 but we need it in all versions now due to the great - opaquing. */ --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !defined(LIBRESSL_VERSION_NUMBER) - int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) - { - req->req_info->enc.modified = 1; diff --git a/dev-python/pypy3/files/openssl_x509name.patch b/dev-python/pypy3/files/openssl_x509name.patch deleted file mode 100644 index 53721e4de136..000000000000 --- a/dev-python/pypy3/files/openssl_x509name.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: lib_pypy/_cffi_ssl/_cffi_src/openssl/x509name.py ---- lib_pypy/_cffi_ssl/_cffi_src/openssl/x509name.py.orig -+++ lib_pypy/_cffi_ssl/_cffi_src/openssl/x509name.py -@@ -75,7 +75,7 @@ Cryptography_STACK_OF_X509_NAME_ENTRY *sk_X509_NAME_EN - """ - - CUSTOMIZATIONS = """ --#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER -+#if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER || defined(LIBRESSL_VERSION_NUMBER) - int Cryptography_X509_NAME_ENTRY_set(X509_NAME_ENTRY *ne) { - return X509_NAME_ENTRY_set(ne); - } diff --git a/dev-python/pypy3/files/ssl_python.patch b/dev-python/pypy3/files/ssl_python.patch deleted file mode 100644 index 03baf16e093f..000000000000 --- a/dev-python/pypy3/files/ssl_python.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN pypy2.7-v7.3.8-src.orig/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py pypy2.7-v7.3.8-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py ---- pypy2.7-v7.3.8-src.orig/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py 2022-03-27 20:48:19.795414119 +0200 -+++ pypy2.7-v7.3.8-src/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py 2022-03-27 20:51:43.997428826 +0200 -@@ -577,7 +577,7 @@ - """ - - CUSTOMIZATIONS = """ --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER - #error Python 3.7 requires OpenSSL >= 1.0.2 - #endif - diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml index d58e6b044b8a..6a14ca407288 100644 --- a/dev-python/pypy3/metadata.xml +++ b/dev-python/pypy3/metadata.xml @@ -1,14 +1,17 @@ - - dev@liguros.net - Development - python@gentoo.org Python - ports + + + Install the ensurepip module that uses bundled wheels + to bootstrap pip and setuptools (if disabled, it will + be only possible to use venv `--without-pip`) + + + gentoo-staging \ No newline at end of file diff --git a/dev-python/pypy3/pypy3-7.3.10.ebuild b/dev-python/pypy3/pypy3-7.3.10.ebuild deleted file mode 100644 index 498fed55c0a3..000000000000 --- a/dev-python/pypy3/pypy3-7.3.10.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 2022 Liguros Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -inherit pax-utils python-utils-r1 toolchain-funcs - -PYPY_PV=${PV%_p*} -MY_P=pypy3.9-v${PYPY_PV/_rc/rc} -PATCHSET="pypy3.9-gentoo-patches-${PV/_rc/rc}" - -DESCRIPTION="A fast, compliant alternative implementation of the Python (3.9) language" -HOMEPAGE=" - https://www.pypy.org/ - https://foss.heptapod.net/pypy/pypy/ -" -SRC_URI=" - https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz -" -S="${WORKDIR}/${MY_P}-src" - -LICENSE="MIT" -# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' -# also check pypy/interpreter/pycode.py -> pypy_incremental_magic -SLOT="0/pypy39-pp73-336" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ensurepip gdbm +jit libressl ncurses sqlite tk" -# many tests are failing upstream -# see https://buildbot.pypy.org/summary?branch=py3.9 -RESTRICT="test" - -RDEPEND=" - || ( - >=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2(+),ncurses?] - >=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV} - ) - dev-lang/python-exec[python_targets_pypy3(-)] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( >=dev-libs/libressl-3.6.0:0= ) - ensurepip? ( dev-python/ensurepip-wheels ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default - - eapply_user - eapply -p0 ${FILESDIR}/openssl_ct.patch - eapply -p0 ${FILESDIR}/openssl_dh.patch - eapply -p0 ${FILESDIR}/openssl_evp.patch - eapply -p0 ${FILESDIR}/openssl_hmac.patch - eapply -p0 ${FILESDIR}/openssl_ocsp.patch - eapply -p0 ${FILESDIR}/openssl_ssl.patch - eapply -p0 ${FILESDIR}/openssl_x509.patch - eapply -p0 ${FILESDIR}/openssl_x509name.patch - eapply -p1 ${FILESDIR}/openssl_proto.patch - eapply -p1 ${FILESDIR}/ssl_python.patch - eapply -p1 ${FILESDIR}/cryptography.patch - eapply -p1 ${FILESDIR}/openssl_cleanup.patch -} - -src_configure() { - tc-export CC -} - -src_compile() { - mkdir bin || die - # switch to the layout expected for cffi module builds - mkdir include/pypy3.9 || die - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die - cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die - # (not installed by pypy-exe) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/pypy3.9/ || die - mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die - pax-mark m pypy3.9-c - - # verify the subslot - local soabi=$( - ./pypy3.9-c - <<-EOF - import importlib.util - import sysconfig - soabi = sysconfig.get_config_var("SOABI") - magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff - print(f"{soabi}-{magic}") - EOF - ) - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - # Add epython.py to the distribution - echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die - - einfo "Generating caches and CFFI modules ..." - - # Generate sysconfig data - local host_gnu_type=$(sh pypy/tool/release/config.guess) - local overrides=( - HOST_GNU_TYPE "${host_gnu_type:-unknown}" - INCLUDEPY "${EPREFIX}/usr/include/pypy3.9" - LIBDIR "${EPREFIX}/usr/$(get_libdir)" - TZPATH "${EPREFIX}/usr/share/zoneinfo" - WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip" - ) - ./pypy3.9-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die - local outdir - outdir=$( pypy_incremental_magic -SLOT="0/pypy39-pp73-336" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ensurepip gdbm +jit libressl ncurses sqlite tk" -# many tests are failing upstream -# see https://buildbot.pypy.org/summary?branch=py3.9 -RESTRICT="test" - -RDEPEND=" - || ( - >=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2(+),ncurses?] - >=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV} - ) - dev-lang/python-exec[python_targets_pypy3(-)] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( >=dev-libs/libressl-3.6.0:0= ) - ensurepip? ( dev-python/ensurepip-wheels ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - local PATCHES=( - "${WORKDIR}/${PATCHSET}" - ) - default - - eapply_user - eapply -p0 ${FILESDIR}/openssl_ct.patch - eapply -p0 ${FILESDIR}/openssl_dh.patch - eapply -p0 ${FILESDIR}/openssl_evp.patch - eapply -p0 ${FILESDIR}/openssl_hmac.patch - eapply -p0 ${FILESDIR}/openssl_ocsp.patch - eapply -p0 ${FILESDIR}/openssl_ssl.patch - eapply -p0 ${FILESDIR}/openssl_x509.patch - eapply -p0 ${FILESDIR}/openssl_x509name.patch - eapply -p1 ${FILESDIR}/openssl_proto.patch - eapply -p1 ${FILESDIR}/ssl_python.patch - eapply -p1 ${FILESDIR}/cryptography.patch - eapply -p1 ${FILESDIR}/openssl_cleanup.patch -} - -src_configure() { - tc-export CC -} - -src_compile() { - mkdir bin || die - # switch to the layout expected for cffi module builds - mkdir include/pypy3.9 || die - # copy over to make sys.prefix happy - cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die - cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die - # (not installed by pypy-exe) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/pypy3.9/ || die - mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die - pax-mark m pypy3.9-c - - # verify the subslot - local soabi=$( - ./pypy3.9-c - <<-EOF - import importlib.util - import sysconfig - soabi = sysconfig.get_config_var("SOABI") - magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff - print(f"{soabi}-{magic}") - EOF - ) - [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" - - # Add epython.py to the distribution - echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die - - einfo "Generating caches and CFFI modules ..." - - # Generate sysconfig data - local host_gnu_type=$(sh pypy/tool/release/config.guess) - local overrides=( - HOST_GNU_TYPE "${host_gnu_type:-unknown}" - INCLUDEPY "${EPREFIX}/usr/include/pypy3.9" - LIBDIR "${EPREFIX}/usr/$(get_libdir)" - TZPATH "${EPREFIX}/usr/share/zoneinfo" - WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip" - ) - ./pypy3.9-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die - local outdir - outdir=$( pypy_incremental_magic +SLOT="0/pypy39-pp73-336" +KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="+ensurepip gdbm +jit ncurses sqlite tk" +# many tests are failing upstream +# see https://buildbot.pypy.org/summary?branch=py3.9 +RESTRICT="test" + +RDEPEND=" + || ( + >=dev-python/pypy3-exe-${PYPY_PV}:3.9-${PYPY_PV}[bzip2(+),ncurses?] + >=dev-python/pypy3-exe-bin-${PYPY_PV}:3.9-${PYPY_PV} + ) + dev-lang/python-exec[python_targets_pypy3(-)] + dev-libs/openssl:0= + dev-python/gentoo-common + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:0= ) + sqlite? ( dev-db/sqlite:3= ) + tk? ( + dev-lang/tk:0= + dev-tcltk/tix:0= + ) +" +DEPEND=" + ${RDEPEND} +" + +src_prepare() { + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + default + + eapply_user +} + +src_configure() { + tc-export CC +} + +src_compile() { + mkdir bin || die + # switch to the layout expected for cffi module builds + mkdir include/pypy3.9 || die + # copy over to make sys.prefix happy + cp -p "${BROOT}"/usr/bin/pypy3.9-c-${PYPY_PV} pypy3.9-c || die + cp -p "${BROOT}"/usr/include/pypy3.9/${PYPY_PV}/* include/pypy3.9/ || die + # (not installed by pypy-exe) + rm pypy/module/cpyext/include/_numpypy/numpy/README || die + mv pypy/module/cpyext/include/* include/pypy3.9/ || die + mv pypy/module/cpyext/parse/*.h include/pypy3.9/ || die + pax-mark m pypy3.9-c + + # verify the subslot + local soabi=$( + ./pypy3.9-c - <<-EOF + import importlib.util + import sysconfig + soabi = sysconfig.get_config_var("SOABI") + magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff + print(f"{soabi}-{magic}") + EOF + ) + [[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}" + + # Add epython.py to the distribution + echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die + + einfo "Generating caches and CFFI modules ..." + + # Generate sysconfig data + local host_gnu_type=$(sh pypy/tool/release/config.guess) + local overrides=( + HOST_GNU_TYPE "${host_gnu_type:-unknown}" + INCLUDEPY "${EPREFIX}/usr/include/pypy3.9" + LIBDIR "${EPREFIX}/usr/$(get_libdir)" + TZPATH "${EPREFIX}/usr/share/zoneinfo" + WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip" + ) + ./pypy3.9-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die + local outdir + outdir=$(