Adding metadata

17 files changed, 380 insertions, 175 deletions

diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index d8cd1f0bd31b..316c561612f4 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1 +1,2 @@
 DIST contourpy-1.1.0.gh.tar.gz 13413711 BLAKE2B 020bf7f63dbe304e71b66249cdfa86047598a3f8352657f7c179bc068869bf7659fb7c821749a0be33a8a04ec02dc642ac7a9ed14f5fd73d4a1e9f20c3606ee2 SHA512 aeb60db039aa14aed29a31dcf6091708daf7e65589964dd7682dc28e085d584103abb872e607685408eaefd4947adeba966c9a0d93cb1f827805189e498c67d8
+DIST contourpy-1.1.1.gh.tar.gz 13417093 BLAKE2B 217b99a1000575d362ca60327f39d39fd5f241f1e0f94ac3f049e2bf195388424f10bfd33c2a007da32eb939c1a04e96942ce0092c091533166c54da906b68af SHA512 7d135f18fa28ecd5d6c715650fc5672291c6f46e96cfcf8d2571c401d5bae0d27fa6a2e9f80e4f735af3016c7ced92552f26e8c5519e725e1bf6fe54c7603a03
diff --git a/dev-python/contourpy/contourpy-1.1.1.ebuild b/dev-python/contourpy/contourpy-1.1.1.ebuild
new file mode 100644
index 000000000000..2a5f22af2bbf
--- /dev/null
+++ b/dev-python/contourpy/contourpy-1.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for calculating contours in 2D quadrilateral grids"
+HOMEPAGE="
+	https://pypi.org/project/contourpy/
+	https://github.com/contourpy/contourpy/
+"
+SRC_URI="
+	https://github.com/contourpy/contourpy/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.6[${PYTHON_USEDEP}]
+	test? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wurlitzer[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# linters
+		tests/test_codebase.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 5ab7f1aad5e0..12f0f85203f7 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,3 +2,4 @@ DIST dask-2023.8.0.gh.tar.gz 8539262 BLAKE2B 3ce61191bca458e32ac88904460f8ee843f
 DIST dask-2023.8.1.gh.tar.gz 8541743 BLAKE2B 485a88354d3aa54ff1f6afb1bd4a8b3317a6a48b519bef4dadf1bcbb240f21e54eb165f2c076ea8aa9b5753fd8714af26453858d7fe154bb015489f89b8114be SHA512 4ca231236e5d868f8fbb69b38721e495a44fbc982a53ea087ef68085c4df2cc99526b5a66b7fee93a3b63a6cd621f8448b877b98370b3dfe1a32e386dd91e73e
 DIST dask-2023.9.0.gh.tar.gz 8541973 BLAKE2B 06e04377f8f7d0e6a6487c1c2aa52e61a8ab73a04455e9a6d7da238bd747d7ac6cf1526f645f0c874f2588f28708139f8fb1fa0271e6166442be6a15ce68b9f1 SHA512 eadc3a9cd5d8d960d8006db2641e5513a093b4818c1cd4de058d70f088ef1cfd74413abcf0bbba757d9188de4b3c103a3fdfe4ce76f14554b589540011c53835
 DIST dask-2023.9.1.gh.tar.gz 8544717 BLAKE2B 786ca3bda6b356acdeb56070964aa25e136f9976322ae5dbaf5895eb181fc1b7582ae4731de12e7881287433d4f502dbbc5002840ebc443403a9fa76df438693 SHA512 1bf0a028059dfba70a131648f4884a6c9a091cd2d550dc7968cb2a8728ce5ef405c351f100001ab2ce48470634577104924fdf4b6dadda32308b4b5a62b3200e
+DIST dask-2023.9.2.gh.tar.gz 8544631 BLAKE2B bd0168d1ea86921235e7bd9ae3e6b9dc2abed3c3e300afea84fb3f2d462970ca5fa4d82f5479bc2c036d4f1a1ec9f63ff98151d8f339db2b14533be765b0f25f SHA512 ae7d289882d7e2e2ef46af3256cf69d8e443f5350f32088e33b46f37377fe8c8328de609d16d0a2abf4df5bc7671d88288968d3d18a535eaec1bfbf0a5adbcba
diff --git a/dev-python/dask/dask-2023.9.2.ebuild b/dev-python/dask/dask-2023.9.2.ebuild
new file mode 100644
index 000000000000..e115a3b90562
--- /dev/null
+++ b/dev-python/dask/dask-2023.9.2.ebuild
@@ -0,0 +1,85 @@
+# 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_{8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
+	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# more tests relying on -Werror
+		"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+		dask/array/tests/test_random.py::test_RandomState_only_funcs
+		# TODO
+		dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+		dask/tests/test_config.py::test__get_paths
+		dask/array/tests/test_linalg.py::test_solve_assume_a
+		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+		"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+		dask/array/tests/test_image.py::test_preprocess
+		dask/tests/test_system.py::test_cpu_count_cgroups_v2
+		# require sqlalchemy<2.0
+		dask/dataframe/io/tests/test_sql.py
+	)
+
+	if ! has_version -b "dev-python/pyarrow[parquet,${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			# fails if pyarrow is installed without USE=parquet
+			# (optional dep, skipped if it's not installed at all)
+			dask/dataframe/io/tests/test_parquet.py::test_pyarrow_filter_divisions
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_rerunfailures -m "not network"
+}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index e9da2ac43cac..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..ddb5b0f1787e 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 18825341fdbb..f24559577197 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -9,3 +9,4 @@ DIST moto-4.1.7.tar.gz 3506753 BLAKE2B 76e38629f1a772816bfa647b90e89e3c4533cd36f
 DIST moto-4.1.8.tar.gz 3520127 BLAKE2B 623d97dbec357227ea401ac98f694eaaa129fcb47f6b160a22bf95f8d52facf9bb3917e00409990a7e447e70de5a94df9f234c3ed615081573169f3976169f3d SHA512 9c3e9825d1e8d09e278f8bbeb11719c4bee756f9e95b2edbe82b4ffbd3acb93008f6ffdc582eb46619104d0b839428b5e8078ef0e341a3b73f0bc61a7ebf806f
 DIST moto-4.1.9.tar.gz 3537033 BLAKE2B fda091585fd331ff68127290426bb1f5418b118b9d60711ca54bcf57b1ff4375320bb3f3ae79321d105e815d856183b7f3c012f20c07f357831fb8260dcbd9f1 SHA512 1ce3aa3549b6320a8493f7018ccdc630f94cd324791e91c2ce28a994dff8da37058c47c84f480dfcad870ef63a0e1d35712348b120c112696b8d9cbce66186a9
 DIST moto-4.2.2.tar.gz 3646677 BLAKE2B 142d66f069a8a461f26959be5ec63cbd8dac7c5f4e752be3f78a728ee262a50b9505c7e1631da3fe98ac7b7d0044bcf4dd31edeb936798722d3c5fac0f062908 SHA512 76d3b7f575f70a0ce51dfca0918c036f791ea74be2194a96210bf92ce628f873458f1eb5d2a04308d5b0805f4469f7cf0d50eef845830a0ee1fa85b96bfb4104
