From 0d2adccb2d092672ea1266fa8718332386a86d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 22 Jun 2024 19:51:51 +0200 Subject: [PATCH] dev-python/nodeenv: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/nodeenv/Manifest | 2 - .../files/nodeenv-1.8.0-which-hunt.patch | 64 ------------------- dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild | 33 ---------- dev-python/nodeenv/nodeenv-1.9.0.ebuild | 34 ---------- 4 files changed, 133 deletions(-) delete mode 100644 dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch delete mode 100644 dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild delete mode 100644 dev-python/nodeenv/nodeenv-1.9.0.ebuild diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest index 839e2f8a2ec6..bfa3c2fa37ce 100644 --- a/dev-python/nodeenv/Manifest +++ b/dev-python/nodeenv/Manifest @@ -1,3 +1 @@ -DIST nodeenv-1.8.0.gh.tar.gz 36750 BLAKE2B e75217bb0c468649cbc29688f29d62450008816fb07e4decf1b28dada8b820c2d6f70eb65444e06a8c64b8a816c0cc98f7d179e770eaefe93e87c0cda05e1f85 SHA512 96dce219e00d3837b2b0083af9fe6d94ed4e3cd029e3da564263ad8656dcb9c52440c2df6a6954095e5cacd03e44437f08695603dea82c28122713045183014f -DIST nodeenv-1.9.0.gh.tar.gz 37002 BLAKE2B a8db26f893816c30c8ff5e86d98b23106b1a3b74dd5f58dd51f423836b070851a5b761fca5221b9b8510a427cae2e36732841ad9fea0a9728aae8d303ca5f40d SHA512 d24612372f7fb6d909ce164f6b980086581b53ee8234c6ec14003a79418d7798481275e87589ade47c0502a4b396fa7b07fcfbb99174f1331f65dd6e7a1e0fd7 DIST nodeenv-1.9.1.gh.tar.gz 37158 BLAKE2B 73cdc56f7e8b55b8f0f6a4ab20fe91957f2ed40c6f58b9f17b13fbadc1f15305566018ffe7731dd930560f6d46ba67572bd4bb4bf4ba0419fd54760bac909dd0 SHA512 28fa814b57323dd996764d754f9c614c9dfd668c85ab21c23d0f9aeebb669ba3933f7b0b9ccbf0c808b5f15783eb3afdf3801f293952f3c4945729dee6ecb20b 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 deleted file mode 100644 index 58d3275e9568..000000000000 --- a/dev-python/nodeenv/files/nodeenv-1.8.0-which-hunt.patch +++ /dev/null @@ -1,64 +0,0 @@ -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 deleted file mode 100644 index 0546736e76c4..000000000000 --- a/dev-python/nodeenv/nodeenv-1.8.0-r1.ebuild +++ /dev/null @@ -1,33 +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_{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 diff --git a/dev-python/nodeenv/nodeenv-1.9.0.ebuild b/dev-python/nodeenv/nodeenv-1.9.0.ebuild deleted file mode 100644 index cf2379ca6bc3..000000000000 --- a/dev-python/nodeenv/nodeenv-1.9.0.ebuild +++ /dev/null @@ -1,34 +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..13} ) - -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=( - # https://github.com/ekalinin/nodeenv/pull/355 - "${FILESDIR}/${P}-which-hunt.patch" -) - -distutils_enable_tests pytest