gentoo resync : 18.08.2019

4 files changed, 15 insertions, 33 deletions

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index fc5b5e1a21c3..7373dd874de1 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -6,7 +6,7 @@ AUX sssd.service 341 BLAKE2B 0cffcd43786633aa8e5bb42c54741cba676021c5a07554b0849
 DIST sssd-1.16.3.tar.gz 6217114 BLAKE2B eefaf8de466d0d76e9a4b60aefef6eb63c17a55b9a1f2e07e973a61d71cbe5432e92357656a1eb353d45bbc2fa92290cef45898d0b315d4a4c4074652ff25a23 SHA512 6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728
 DIST sssd-2.1.0.tar.gz 6463331 BLAKE2B 9226370dc384c58841d944bdf9b067d953bf138ee7a289f01a4b8bb5d09beee3b9f21609989123d8f4f9fc13237670d61e32dcb194555ddc6785c598ce78d08c SHA512 12a7e5b89d462350af3c43e15b24a437dd985ac4a2e419d5e52cc0d05c6eacb9319d39b23681595ef860120cd1ae6e5fb265054afeddcb05d3d5f5de5d6ffa63
 DIST sssd-2.2.0.tar.gz 6642715 BLAKE2B e6c16ca69effe59769fc166c02203faee445ebe2bf551c6a1460bdee2474ccbce1a38b3aa59b1ae4a79bb170696a784b800a9299025bf6a58bc9aeb94b946338 SHA512 9ebd8784e1f0c72cb808bbc153c0b0aa9bf507938f78336a260073a89b49350dc2c6172653509738ea7a50bb9da596725e1d6c92f99c7a03308aa42f6378dbbb
-EBUILD sssd-1.16.3-r2.ebuild 6285 BLAKE2B e44ab49fc7d72b0c2121bc4b5bea2b2413f6a379d1223a9b2f2cea59cb79685e30ae2beb25620e4c3094c5c032bdf29bf1affd5456665d12504ed84adae44528 SHA512 d79062bc3c7d48db6452bd6cdcf681745f4ae7e13f5aacd7bb8f434963df82d66c0293a1848518a6c2df71e7fcc3337e9de58a622859b1772e6c96fa8618cfa6
-EBUILD sssd-2.1.0.ebuild 6205 BLAKE2B f78b016540080eec10a44fb162dacc639639db594dd2e763774a1a51917cd5e2410184c7a2c6efb04a1bf876bd2320a977082980a807ac308292080de3fb9a7b SHA512 b36a70fa89df5717a53e03b42541c881e69eb6c27868fa25f2cbc5dbfd64ac21e020ef6c916acd7c0d0fe3967e05629abd4952f29234fb6a7c41b0f911be41b6
-EBUILD sssd-2.2.0.ebuild 6205 BLAKE2B f78b016540080eec10a44fb162dacc639639db594dd2e763774a1a51917cd5e2410184c7a2c6efb04a1bf876bd2320a977082980a807ac308292080de3fb9a7b SHA512 b36a70fa89df5717a53e03b42541c881e69eb6c27868fa25f2cbc5dbfd64ac21e020ef6c916acd7c0d0fe3967e05629abd4952f29234fb6a7c41b0f911be41b6
+EBUILD sssd-1.16.3-r2.ebuild 6049 BLAKE2B 737c2d6271e5e8cf022656c552c666fb5e69d2cdb256035eb2b521a9693492e8d0c77533e90621ff599c1411e5d7b183183e587b5a5f1049b6b129c6a6d2908b SHA512 70c3ed9b8f3184c1d56058844bb4033981341cff6b6eb4b904bc482770f247087e85845bd8af7b1e73267a38d89181f27684ba93b9527a1c1766be397cfd9081
+EBUILD sssd-2.1.0.ebuild 5969 BLAKE2B 82d98764761159594dd1b771e2bbbe2e2029916a922d0c8f7086c1ec409b9f89700f719d805bf3551805ba525c1ed99b4a83894f04f6d5b2f2efc7196a97768e SHA512 25ecf654a10f4b57e3aa360499718ecb393a7c87362fcc2efed542450eadcbd340fc8a9f68598709f8a95f7d3b1ba76ccf81e86635a2179c85590454e4556989
+EBUILD sssd-2.2.0.ebuild 5969 BLAKE2B 82d98764761159594dd1b771e2bbbe2e2029916a922d0c8f7086c1ec409b9f89700f719d805bf3551805ba525c1ed99b4a83894f04f6d5b2f2efc7196a97768e SHA512 25ecf654a10f4b57e3aa360499718ecb393a7c87362fcc2efed542450eadcbd340fc8a9f68598709f8a95f7d3b1ba76ccf81e86635a2179c85590454e4556989
 MISC metadata.xml 1090 BLAKE2B 7085d66b3454b3756d7dab49b6d9525c4ba90156d07f2710f4eb3c5bf3bbd9d10412d511dc0fe091ac4c5291f87a258fac6adbe9732d20a96660f4e0a66cf247 SHA512 2cbf20cd206a45bd82b1416926a02de06bf40b1b4168f19202c367cf8e24d764745b8a5116366ee10520cae15800e17b43d3000995419117f02b2d37474f142e
