gentoo auto-resync : 28:10:2024 - 03:04:40

5 files changed, 4 insertions, 669 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6de83e7e3dbe..33db5e47578b 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 9602f58935ef..0bd75c714793 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,10 +1,7 @@
 AUX sssd-2.8.2-krb5_pw_locked.patch 453 BLAKE2B 7aed1dd32f0743381b704444ac36dcffa76535d58cd39d307d370290b9b5ad634ef9b90f4d076c7b91b41113792b0d24cf04b63bcd1e1220aa3e790f9c9a23c0 SHA512 e3c210032d6f65ebffa14aa7c398ca929b7bb17d9aa9ef30c2a1522311bc0bf278214d008d7dbac47e8565245b35e00f7143f5c7d0d24f99d64a92486ec50e45
 AUX sssd-2.9.1-conditional-python-install.patch 533 BLAKE2B ce076e4e00bd1b3e8a18427fde385b6a65fbbc65f28a542f575d3b77b8e7d277ebc829a7d43fdbced51475b69553de4fd6e564d52d06c6a83edcae7fa8a2a53a SHA512 4348577c16ab96717e0b92dcae00e955e76e9be6c58a6f6c4435f2315c8393336396e7a0ccdd05f50b97233a956ef674fd64589780500159748ac47c65edb623
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
-DIST sssd-2.9.4.tar.gz 7982544 BLAKE2B 6ed23787f1c029abc89f2bbe516787ddbe2fa39f052b75b965972b0a3532c66076f16b775258c5ee6f4ac9ef63bd6ab5bad1a3b660bcac135b3af460d0f14748 SHA512 9546cf074628f32137b16ca0c763988785271124244b645d1e786762e8578f10d983793a29bffcc004b064452fe8d465476a3041688d2f3c11c2751fb5bec3e2
 DIST sssd-2.9.5.tar.gz 8001964 BLAKE2B e9c839e58fbeac9e8cba83b726f075c5db6ce85059546d745672c222b594f4aa26ad103f0eb3a8ff9e2b364c3502fb93c639fe9e621fefd6fecd2319f5cb499a SHA512 d219f12ffc75af233f0e4ffc62c0442acc6da3cd94ed4eab7102a78821af5257c8e4ba0d06b2c99c08e06502f8d0d0bcc80540d63823dbe0f52eb0432ae7e14d
-EBUILD sssd-2.9.4-r1.ebuild 8384 BLAKE2B 67fabba2eccecef981c5b8cbc015d4eb75692cc7fb0005f2e51df66e92dfa4e37803310f52d346a987eff5d92ca94e454964263c5a01ddeab79f070666cf3ccd SHA512 f15fffbd8659ae85d677865ee2e234a79c1805cd1962bd9114b936b628ab0acc2a2cf7a5cb15d032686ee9cd195d2a141614d9e6bd3241f950712779449518d7
-EBUILD sssd-2.9.4.ebuild 8395 BLAKE2B 7e11eed623aeda5e6567ebd9ae4de75e48fe8b29c631ca0623fd7d44f989b89da5225b6d5965d6e42700961a0054641bab33e16fed61a021eb97f803e7347884 SHA512 c1ae1b935291bf8751c7389f12ebfa60c91ac9ef3c35d5644d4528a5220a861a95af63f252d6afec935362238bd4611bca35ed97b2c41c0fc27a7b567c9da626
-EBUILD sssd-2.9.5-r1.ebuild 8432 BLAKE2B 861dd47495211efa9ad22636f908bb4e6de2b0ed855367ec05a6a4e8e1d2e780c79b4506e86df9b9a0f8359d9527af11bd0aceb974b4d4b50e0f6dffb76fd329 SHA512 bdb276b6a72dbb2dd211b80a098b96afe11af2228f091daf700ac691468891191406eb6e3ce852c5e38b3f9def2df7bc1e6db3fbc89def07490f81f4a83487b0
+EBUILD sssd-2.9.5-r2.ebuild 8539 BLAKE2B bc11c907352862078b39bf8f83e314864f262074b9fd47ac785835ee0220ade68dfb502cffc9fbedafb7fbd29d20fcff3d9aac179b1bd772d6f2d1b7529ac496 SHA512 fb8615e7ff5c79da4aba30f838976cc24effbcbd706ac6ff21b2060b30dfbe7743fd4da5fe6516097f96749b6bdf29c0bba584be605d1d30c71191281e1912b4
 EBUILD sssd-2.9.5.ebuild 8443 BLAKE2B 4053db31c371e80684619b56fb178e2e9bd391450cb4f5ce1b15cc4ed853119d5d869269ffa55eb2ed48cb6d170b9fcba0cef7c0a88b500445be31d597244828 SHA512 b915e3d8a7ffd2b01a88d845a0a58f2dd0566c8872ed2f15ff22d959e028ae68c7c934165d49f03daaf635cc72fac6dfd54d834c0088d5622f8d293f70492a16
 MISC metadata.xml 1267 BLAKE2B 6476e67ddb1c7c8153faba317331499bc918393b02ce7c6e91685e29b514f8ea28836928e3faf1095896577b9b29045fe1b3191a7790495d0080d33288a42b5a SHA512 54a8cd9fb1c3c57b20deb779dfb9fa9377986d8c9ecda4f009b1643210683163456aa6562ed5f9a58232b90bed5cefbeeb4ee762d32a5ee5e3db0d95c3e0d37c