+DIST moto-4.2.3.tar.gz 4693815 BLAKE2B 3163376f5dd645af9fb9cd1a9af459ec76c6fd3c6f908d72429c2f72e5b4c2e8864afc0afbabe344524c403da0bf19477491b44bba2f29f422c38334595d0fc8 SHA512 a9a45fdb05722466f29e1a66b59637aa839960922b5992ad0aca6523edbe0c3b6c4e4724311d74d5b18cebdbf3fb26dd64887b2fea83ab5cc5487728f18a4c0e
diff --git a/dev-python/moto/moto-4.2.3.ebuild b/dev-python/moto/moto-4.2.3.ebuild
new file mode 100644
index 000000000000..c5002aa42c5a
--- /dev/null
+++ b/dev-python/moto/moto-4.2.3.ebuild
@@ -0,0 +1,103 @@
+# 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_{8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="
+	https://github.com/getmoto/moto/
+	https://pypi.org/project/moto/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
+	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_dependencies
+		tests/test_batch/test_batch_jobs.py::test_failed_job
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_core/test_docker.py::test_docker_is_running_and_available
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+		# TODO
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_queue
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_fifo_queue
+		# require py_partiql_parser
+		tests/test_s3/test_s3_select.py
+		tests/test_dynamodb/test_dynamodb_statements.py
+		# broken by new urllib3
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data
+		tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests
+		tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url
+		tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers
+		tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	# note: pytest-xdist causes random test failures
+	epytest -m 'not network'
+}
diff --git a/dev-python/pipenv/pipenv-2023.7.11-r1.ebuild b/dev-python/pipenv/pipenv-2023.7.11-r1.ebuild
new file mode 100644
index 000000000000..cf9f91bc4742
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2023.7.11-r1.ebuild
@@ -0,0 +1,115 @@
+# 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_{8,9,10,11} )
+
+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"
+
+PATCHES=(
+	"${FILESDIR}/pipenv-2022.9.24-inject-site-packages.patch"
+	"${FILESDIR}/pipenv-2023.4.29-append-always-install.patch"
+	"${FILESDIR}/pipenv-2023.7.11-fix-imports.patch"
+	"${FILESDIR}/pipenv-2023.7.11-fix-imports-utils.patch"
+)
+
+RDEPEND="
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-didyoumean[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${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/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	dev-python/virtualenv-clone[${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() {
+	local pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( cerberus colorama click_didyoumean dotenv markupsafe \
+					 pexpect ptyprocess pyparsing requests urllib3 \
+					 shellingham tomli tomlkit )
+	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" || 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 README.rst ruamel.*.LICENSE vendor.txt; do
+		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/$fname"
+	done
+
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
deleted file mode 100644
index 9f6ec7e8ff54..000000000000
--- a/dev-python/pyGPG/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-DIST pyGPG-0.2_p20220808.gh.tar.gz 31955 BLAKE2B ae671b7bf685b1072364dbfcf79bca8fa2dadd034fbdf7a721d7a2cfec44e8d8ffa22b08c14414c8774422b6a62af8d511bd31bd15bd68d89632cde031ec0906 SHA512 85c8d67e71e91cfb26b1e0087889d7cd4fccae9ddcffcd3e3f9d208da7fd352c3273c580e3b7c284c5ab4c2a53c56f4530e5587dc22869098a408a1dfcd1e257
diff --git a/dev-python/pyGPG/metadata.xml b/dev-python/pyGPG/metadata.xml
deleted file mode 100644
index d396b5a12f49..000000000000
--- a/dev-python/pyGPG/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>tools-portage@gentoo.org</email>
-  <name>Gentoo Portage tools team</name>
- </maintainer>
- <longdescription>A python interface library for wrapping gnupg's gpg command.
-		It also connects to gpg's status-fd output and makes all the status data
-		available as subclassed namedtuple instances.
-	</longdescription>
- 
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyGPG/pyGPG-0.2-r1.ebuild b/dev-python/pyGPG/pyGPG-0.2-r1.ebuild
deleted file mode 100644
index 3adb627ae3a4..000000000000
--- a/dev-python/pyGPG/pyGPG-0.2-r1.ebuild
+++ /dev/null
@@ -1,39 +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_{8,9,10,11} )
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="A python interface wrapper for gnupg's gpg command"
-HOMEPAGE="https://github.com/dol-sen/pyGPG"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-crypt/gnupg"
-
-pkg_postinst() {
-	elog "This is experimental software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/pyGPG/issues"
-	elog "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
-	elog
-	ewarn "There may be some Python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
-}
diff --git a/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild b/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
deleted file mode 100644
index 4b52792b49ce..000000000000
--- a/dev-python/pyGPG/pyGPG-0.2_p20220808.ebuild
+++ /dev/null
@@ -1,55 +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_{8,9,10,11} )
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
-	EGIT_BRANCH="master"
-elif [[ ${PV} == *_p* ]] ; then
-	MY_COMMIT="eb44ec69978044809325a0a9c8972d1d4f573b47"
-	SRC_URI="https://github.com/dol-sen/pyGPG/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}"/${PN}-${MY_COMMIT}
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-fi
-
-DESCRIPTION="A python interface wrapper for gnupg's gpg command"
-HOMEPAGE="https://github.com/dol-sen/pyGPG"
-
-LICENSE="BSD"
-SLOT="0"
-if [[ ${PV} != *9999 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-RDEPEND="app-crypt/gnupg"
-
-EPYTEST_DESELECT=(
-	# Expired keys
-	test/pyGPG/test_gpg.py::test_listkeys2
-	test/pyGPG/test_gpg.py::test_listkey2
-	test/pyGPG/test_gpg.py::test_listkey
-	test/pyGPG/test_gpg.py::test_fingerprint2
-)
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "This is experimental software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/pyGPG/issues"
-	elog "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
-	elog
-	ewarn "There may be some Python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
-}
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
deleted file mode 100644
index 2fc9279aed8a..000000000000
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ /dev/null
@@ -1,55 +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_{8,9,10,11} )
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dol-sen/pyGPG.git"
-	EGIT_BRANCH="master"
-elif [[ ${PV} == *_p* ]] ; then
-	MY_COMMIT="eb44ec69978044809325a0a9c8972d1d4f573b47"
-	SRC_URI="https://github.com/dol-sen/pyGPG/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}"/${PN}-${MY_COMMIT}
-else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-fi
-
-DESCRIPTION="A python interface wrapper for gnupg's gpg command"
-HOMEPAGE="https://github.com/dol-sen/pyGPG"
-
-LICENSE="BSD"
-SLOT="0"
-if [[ ${PV} != *9999 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-RDEPEND="app-crypt/gnupg"
-
-EPYTEST_DESELECT=(
-	# Expired keys
-	test/pyGPG/test_gpg.py::test_listkeys2
-	test/pyGPG/test_gpg.py::test_listkey2
-	test/pyGPG/test_gpg.py::test_listkey
-	test/pyGPG/test_gpg.py::test_fingerprint2
-)
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog "This is experimental software."
-	elog "The APIs it installs should be considered unstable"
-	elog "and are subject to change."
-	elog
-	elog "Please file any enhancement requests, or bugs"
-	elog "at https://github.com/dol-sen/pyGPG/issues"
-	elog "I am also on IRC @ #gentoo-ci of the Libera.Chat network"
-	elog
-	ewarn "There may be some Python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
-}
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.8.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.8.0-r1.ebuild
index f9c14f0bb915..ff07f06dc437 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.8.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.8.0-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="all-plugins"
 RDEPEND="
 	dev-python/docstring-to-markdown[${PYTHON_USEDEP}]
 	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.1.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
 	all-plugins? (
 		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tcolorpy/Manifest b/dev-python/tcolorpy/Manifest
index 4235a6400c73..3c0a847843ef 100644
--- a/dev-python/tcolorpy/Manifest
+++ b/dev-python/tcolorpy/Manifest
@@ -1 +1,2 @@
 DIST tcolorpy-0.1.3.tar.gz 10880 BLAKE2B acae626ccc330b5eb0032d9e14d157bd1fbc588dc72c72ff700980ee9a572a4296700026ba26623857ae7bd43febe109c66b8e4d9eb0a82146d7eab90234207e SHA512 978360b224959f8d050fc889a329a191102cf42fb60c1ca298cd0ab53a6c75a4181ef7ded7282d05614cb415b56f141086e9efc6c9c32922aa9ccd3e101e9a1e
+DIST tcolorpy-0.1.4.tar.gz 11072 BLAKE2B 2ceefe31475d44546efbf919c6353caf3d023f269f1cf373185900704c88d318bd7c96beae2e0ef287a695ef1cf7367fd5e5dd21d73a61400b17a9a40d1d727a SHA512 4be98b0819c6eca0af55170e473e26b90d0c62b81c00fb1fe66b197f1fd6e7aec38cdd2b24dcc1b059af0ed1a54cfdc0900fad2e9145bf49b578d90edc65e74c
diff --git a/dev-python/tcolorpy/tcolorpy-0.1.4.ebuild b/dev-python/tcolorpy/tcolorpy-0.1.4.ebuild
new file mode 100644
index 000000000000..14a406fc512f
--- /dev/null
+++ b/dev-python/tcolorpy/tcolorpy-0.1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="tcolorpy is a Python library to apply true color for terminal text"
+HOMEPAGE="
+	https://github.com/thombashi/tcolorpy/
+	https://pypi.org/project/colorpy/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest