From dce60e5aa0a12ccc07c10a0a2c3f8f063393b32a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2024 11:36:40 +0000 Subject: gentoo auto-resync : 15:02:2024 - 11:36:40 --- dev-python/Manifest.gz | Bin 269036 -> 269042 bytes dev-python/httpbin/Manifest | 4 +- .../files/httpbin-0.10.1-optional-flasgger.patch | 24 +---- dev-python/httpbin/httpbin-0.10.1-r4.ebuild | 55 ---------- dev-python/httpbin/httpbin-0.10.1-r5.ebuild | 55 ++++++++++ dev-python/python3-discogs-client/Manifest | 4 +- .../python3-discogs-client-2.7.ebuild | 3 +- .../python3-discogs-client-9999.ebuild | 3 +- dev-python/virtualenvwrapper/Manifest | 5 +- ...apper-4.8.4_p20230121-remove-use-of-which.patch | 116 --------------------- .../virtualenvwrapper-6.0.0.ebuild | 71 ------------- .../virtualenvwrapper-6.1.0.ebuild | 2 +- 12 files changed, 64 insertions(+), 278 deletions(-) delete mode 100644 dev-python/httpbin/httpbin-0.10.1-r4.ebuild create mode 100644 dev-python/httpbin/httpbin-0.10.1-r5.ebuild delete mode 100644 dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch delete mode 100644 dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index ed6b9a89518c..78afe3fd08fb 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest index 376a9632841c..6722680f94fe 100644 --- a/dev-python/httpbin/Manifest +++ b/dev-python/httpbin/Manifest @@ -1,5 +1,5 @@ -AUX httpbin-0.10.1-optional-flasgger.patch 3009 BLAKE2B 4e71b09cedce87f58fae6295f91efbe89e7619a8f9a778e145c34e21b2f974b37547930b331e949f656a950aef057f497e81dc6e255ff33c2f1d0ea596e45d28 SHA512 c57143d4e31c6d74d2155cb8539807ec472ffda7060fbd0e694267c06c21f9cea1b6e62003563d0cbb9dcbd1b6a515855ba5cf358fd216a9ee495bc9964d6c4f +AUX httpbin-0.10.1-optional-flasgger.patch 2246 BLAKE2B f96db03047b779625f5107aff167eba52f6819b99c4fcded932e1c4337e02e00be15901a3a3dacaf708933c04cdf9b687a78eedd7b03fb13aac868163ee0f632 SHA512 1e161b7ead872cccda833fa7a21e82229563dd996f9d5511550becf5e5623a61a7c85034e8ccb125d39eeaf9cbefb67616d692d08554f93b1fb0295ce5530ccc AUX httpbin-0.10.1-werkzeug-3.patch 2753 BLAKE2B eb335f980867d0f55b4f790689b890c4c92246e870f3714fcda88ec302491ff76e6cc46929d227d0ef3b5b5682152d0ad83dd97e46a16729282de1497935c5e5 SHA512 b232558f609425f7cb674bf34fa0116c76e69d93ce52df656a4d76a7fec8e5a9d6f872abc681bbafede7aa5c7187439a695fbbf18ebc5c8271001bc7776a7fb7 DIST httpbin-0.10.1.tar.gz 107058 BLAKE2B a46732946fc3454e2ae71c4eec4f88521e190b736445c54f555021a273a75f57acbc9234237e6973a21fc3bf8f71d8c8b51d6422d719f03546ecd6887a20fe1b SHA512 e3b851253c347893a80e866e7d0188c572f2a87a540125de3d9cbe0b8c3f1ddfab2c60ee3ffde3fd7274fc662294c978c39b1b52acfd92c52fd552966da203be -EBUILD httpbin-0.10.1-r4.ebuild 1273 BLAKE2B 8e9f8928bb6a813c87e7928b6f4364a1b5103efd9458196f02c323bdbbf83f1626d563d321494c12a2ca70aab06232ebd7f5c4fa4263ca804b15264dda04dddb SHA512 6e712edf26e963d4b43db50538b3d1868a0056141c4f95cde4850127421e042b2e2c2d271ea18e1698ffde93c4930fa1918eab165bf19f1a2da36a573c9f4c35 +EBUILD httpbin-0.10.1-r5.ebuild 1273 BLAKE2B 8e9f8928bb6a813c87e7928b6f4364a1b5103efd9458196f02c323bdbbf83f1626d563d321494c12a2ca70aab06232ebd7f5c4fa4263ca804b15264dda04dddb SHA512 6e712edf26e963d4b43db50538b3d1868a0056141c4f95cde4850127421e042b2e2c2d271ea18e1698ffde93c4930fa1918eab165bf19f1a2da36a573c9f4c35 MISC metadata.xml 445 BLAKE2B c577334830bc0d51f9df221e224c231c254b3db9129e4028d53cbd96a4481728e3b721b44f569c243deeecfb38e8dc81a7566a0b7ccd665d51b1a69a3687eb18 SHA512 fcdbd0c24e12d91df89af24befa6c9600f28083c3fe38e88ebec9856f4fb5c4c137c3b85f2271422c513bbd7c31a457f8290ebc2dd755d9117d57aa42883eec8 diff --git a/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch b/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch index c3d87ec4144d..d4695173dad5 100644 --- a/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch +++ b/dev-python/httpbin/files/httpbin-0.10.1-optional-flasgger.patch @@ -54,34 +54,12 @@ index a82c1b8..77576a4 100644 + @app.route("/") + def no_flasgger_index(): + """Redirect to legacy index if flasgger is not available.""" -+ return redirect(url_for("view_landing_page")) ++ return view_landing_page() + + @app.route("/legacy") def view_landing_page(): """Generates Landing Page in legacy layout.""" -diff --git a/tests/test_httpbin.py b/tests/test_httpbin.py -index 6b75124..2ce63a6 100755 ---- a/tests/test_httpbin.py -+++ b/tests/test_httpbin.py -@@ -10,6 +10,7 @@ from hashlib import md5, sha256, sha512 - from io import BytesIO - - import httpbin -+from httpbin.core import Swagger - from httpbin.helpers import parse_multi_value_header - - -@@ -115,7 +116,8 @@ class HttpbinTestCase(unittest.TestCase): - - def test_index(self): - response = self.app.get('/', headers={'User-Agent': 'test'}) -- self.assertEqual(response.status_code, 200) -+ self.assertEqual(response.status_code, -+ 200 if Swagger is not None else 302) - - def get_data(self, response): - if 'get_data' in dir(response): -- 2.43.0 diff --git a/dev-python/httpbin/httpbin-0.10.1-r4.ebuild b/dev-python/httpbin/httpbin-0.10.1-r4.ebuild deleted file mode 100644 index d34c543e7976..000000000000 --- a/dev-python/httpbin/httpbin-0.10.1-r4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="HTTP Request and Response Service" -HOMEPAGE=" - https://github.com/psf/httpbin/ - https://pypi.org/project/httpbin/ -" - -LICENSE="|| ( MIT ISC )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test-rust" - -RDEPEND=" - dev-python/brotlicffi[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - >=dev-python/flask-2.2.4[${PYTHON_USEDEP}] - dev-python/itsdangerous[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - test-rust? ( - dev-python/flasgger[${PYTHON_USEDEP}] - ) - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/psf/httpbin/pull/29 - "${FILESDIR}/${P}-werkzeug-3.patch" - # https://github.com/psf/httpbin/pull/44 (simplified) - "${FILESDIR}/${P}-optional-flasgger.patch" - ) - - # remove unnecessary deps - sed -i -e '/greenlet/d' -e '/flasgger/d' pyproject.toml || die - distutils-r1_src_prepare -} - -pkg_postinst() { - optfeature "Fancy index" dev-python/flasgger -} diff --git a/dev-python/httpbin/httpbin-0.10.1-r5.ebuild b/dev-python/httpbin/httpbin-0.10.1-r5.ebuild new file mode 100644 index 000000000000..d34c543e7976 --- /dev/null +++ b/dev-python/httpbin/httpbin-0.10.1-r5.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="HTTP Request and Response Service" +HOMEPAGE=" + https://github.com/psf/httpbin/ + https://pypi.org/project/httpbin/ +" + +LICENSE="|| ( MIT ISC )" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="test-rust" + +RDEPEND=" + dev-python/brotlicffi[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + >=dev-python/flask-2.2.4[${PYTHON_USEDEP}] + dev-python/itsdangerous[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + test-rust? ( + dev-python/flasgger[${PYTHON_USEDEP}] + ) + ) +" + +distutils_enable_tests pytest + +src_prepare() { + local PATCHES=( + # https://github.com/psf/httpbin/pull/29 + "${FILESDIR}/${P}-werkzeug-3.patch" + # https://github.com/psf/httpbin/pull/44 (simplified) + "${FILESDIR}/${P}-optional-flasgger.patch" + ) + + # remove unnecessary deps + sed -i -e '/greenlet/d' -e '/flasgger/d' pyproject.toml || die + distutils-r1_src_prepare +} + +pkg_postinst() { + optfeature "Fancy index" dev-python/flasgger +} diff --git a/dev-python/python3-discogs-client/Manifest b/dev-python/python3-discogs-client/Manifest index 54c62256aa40..27b574c482b6 100644 --- a/dev-python/python3-discogs-client/Manifest +++ b/dev-python/python3-discogs-client/Manifest @@ -1,4 +1,4 @@ DIST python3-discogs-client-2.7.tar.gz 36551 BLAKE2B f27fbf17afd7c0f6bb3619a4d0a7922f0a2192b34cddf72cb82f5580d81512d6450aa2464ab5e3746262ccdf66bf3411bd63ed121f69021bed06319bcc171de3 SHA512 7bb43429d6ceb3bbf892b6a65d4d93f0a9ec1bb3535b62169d7e1e4ff0e5032963b2ad5753e381745559efd21ed9e875bfbe3f5260e26f7df5f4a344bedded4a -EBUILD python3-discogs-client-2.7.ebuild 790 BLAKE2B 9e89179356c32445e5edeea252474104e7ccf66821d308a049788a739bb29349eaceca25f528779b84a2fa59213ce2b8eb5f43d730de087119a2fbf739dca91a SHA512 112bc2a42db09c64af707cd593db2e4249da8827b0516620486b5b3020c22afa3598a16b2a2e789dca936869360c22d297b2fcc3ea500b8c5ede99a080e7f55c -EBUILD python3-discogs-client-9999.ebuild 785 BLAKE2B 054613167090a8e96afe025d4f7ca68f4528398dd0b5bf03ff46d86c63b953aca96bb16898d9db2b5c412fbc91173ae2ce9cc0a2874d51ec9acecb346d59f43c SHA512 aecfe5e59659d423313cb8fd7a22861a02343614cf615f4f8fb4a3c2cc5b3a67b08e93bfea69ce7078ec449e38726b66f66653860563f1d0e71a192adba43958 +EBUILD python3-discogs-client-2.7.ebuild 757 BLAKE2B 87eb0b9d91b6a96b1b87be1d77750d14ebcd2b1658a24128e4332fd4558e10562b1536c617010b572040fb67c6606f6800d0f22f41f48700f0a6d5437c912aa7 SHA512 3bc9b20613b8e8205b8aa776658297c25ad421a3a9ae2fdc6aed82142627695045da210d33701dca3605776ba89c0d51ad3dd3311a4e15260d6040d104c18ff3 +EBUILD python3-discogs-client-9999.ebuild 752 BLAKE2B 47b24b2a1234bf17fe246e31a0c7b7edcaea749647860c54f18ad0b99a9813a435d5385f44a48495097ce7ada09739cf83eac2c00443e777cf92cbef13e0b32e SHA512 a9ec0a917c6f2ccd1c8540b98960a7048769ce4b97a8d7905247a8f0c6644bce78fccc683057818ce544d2fd95cbc3861b08bf6a62e470b483778e783dd9e985 MISC metadata.xml 674 BLAKE2B 5c0dd431ad4633cbc7ddaa97e54e9f5b3eb67ed28e07ac313f218fd055e0042365c270e83153627decd196aca49db12304da87f2c74f20bc454fd8e5b4b8fb46 SHA512 ad582419be3887c5fa3c0d630ad32575f378453dd4f7a8c33df91db31b495caa88707214f7e456d69027532540a474c41ad8336b40e90229f1f31cd3193d7f82 diff --git a/dev-python/python3-discogs-client/python3-discogs-client-2.7.ebuild b/dev-python/python3-discogs-client/python3-discogs-client-2.7.ebuild index 5544804553aa..5e2a9ac6cd6b 100644 --- a/dev-python/python3-discogs-client/python3-discogs-client-2.7.ebuild +++ b/dev-python/python3-discogs-client/python3-discogs-client-2.7.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYPI_PN="python3-discogs-client" PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/dev-python/python3-discogs-client/python3-discogs-client-9999.ebuild b/dev-python/python3-discogs-client/python3-discogs-client-9999.ebuild index 3e47b3b4124c..6c4aa64a3c5d 100644 --- a/dev-python/python3-discogs-client/python3-discogs-client-9999.ebuild +++ b/dev-python/python3-discogs-client/python3-discogs-client-9999.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYPI_PN="python3-discogs-client" PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest index 6118c0ec64be..31ef16fe82f0 100644 --- a/dev-python/virtualenvwrapper/Manifest +++ b/dev-python/virtualenvwrapper/Manifest @@ -1,8 +1,5 @@ AUX virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch 905 BLAKE2B e3dc59287d4fa4efe5427c77690853136a3d52abf58ae3f8931755c846f6f81beb5d04338d9a587a1281ef7ef9b99616c95d2c355df3481141a13d843dc4cb79 SHA512 b5827d93420d33767e6931ebb7ab6337baa186848e270eff4bfe2f31d98e550647754c7b466290a8fee666acd8a0f5b4d4a962af8834c43349b448f569ba15d9 -AUX virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch 4608 BLAKE2B 06a808faa7c3fbb96206c59d6c40429800496be41e8b03bf760a199bbb50b1735469094e6cb35504c23a7339d5564329e335b7a563b1df96143e9cf48b9cde43 SHA512 52ed979503f50d53dc849f99f219200e3ec837693612a8723dd7f0cb8bd325573c9bbbefbd162da1390eae9e4e0031079ac9d151cff2232c43fa4aa892bf81f6 AUX virtualenvwrapper-6.0.0-remove-use-of-which.patch 4163 BLAKE2B 18b55822ef7fdf9da462fa35a0bc9a40ff99617dc0a0df1d29dd93b0ae1ba77c598f5458eb1ccf1f9fb86503e23d332db224fe59acd1af6b692a88bdffd5944f SHA512 e7749734d9a58841eff2019e89d36c5f1c2c8a2138b088584da5eec30cce2ee4e94fdbeae802d6d9d883076863d967eb0096f84b2bbb3180ac7cfa9936945fb7 -DIST virtualenvwrapper-6.0.0.tar.gz 95407 BLAKE2B b2a6a7a58be23e1cf0642d780d8fc53e9aef6e44703fa15a2e7627db3c3e12024b33da75b591897ea5181ed5407eb2d52e96f56d7026c083a03e13f94165d9e4 SHA512 ab805b61a9f81e0b0842182686a88fcf07e41ad7206484f002110c693ca6076e2a88fefbef8b7409838082ed7e7a43f61f1a0006a314cb1d71efb943dc6fdede DIST virtualenvwrapper-6.1.0.tar.gz 95880 BLAKE2B 86d37682148ee132f9be5c4554de3c770c0f1c3055441bbce080d94da6fa83fc138a15c4c7edbb525e0c303c3c2ba5c1b1ee23260ea5bafaab157b3699b39b87 SHA512 78e09956132862fbf1caf53cb6c9375aa3718685f72d8f3fb61e402e6b26e8568d5b3a3ed18142b14f3b2691f89e6f912782e813d8139dc71ceb7e47bde8d0b0 -EBUILD virtualenvwrapper-6.0.0.ebuild 1795 BLAKE2B 0352ecb5c59f8371c431da8b4fbc665f29b5dd51e6d57befc03695acb071cd750c3a1ddca243d791367ba85f8ab36cc6dc90e0c8131a4057fffe282839c6eefd SHA512 7462480c8f1e79d0526869bfc80936c3a2cc0a7847c89c3bfcbba771aca92ca0bd1f2d0d0fe85c47bd58a410ec9554547f5e2ba2ff51f6a20e8a1c5087e0186b -EBUILD virtualenvwrapper-6.1.0.ebuild 1797 BLAKE2B 67da77c7d6b06f70eb0ea6d8f001e0bebd1f47cf88370ceada9c26947afdbe8e81ee1c544359bec321e54d5fb143666b7f2435b39bd05331dbf5b8c420621de9 SHA512 bac4bce3b0f847ca9929e4c29db88b301c979c87bf7b3d8d58e80bf691868dd6313a397736c15e5d40689b9a4722e2f629a842db63703ae721fb93c537f14a29 +EBUILD virtualenvwrapper-6.1.0.ebuild 1795 BLAKE2B 0352ecb5c59f8371c431da8b4fbc665f29b5dd51e6d57befc03695acb071cd750c3a1ddca243d791367ba85f8ab36cc6dc90e0c8131a4057fffe282839c6eefd SHA512 7462480c8f1e79d0526869bfc80936c3a2cc0a7847c89c3bfcbba771aca92ca0bd1f2d0d0fe85c47bd58a410ec9554547f5e2ba2ff51f6a20e8a1c5087e0186b MISC metadata.xml 732 BLAKE2B fa857378ea2001e084a9d00d5ccc65644cc4e3ade62c04ff7dfeec4cf7df245bd700833aec1f5f430d780be5adb8fb594300e43a113b232fa83a3cfd2fa0cb15 SHA512 935796e3055e0104328dab877ca92e579770d6748053e464f6ce3563ea49022eaeae322c5c9cb026e9c3f42089c89ae06c0a2e755d124c71e05768cbbefdda44 diff --git a/dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch b/dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch deleted file mode 100644 index 875542cf17f6..000000000000 --- a/dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch +++ /dev/null @@ -1,116 +0,0 @@ -https://bugs.gentoo.org/646588 -https://github.com/parona-source/virtualenvwrapper/commit/d7dd99ca8e4ebdf5668708634cf793acee5d35b3 - -From d7dd99ca8e4ebdf5668708634cf793acee5d35b3 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Wed, 21 Jun 2023 11:35:04 +0300 -Subject: [PATCH] Remove use of which, use command -v or built-ins instead - -* which isn't a POSIX tool and some distributions have or are still - considering dropping it in favour of using commands included by - POSIX or shell built-ins. -* Used command built-in where applicable, but type and whence for bash - and zsh respectively in virtualenvwrapper_verify_resource to preserve - previous behaviour with which when programs also have built-ins - with the same name. command -v outputs just the name and not the path - in those cases. - -https://lwn.net/Articles/874049/ -https://bugs.gentoo.org/646588 - -Signed-off-by: Alfred Wingate ---- - tests/run_tests | 2 +- - tests/test_cp.sh | 2 +- - tests/test_mkvirtualenv.sh | 4 +--- - virtualenvwrapper.sh | 10 ++++++++-- - virtualenvwrapper_lazy.sh | 2 +- - 5 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/tests/run_tests b/tests/run_tests -index 68cb362..c9a81d6 100755 ---- a/tests/run_tests -+++ b/tests/run_tests -@@ -62,7 +62,7 @@ do - echo " BASH_VERSION=$BASH_VERSION" - echo " ZSH_VERSION=$ZSH_VERSION" - echo " KSH_VERSION=$KSH_VERSION" -- echo " virtualenv=$(which virtualenv)" -+ echo " virtualenv=$(command -v virtualenv)" - echo " test_shell_opts=$test_shell_opts" - echo " ZSH=$ZSH_NAME $ZSH_EVAL_CONTEXT" - echo " TMPDIR=$TMPDIR" -diff --git a/tests/test_cp.sh b/tests/test_cp.sh -index 3bd9196..3227c7a 100755 ---- a/tests/test_cp.sh -+++ b/tests/test_cp.sh -@@ -26,7 +26,7 @@ test_new_env_activated () { - (cd tests/testpackage && python setup.py install) >/dev/null 2>&1 - cpvirtualenv "source" "destination" >/dev/null 2>&1 - rmvirtualenv "source" >/dev/null 2>&1 -- testscript="$(which testscript.py)" -+ testscript="$(command -v testscript.py)" - assertTrue "Environment test script not found in path" "[ $WORKON_HOME/destination/bin/testscript.py -ef $testscript ]" - testscriptcontent="$(cat $testscript)" - assertTrue "No cpvirtualenvtest in $testscriptcontent" "echo $testscriptcontent | grep cpvirtualenvtest" -diff --git a/tests/test_mkvirtualenv.sh b/tests/test_mkvirtualenv.sh -index 3c37dfe..47b603a 100755 ---- a/tests/test_mkvirtualenv.sh -+++ b/tests/test_mkvirtualenv.sh -@@ -68,11 +68,9 @@ GLOBAL postmkvirtualenv" - } - - test_no_virtualenv () { -- # Find "which" before we change the path -- which=$(which which) - old_path="$PATH" - PATH="/bin:/usr/sbin:/sbin" -- venv=$($which virtualenv 2>/dev/null) -+ venv=$(command -v virtualenv) - if [ ! -z "$venv" ] - then - echo "FOUND \"$venv\" in PATH so skipping this test" -diff --git a/virtualenvwrapper.sh b/virtualenvwrapper.sh -index b8e4a42..469fa35 100644 ---- a/virtualenvwrapper.sh -+++ b/virtualenvwrapper.sh -@@ -47,7 +47,7 @@ - # Locate the global Python where virtualenvwrapper is installed. - if [ "${VIRTUALENVWRAPPER_PYTHON:-}" = "" ] - then -- _virtualenvwrapper_python_executable="$(which python3 2>/dev/null)" -+ _virtualenvwrapper_python_executable="$(command -v python3)" - if [ -n "$_virtualenvwrapper_python_executable" ] && $_virtualenvwrapper_python_executable -m 'virtualenvwrapper.hook_loader' --help >/dev/null 2>&1 - then - VIRTUALENVWRAPPER_PYTHON=$_virtualenvwrapper_python_executable -@@ -330,7 +330,13 @@ function virtualenvwrapper_initialize { - - # Verify that the passed resource is in path and exists - function virtualenvwrapper_verify_resource { -- typeset exe_path="$(command \which "$1" | (unset GREP_OPTIONS; command \grep -v "not found"))" -+ if [ -n "${ZSH_VERSION}" ] -+ then -+ typeset exe_path="$(whence -p "${1}")" -+ else -+ typeset exe_path="$(type -P "${1}")" -+ fi -+ - if [ "$exe_path" = "" ] - then - echo "ERROR: virtualenvwrapper could not find $1 in your path" >&2 -diff --git a/virtualenvwrapper_lazy.sh b/virtualenvwrapper_lazy.sh -index 3902d08..9016b6c 100644 ---- a/virtualenvwrapper_lazy.sh -+++ b/virtualenvwrapper_lazy.sh -@@ -5,7 +5,7 @@ export _VIRTUALENVWRAPPER_API="$_VIRTUALENVWRAPPER_API mkvirtualenv rmvirtualenv - - if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ] - then -- export VIRTUALENVWRAPPER_SCRIPT="$(command \which virtualenvwrapper.sh)" -+ export VIRTUALENVWRAPPER_SCRIPT="$(command -v virtualenvwrapper.sh)" - fi - if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ] - then --- -2.41.0 - diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild deleted file mode 100644 index 45e014b5fb7f..000000000000 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" -HOMEPAGE=" - https://github.com/python-virtualenvwrapper/virtualenvwrapper/ - https://pypi.org/project/virtualenvwrapper/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/stevedore[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/virtualenv-clone[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/setuptools-scm[${PYTHON_USEDEP}] - ') - test? ( - ${RDEPEND} - $(python_gen_cond_dep ' - dev-python/pip[${PYTHON_USEDEP}] - ') - ) -" - -PATCHES=( - "${FILESDIR}/virtualenvwrapper-6.0.0-remove-use-of-which.patch" - "${FILESDIR}/virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch" -) - -src_prepare() { - default - - # specify default python interpeter to align with PYTHON_SINGLE_TARGET - sed -i -e "s:@@GENTOO_PYTHON_EXECUTABLE@@:${PYTHON}:" virtualenvwrapper.sh || die - - # remove tests which require an internet connection - rm tests/test_mkvirtualenv_install.sh || die - rm tests/test_mkvirtualenv_requirements.sh || die - - # remove tests which require functional git repos with remotes - sed -i -e '/test_wipeenv_\(pip_e\|develop\) () {/,/}/ d' tests/test_wipeenv.sh || die -} - -python_test() { - # tests have unusual expectations - local -x HOME="${HOME%/}" - local -x USER="${USER}" - - cp -a "${BUILD_DIR}"/{install/usr,test} || die - local -x VIRTUAL_ENV="${BUILD_DIR}/test" - - bash ./tests/run_tests "${VIRTUAL_ENV}" || die "Tests failed under ${EPYTHON}" -} diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-6.1.0.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-6.1.0.ebuild index 3a8f01c1583b..45e014b5fb7f 100644 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-6.1.0.ebuild +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-6.1.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.2.3