[gentoo-commits] repo/gentoo:master commit in: sys-auth/oath-toolkit/

["Sam James" <sam@gentoo.org>]

commit:     313acdc21a558ff82c633a93796ac467cad4f385
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 05:28:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 05:28:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313acdc2

sys-auth/oath-toolkit: unconditionally depend on xmlsec

psks can't be reliably disabled.

Bug: https://bugs.gentoo.org/827887
Bug: https://bugs.gentoo.org/904361
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...olkit-2.6.7-r1.ebuild => oath-toolkit-2.6.7-r2.ebuild} | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r1.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
similarity index 87%
rename from sys-auth/oath-toolkit/oath-toolkit-2.6.7-r1.ebuild
rename to sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
index 2641b73deb6f..020037b1bbd1 100644
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r1.ebuild
+++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.7-r2.ebuild
@@ -12,17 +12,14 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
-IUSE="pam pskc static-libs test"
-REQUIRED_USE="test? ( pskc )"
+IUSE="pam static-libs test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/icu:=
+	dev-libs/libxml2
+	<dev-libs/xmlsec-1.3.0:=
 	pam? ( sys-libs/pam )
-	pskc? (
-		dev-libs/libxml2
-		<dev-libs/xmlsec-1.3.0:=
-	)
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
@@ -40,10 +37,10 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 
 src_configure() {
 	local myeconfargs=(
+		--enable-pskc
 		$(use_enable test xmltest)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable pskc)
 		$(use_enable static-libs static)
 	)
 
@@ -68,7 +65,5 @@ src_install() {
 		newdoc pam_oath/README README.pam
 	fi
 
-	if use pskc; then
-		doman pskctool/pskctool.1
-	fi
+	doman pskctool/pskctool.1
 }