commit: 1319bd8709d0dc7b3161c0c346eb935e03496f59
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 03:33:22 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 03:33:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1319bd87
dev-python/k5test: Patch out the dep on which(1)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/k5test/files/k5test-0.10.1-which.patch | 41 ++++++++++++++++++++++
...st-0.10.1-r1.ebuild => k5test-0.10.1-r2.ebuild} | 6 ++--
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/dev-python/k5test/files/k5test-0.10.1-which.patch
b/dev-python/k5test/files/k5test-0.10.1-which.patch
new file mode 100644
index 000000000000..c5a72b5dc091
--- /dev/null
+++ b/dev-python/k5test/files/k5test-0.10.1-which.patch
@@ -0,0 +1,41 @@
+From cff2138124cb7461fe2b1a270d0c0132e6f66f6b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
+Date: Wed, 26 Oct 2022 05:31:22 +0200
+Subject: [PATCH] Use built-in shutil.which() instead of which(1) tool
+
+Use the built-in shutil.which() function that is available since Python
+3.3 instead of the external which(1) program. The latter is not part
+of POSIX and may be missing entirely (Gentoo is activately working
+towards removing it)>
+---
+ k5test/realm.py | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/k5test/realm.py b/k5test/realm.py
+index 8b24141..2260258 100644
+--- a/k5test/realm.py
++++ b/k5test/realm.py
+@@ -68,16 +68,13 @@ def _cfg_merge(cfg1, cfg2):
+
+
+ def _discover_path(name, default, paths):
+- stderr_out = subprocess.DEVNULL
+- try:
+- path = subprocess.check_output(["which", name],
stderr=stderr_out).strip()
+- path = path.decode(sys.getfilesystemencoding() or
sys.getdefaultencoding())
++ path = shutil.which(name)
++ if path is not None:
+ _LOG.debug(f"Using discovered path for {name} ({path})")
+- return path
+- except subprocess.CalledProcessError as e:
++ else:
+ path = paths.get(name, default)
+ _LOG.debug(f"Using default path for {name} ({path}): {e}")
+- return path
++ return path
+
+
+ class K5Realm(metaclass=abc.ABCMeta):
+--
+2.38.1
+
diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild
b/dev-python/k5test/k5test-0.10.1-r2.ebuild
similarity index 91%
rename from dev-python/k5test/k5test-0.10.1-r1.ebuild
rename to dev-python/k5test/k5test-0.10.1-r2.ebuild
index ea7af94b2982..aa48a24cd102 100644
--- a/dev-python/k5test/k5test-0.10.1-r1.ebuild
+++ b/dev-python/k5test/k5test-0.10.1-r2.ebuild
@@ -19,6 +19,6 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-RDEPEND="
- sys-apps/which
-"
+PATCHES=(
+ "${FILESDIR}"/${P}-which.patch
+)
