Restore samba4 magic

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

3 files changed, 25 insertions, 20 deletions

diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog
index d5a309e29d89..bc1ca051fd0b 100644
--- a/sys-auth/sssd/ChangeLog
+++ b/sys-auth/sssd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-auth/sssd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.69 2015/04/10 00:23:33 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.70 2015/04/18 18:00:00 hwoarang Exp $
+
+  18 Apr 2015; Markos Chandras <hwoarang@gentoo.org> sssd-1.12.4.ebuild:
+  Restore samba4 magic
 
   10 Apr 2015; Anthony G. Basile <blueness@gentoo.org> sssd-1.12.1.ebuild,
   sssd-1.12.4.ebuild, sssd-1.9.6-r3.ebuild, sssd-1.9.7.ebuild:
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 61590ef3733b..f27b232f08ce 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -14,25 +14,27 @@ DIST sssd-1.12.4.tar.gz 4226841 SHA256 ea3be3a40b20284bd3126481dd0747cd07e39d5ef
 DIST sssd-1.9.6.tar.gz 3180066 SHA256 ca96e8d98eb4113396b13d9601dbdd20f4b2f2613d0f29a0157ffd05e3748601 SHA512 32d6056db1a17fe348f0b932d4242ce3b3dc615d4d93ebf580f5f9a3e16985324d9955e092803cf9a2bf35724feab0450737f516e9ce003f6812a0debf54ba15 WHIRLPOOL e496d63a042b39dd5d269a7d24b9a535c73a47741a4429e78e2a9d1282515747a83251338d6c94d75b2de06a415bfed18f7223864b1b4e9a824a25d41afa6a59
 DIST sssd-1.9.7.tar.gz 3485351 SHA256 ed2b7e9835143404cbc0e3e105607b7c554f568e4af024b5db0f10ca4f809c7e SHA512 1c73078f2127c1359c13601900e39dcb7527c5ca1346dfbb2fdcf07d98d3542f7b79aed8acc9dd289ab1a679f0b5477e08a9f1d58da4847ada53bdb4f3f606e2 WHIRLPOOL 691164b8edbcdc5acba024a00ead18e1769175cf6f9c3e49f065d31c84b55b315e569fbf04a841c9cd67ce76531f26875a97e0c553b462aecee29aa9428493be
 EBUILD sssd-1.12.1.ebuild 3517 SHA256 805e028fff71740743ad096907566b5abf554d97699b8880559beb535ce1ae62 SHA512 c3e1786b429ec230fb7221d4453ebd1ec1ac83e80eccf24709788da6217c8ac9e6a25d0804352530c9c9cbb74731d21b06f1a037c4d212e5492772fae5412422 WHIRLPOOL dc267384f92a37eb3ae5a836af4811c81ae7da4c787a971b94b9e4f1437f57d947890c48127ff2273d75534dd3857079766f64203ed41a7ce49e3fbe10eb61eb
-EBUILD sssd-1.12.4.ebuild 5335 SHA256 2cc0d90158079922ca47084491e239db9ab1b4db7a9524b06cec65fcccdb9e7c SHA512 1084bbfd88120cd971cd2b425dd783ab767d0dddb184b7c35d78cc86bcc8955cf0caa362dce3c99a322c5c22460e7891f34b752ad8dec73157a46bbac36d8064 WHIRLPOOL 8a5f20f8216235e622f49eab9ddb09035f3207d232097a0d9bfc82853f0c6c09448cd7fdfc1943a121a9aa2c2e7ba97b745be30e728a88044871d25a6eb01a23
+EBUILD sssd-1.12.4.ebuild 5366 SHA256 bb2b6b12ec3f164e9edf85e6821d3edd384d63413358bed601b8a6737be6a55f SHA512 666681c95f58a4d2dde85b5eace2e307a9577f2e7556d3406ae1874289e334b96bd1f7c4bf9e92c44612a252e2a18b842d78d73c6996e85335460dbd7342cf41 WHIRLPOOL 2af7db1bd461bb5d5bf4813bfdb6ded4b21109d7b00dbb4253407aed49c51d8556b724abd65d06d4e2929b15cccac537dd80785601516f6b0c31233bfab7a8f8
 EBUILD sssd-1.9.6-r3.ebuild 3221 SHA256 d694b694c51c4eaa3c772f0bba0381cab51223ce1af556fc48f39d85e61d413a SHA512 69241bfe5793c8fa674d3ed35f9deb1f7c2365b4f25f920d8834a05b061d1efed875fa4be02436abb5723487e0454687c4920b7b21f5af79c153160d4c49285c WHIRLPOOL 6652d3c24ab3783e282463b5653286d18f651ba3a2ddf03feebdb6b1c122c9a2e41b1f05a5cd0a342a5e4b60ad7e143f5f36b03547d1ecec69cd59abcc35eb91
 EBUILD sssd-1.9.7.ebuild 3233 SHA256 04637dec37ffaff36ebbb73684a8875bfb757420562d93a9b53fcb33396ffc11 SHA512 b65ba70a3cd9fe64ebcee77e1616dabfe7781415703e201d2eb1c5aaab8f47aefd19d97d859746136e74057ac2673ecd16098bc33291c71c74a0ae1569d7b0f5 WHIRLPOOL 674ba708e698bdd8e1a906605ef6d768b21c4e908015c2f0c3a2db4c452ab796c3b3d255776abb42d5054e09e64ed521cded9169a53b2db355ffedc090d8ead1
