From a0953f7ac639d8e180f62ab3364ccf9af71f783d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Feb 2023 21:58:19 +0000 Subject: gentoo auto-resync : 26:02:2023 - 21:58:19 --- dev-python/Manifest.gz | Bin 260127 -> 260121 bytes dev-python/blessed/Manifest | 2 +- dev-python/blessed/blessed-1.20.0.ebuild | 3 +- dev-python/coverage/Manifest | 2 +- dev-python/coverage/coverage-7.1.0.ebuild | 2 +- dev-python/cython/Manifest | 2 + dev-python/cython/cython-3.0.0_beta1.ebuild | 95 ++++++++++ dev-python/httpx-socks/Manifest | 2 +- dev-python/httpx-socks/httpx-socks-0.7.5.ebuild | 2 +- dev-python/hypercorn/Manifest | 2 +- dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild | 2 +- dev-python/libvirt-python/Manifest | 2 +- .../libvirt-python/libvirt-python-8.9.0.ebuild | 2 +- dev-python/pulsectl/Manifest | 2 +- dev-python/pulsectl/pulsectl-22.3.2.ebuild | 6 +- dev-python/pycparser/Manifest | 5 +- .../files/pycparser-2.21-lextab-cache.patch | 66 +++++++ dev-python/pycparser/pycparser-2.21-r1.ebuild | 5 + dev-python/pycparser/pycparser-2.21-r2.ebuild | 5 + dev-python/pymediainfo/Manifest | 2 +- dev-python/pymediainfo/pymediainfo-6.0.1.ebuild | 10 +- dev-python/pyocr/Manifest | 2 +- dev-python/pyocr/pyocr-0.8.3.ebuild | 10 +- dev-python/pypy3/Manifest | 2 + dev-python/pypy3/pypy3-7.3.11_p1.ebuild | 205 +++++++++++++++++++++ dev-python/python-daemon/Manifest | 2 +- .../python-daemon/python-daemon-2.3.2.ebuild | 2 +- dev-python/python-multipart/Manifest | 2 +- .../python-multipart/python-multipart-0.0.5.ebuild | 2 +- dev-python/python-socks/Manifest | 2 +- dev-python/python-socks/python-socks-2.1.1.ebuild | 2 +- dev-python/sphinx-testing/Manifest | 2 +- .../sphinx-testing/sphinx-testing-1.0.1-r2.ebuild | 4 +- dev-python/starlette/Manifest | 2 +- dev-python/starlette/starlette-0.25.0.ebuild | 2 +- dev-python/tiny-proxy/Manifest | 2 +- dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild | 2 +- dev-python/websocket-client/Manifest | 6 +- .../websocket-client/websocket-client-1.4.2.ebuild | 37 ---- .../websocket-client/websocket-client-1.5.0.ebuild | 2 +- .../websocket-client/websocket-client-1.5.1.ebuild | 4 +- dev-python/werkzeug/Manifest | 2 +- dev-python/werkzeug/werkzeug-2.2.3.ebuild | 2 +- 43 files changed, 433 insertions(+), 84 deletions(-) create mode 100644 dev-python/cython/cython-3.0.0_beta1.ebuild create mode 100644 dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch create mode 100644 dev-python/pypy3/pypy3-7.3.11_p1.ebuild delete mode 100644 dev-python/websocket-client/websocket-client-1.4.2.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index af6965bc3943..c60855258825 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest index af7ff24e2031..4872bc07c896 100644 --- a/dev-python/blessed/Manifest +++ b/dev-python/blessed/Manifest @@ -1,5 +1,5 @@ DIST blessed-1.19.1.tar.gz 6653802 BLAKE2B 5755efde3c203ab21a8994e29c55cdaace1cca772c9cdee4343562bb8ee4f9ffdee97d9131646d8385ef7e46664d23723ba46a3807d85623d9512ca40c7c4002 SHA512 0d899c42d7c6246362081bdc5d7dd2fcb13209fe0cee7e5a4fa342bdaf16a5cc21ab7e402bc5287ab1239f7e3afb02381e0e57e2d6111b80fe3c52b92cfa0f84 DIST blessed-1.20.0.tar.gz 6655612 BLAKE2B 10523940ac2fe528487f2d1d68d9f38782ec260f1f42735940219d37d4b4dbaef2fd4ca63d753780123d54ae39ab04652d2c6ba8f3323c621a2206b0a706f6e0 SHA512 8567ff1c55f68ad99c6c524edbf8ee57813d23d885dcb372767debc76bc2d75642c2b0491e1ed05460f023c28403b5dabb13769dea101a1c6e3156c82e0d0355 EBUILD blessed-1.19.1.ebuild 1306 BLAKE2B 56956de0866175a6ea74c80203b260a56a093a123c21d2746ad814fcd783923dff28002b5db23f8f7dc12d679375e2220b028ab81b330b931330c78bee4188f7 SHA512 eeba5d69aaf7b6e4f8c3bf7708721bcaaa8583f66df120ff626d74e35541e3e373ce835af1aadea2c79338ad02f44ebeea04629f14ad77cacaf3424b969a564a -EBUILD blessed-1.20.0.ebuild 1348 BLAKE2B 67502c4cede20f47ac0af456632c5fa21d5ccd7a760598f953c7f6898349884352f475aa9c73faeaecbd90ab3ef23c2eda5d360a492a42150bd03943e4bd647d SHA512 34333133369dff1bedb200176312eae7f447bfd9ee860697f53e4e518d58f9b321a527810226d02f92bd99b37c12935e6614eab13955bd630e225276caec7e0c +EBUILD blessed-1.20.0.ebuild 1301 BLAKE2B 1e22d82468c730f9e7e123f6e2d8fa5690562371eed22cecd4ce0867eb03c81350d84bd570dc0bacb811437e5c849e1457419f13952d0e84b8f30ba9d6caa2c9 SHA512 a8d6a216e60a54ede1ffe8d79a1c66533dc610e2e54ddf9b0af01f1f0b19bce0e3c559e5a64c792449753563a8475e7d84429eaf00ce86088a935c416fc1fab0 MISC metadata.xml 557 BLAKE2B dbfca7b52ee79a095475d591fb6fd4c151309e5e9c0c9e1e4dd031b66dc3128f9e0057eab3fa85d9fc875ba14b1229e81b8101626e341dccf597f0a6db97c42f SHA512 b0c74de041336d52276075ffc75f58827812a672016c30411888cd9ffc1e468120ef9a847ae16cf7eddd892e7176aafc4d9b635c1826d8ab98d7259d642cb6e3 diff --git a/dev-python/blessed/blessed-1.20.0.ebuild b/dev-python/blessed/blessed-1.20.0.ebuild index 208bbf607353..12937dfae776 100644 --- a/dev-python/blessed/blessed-1.20.0.ebuild +++ b/dev-python/blessed/blessed-1.20.0.ebuild @@ -6,14 +6,13 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( pypy3 python3_{9..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning" HOMEPAGE=" https://github.com/jquast/blessed/ https://pypi.org/project/blessed/ " -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest index 8bc1dc128063..bf42591f4118 100644 --- a/dev-python/coverage/Manifest +++ b/dev-python/coverage/Manifest @@ -2,6 +2,6 @@ DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2 DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b EBUILD coverage-7.0.5.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8 -EBUILD coverage-7.1.0.ebuild 1881 BLAKE2B 775191d671c07b917ed543b504457dc15f99946160381602d0bcce8ddf415d724c899f413c585883d76965211b111c2485731f64697ee0859f9e2c545171ac29 SHA512 7407b3dc82725d13f1a6045817d515395206a04c76ea18e7d576d76d4eb750804874dfa5d632bdc1cd9e2372955fabb5df091d1bce08e7c285ce81cabb6000ad +EBUILD coverage-7.1.0.ebuild 1880 BLAKE2B 625b4106e56dfdd41ecdf7d90c7a95dee9b41cc81a428a5fd54b1df3c7ad87ea9a9267e999f831cd0708f6a15f008905aebb27bbcf56e75c0dd25d38bc6e70b5 SHA512 a45c4292c142aa9bc59d8e4684246a10156e4b0348edb3a4faaf86d4ea700c68f672338f0483584181c84a516d7cb21d1b1ed3c1619ac159666c8c3a0deac1e2 EBUILD coverage-7.2.0.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064 diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild index 0b8e283213d3..a0a35a6df9e0 100644 --- a/dev-python/coverage/coverage-7.1.0.ebuild +++ b/dev-python/coverage/coverage-7.1.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" RDEPEND=" $(python_gen_cond_dep ' diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest index 26e42691caff..272bc9128987 100644 --- a/dev-python/cython/Manifest +++ b/dev-python/cython/Manifest @@ -3,6 +3,8 @@ AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e08232 AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce DIST cython-0.29.32.gh.tar.gz 2110417 BLAKE2B 008ffe325c87d165bf45afb2ff92db5286f611bbe425d0e9f18b530202135ca21f5f5ab564a4d0c6251ec2479ea0fd19207274a255fb1faf8863d3b067d17ae9 SHA512 55462792fa70d8edf60aa470627ab494918d7297fd7d282a7a54da76ee5a180233108404a1c8f3d79f6408f19b6e4f46b36e59fd47c38ede24f061f374437b6f DIST cython-0.29.33.gh.tar.gz 2113910 BLAKE2B 9212edfa36680a3243632d28c4f5616a7336e82ee1f96df7d5e29711056619639c9a8fe9bbf9aea0a86aed39e836dc6eaa112ad35080f530add6309ccd09c53c SHA512 85f5ba7159d8793dbda980140b26086727f356a71d78f8522419657841d07b865d09c2f0a0f77d398669d071c1d261060235321a19eb7808e35d24f8ac71560d +DIST cython-3.0.0b1.gh.tar.gz 2659132 BLAKE2B 7ed252d90f71521f24817e064f1b55f671185053cdd46214fb14f2b6e16dbfbc46e87659681ead40a32bb0506150ae6b8cdbaceae7667811aa81f97a39b5efcc SHA512 a7b2e9c22d19eab9e4ad551895e5c8882a7098a52865e341fd84d902124b4599d193d202333d9f1ffd5354fff62637c65d124820e6721905edaed46b5881b14c EBUILD cython-0.29.32.ebuild 1989 BLAKE2B 57cc0e23f5ec7feaa5a697e6807b37003cbaa6b7be1757ff607c6591dfc39a5f7e1e0e016630f47f9f7a8cb6b235682952a894f1a2cdcad2d2f9aabef98a39e2 SHA512 ba986bf5401dc05f204270e03a4b3f911721f5e94a79bcd1c714c8a0956affe7919bae01c433ade3b84ab22a823c7c61af95b8364470781c430dd6b125244886 EBUILD cython-0.29.33.ebuild 1995 BLAKE2B 7c05a109959ed765232f618d4a60ca1f79439af246bf0c53fdf2b65eac9ff256c4c061bd28eef80c4b088e8ea74539870bbe423944b84c52a1a28dfc6bb826de SHA512 a0fac8ab71978548a5baf7085151203dc8571c3d5c4ec073f48ff406af57c3b4f4a22374ce3a7ca29d2baa2f2f28cfa8b9aca3b38aa613bfaf6d1cc28342514a +EBUILD cython-3.0.0_beta1.ebuild 2121 BLAKE2B ced4f51629663e7a8237996c7627123c30ca26f7492cfcbe63539f29646a75bed8f265b4e14ea6fca648ced5865ab666e31ae15dd31e1a95889269cf05703517 SHA512 928c1faa04105265373cb4177579f237d52abe104bd49800dc1bd31df432bc03e2d03af7de87604b6eba0ec5d429deea1c19c92719903f4732d033709df68bca MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78 diff --git a/dev-python/cython/cython-3.0.0_beta1.ebuild b/dev-python/cython/cython-3.0.0_beta1.ebuild new file mode 100644 index 000000000000..54bc5b850f4d --- /dev/null +++ b/dev-python/cython/cython-3.0.0_beta1.ebuild @@ -0,0 +1,95 @@ +# 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_{9..11} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 toolchain-funcs elisp-common + +MY_P=${P/_beta/b} +DESCRIPTION="A Python to C compiler" +HOMEPAGE=" + https://cython.org/ + https://github.com/cython/cython/ + https://pypi.org/project/Cython/ +" +SRC_URI=" + https://github.com/cython/cython/archive/${PV/_beta/b}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +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 ~x64-solaris ~x86-solaris" +IUSE="emacs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) +" +BDEPEND=" + ${RDEPEND} + test? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ' python3_{8..10}) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" + "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" +) + +SITEFILE=50cython-gentoo.el + +distutils_enable_sphinx docs \ + dev-python/jinja \ + dev-python/sphinx-issues \ + dev-python/sphinx-tabs + +python_compile() { + # Python gets confused when it is in sys.path before build. + local -x PYTHONPATH= + + distutils-r1_python_compile +} + +python_compile_all() { + use emacs && elisp-compile Tools/cython-mode.el +} + +python_test() { + if has "${EPYTHON}" pypy3 python3.11; then + einfo "Skipping tests on ${EPYTHON} (xfail)" + return + fi + + tc-export CC + # https://github.com/cython/cython/issues/1911 + local -x CFLAGS="${CFLAGS} -fno-strict-overflow" + "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests || + die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) + distutils-r1_python_install_all + + if use emacs; then + elisp-install ${PN} Tools/cython-mode.* + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-python/httpx-socks/Manifest b/dev-python/httpx-socks/Manifest index 456b123c1876..c9582b58b27f 100644 --- a/dev-python/httpx-socks/Manifest +++ b/dev-python/httpx-socks/Manifest @@ -1,3 +1,3 @@ DIST httpx-socks-0.7.5.gh.tar.gz 24847 BLAKE2B 9c119b756bf493df47a1bc9c36339508a2192d2bd4392113955fed6929d7c79654f17c069f9d952a11d8c95cf210cdf54af1bb59f47dc50b26b180f0915d3fe9 SHA512 df921af0c5fd0e8b4cb127cd13d5285ae57eb6ff9bc95f9422c02c79771ef55f345ef1618156fd0887467ed81cad2081ea9f2a56a03dc1d80948ed9eabe67aee -EBUILD httpx-socks-0.7.5.ebuild 1139 BLAKE2B 3d83da22401997272d6382f66bb549f393100bffb957edad9dc05f4cd9536c30308340722d4b9661ce20e8d9fdfec8863d39bfc8a02cc082d6999d43347466ca SHA512 f6755cd2cae65b06e928b6d2550ceecdb0f9a1666e8f1da4f5dd056fd85f5fc84872864e230ab635d319600ed845be618aaed13b6889daefff0a105693e67bc3 +EBUILD httpx-socks-0.7.5.ebuild 1145 BLAKE2B 54de0057b1dc3ed8b5cb8f6e55bf2eec77a2f559fdb9d040deffa06e5be820393681898a4513bb5ae66f594b6397de489038c0e6cee725ef87ea6bac8c79c7ca SHA512 fc2e4e1056b1bca945f26504f9db033356097254f728d7025721edf62358bbd45cde19e59b255d28186e364ab79f0ffb3fc421a5c3d32250787df48fe25ce0ad MISC metadata.xml 400 BLAKE2B b244ebd9f79b1c3313797b0384339d17df61913473cd26ab01c8490fe02cbe735609dbd2b2d76e7b1b7f716bbb3038590517481a05c1b7886ad49905f171f5e3 SHA512 3cb1600426cdc5b9ec3bd5d18b547dedb961bbc341891293f828e70d5156d845c8676ba25244804d32c702fab40134c39237e5ce4fc518104a969a8f8ffb282f diff --git a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild index 73540c460595..e0dff8065973 100644 --- a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild +++ b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" RDEPEND=" +Date: Sun, 26 Feb 2023 01:04:34 +0100 +Subject: [PATCH] _build_tables: Invalidate cache before importing generated + modules (#494) + +Make sure to invalidate finder caches before trying to import generated +modules. This is necessary according to the Python documentation: +https://docs.python.org/3/library/importlib.html#importlib.invalidate_caches + +This fixes a hard-to-reproduce bug that Python would be unable to find +just-generated `lextab.py` if mtime of the current directory did not +change from the moment the script was started. This could +e.g. be the case if one has second-precision timestamps and removes +the generated file just before starting the build, e.g.: + + $ rm pycparser/lextab.py; python -m build -nw + +It could also be reproduced easier by doing something like: + + $ cd pycparser + $ touch .; python -B _build_tables.py + Traceback (most recent call last): + File "/var/tmp/pycparser/pycparser/_build_tables.py", line 38, in + import lextab + ModuleNotFoundError: No module named 'lextab' + +This is because the first command (`rm` or `touch`) updates the mtime +of the directory to the current time. If the script is run fast enough, +it manages to scan the directory and then write the new `lextab.py` +within the same second. As a result, mtime of the directory after +writing the new file is the same as when the script was started, finder +does not invalidate the cache and assumes that `lextab.py` does not +exist since it did not exist when the directory was scanned earlier. + +This potentially fixes #493. + +It was originally reported on https://bugs.gentoo.org/701878. +Thanks to Gary E. Miller for patience in reproducing the problem +and proxy-debugging it for me, as well as testing the final patch before +submission. +--- + pycparser/_build_tables.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pycparser/_build_tables.py b/pycparser/_build_tables.py +index 958381ad..4f371079 100644 +--- a/pycparser/_build_tables.py ++++ b/pycparser/_build_tables.py +@@ -13,6 +13,7 @@ + # Insert '.' and '..' as first entries to the search path for modules. + # Restricted environments like embeddable python do not include the + # current working directory on startup. ++import importlib + import sys + sys.path[0:0] = ['.', '..'] + +@@ -32,6 +33,8 @@ + + # Load to compile into .pyc + # ++importlib.invalidate_caches() ++ + import lextab + import yacctab + import c_ast diff --git a/dev-python/pycparser/pycparser-2.21-r1.ebuild b/dev-python/pycparser/pycparser-2.21-r1.ebuild index 1b0d8e6f6901..3848eaeedd3a 100644 --- a/dev-python/pycparser/pycparser-2.21-r1.ebuild +++ b/dev-python/pycparser/pycparser-2.21-r1.ebuild @@ -30,6 +30,11 @@ BDEPEND=" distutils_enable_tests unittest python_prepare_all() { + local PATCHES=( + # https://github.com/eliben/pycparser/pull/494 + "${FILESDIR}"/${P}-lextab-cache.patch + ) + # remove the original files to guarantee their regen rm pycparser/{c_ast,lextab,yacctab}.py || die diff --git a/dev-python/pycparser/pycparser-2.21-r2.ebuild b/dev-python/pycparser/pycparser-2.21-r2.ebuild index edebc42725b5..08416104b7d4 100644 --- a/dev-python/pycparser/pycparser-2.21-r2.ebuild +++ b/dev-python/pycparser/pycparser-2.21-r2.ebuild @@ -29,6 +29,11 @@ BDEPEND=" distutils_enable_tests unittest python_prepare_all() { + local PATCHES=( + # https://github.com/eliben/pycparser/pull/494 + "${FILESDIR}"/${P}-lextab-cache.patch + ) + # remove the original files to guarantee their regen rm pycparser/{c_ast,lextab,yacctab}.py || die diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest index 7633415e68cb..825058262ddb 100644 --- a/dev-python/pymediainfo/Manifest +++ b/dev-python/pymediainfo/Manifest @@ -1,3 +1,3 @@ DIST pymediainfo-6.0.1.tar.gz 446487 BLAKE2B 402c71157e43fd03efe37934932c61e1e22d469c13f5b5e85d7e0f1d52d6e54289860777c1677efeb4710a5c55086a1c7db03da8ad2f88f49d144bd5484f8638 SHA512 7b373b133911eb320248f72627f6aeb6fa04705b55500639d18094ed8227296fd744c2c4b76d765e8b2d98d78f443114e9ca7ef8e2e0eb498d48d2b46956f952 -EBUILD pymediainfo-6.0.1.ebuild 752 BLAKE2B b96e95921fc32a9e153e085bd90ab487f96eda7a5587c41edfb0d157b6f104b16be74f1f7af438ee9b14d0a8abf3512b3c890288c45ae7eb65b798aa5fc28f52 SHA512 d8ffee2224f33d5af431af8ebe8d14ba1f709bd7947fd86c87de4e0a7fbb3b58608b8a011ec823925907882d645405a6c6cb1be62f02faa67e546c9d994e3ff0 +EBUILD pymediainfo-6.0.1.ebuild 748 BLAKE2B 14819ad6af189d20da41357ca7cc7836a835ef98ee8d84a0d42715ef0d3f4bb0445234cef53d58539f2605f3d55015a2166864dfdfcf38dfec60e6ba189c3935 SHA512 1b5848fcec33d71d2b90c2024637733b9a93db4d6a0a8a2cfa9ad203f00111899b236888b891ddc14df7d4bf02614187da9801f19db8dc439dc564f99fbb965f MISC metadata.xml 491 BLAKE2B c204e000d175f22b70686247e5db4b7cf791489785aaa72099676a554791c555ad3c60892229b12c35b84d1a382b9adfa54eef6cc20bd5cc63ea536c05995032 SHA512 507cc75dc66e7d23846f0a295ac0a21110f9164fb0a5b70f3f7a71420796fd1f35ffb587a84952634e1cef6df322db4abf0eba50976033fd0159d92f54e10357 diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild index 1df296187ae4..a161439ad7b3 100644 --- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild +++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,13 @@ DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( pypy3 python3_{9..11} ) PYTHON_REQ_USE="xml(+)" -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="A wrapper around the mediainfo library" -HOMEPAGE="https://github.com/sbraz/pymediainfo" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +HOMEPAGE=" + https://github.com/sbraz/pymediainfo/ + https://pypi.org/project/pymediainfo/ +" LICENSE="MIT" SLOT="0" diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest index 94ff4c40a51c..ab39ab162abc 100644 --- a/dev-python/pyocr/Manifest +++ b/dev-python/pyocr/Manifest @@ -1,3 +1,3 @@ DIST pyocr-0.8.3.tar.gz 67625 BLAKE2B 86edfb08519eda73b29b57b57d495c0fa3bebe8b521d96ce4b644d534d2b32e92532e6275f595912c77093eaf0b1f767f08a130605e9b50142fddf77eb570c4d SHA512 aa4f4fcedd668010841d036899bb83bc0fca6499b29ce2f209e538fd3a2448dce2b52721f0b77bc402d9b3f62052af53e25e78780103172623dea1b367caeab1 -EBUILD pyocr-0.8.3.ebuild 886 BLAKE2B 57be15a3b84bffc819dc00770f760a6af9ee5871ed26e6ec20c6de1ab15519c993478c3e9c1b0fdd6c708fa474310508ef36f3801b345f21b072b22c3d61ed9c SHA512 a77f27cf28cfbabcf24f2c355b4cc5c4325c094832256f852e81be84c3eb40c6ef3dd3daaf45f808990c27c041ba960a49809df16b610bc381377a1a3ebd6676 +EBUILD pyocr-0.8.3.ebuild 1013 BLAKE2B d81e8bc2622127c5c8c87c7535e4b9337a9cf1bdc32f164f3dfc39fd1b79eff2c091c3808db07b3e51b473341eafb87aeaf81346dbab1cdba3086117f03c5c65 SHA512 d9f077ea53bffe7ce8f0b492515be2e204d954bf9d1bae4b52ffde2b6af28a5bd6989bdb6a99e0b5abc8f07f3340fa74329773917b5df47d1282e711da9a5151 MISC metadata.xml 1203 BLAKE2B b9111445c4d6ee7876a2a151add124a02861f0ec23312140ac3722848f6cd888e890f244043f3f1117b1ec01d26161a4772b15f0f86ad2e353e814ccfa66440c SHA512 e432f55c0e8c982bc5ca9b07f96c7585c381e87ed16c1dd8ae372bddc744570a55af809e6d65925949afe67411b3ad8b1e797b51b740b1dea745ab6772749280 diff --git a/dev-python/pyocr/pyocr-0.8.3.ebuild b/dev-python/pyocr/pyocr-0.8.3.ebuild index fddb70bcf83d..043633454a4a 100644 --- a/dev-python/pyocr/pyocr-0.8.3.ebuild +++ b/dev-python/pyocr/pyocr-0.8.3.ebuild @@ -6,11 +6,10 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="An optical character recognition (OCR) tool wrapper" HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" @@ -34,4 +33,9 @@ RDEPEND+=" tesseract? ( app-text/tesseract ) " -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +src_prepare() { + # workaround setuptools failing due to version being None + # https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/issues/127 + sed -i -e '/version=version/d' setup.py || die + distutils-r1_src_prepare +} diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest index 53d6ae4372f9..e9ab1f893b5a 100644 --- a/dev-python/pypy3/Manifest +++ b/dev-python/pypy3/Manifest @@ -1,4 +1,6 @@ DIST pypy3.9-gentoo-patches-7.3.11.tar.xz 6444 BLAKE2B adcc1ae4c3ae2c5317a05d6de51785945625d8bcc7cb35bd6608fa80f09b37c483c95663eacb0353013a5abec308d25b12666699c65512f5f3a6d7345f2b5b18 SHA512 f2064ecffa09ba23f5f8c281ca4c8c0740cb6b57185d66c02eec2bcb77cfb566b1a2db4f52c472bcaf0d5fb759ee8003b27761af37785d12465c2010fd73c49d +DIST pypy3.9-gentoo-patches-7.3.11_p1.tar.xz 7480 BLAKE2B ffb478402e82244af25dd67bb9e21abb4bb186d98495899f8ca8f323bdf27a77356e40efd33217a5238ef86f6156fc7d85c681a747ea5a35bd73bab659972986 SHA512 6c3ee21b51145907c2434f740e9849ac02ad83203fdcb2802b97ba199f37d08297d8016f659069bea3f0854ace30aefb947af4f057cbc91332106d9fc1389cf4 DIST pypy3.9-v7.3.11-src.tar.bz2 23460769 BLAKE2B fa8a827c28813243926c8689addb008c0a43acdc3f81a18749a8f2c1926b6294f2c0c95a4c315e3b77ce84b4f337af7a0bce5daf8dcb60ead965532d4af183cb SHA512 33c978ffbeeb39453028d1d1646ccfdace062ce48a5d939245bea41643038dd3687e80e34f88fa0622bcb175d7dd78f75cbe36b24229c8052f09d2d17dcdfd8c EBUILD pypy3-7.3.11-r1.ebuild 5860 BLAKE2B 1dc807f5275e756aa18726045ed5770c821c4dc8361c27270d2c2057eca84a49aa7a1557406a01d0b395e5eded2805764532916c81feaf43bebd7bf09362a9b4 SHA512 776b342d4c51e5d42229912afab4deb0ff16e84db5bc7a696e8dcff6e476ad7931bf5b13cd5f8e3b1edc08b51b8f5f4f47cf0637139a9a3af011ed8a98511983 +EBUILD pypy3-7.3.11_p1.ebuild 5862 BLAKE2B 0c2d2ab149bc6faf94f8949c42c6c0b3b30f5986828da58d348e2114585ea9bd899e01fa179e3c50973b8d8dc40135134e5458f34c91f79d233803012462c370 SHA512 02a9692f3b534b13bf8570d279ae3726fc8c6791a4491031cc2edd08b301b3d3b8234cfe671727e60b827329d1190bf4af2d0f2b313caa7cecb1359db7a49742 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6 diff --git a/dev-python/pypy3/pypy3-7.3.11_p1.ebuild b/dev-python/pypy3/pypy3-7.3.11_p1.ebuild new file mode 100644 index 000000000000..d0f7918e6b5f --- /dev/null +++ b/dev-python/pypy3/pypy3-7.3.11_p1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2023 Gentoo 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 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=$(