From 921566493c69ed274a06e56121d82b2d5975954f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Mon, 28 Nov 2022 13:43:32 +0100
Subject: [PATCH] [sys-auth/sssd] condense pac into samba, bind changes for
 overlay, style

---
 sys-auth/sssd/sssd-2.8.1.ebuild | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/sys-auth/sssd/sssd-2.8.1.ebuild b/sys-auth/sssd/sssd-2.8.1.ebuild
index 442f31a..723fc8f 100644
--- a/sys-auth/sssd/sssd-2.8.1.ebuild
+++ b/sys-auth/sssd/sssd-2.8.1.ebuild
@@ -9,7 +9,8 @@ PLOCALE_BACKUP="sv"
 PYTHON_COMPAT=( python3_{8..10} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sssd.asc
 
-inherit autotools linux-info multilib-minimal optfeature plocale python-single-r1 pam systemd toolchain-funcs verify-sig
+inherit autotools linux-info multilib-minimal optfeature plocale \
+	python-single-r1 pam systemd toolchain-funcs verify-sig
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://github.com/SSSD/sssd"
@@ -19,9 +20,8 @@ SRC_URI+=" verify-sig? ( https://github.com/SSSD/sssd/releases/download/${PV}/${
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux subid sudo systemd systemtap test valgrind"
+IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test valgrind"
 REQUIRED_USE="
-	pac? ( samba )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( sudo )
 	valgrind? ( test )"
@@ -37,8 +37,11 @@ DEPEND="
 	dev-libs/libunistring:=
 	>=dev-libs/popt-1.16
 	>=dev-libs/openssl-1.0.2:=
-	>=net-dns/bind-tools-9.9[gssapi]
-	>=net-dns/c-ares-1.7.4:=
+	|| (
+		>=net-dns/bind-tools-9.9[gssapi]
+		>=net-dns/bind-9.18[gssapi]
+	)
+	>=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}]
 	>=net-nds/openldap-2.4.30:=[sasl]
 	>=sys-apps/dbus-1.6
 	>=sys-apps/keyutils-1.5:=
@@ -49,7 +52,6 @@ DEPEND="
 	>=sys-libs/ldb-1.1.17-r1:=
 	virtual/libintl
 	acl? ( net-fs/cifs-utils[acl] )
-	locator? ( >=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3 )
 	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
@@ -194,8 +196,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with selinux)
 		$(multilib_native_use_with selinux semanage)
 		--with-kcm
-		$(use_enable locator krb5-locator-plugin)
-		$(use_enable pac pac-responder)
+		--enable-krb5-locator-plugin
+		$(use_enable samba pac-responder)
 		$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
 		$(use_enable nls)
 		$(multilib_native_use_with netlink libnl)
@@ -233,6 +235,7 @@ multilib_src_configure() {
 			# non-pkgconfig checks
 			ac_cv_lib_ldap_ldap_search=yes
 			--without-kcm
+			--without-manpages
 		)
 	fi
 
@@ -245,8 +248,8 @@ multilib_src_compile() {
 		use doc && emake docs
 	else
 		emake libnss_sss.la pam_sss.la pam_sss_gss.la
-		use locator && emake sssd_krb5_locator_plugin.la
-		use pac && emake sssd_pac_plugin.la
+		emake sssd_krb5_locator_plugin.la
+		use samba && emake sssd_pac_plugin.la
 	fi
 }
 
@@ -272,12 +275,10 @@ multilib_src_install() {
 		into /
 		dolib.so .libs/libnss_sss.so*
 
-		if use locator; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doexe .libs/sssd_krb5_locator_plugin.so
-		fi
+		exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+		doexe .libs/sssd_krb5_locator_plugin.so
 
-		if use pac; then
+		if use samba; then
 			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
 			doexe .libs/sssd_pac_plugin.so
 		fi