gentoo auto-resync : 23:06:2024 - 00:11:30

5 files changed, 2 insertions, 138 deletions

diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 7802552e27ac..bfca60872b2d 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,9 +1,4 @@
-AUX nodeenv-1.8.0-which-hunt.patch 2104 BLAKE2B cf39acc007c270fa742b6e6556c5cd2a1655112852f4d9bb4b446165c511418cc00bc9c8c21be22007d18d0519f213a9e68b8b85d6188d5cebba729cd004c271 SHA512 d1ada89867dde59a136d0f5383e5dcacecf154bd0a264f8bce1f207ae7c08ae4ce61386126f33cf24a8d821ae52dd51b8829cb999c9fe699b7b24c217e5f92bf
 AUX nodeenv-1.9.0-which-hunt.patch 1525 BLAKE2B ee26931d73f75bd157224be169ea97381b9d57c704693561347990e2a008c96fe2d051df51c91e4560cd87510626b505b2ebc4b42c001998f7c3f99d2d7890a2 SHA512 8d6c01cf5da9026a12f08bb9eaa92d3838bc0008f917c2323ddfa06caea46b2ede4faae34533a7df0c5b62e4661538df4b74ff63471f33beead42ef51bba1688
-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
-EBUILD nodeenv-1.8.0-r1.ebuild 655 BLAKE2B 43efd2983f6939e6f96e6375fc611788ad69ced89dc690a1348d43d7656201e70f761f2912e8d8285ecda420f02971d9efa6a420e8af3fc0ef3495799c9059b8 SHA512 f1d9647fa4ef78143dd2803be1ad01ff056b11c87d9774a5583b9234cbe80b4618dccd83340a0ec645f852ff395316a5672261625cff4218c97365a61efd3c27
-EBUILD nodeenv-1.9.0.ebuild 699 BLAKE2B c880dd11732d66ea80d0e818cda7aa92298d0b3485fe197d069e8abec875463829ea985f639b102f6558e0259baaf63e1c231e31758918979870bfb813eac70b SHA512 fc39f4a3dddb5e38d0f0cbfca7d0ddc3a1f0663103e31b518f36e6f492e8192d130caf76015c80b0316960102be3214edb6babea3b3a58b1373740fafaaa5fde
-EBUILD nodeenv-1.9.1.ebuild 706 BLAKE2B b12398989a7fb964de443a4e8677cad08f8d9ffa486a9899828c8a5d7eaaea2ef7c0151fc0179383748ae80b530179b47a1d75c060731df0890c9bf0e9a1f7e8 SHA512 86d277247824a26c432b3915fddd33dc5fd9c7e979b38bae38479df21992749c77132f2ed3391e740fe507ea62f5c9d48220ed7faf01050bd51a4fd11deb31c6
+EBUILD nodeenv-1.9.1.ebuild 703 BLAKE2B 2bd47ffebc2e9905062ff572feb96b2e996b90e55193122ee9e0c04167384e2eae0527bdb358c763299c4e7c61f8f457bfdc46173508e91ea0fc827639d675fb SHA512 147ff43212f36c62eae9c8a9abfee76f03c4d47e70da51a819ffb52e5a4dc4f3ff2a97f3ddb2922c6b224907174abe679fb144f52e36bad3c36c299283eb6c81
 MISC metadata.xml 294 BLAKE2B 243e0fe79352f73a8be8b1e9921a4537179e5a251f9b2492854b0609979e221bca122b8ba4afef38b4d6ce556ef59f9dd08f5852e6664488de99015b3790fbcf SHA512 36afd4b95183c7e42bf237887634fb4a19c25ce96cea1282dfc76d38dbef725ffcc02052184a4d4115eeffd276f62f77240809d3cfb0adb6ae5887ade583cb24
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 <sam@gentoo.org>
-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
diff --git a/dev-python/nodeenv/nodeenv-1.9.1.ebuild b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
index 1166bc54bc60..332e593b8bff 100644
--- a/dev-python/nodeenv/nodeenv-1.9.1.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.9.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 x86"
 
 # requires network access
 RESTRICT="test"