6 files changed, 90 insertions, 33 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c4b16b0a27ef..81e45df9b8fe 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/ktsuss/Manifest b/x11-misc/ktsuss/Manifest
index 3306e3ca1f42..c1b39436c3f8 100644
--- a/x11-misc/ktsuss/Manifest
+++ b/x11-misc/ktsuss/Manifest
@@ -1,3 +1,5 @@
+AUX ktsuss-2.1-clang16.patch 575 BLAKE2B 5c3a1b7d237615c791011e9688dfccd450f2091ba90911d76e856f3e6e65735034bf08a0f26eab80d245ef51443ab39366cc56705160445e18f35d3cc21f1644 SHA512 76c25096649c67fc8d596040d048ac44182ec152a2e6eea7c2f3c6d6954f9b4d5b2d02fab11dad3d3a22ebb69118dd7bf364413d6f7296af5fb0969e24847f78
+AUX ktsuss-2.1-no-which.patch 445 BLAKE2B 9ea367a6aef2b49c078ad5963373a13f56ab95553a03403a1943b2293501b8a5cca02c8190b617640baae7f8aa3e06bdda14a7af3213747a8d108557fee42d5d SHA512 926d72eb24bac6d8f344d5a2ed104ed538d43ec9c52b1f22a0ec54a234eff67229be512da3f9afa9e63a641960122c23f5a8a86ec5ad7e965188957dbbd6255e
 DIST ktsuss-2.1.tar.gz 31065 BLAKE2B 86aa1bd451880a4ed7606d4234c8f0c646286e9bcb225fc8a7f094943f8e51c3a2f93877da3403f75487f5162dcba932b262d7502987f5da4b9450cadb388b37 SHA512 980c184947ebac91f936cad9cd74050e42e57da39f13cca3b9ec0ec44a16265243a1e6f570a2027435234084c1e15ce28b3dc6389d7831237c762b1aafb99507
-EBUILD ktsuss-2.1.ebuild 646 BLAKE2B 790ed4f260f1ceb01cfe4250b9618e34dfebd38709576f9d268bd102c2d1a2dbfc916a133f20c8437adb29d57a311485235cf24cf2a39ccec0941ccd7424b99d SHA512 90e9a0c881f33e4a57ffcc0e5752c101add991051181fefd2b0300829a4e8d91ad4e9d7f680e7e1b35e3c16f388ac2d2130fd35617b6c09d8480f624f2fae717
+EBUILD ktsuss-2.1-r1.ebuild 794 BLAKE2B ec9c725a96f8ebd2580849e76ba1b94d84a7cc33cb43bfcfb4949f5b03b90cac17190d31b7ff3e0b8b62b4b1c9a3247de3eeb7572963641ebebce8a704fb4d0b SHA512 70895fe4bded65b0703dfaed23d091225b612fa2a8791ac0857c91a4979f2f752cc3601e4d1a5c314fcb0af4e10aa6c97b623f73a3e6eb8093904b62f83585e3
 MISC metadata.xml 379 BLAKE2B 86756f0f9705e83091145ae018fc44eeba8000048b5973661c3eb0ee3e4480f3f9924fc5a0a632df82aeab5d6a7271338ae4be5333dbc01183dc75a366f7f1fd SHA512 835a4bf61938066dd7615a036110c284b098d0b861f8c3c718e0b76fdd50b82cacbf3510fdd28bcf134b2c43afaa8ee10b08f45dbe44f43f817a407312c6c5ac
diff --git a/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch b/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch
new file mode 100644
index 000000000000..e0763c688a62
--- /dev/null
+++ b/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/874540
+--- a/src/ktsuss.c
++++ b/src/ktsuss.c
+@@ -38,2 +38,3 @@
+ #include <sys/types.h>
++#include <err.h>
+ #include <errno.h>
+--- a/src/su_backend.c
++++ b/src/su_backend.c
+@@ -40,2 +40,3 @@
+ #include <sys/types.h>
++#include <err.h>
+ #include <errno.h>
+@@ -54,2 +55,4 @@
+ 
++void tty_raw(int ttyfd);
++
+ static struct termios orig_termios;
+--- a/src/sudo_backend.c
++++ b/src/sudo_backend.c
+@@ -40,2 +40,3 @@
+ #include <sys/types.h>
++#include <err.h>
+ #include <errno.h>
+@@ -55,2 +56,4 @@
+ 
++void tty_raw(int ttyfd);
++
+ static struct termios orig_termios;
diff --git a/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch b/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch
new file mode 100644
index 000000000000..12909025c18c
--- /dev/null
+++ b/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/781185
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,3 +25,3 @@
+ 		AC_MSG_CHECKING([whether we can locate the su program])
+-		supath=`which su 2>/dev/null`
++		supath=`command -v su 2>/dev/null`
+ 		if test "x$supath" = "x"; then
+@@ -36,3 +36,3 @@
+ 		AC_MSG_CHECKING([whether we can locate the sudo program])
+-		sudopath=`which sudo 2>/dev/null`
++		sudopath=`command -v sudo 2>/dev/null`
+ 		if test "x$sudopath" = "x"; then
diff --git a/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild b/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild
new file mode 100644
index 000000000000..87718a586671
--- /dev/null
+++ b/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Graphical version of su written in C and GTK+ 2"
+HOMEPAGE="https://github.com/nomius/ktsuss/"
+SRC_URI="https://github.com/nomius/ktsuss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+IUSE="sudo"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	sudo? ( app-admin/sudo )
+	!sudo? (
+		|| (
+			sys-apps/util-linux[su]
+			sys-apps/shadow[su]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( Changelog CREDITS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable sudo)
+}
diff --git a/x11-misc/ktsuss/ktsuss-2.1.ebuild b/x11-misc/ktsuss/ktsuss-2.1.ebuild
deleted file mode 100644
index 957f0076fb18..000000000000
--- a/x11-misc/ktsuss/ktsuss-2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Graphical version of su written in C and GTK+ 2"
-HOMEPAGE="https://github.com/nomius/ktsuss"
-SRC_URI="https://github.com/nomius/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="sudo"
-
-RDEPEND=">=x11-libs/gtk+-2.12.11:2
-	>=dev-libs/glib-2.16.5:2
-	sudo? ( app-admin/sudo )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-DOCS=( Changelog CREDITS README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable sudo)
-}