From 0cd96b20bc20800cf9b6c25c04feba12ee848f7c Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Sat, 30 Nov 2024 19:20:09 +0500
Subject: [PATCH] dev-util/find-work: add 1.0.0, drop 0.91.2

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-util/find-work/Manifest                   |  2 +-
 ...k-0.91.2.ebuild => find-work-1.0.0.ebuild} | 29 ++++++++++---------
 dev-util/find-work/find-work-9999.ebuild      |  9 ++----
 3 files changed, 19 insertions(+), 21 deletions(-)
 rename dev-util/find-work/{find-work-0.91.2.ebuild => find-work-1.0.0.ebuild} (77%)

diff --git a/dev-util/find-work/Manifest b/dev-util/find-work/Manifest
index e7094eb51c..7642d7e624 100644
--- a/dev-util/find-work/Manifest
+++ b/dev-util/find-work/Manifest
@@ -1,2 +1,2 @@
-DIST find_work-0.91.2.tar.gz 20782 BLAKE2B 1e2253dced05e27511585a5db96685783155248fa6e32105aa0cac91b19cc9deba81a48e2693931de40ff47c44cebeda3b122d9c3d0e2eeeed9f06580a336769 SHA512 4c7172aa0ff35d91447aa6191bec737aa62a929a2f43220b97ba3ae94bd392a84cb4612fa6ec2cea4215bf7d13994c2bb3248ef23c0c2d2c6a5398d6622b0cfa
 DIST find_work-0.990.0.tar.gz 24665 BLAKE2B 3cf63d272a7fc863f731532afb86501cf9156ddd35e32d74d78b041592946e37b102a11de3dbeb42530a1cf427e4723f069d45babf3575dd4602cf018886e9fe SHA512 ffb25e8e0c22fd3e1e84043ec9e55a7f156a18694598e9ee29d4d4e26e1460715ce8883bed33c3b7b25d55d89f6d92995e108f2d7e25c34bf6e553dad50cbfe3
+DIST find_work-1.0.0.tar.gz 26754 BLAKE2B ea04ae60ba08a49351bd4ea7a8df94b1fdf4eff6174d27ec4fc0317c6548b009701b811ff58aea3e5f778b2b77e976da25a3c8f8d957cca365649ca20fc4cfe8 SHA512 196aed046e85cd83120aabceff988c53532a298a2b0e64e1ae70c300a61b4e921c68ee94d77f107b4c0ad64b0fa63bfc9258d0e686cceea6b15d1fc1e1148e0f
diff --git a/dev-util/find-work/find-work-0.91.2.ebuild b/dev-util/find-work/find-work-1.0.0.ebuild
similarity index 77%
rename from dev-util/find-work/find-work-0.91.2.ebuild
rename to dev-util/find-work/find-work-1.0.0.ebuild
index bc6179d297..6f32455bf5 100644
--- a/dev-util/find-work/find-work-0.91.2.ebuild
+++ b/dev-util/find-work/find-work-1.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11..13} )
 DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1
+inherit click-app distutils-r1
 
 DESCRIPTION="Personal advice utility for Gentoo package maintainers"
 HOMEPAGE="
@@ -26,7 +26,6 @@ SLOT="0"
 IUSE="minimal"
 
 RDEPEND="
-	<app-portage/gentoopm-2[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
@@ -39,6 +38,12 @@ RDEPEND="
 	<dev-python/pydantic-3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2[${PYTHON_USEDEP}]
 	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	!minimal? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)
 "
 BDEPEND="
 	test? (
@@ -55,24 +60,20 @@ PDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	# fails with plug-ins installed
-	find_work/__main__.py::import-check
-)
-
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \
 	dev-python/insipid-sphinx-theme \
 	dev-python/sphinx-prompt
 
+click-app_enable_completions find-work
+
+python_test() {
+	distutils_write_namespace find_work
+	distutils-r1_python_test
+}
+
 src_install() {
 	distutils-r1_src_install
-
-	local mymakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-	)
-
-	emake "${mymakeargs[@]}" install-man
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install-man
 }
diff --git a/dev-util/find-work/find-work-9999.ebuild b/dev-util/find-work/find-work-9999.ebuild
index e1cfbced22..6f32455bf5 100644
--- a/dev-util/find-work/find-work-9999.ebuild
+++ b/dev-util/find-work/find-work-9999.ebuild
@@ -26,7 +26,6 @@ SLOT="0"
 IUSE="minimal"
 
 RDEPEND="
-	<app-portage/gentoopm-2[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
@@ -39,7 +38,10 @@ RDEPEND="
 	<dev-python/pydantic-3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2[${PYTHON_USEDEP}]
 	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
 	!minimal? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
 		dev-python/tabulate[${PYTHON_USEDEP}]
 	)
 "
@@ -58,11 +60,6 @@ PDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	# fails with plug-ins installed
-	find_work/__main__.py::import-check
-)
-
 distutils_enable_tests pytest
 
 distutils_enable_sphinx docs \