-MISC ChangeLog 11315 SHA256 211b421327c0966249abae8c44af1da96cd433f0ab46c105776ee32dcabe51db SHA512 b67147e89e836166e3bb8bca38e07487fb6a2084b74d5e2e8f2e7b10b42977a2f7a5189868d8b2316e75e4726d00dd9c9062a181e50ccba663e57b121b7a56b2 WHIRLPOOL 64fa489396570fc13e41629d2df44ced1c00e828b41d2a1d9a6df4cbc84df7fe9bb757819c76e5060d73822230654270a1841a2361beeb4f74c046daaa256c56
+MISC ChangeLog 11412 SHA256 4eb583a1075794b7823baf2e34ae1a153a1652fa5c5c7eac1b2c44718104557f SHA512 c71dc6c794d7ba0e596df85fab483575d15049fd5174beea642a5fe746c372f146cf5378f955ee07a9b12c1b092f79bf9486f6725c33515ec61f8fad29ebfb73 WHIRLPOOL 6d6b8519502b3b5bc1988cacb4c7df8f527de5fa33cb1c8c42791753771d911e630bf8701371e668aecabd2a37aa72ebef90d3dcfe34ef1e7c20bd4c21b069fb
 MISC metadata.xml 1023 SHA256 d056fd8216ec84da30390ed4f3961cb97969d2159cca695dd3fd2f939e808b4c SHA512 9296ab06d55fe4e81fd2dd81ca79220268496bdb686d7e49e3fe2eae0e253d91964c6101f09653de688b1fb1074a0dde78e999b5774a9d27e02fdb1cf9cd9f4c WHIRLPOOL df942efd13b9e8002fdf9be5b6d981832b014ea48814ed663725dc790f8e0f7b3a60c329d8f720b569eef563d5b219331f35dba3c18ec992676ed5ee2d1537b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJxiKAAoJEJOE+m71LUu65RUP/RTPyajAdv/gt14kl7vL8KVl
