gentoo auto-resync : 13:10:2024 - 04:04:06

4 files changed, 2 insertions, 253 deletions

diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index aa7206485bac..757179ba1213 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,8 +1,5 @@
 AUX pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch 1043 BLAKE2B 09a50ba813d21a82333905e098dbd99b11a6c6f07c2ae512eed4189bfee371b0ceb2e27ffff41fb414b336c8ec49014c43903f3a2f12fb9b6323dafdf13f8634 SHA512 c900dc2589b5f4b3f36b15ddf2287d74dcafb1395c96330058a400ac3698a525715b69cd32b5780cc7ec9d71d067f159c623deaf63c9e4c11876cd651c069f87
 AUX pipenv-2023.9.8-inject-system-packages.patch 1672 BLAKE2B d803b80a5c46bac67ab7c361f369fad58b1c2a933bc2f78b2d4fa5fa172a23e7e5c026edf48cf398b3232280428eaf40369cafdf4c6c019c3dc9e397e884564d SHA512 5600a8bd7bc5cdf2152d84fc7791359a04df15f38d11f8c9517b709a2793ce05c6fc5acc1d1d8b763078465012e421826699287d2e3ae97838e155a9a1694650
-DIST pipenv-2024.0.1.gh.tar.gz 10805446 BLAKE2B d9fc964cc3a204bb45c299595c238e3d37368e53b39d8be0cdbcadcec3ca395adbb03bf7abaa7d5d729ed47443c40b908f74abbff475e4a99c7e6d4436f04ee8 SHA512 67acff8e4c40e18a60e824420752cd2e5633e50c138b64131ca19cce15e97a1e36b9e685b92fed7378eeccce8154d3d36701134854d60b0fbc47e341b18f945e
 DIST pipenv-2024.0.2.gh.tar.gz 10812462 BLAKE2B 450c8027b2720188edf284a2644a705a3004ee481553871781d8906f415af56ef87d6cdb5ebb00df96bd36fd4dce8dad29cfc2480d9afe3be6ed6891458c188d SHA512 a414727d6ce5a1af565870cb75dfd57731a0513b97c818f304654867b87cf3d89e857fed45a898d19acc37d272d32897f838328fcd7b780fb4ba3e235c77bbb5
-EBUILD pipenv-2024.0.1-r1.ebuild 4939 BLAKE2B 2d1ac34a44f47cded99578589fa016da082fe0f35c87ebc72c3e1a926ae71821f01069358e4a9b52b63929d08c9ef9d11938fc4dcb6d3515c424953c23dd14c5 SHA512 c299e17a08c124e8972e7d07b2b5e30157b1809483d89d8f62709955d02f392380e8f16a64e75e849047d755a58107db0edcddf10ad0b4310131195a3853ea4b
-EBUILD pipenv-2024.0.1.ebuild 4938 BLAKE2B db14870f08a080f5ade4871de332e057d887884b630a10e35e699958b789b65fe51b16b2da3482fcede8b2faed82bfdab7866d0f080099e5f7b4bed40a423567 SHA512 a8c0b080275bf30b8db52af0e141ea288d8055173b5778a828b22f29576fe8fbe2526eb1e5a99f0a04ed2e50fb09a17dad145c2f8ff65ab6a6e9eb7feedd7e1c
-EBUILD pipenv-2024.0.2.ebuild 4939 BLAKE2B 2d1ac34a44f47cded99578589fa016da082fe0f35c87ebc72c3e1a926ae71821f01069358e4a9b52b63929d08c9ef9d11938fc4dcb6d3515c424953c23dd14c5 SHA512 c299e17a08c124e8972e7d07b2b5e30157b1809483d89d8f62709955d02f392380e8f16a64e75e849047d755a58107db0edcddf10ad0b4310131195a3853ea4b
+EBUILD pipenv-2024.0.2.ebuild 4938 BLAKE2B e31c27af6bb6d40850898637e3edfe9bd5bb9d953f36abd11102e6fc2aa674bdf2629791b07d8e117c0bc06904ca2345f5811263566417899dfe50fada5c58a4 SHA512 d242067e7c58f5387d458c476a2d032b45dc8d653b65aa274ab98177a728a39e8747ca84d1c2d66a3632c11bb345900a96d23b5a0975a007dfbde667c1691620
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild b/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild
deleted file mode 100644
index 92b2a3583056..000000000000
--- a/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild
+++ /dev/null
@@ -1,124 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
-	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
-)
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/dparse[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
-	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-8.4.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
-
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
-					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
-					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
-		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
-	done
-
-	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
-
-	rm -Rfv pipenv/vendor || die "Could not vendor"
-	rm -Rfv examples || die "Could not remove examples"
-	rm -Rfv docs || die "Could not remove docs"
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2024.0.1.ebuild b/dev-python/pipenv/pipenv-2024.0.1.ebuild
deleted file mode 100644
index f0f6dba4941e..000000000000
--- a/dev-python/pipenv/pipenv-2024.0.1.ebuild
+++ /dev/null
@@ -1,124 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
-	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
-)
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/dparse[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
-	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-7.1.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
-
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
-					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
-					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
-		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
-	done
-
-	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
-
-	rm -Rfv pipenv/vendor || die "Could not vendor"
-	rm -Rfv examples || die "Could not remove examples"
-	rm -Rfv docs || die "Could not remove docs"
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2024.0.2.ebuild b/dev-python/pipenv/pipenv-2024.0.2.ebuild
index 92b2a3583056..39e1f5da992d 100644
--- a/dev-python/pipenv/pipenv-2024.0.2.ebuild
+++ b/dev-python/pipenv/pipenv-2024.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 PATCHES=(
 	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"