diff --git a/sys-auth/sssd/sssd-2.9.4-r1.ebuild b/sys-auth/sssd/sssd-2.9.4-r1.ebuild
deleted file mode 100644
index 37778e095f92..000000000000
--- a/sys-auth/sssd/sssd-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ca de es fr ja ko pt_BR ru sv tr uk"
-PLOCALES_BIN="${PLOCALES} bg cs eu fi hu id it ka nb nl pl pt tg zh_TW zh_CN"
-PLOCALE_BACKUP="sv"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools linux-info multilib-minimal optfeature plocale \
-	python-single-r1 pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://github.com/SSSD/sssd"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SSSD/sssd.git"
-	EGIT_BRANCH="master"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( sudo )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
-	app-crypt/p11-kit
-	>=dev-libs/ding-libs-0.2
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	dev-libs/jansson:=
-	dev-libs/libpcre2:=
-	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.10.0-r1:=[${MULTILIB_USEDEP}]
-	>=net-nds/openldap-2.4.30:=[sasl,experimental]
-	>=sys-apps/dbus-1.6
-	>=sys-apps/keyutils-1.5:=
-	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	virtual/ldb:=
-	virtual/libintl
-	acl? ( net-fs/cifs-utils[acl] )
-	netlink? ( dev-libs/libnl:3 )
-	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
-	nls? ( >=sys-devel/gettext-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		systemd? (
-			$(python_gen_cond_dep '
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-			')
-		)
-	)
-	samba? ( >=net-fs/samba-4.10.2[winbind] )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	subid? ( >=sys-apps/shadow-4.9 )
-	systemd? (
-		sys-apps/systemd:=
-		sys-apps/util-linux
-	)
-	systemtap? ( dev-debug/systemtap )"
-RDEPEND="${DEPEND}
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
-BDEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? ( app-text/doxygen )
-	man? (
-		app-text/docbook-xml-dtd:4.4
-		>=dev-libs/libxslt-1.1.26
-		nls? ( app-text/po4a )
-	)
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-libs/check
-		dev-libs/softhsm:2
-		dev-util/cmocka
-		net-libs/gnutls[pkcs11,tools]
-		sys-libs/libfaketime
-		sys-libs/nss_wrapper
-		sys-libs/pam_wrapper
-		sys-libs/uid_wrapper
-	)
-"
-
-CONFIG_CHECK="~KEYS"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.2-krb5_pw_locked.patch"
-	"${FILESDIR}/${PN}-2.9.1-conditional-python-install.patch"
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-	# from 1.15.3
-	/usr/include/sss_certmap.h
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_get_locales > src/man/po/LINGUAS || die
-
-	sed -i \
-		-e "/_langs]/ s/ .*//" \
-		src/man/po/po4a.cfg \
-		|| die
-	enable_locale() {
-		local locale=${1}
-
-		sed -i \
-			-e "/_langs]/ s/$/ ${locale}/" \
-			src/man/po/po4a.cfg \
-			|| die
-	}
-
-	plocale_for_each_locale enable_locale
-
-	PLOCALES="${PLOCALES_BIN}"
-	plocale_get_locales > po/LINGUAS || die
-
-	sed -i \
-		-e 's:/var/run:/run:' \
-		src/examples/logrotate \
-		|| die
-
-	# disable flaky test, see https://github.com/SSSD/sssd/issues/5631
-	sed -i \
-		-e '/^\s*pam-srv-tests[ \\]*$/d' \
-		Makefile.am \
-		|| die
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die)
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	myconf+=(
-		--libexecdir="${EPREFIX}"/usr/libexec
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-pid-path="${EPREFIX}"/run
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-db-path="${EPREFIX}"/var/lib/sss/db
-		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
-		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
-		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
-		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
-		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
-		--with-log-path="${EPREFIX}"/var/log/sssd
-		--with-kcm
-		--enable-kcm-renewal
-		--with-os=gentoo
-		--disable-rpath
-		--disable-static
-		# Valgrind is only used for tests
-		--disable-valgrind
-		$(use_with samba)
-		--with-smb-idmap-interface-version=6
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		--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)
-		$(multilib_native_use_with man manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_with autofs)
-		$(multilib_native_with ssh)
-		--without-oidc-child
-		--without-passkey
-		$(use_with subid)
-		$(use_enable systemtap)
-		--without-python2-bindings
-		$(multilib_native_use_with python python3-bindings)
-		# Annoyingly configure requires that you pick systemd XOR sysv
-		--with-initscript=$(usex systemd systemd sysv)
-	)
-
-	use systemd && myconf+=(
-		--with-systemdunitdir=$(systemd_get_systemunitdir)
-	)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,UNISTRING,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
-			{NDR_NBT,SAMBA_UTIL,SMBCLIENT,NDR_KRB5PAC,JANSSON}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-			--without-kcm
-			--without-manpages
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-		use doc && emake docs
-	else
-		emake libnss_sss.la pam_sss.la pam_sss_gss.la
-		emake sssd_krb5_locator_plugin.la
-		use samba && emake sssd_pac_plugin.la
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		local -x CK_TIMEOUT_MULTIPLIER=10
-		emake check VERBOSE=yes
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" install
-		if use python; then
-			python_fix_shebang "${ED}"
-			python_optimize
-		fi
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-		dopammod .libs/pam_sss_gss.so
-
-		into /
-		dolib.so .libs/libnss_sss.so*
-
-		exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-		doexe .libs/sssd_krb5_locator_plugin.so
-
-		if use samba; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
-			doexe .libs/sssd_pac_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/sssd
-	insopts -m600
-	doins src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	keepdir /var/lib/sss/db
-	keepdir /var/lib/sss/deskprofile
-	keepdir /var/lib/sss/gpo_cache
-	keepdir /var/lib/sss/keytabs
-	keepdir /var/lib/sss/mc
-	keepdir /var/lib/sss/pipes/private
-	keepdir /var/lib/sss/pubconf/krb5.include.d
-	keepdir /var/lib/sss/secrets
-	keepdir /var/log/sssd
-
-	# strip empty dirs
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
-		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap}_doc || die
-	fi
-
-	rm -r "${ED}"/run || die
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features."
-	optfeature "Kerberos keytab renew (see krb5_renew_interval)" app-crypt/adcli
-}
diff --git a/sys-auth/sssd/sssd-2.9.4.ebuild b/sys-auth/sssd/sssd-2.9.4.ebuild
deleted file mode 100644
index 6592cc6d1e68..000000000000
--- a/sys-auth/sssd/sssd-2.9.4.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="ca de es fr ja ko pt_BR ru sv tr uk"
-PLOCALES_BIN="${PLOCALES} bg cs eu fi hu id it ka nb nl pl pt tg zh_TW zh_CN"
-PLOCALE_BACKUP="sv"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools linux-info multilib-minimal optfeature plocale \
-	python-single-r1 pam systemd toolchain-funcs
-
-DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
-HOMEPAGE="https://github.com/SSSD/sssd"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SSSD/sssd.git"
-	EGIT_BRANCH="master"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl doc +netlink nfsv4 nls +man python samba selinux subid sudo systemd systemtap test"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( sudo )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
-	app-crypt/p11-kit
-	>=dev-libs/ding-libs-0.2
-	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
-	dev-libs/jansson:=
-	dev-libs/libpcre2:=
-	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.10.0-r1:=[${MULTILIB_USEDEP}]
-	>=net-nds/openldap-2.4.30:=[sasl,experimental]
-	>=sys-apps/dbus-1.6
-	>=sys-apps/keyutils-1.5:=
-	>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.0.7
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.16
-	>=sys-libs/ldb-1.1.17-r1:=
-	virtual/libintl
-	acl? ( net-fs/cifs-utils[acl] )
-	netlink? ( dev-libs/libnl:3 )
-	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
-	nls? ( >=sys-devel/gettext-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		systemd? (
-			$(python_gen_cond_dep '
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-			')
-		)
-	)
-	samba? ( >=net-fs/samba-4.10.2[winbind] )
-	selinux? (
-		>=sys-libs/libselinux-2.1.9
-		>=sys-libs/libsemanage-2.1
-	)
-	subid? ( >=sys-apps/shadow-4.9 )
-	systemd? (
-		sys-apps/systemd:=
-		sys-apps/util-linux
-	)
-	systemtap? ( dev-debug/systemtap )"
-RDEPEND="${DEPEND}
-	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
-BDEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	doc? ( app-text/doxygen )
-	man? (
-		app-text/docbook-xml-dtd:4.4
-		>=dev-libs/libxslt-1.1.26
-		nls? ( app-text/po4a )
-	)
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-libs/check
-		dev-libs/softhsm:2
-		dev-util/cmocka
-		net-libs/gnutls[pkcs11,tools]
-		sys-libs/libfaketime
-		sys-libs/nss_wrapper
-		sys-libs/pam_wrapper
-		sys-libs/uid_wrapper
-	)
-"
-
-CONFIG_CHECK="~KEYS"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.2-krb5_pw_locked.patch"
-	"${FILESDIR}/${PN}-2.9.1-conditional-python-install.patch"
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ipa_hbac.h
-	/usr/include/sss_idmap.h
-	/usr/include/sss_nss_idmap.h
-	# --with-ifp
-	/usr/include/sss_sifp.h
-	/usr/include/sss_sifp_dbus.h
-	# from 1.15.3
-	/usr/include/sss_certmap.h
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_get_locales > src/man/po/LINGUAS || die
-
-	sed -i \
-		-e "/_langs]/ s/ .*//" \
-		src/man/po/po4a.cfg \
-		|| die
-	enable_locale() {
-		local locale=${1}
-
-		sed -i \
-			-e "/_langs]/ s/$/ ${locale}/" \
-			src/man/po/po4a.cfg \
-			|| die
-	}
-
-	plocale_for_each_locale enable_locale
-
-	PLOCALES="${PLOCALES_BIN}"
-	plocale_get_locales > po/LINGUAS || die
-
-	sed -i \
-		-e 's:/var/run:/run:' \
-		src/examples/logrotate \
-		|| die
-
-	# disable flaky test, see https://github.com/SSSD/sssd/issues/5631
-	sed -i \
-		-e '/^\s*pam-srv-tests[ \\]*$/d' \
-		Makefile.am \
-		|| die
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die)
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	myconf+=(
-		--libexecdir="${EPREFIX}"/usr/libexec
-		--localstatedir="${EPREFIX}"/var
-		--runstatedir="${EPREFIX}"/run
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-pid-path="${EPREFIX}"/run
-		--with-plugin-path="${EPREFIX}"/usr/$(get_libdir)/sssd
-		--enable-pammoddir="${EPREFIX}"/$(getpam_mod_dir)
-		--with-ldb-lib-dir="${EPREFIX}"/usr/$(get_libdir)/samba/ldb
-		--with-db-path="${EPREFIX}"/var/lib/sss/db
-		--with-gpo-cache-path="${EPREFIX}"/var/lib/sss/gpo_cache
-		--with-pubconf-path="${EPREFIX}"/var/lib/sss/pubconf
-		--with-pipe-path="${EPREFIX}"/var/lib/sss/pipes
-		--with-mcache-path="${EPREFIX}"/var/lib/sss/mc
-		--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
-		--with-log-path="${EPREFIX}"/var/log/sssd
-		--with-kcm
-		--enable-kcm-renewal
-		--with-os=gentoo
-		--disable-rpath
-		--disable-static
-		# Valgrind is only used for tests
-		--disable-valgrind
-		$(use_with samba)
-		--with-smb-idmap-interface-version=6
-		$(multilib_native_use_enable acl cifs-idmap-plugin)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with selinux semanage)
-		--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)
-		$(multilib_native_use_with man manpages)
-		$(multilib_native_use_with sudo)
-		$(multilib_native_with autofs)
-		$(multilib_native_with ssh)
-		--without-oidc-child
-		--without-passkey
-		$(use_with subid)
-		$(use_enable systemtap)
-		--without-python2-bindings
-		$(multilib_native_use_with python python3-bindings)
-		# Annoyingly configure requires that you pick systemd XOR sysv
-		--with-initscript=$(usex systemd systemd sysv)
-	)
-
-	use systemd && myconf+=(
-		--with-systemdunitdir=$(systemd_get_systemunitdir)
-	)
-
-	if ! multilib_is_native_abi; then
-		# work-around all the libraries that are used for CLI and server
-		myconf+=(
-			{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
-			# ldb headers are fine since native needs it
-			# ldb lib fails... but it does not seem to bother
-			{DHASH,UNISTRING,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
-			{PCRE,CARES,SYSTEMD_LOGIN,SASL,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
-			{NDR_NBT,SAMBA_UTIL,SMBCLIENT,NDR_KRB5PAC,JANSSON}_{CFLAGS,LIBS}=' '
-
-			# use native include path for dbus (needed for build)
-			DBUS_CFLAGS="${native_dbus_cflags}"
-
-			# non-pkgconfig checks
-			ac_cv_lib_ldap_ldap_search=yes
-			--without-kcm
-			--without-manpages
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-		use doc && emake docs
-	else
-		emake libnss_sss.la pam_sss.la pam_sss_gss.la
-		emake sssd_krb5_locator_plugin.la
-		use samba && emake sssd_pac_plugin.la
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		local -x CK_TIMEOUT_MULTIPLIER=10
-		emake check VERBOSE=yes
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" install
-		if use python; then
-			python_fix_shebang "${ED}"
-			python_optimize
-		fi
-	else
-		# easier than playing with automake...
-		dopammod .libs/pam_sss.so
-		dopammod .libs/pam_sss_gss.so
-
-		into /
-		dolib.so .libs/libnss_sss.so*
-
-		exeinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-		doexe .libs/sssd_krb5_locator_plugin.so
-
-		if use samba; then
-			exeinto /usr/$(get_libdir)/krb5/plugins/authdata
-			doexe .libs/sssd_pac_plugin.so
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/sssd
-	insopts -m600
-	doins src/examples/sssd-example.conf
-
-	insinto /etc/logrotate.d
-	insopts -m644
-	newins src/examples/logrotate sssd
-
-	newconfd "${FILESDIR}"/sssd.conf sssd
-
-	keepdir /var/lib/sss/db
-	keepdir /var/lib/sss/deskprofile
-	keepdir /var/lib/sss/gpo_cache
-	keepdir /var/lib/sss/keytabs
-	keepdir /var/lib/sss/mc
-	keepdir /var/lib/sss/pipes/private
-	keepdir /var/lib/sss/pubconf/krb5.include.d
-	keepdir /var/lib/sss/secrets
-	keepdir /var/log/sssd
-
-	# strip empty dirs
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/doc/"${PF}"/doc || die
-		rm -r "${ED}"/usr/share/doc/"${PF}"/{hbac,idmap,nss_idmap}_doc || die
-	fi
-
-	rm -r "${ED}"/run || die
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "You must set up sssd.conf (default installed into /etc/sssd)"
-	elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
-	elog "features."
-	optfeature "Kerberos keytab renew (see krb5_renew_interval)" app-crypt/adcli
-}
diff --git a/sys-auth/sssd/sssd-2.9.5-r1.ebuild b/sys-auth/sssd/sssd-2.9.5-r2.ebuild
index 694855d4374c..2df836ab8b1b 100644
--- a/sys-auth/sssd/sssd-2.9.5-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.9.5-r2.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
 	dev-libs/jansson:=
 	dev-libs/libpcre2:=
-	dev-libs/libunistring:=
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
 	>=dev-libs/popt-1.16
 	>=dev-libs/openssl-1.0.2:=
 	>=net-dns/bind-tools-9.9[gssapi]
@@ -220,6 +220,8 @@ multilib_src_configure() {
 		# Annoyingly configure requires that you pick systemd XOR sysv
 		--with-initscript=$(usex systemd systemd sysv)
 		KRB5_CONFIG="${ESYSROOT}"/usr/bin/krb5-config
+		# Needed for Samba 4.21
+		CPPFLAGS="${CPPFLAGS} -I${ESYSROOT}/usr/include/samba-4.0"
 	)
 
 	use systemd && myconf+=(