-AkwNF/n3E2/4QgFSBrmkYhJYelalBW7ZgI0icT89UQVGzK7kBGNOLjgtf/QiYKAR
-9rI9A5JKubKm0oBdSluJxMIv7o3kI3pnXLHo76tAot1N1OdR3LAVeIGhhZYI04Ys
-yNrgmtmBfpBr1BvTd1atufGKWSAs9adwFJ/rRUfRqhUBOtVjfXIIp3+Oz0RSVSX8
-6WFsIbyrayUDeDEaS0nk714fG0AS7XzVFxekORpbXRXWuaVtxUZG3EQcA/aYfQh2
-/qcB3srSNmuXhS/h/tUZk5seyctx3oYFBBLdeGaaySCVFU/fPohUTKTbYyF9F5mG
-JWoESxTmcJvbo8cePyiRXG5dfyXGvSKe+u4O6J+BILJYfZkys4/jhBW4A6QzHTV7
-Ety16XDKwYoDnU4vJouHq9wyDoayKj0DOHXdSTTrS7Mtt9bj466eIbP0hvHD/rt6
-h+MfGpYxMxFJ84Kqpri8jWCIBWGJlNEJMWvatsVhmuzwn25WDWTE8yhsT54pAJ89
-3pkxqmBC/DpTSj/mL6Y4iyQYOkyw1tiPoCgXw/ncUX5aDMXq+sspmBN2fUs3ws1G
-7Y164qd64veqzid0NCLcL/frK3hjEOM18LR/2hMFmb4+nC8y7MaQaxipRWL6ZuxR
-7JhN/zKSbKmZ+eU4UJJc
-=GwPE
+iQJ8BAEBCABmBQJVMpufXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun883JwP/3cdQjflelUG4wUUsgW9AK7b
+X+COLTZ2N9al1Z+2IlnWNRN2QnO/Z4ggcmbs2NGEXe42RJmVTYZKmAPcnsoR7ldP
+aDWEF+mJRbR+lNd6HjTSLIF7xZVBywXRE2TMlJsrrPKJ2j+E+0uIIUP8H3O0Ukm6
+0V33ySvQVb3ezTu4BCbpJuOcTORySAiZcB/6+u38QRCQfgsZRjFtbtY8LtofExIX
+6EKnT/mbN7RVuEs5ABf4PRbmpOdVx54eDT9XC3DvizTpImQ1RRqBDVHrfBNBtBCK
+UAHLCSxRoitJe4ubW6QRKPBdmK91UcZX9tvBp6eQYAcC1+9V3VKnHHQ/cbdpOB7j
+XSsQvIjowMdZb7d35ajHWmohcLHLtAiSh9lmpBN6myVgwWT++gPJa+XohImLNZu/
+7AMeOSq/0zfWDQ0KygetbGWiO4ScksGltdfk7ikFEmnb4/G+JBlAqx+0wTLcekVT
+lOo8KdGcKYaixjFIijBXDHqZDIdG4g74E0+fpWsYuC3fLE/2FR2H1pZ0eKawyP4j
+/FoD6XH5ENOi4k4n4IqYmpPMCMbEc+GT4IRPhUnZxwbpgEbKERDsB2Dy/3OyDMPD
+XpSqCl3EC39M36ZXaD5jyN/AzFeVBThM7noV6hHp1vHXxy/f2LAchDnh1hw+oyrE
+yXGJ3xCO2sOnw6U19xHV
+=mFoN
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/sssd/sssd-1.12.4.ebuild b/sys-auth/sssd/sssd-1.12.4.ebuild
index 82009d6dd1ed..883cb2b4503c 100644
--- a/sys-auth/sssd/sssd-1.12.4.ebuild
+++ b/sys-auth/sssd/sssd-1.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.12.4.ebuild,v 1.4 2015/04/10 00:23:33 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.12.4.ebuild,v 1.5 2015/04/18 18:00:00 hwoarang Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://fedorahosted.org/released/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python selinux sudo ssh test"
+IUSE="acl augeas autofs +locator netlink nfsv4 nls +manpages python samba selinux sudo ssh test"
 
 COMMON_DEP="
 	>=virtual/pam-0-r1[${MULTILIB_USEDEP}]
@@ -49,6 +49,7 @@ COMMON_DEP="
 	nls? ( >=sys-devel/gettext-0.18 )
 	virtual/libintl
 	netlink? ( dev-libs/libnl:3 )
+	samba? ( >=net-fs/samba-4.0 )
 	"
 
 RDEPEND="${COMMON_DEP}
@@ -92,7 +93,6 @@ src_configure() {
 }
 
 multilib_src_configure() {
-	# no samba4 per 447022
 	# set initscript to sysv because the systemd option needs systemd to
 	# be installed. We provide our own systemd file anyway.
 	local myconf=(
@@ -106,7 +106,7 @@ multilib_src_configure() {
 		--disable-rpath
 		--enable-silent-rules
 		--sbindir=/usr/sbin
-		--without-samba
+		$(multilib_native_use_with samba)
 		$(multilib_native_use_enable acl cifs-idmap-plugin)
 		$(multilib_native_use_enable augeas config-lib)
 		$(multilib_native_use_with selinux)