diff --git a/sys-auth/sssd/sssd-1.16.3-r2.ebuild b/sys-auth/sssd/sssd-1.16.3-r2.ebuild
index 123d66457912..6397b5835b11 100644
--- a/sys-auth/sssd/sssd-1.16.3-r2.ebuild
+++ b/sys-auth/sssd/sssd-1.16.3-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
@@ -14,7 +12,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -104,12 +102,6 @@ multilib_src_configure() {
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
 	#Work around linker dependency problem.
 	append-ldflags "-Wl,--allow-shlib-undefined"
 
@@ -142,6 +134,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with ssh)
 		--with-crypto="nss"
 		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
 
 		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
 	)
diff --git a/sys-auth/sssd/sssd-2.1.0.ebuild b/sys-auth/sssd/sssd-2.1.0.ebuild
index 146e47c5995d..3bb83f60232e 100644
--- a/sys-auth/sssd/sssd-2.1.0.ebuild
+++ b/sys-auth/sssd/sssd-2.1.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
@@ -14,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -101,12 +99,6 @@ multilib_src_configure() {
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
 	#Work around linker dependency problem.
 	append-ldflags "-Wl,--allow-shlib-undefined"
 
@@ -139,6 +131,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with ssh)
 		--with-crypto="nss"
 		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
 
 		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
 	)
diff --git a/sys-auth/sssd/sssd-2.2.0.ebuild b/sys-auth/sssd/sssd-2.2.0.ebuild
index 146e47c5995d..3bb83f60232e 100644
--- a/sys-auth/sssd/sssd-2.2.0.ebuild
+++ b/sys-auth/sssd/sssd-2.2.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools flag-o-matic linux-info multilib-minimal pam python-r1 systemd toolchain-funcs
+inherit autotools flag-o-matic linux-info multilib-minimal pam systemd toolchain-funcs
 
 DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
 HOMEPAGE="https://pagure.io/SSSD/sssd"
@@ -14,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl autofs +locator +netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
+IUSE="acl autofs +locator +netlink nfsv4 nls +manpages samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -101,12 +99,6 @@ multilib_src_configure() {
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=()
-	if [[ "${PYTHON_TARGETS}" == *python2* ]]; then
-		myconf+=($(multilib_native_use_with python python2-bindings))
-	fi
-	if [[ "${PYTHON_TARGETS}" == *python3* ]]; then
-		myconf+=($(multilib_native_use_with python python3-bindings))
-	fi
 	#Work around linker dependency problem.
 	append-ldflags "-Wl,--allow-shlib-undefined"
 
@@ -139,6 +131,8 @@ multilib_src_configure() {
 		$(multilib_native_use_with ssh)
 		--with-crypto="nss"
 		--with-initscript="sysv"
+		--without-python2-bindings
+		--without-python3-bindings
 
 		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
 	)