gentoo resync : 24.07.2021

2 files changed, 28 insertions, 30 deletions

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index b993952010db..c28338d798ac 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -1,9 +1,9 @@
 AUX sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch 1180 BLAKE2B 22b12936b8a4256af39396ce31a90742bc93331b2adb9c44442ddd1285ee19e03c24f99b899dfe35768d4383f7e46a241a0fa3975cc3cf4b32e93f1dd0805915 SHA512 d4519c7d9a63d6902da028584379457fda0be7b4e3b882498586504543e944462d93a3fe804f307562d75cd15257a1595c09bc1e804a41f47f1d2ff9999c7973
 AUX sssd.conf 124 BLAKE2B b6f9c016a014510f97b036d23d5f50e1e13085220fe82b0e6ef7a3ceeb114e59af935f39e66e4ad60a46f43983930e5d381b16b0ed31ba4349abe38c4b509367 SHA512 f16908c44b213edbf6b0c6e8d49df92e8c06fc623279037074fe51e49b8aca7dc18f5ed83f71909fc8209df80dfc150583edb1687f88e61588bdf9d1fbf6ed5a
 DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7861028c07ce2985db8a151ce743d633061386fea6460fe8eabb89242b816d4bac87975bb9b7b2064ad1d547 SHA512 6aeb52d5222c5992d581296996749327bcaf276e4eb4413a6a32ea6529343432cfe413006aca4245c19b38b515be1c4c2ef88a157c617d889274179253355bc6
-DIST sssd-2.5.0.tar.gz 7474851 BLAKE2B 835ca53a7910f457666a92be62fe047dbcf52c56560dad60d6c6275dccca917b4349d053586c8c88da49f900d570c890faa7372783be35940ccd49d1fd4ec09d SHA512 80b5e81cedacdf0bbe724af20d69b918bb6cc353976c6c65421afcd5809d1723f523bc3c1be294b9e01cfda9617c2df5c6ceb007837f195eb1abc2abdab9858c
 DIST sssd-2.5.1.tar.gz 7492275 BLAKE2B 9f19d12cb0e071b15bd8fe2660ab9a2223d53267549602c4837f35ed852fa60022514a0bbd03c684c1f398d763120c5f706999d86432d9fe03c3715cb0d43000 SHA512 7441df3b5f1cc1eadb0c6853b048d780ecb36761876aaeb26b9a2d87729211d3ceeae01085dc3ec4fd1c5328f951c8abe854b1d01d91fae25466f930fe16e44a
+DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd48458d742285b60e7beb6d48af865f3415e11ce89e187f4643bbecf15bbb321859ec80cfe458eb781cea6c9 SHA512 a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48
 EBUILD sssd-2.3.1-r2.ebuild 7563 BLAKE2B b7dd8d9487bf8081aff7a20866e63ea37f97c12f4c6075af8080cf120d060c3075d9f0fa87234f5db6d9aa74ab58d0d53b21f059133975a819ee1b963d7e888a SHA512 3980637d2480a2247b897c0412a18c53536481eaf624089f5d697353688b13181d3928e8d665829f411d7bcf3e7da95b51a6407072a5c9548c7f66b47e92b30c
-EBUILD sssd-2.5.0.ebuild 7712 BLAKE2B 4a24c8e318bf59b39b32e748ef3b9883d04f948ce728939a6be93d0aa24bcd5d79de7eefb377bbcab2fa08900650549c4b31101e40b5da6c96ed617b9dba4d52 SHA512 c8be74be419ee65473cb415f2b0b642c9f1b1ecdf523ddd587d36c77abfb5a49633476d0f3cd9813e7fd44abc5d6bb4d7b1456a74c324ebdd1cbd84782f7f79a
 EBUILD sssd-2.5.1.ebuild 7673 BLAKE2B 092df102af81094e598184c006d2669745fea384308dfc7655b35e84fd80dc56c5c9e587b9217b9ef822ad0893d0967827257f693ea5fb116b3ae9b4e7ad1b1f SHA512 85a3c54b36d15c0c4f9641c03b7893ca8994cb0f8218eb8039947dd500227640bc56bd6056cf94a60670b42c1b2d25d015383e5f0c47e95ccb33548550dec490
+EBUILD sssd-2.5.2.ebuild 7673 BLAKE2B 092df102af81094e598184c006d2669745fea384308dfc7655b35e84fd80dc56c5c9e587b9217b9ef822ad0893d0967827257f693ea5fb116b3ae9b4e7ad1b1f SHA512 85a3c54b36d15c0c4f9641c03b7893ca8994cb0f8218eb8039947dd500227640bc56bd6056cf94a60670b42c1b2d25d015383e5f0c47e95ccb33548550dec490
 MISC metadata.xml 1181 BLAKE2B 169890eab8d708cc561792859dd065849c6c1b5ea4b338133a9850979032ebfe292d200c0437bbded1369cebef60c3acb9e4c6a3af4384700bd703a90ecd67ac SHA512 b4fc2aefde3549d763dcd806a1314f8bb09d2b8a18652d6e5d4e6c6e61e345c3e05fc161adef31e93c99344b6a7e129fa10e6ed0c34445c0c6149c2fe9da23a9
diff --git a/sys-auth/sssd/sssd-2.5.0.ebuild b/sys-auth/sssd/sssd-2.5.2.ebuild
index f3bfe43fa440..3c3af9abb66e 100644
--- a/sys-auth/sssd/sssd-2.5.0.ebuild
+++ b/sys-auth/sssd/sssd-2.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
 
@@ -17,13 +17,33 @@ SLOT="0"
 IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="pac? ( samba )
-	python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	pac? ( samba )
 	test? ( sudo )
 	valgrind? ( test )"
 
-DEPEND="
-	>=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	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
+		valgrind? ( dev-util/valgrind )
+	)
+	man? (
+		app-text/docbook-xml-dtd:4.4
+		>=dev-libs/libxslt-1.1.26
+		nls? ( app-text/po4a )
+	)"
+
+DEPEND=">=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
 	app-crypt/p11-kit
 	>=dev-libs/ding-libs-0.2
 	dev-libs/glib:2
@@ -67,25 +87,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=sys-libs/glibc-2.17[nscd]
 	selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
-BDEPEND=">=sys-devel/autoconf-2.69-r5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	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
-		valgrind? ( dev-util/valgrind )
-	)
-	man? (
-		app-text/docbook-xml-dtd:4.4
-		>=dev-libs/libxslt-1.1.26
-		nls? ( app-text/po4a )
-	)"
 
 CONFIG_CHECK="~KEYS"
 
@@ -102,6 +103,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 pkg_setup() {
 	linux-info_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -121,10 +123,6 @@ src_prepare() {
 	eautoreconf
 
 	multilib_copy_sources
-
-	if use python && multilib_is_native_abi; then
-		python_setup
-	fi
 }
 
 src_configure() {