From 22b4e2ee9c8011b75d7c030d6129a7487494aeba Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 13 Dec 2023 05:39:05 +0000 Subject: gentoo auto-resync : 13:12:2023 - 05:39:04 --- dev-python/Manifest.gz | Bin 271025 -> 271032 bytes dev-python/PyQt6/Manifest | 3 +- dev-python/PyQt6/PyQt6-6.6.1.ebuild | 4 ++ dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch | 77 +++++++++++++++++++++ dev-python/nodeenv/Manifest | 2 + .../nodeenv/files/nodeenv-1.8.0-which-hunt.patch | 64 +++++++++++++++++ dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild | 33 +++++++++ 7 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch create mode 100644 dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch create mode 100644 dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 481767f50c47..7021e9a36c81 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index 9ef613a5de3c..f10c9fc4c9ea 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1,8 +1,9 @@ AUX PyQt6-6.5.2-qt660.patch 767 BLAKE2B ec6c345ad8a7f2b1029291bc76b8ccd3df6b0661761c1c6e2d1c8eeb033189f0ffa04c9a509a160bdd86768c5f89bfcd556602e9545404bdd5e7b67976ad2a0a SHA512 975bbb18dd39c9b4f232695210283e9d28da92945a80c22cc1e490d805bdef1ea70904b86af74ca7abdafcdb6b3cea5ffdbd58e7d6bd3e77f5d7c43414f3232c +AUX PyQt6-6.6.1-qt670.patch 2528 BLAKE2B 3157c4e4e063747db56e92b011147dfb3a57474b6e80f052372d4b83b91bf36bb18ba256f4e2b4466c140744b075ac47217915ad5d744900754c8f4af7ab8f61 SHA512 5894b371cfa9b22de2300cc75b7ab486944ecd7c8f2aed6bdd03355c9952ebd550ec2383ff057d629b54d91f92ef67cd566a39d7e38696d6ba2b09622b9900e8 DIST PyQt6-6.5.3.tar.gz 1039271 BLAKE2B 965efa73daa83e46fbb1428b27f8bfc8e5cbfd4cfa5481b50835fdcc58f475416207a670882d47a0cc724e4dc06e0a00a512c5f83c4918134c2f1303aecda20e SHA512 a502693cc9e1887011466132cd85e232ce653bfc38519aed99a77332413bdb65a01ecad4680b831eb76365b086e6a3b52fa69017b39d95933a6372d2e7e8e4bb DIST PyQt6-6.6.0.tar.gz 1043298 BLAKE2B 1e0412e5f73734de625f5eb3f148d675c44909d56694e47e029a3ae91fd28f17e1edb2469f7af03baec52ad5636c3dba120d1328664f4f0557b7a9658b1e6cf1 SHA512 2fe8640b1dc82aa1da6064da2ef6c4ee81216ed34f28211b69d22c5ea00f782298f5a6a94d32ab00c3ee095abf15d2182a17324cd132458580f5659e789686e3 DIST PyQt6-6.6.1.tar.gz 1043203 BLAKE2B dd2b6988ebeabaae47fe57c5c0d17fbe4b62c377262b4bb360adb7fd6724ccb6a67ba5c2bd7498df98db3ce6b00978f936b11a43b464c3c7af169f25b30ee1a6 SHA512 c2ff8c47c9b0e43c009d0c90f565a54344e6f384c67dd30c2d422465d0702c07713acc0095c8b67827d1146675611c07d548ba282a26e41bb60a0a21977a7a64 EBUILD PyQt6-6.5.3.ebuild 5585 BLAKE2B 4613e566f035e50b2d3ce07c460cd863a391f1df8a758a7178697da18bfddd25befd512f506f0dd65976ee7acd6e245126c3f3917ebfef849f5e4f6303e0d697 SHA512 68ca15ce30fb2297bfee0eba3a7839ddbe96bec3653107459982d2b20fd87a33653dad8135ed9665d18f9d9a32ae783a20d940d638221c081a476a62dc35231a EBUILD PyQt6-6.6.0-r1.ebuild 5534 BLAKE2B ec7f209c98a2efa834e174465d93f60c5fef1aa0ce90e14a82fae393d9774389539071b95a6df5fb95b5837956cd950f073556439538940d81a6942d63ab4e3c SHA512 cfdba1d97e3485f72fc1c742bb2bfb0f259cc436e7d6f63db4510da456a6cca5756316bafeea8ed7d35798872d432f71110a16a89a9dc66d4a7425a04c62807c -EBUILD PyQt6-6.6.1.ebuild 5534 BLAKE2B ec7f209c98a2efa834e174465d93f60c5fef1aa0ce90e14a82fae393d9774389539071b95a6df5fb95b5837956cd950f073556439538940d81a6942d63ab4e3c SHA512 cfdba1d97e3485f72fc1c742bb2bfb0f259cc436e7d6f63db4510da456a6cca5756316bafeea8ed7d35798872d432f71110a16a89a9dc66d4a7425a04c62807c +EBUILD PyQt6-6.6.1.ebuild 5586 BLAKE2B 8034c5214d998bab48da026023b30c46d23b1877484ca0460593a8edad82277f58d3193c620489b33af9cb79be1ecb61f2b77c3d968419c5e20f33d7b3464f3f SHA512 e1d299f51f609bc7d03f04dd9fe056f80e0b03bfe37a2b89ee4504d9fe5bdae13e86bad5962c7732878f522bae5d88a680e3fdfee89e99ba1d8f2afd26571673 MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild b/dev-python/PyQt6/PyQt6-6.6.1.ebuild index 4dee14aeda33..b5abeb38b190 100644 --- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild +++ b/dev-python/PyQt6/PyQt6-6.6.1.ebuild @@ -84,6 +84,10 @@ BDEPEND=" dbus? ( virtual/pkgconfig ) " +PATCHES=( + "${FILESDIR}"/${PN}-6.6.1-qt670.patch +) + src_prepare() { default diff --git a/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch b/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch new file mode 100644 index 000000000000..64c4aa303836 --- /dev/null +++ b/dev-python/PyQt6/files/PyQt6-6.6.1-qt670.patch @@ -0,0 +1,77 @@ +Early workarounds to fix build with upcoming Qt6.7.0 not to have +to wait for the matching PyQt6-6.7.0. Not fully correct fixes, +but should be better than failing. May need revision given 6.7 +apis are not finalized as of the writing of this. + +Caused by the following commits: +https://github.com/qt/qtbase/commit/fd48ce0b73c (qdatastream+pyqtpyboject) +> qsizetype is ssize_t and ends up more correct (e.g. for Py_ssize_t) +https://github.com/qt/qtbase/commit/7a3fed3f209 (qtimezone) +> removed, can just drop these if 6.7 and ignore the replacement +https://github.com/qt/qtbase/commit/19bc5de296a (qfont) +https://github.com/qt/qtbase/commit/bde443801fe (qfont) +> these tag features are new'ish (and changing) and only available if +> >=6.6 as-is, let's just drop them if 6.7 as no revdeps should need yet +--- a/qpy/QtCore/qpycore_pyqtpyobject.cpp ++++ b/qpy/QtCore/qpycore_pyqtpyobject.cpp +@@ -173,9 +173,13 @@ + { + char *ser; ++#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) ++ qsizetype len; ++#else + uint len; ++#endif + + in.readBytes(ser, len); + +- if (len) ++ if (len > 0) + { + static PyObject *loads = 0; +--- a/sip/QtCore/QtCoremod.sip ++++ b/sip/QtCore/QtCoremod.sip +@@ -23,5 +23,5 @@ + %Module(name=PyQt6.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt6, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True) + +-%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0} ++%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0 Qt_6_7_0} + + %Platforms {Android iOS Linux macOS WebAssembly Windows} +--- a/sip/QtCore/qdatastream.sip ++++ b/sip/QtCore/qdatastream.sip +@@ -123,5 +123,9 @@ + %MethodCode + char *s; ++#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) ++ qsizetype l; ++#else + uint l; ++#endif + + Py_BEGIN_ALLOW_THREADS +--- a/sip/QtCore/qtimezone.sip ++++ b/sip/QtCore/qtimezone.sip +@@ -72,6 +72,8 @@ + ~QTimeZone(); + void swap(QTimeZone &other /Constrained/); ++%If (- Qt_6_7_0) + bool operator==(const QTimeZone &other) const; + bool operator!=(const QTimeZone &other) const; ++%End + bool isValid() const; + QByteArray id() const; +--- a/sip/QtGui/qfont.sip ++++ b/sip/QtGui/qfont.sip +@@ -209,4 +209,5 @@ + QStringList families() const; + void setFamilies(const QStringList &); ++%If (- Qt_6_7_0) + %If (Qt_6_6_0 -) + void setFeature(quint32 tag, quint32 value); +@@ -239,4 +240,5 @@ + static quint32 stringToTag(const char *tagString /Encoding="None"/); + %End ++%End + }; + diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest index 1add1cd18b49..eaaf77e3ddcb 100644 --- a/dev-python/nodeenv/Manifest +++ b/dev-python/nodeenv/Manifest @@ -1,3 +1,5 @@ +AUX nodeenv-1.8.0-which-hunt.patch 2104 BLAKE2B cf39acc007c270fa742b6e6556c5cd2a1655112852f4d9bb4b446165c511418cc00bc9c8c21be22007d18d0519f213a9e68b8b85d6188d5cebba729cd004c271 SHA512 d1ada89867dde59a136d0f5383e5dcacecf154bd0a264f8bce1f207ae7c08ae4ce61386126f33cf24a8d821ae52dd51b8829cb999c9fe699b7b24c217e5f92bf DIST nodeenv-1.8.0.gh.tar.gz 36750 BLAKE2B e75217bb0c468649cbc29688f29d62450008816fb07e4decf1b28dada8b820c2d6f70eb65444e06a8c64b8a816c0cc98f7d179e770eaefe93e87c0cda05e1f85 SHA512 96dce219e00d3837b2b0083af9fe6d94ed4e3cd029e3da564263ad8656dcb9c52440c2df6a6954095e5cacd03e44437f08695603dea82c28122713045183014f +EBUILD nodeenv-1.8.0-r1.ebuild 658 BLAKE2B 0327727092166c42d500d3f2dbd7b1339c43e13cc07a595487026dd324e1bf4bfe7d8a821f653afe06b358908689b76b87874a0226214a70e524772944c1926b SHA512 62125f5155347adb50744721f494e172024c1a3ea7756ff1a523ff7de6adb13fb28914169fcb5c0cf6d68a88f3d03f7663b78361a4a232582543744b0348e55a EBUILD nodeenv-1.8.0.ebuild 692 BLAKE2B a1097ac1da6949cbc2775bd4cfd20a7f33b36ac175b07535e2966a3ce02bc4828bff239588fbb5b2bd2bd1b91d212f58e025c094d1ec7a16984511daf3cfdc2b SHA512 9bc7f2619f379734fd07e9b3cd7da3725c63e8ba238367e8bf9adbadd7dab6acf92b5d52d9793f80e55d535b7efcf1461359dd1cc19e291fe3f50d0f1b2e484c MISC metadata.xml 378 BLAKE2B 7dfad28224587f9df7781a7b1d8837b6c386b40fe20da3fe4b1cd4dcdc417a55ce5da03870907e44f6aa64e1d1160dda43848dac097ef881615688c511ce9a4d SHA512 06d76ecd3a1077b3bd37d37783ff37b4f58ad2e7fbb5294a0594ff748e5f64498567e4d1814a89ed0136ecf17a335a0f8a1627af2185144b4d929b25a8eaa2d3 diff --git a/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch b/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch new file mode 100644 index 000000000000..58d3275e9568 --- /dev/null +++ b/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch @@ -0,0 +1,64 @@ +https://github.com/ekalinin/nodeenv/issues/333 +https://github.com/ekalinin/nodeenv/pull/346 + +From 0d3ebaf7e13175e2871f59856f29d880a4cb3acf Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 13 Dec 2023 04:13:24 +0000 +Subject: [PATCH] Remove usage of non-portable `which` + +* Use Python's shutil.which() instead of shelling out to `which` to find Python 2 +* Use `command -v` instead of `which` in README + +Fixes: https://github.com/ekalinin/nodeenv/issues/333 +--- + README.rst | 2 +- + README.ru.rst | 2 +- + nodeenv.py | 8 ++------ + 3 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/README.rst b/README.rst +index c9e130b..3459572 100644 +--- a/README.rst ++++ b/README.rst +@@ -211,7 +211,7 @@ environment:: + + $ workon my_env + $ npm install -g coffee-script +- $ which coffee ++ $ command -v coffee + /home/monty/virtualenvs/my_env/bin/coffee + + Creating a virtual environment with a custom prompt: +diff --git a/README.ru.rst b/README.ru.rst +index c3eb130..2cc821e 100644 +--- a/README.ru.rst ++++ b/README.ru.rst +@@ -155,7 +155,7 @@ python'а:: + + $ workon my_env + $ npm install -g coffee-script +- $ which coffee ++ $ command -v coffee + /home/monty/virtualenvs/my_env/bin/coffee + + +diff --git a/nodeenv.py b/nodeenv.py +index 9d5dd06..183ded2 100644 +--- a/nodeenv.py ++++ b/nodeenv.py +@@ -707,12 +707,8 @@ def build_node_from_src(env_dir, src_dir, node_src_dir, args): + # Currently, the node.js build scripts are using python2.*, + # therefore we need to temporarily point python exec to the + # python 2.* version in this case. +- try: +- _, which_python2_output = callit( +- ['which', 'python2'], args.verbose, True, node_src_dir, env +- ) +- python2_path = which_python2_output[0] +- except (OSError, IndexError): ++ python2_path = shutil.which('python2') ++ if not python2_path: + raise OSError( + 'Python >=3.0 virtualenv detected, but no python2 ' + 'command (required for building node.js) was found' + diff --git a/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild b/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild new file mode 100644 index 000000000000..71ae564e69fb --- /dev/null +++ b/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild @@ -0,0 +1,33 @@ +# 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_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="Node.js virtual environment builder" +HOMEPAGE=" + https://github.com/ekalinin/nodeenv/ + https://pypi.org/project/nodeenv/ +" +SRC_URI=" + https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" + +# requires network access +RESTRICT="test" +PROPERTIES="test_network" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-which-hunt.patch +) + +distutils_enable_tests pytest -- cgit v1.2.3