Make systemd library support optional, bug #512510.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 28 insertions, 21 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index c68d9ad956b2..6df0fe658162 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.701 2014/12/26 09:18:35 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.702 2015/01/03 17:28:06 mgorny Exp $
+
+  03 Jan 2015; Michał Górny <mgorny@gentoo.org> samba-4.1.14.ebuild:
+  Make systemd library support optional, bug #512510.
 
   26 Dec 2014; Agostino Sarubbo <ago@gentoo.org> samba-3.6.24.ebuild:
   Stable for sparc, wrt bug #514676
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 60ed2463e8dc..07a3d69d7c28 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -58,24 +58,26 @@ EBUILD samba-3.6.24.ebuild 13517 SHA256 34686659fa4f283611d0469bf778aed6160a7910
 EBUILD samba-4.0.22.ebuild 4749 SHA256 63cb2fd163a098360152cc9f769e154c194aabbb115f780c13c98249a1649d13 SHA512 f026b6c3a0435183153cef7c86133b10a39b1cd4ee0b6c621072ba1eed234fb7a1f9c45a19c863d3075ee86386d13a223662346726070fc10c09f514afd54cf7 WHIRLPOOL cb5464a87c62a5063fc31ceb9e40661e0602476228312bdf6b720bddde056353988548ded2c17c5141ab00700d4651bef3d3a5d023356a1d20c8bbec0bf3f62e
 EBUILD samba-4.0.23.ebuild 4756 SHA256 1d7cead76a54c2dbdb406a1f3a124406a1b37393aefac081602f7f9cc5c7a8e7 SHA512 0bf396d8089cc98f3419775246db482bd8ab4da300064471e3a7fba95bbd6eb678e5929f07b074a33c81301e60776a21888968acc799e3558ab0c9721c872d6f WHIRLPOOL 688a81ff0ec14c09f54e85bcad1415fc8760ae0f0275d67f79d37fbb51c9c9e97c989cfb9729dcdb2607826b7f54f1270495e36c05d38d7f76ca2cce25df0e64
 EBUILD samba-4.1.13.ebuild 4665 SHA256 c8d18fe7ae10142bba4b1f0aeb28aff7aaf323d9f0865775d39c985971bce00a SHA512 4721c5787a52b671725952ab762cbc4d40057b18c106130a83f8e0a710fbe9626c34934d397453633e18f0b902498aebe28edfce85227a8b3d1d9033dadcef1a WHIRLPOOL 39524ddee01558cfb671ecb1d24f84dd71bf1964e91b490e0c00ab3ba0057496e24ccd5867c7f99083db580e5cd25b15ab1e5950fd143d0d68940450af3927fb
-EBUILD samba-4.1.14.ebuild 4622 SHA256 5b2b8dc2c089dd1c19d29912b651713583ebef162b2f58e02fa99675b757aa0c SHA512 970423b53a645d12cf198601d64b180334b6f2bdce0b0be30e0f05f92ad20e87ceb9c2ec4f134eb5d9850637b7f11a1a79c4ed0da60e584fb703f8e453a0ed9d WHIRLPOOL d9f1c6ec48b3f95b5cecff5717db44c1e6612e80d67c8b2c3152497b011605232f0329ad2766fac5185a320645c34cec920a020b4eaf0d1ec6f3e80b960be19c
-MISC ChangeLog 8270 SHA256 f2b942ef6d623e76c264aae7c325d6fa481a4226f5b7ca1a7b9f84cb4e9f9848 SHA512 444258e11d51637003a8d9bc288578d63123fd48aa2a004fa9c6b6d0ad557737987d25afcfedc3bfd581c8dc57a4a61dfcd7a5dc1410a465f2748ffd274cff64 WHIRLPOOL 43161bd4a102f55bee5379ad24a8502754c9d9994e11ad671d0f1a17755c825512708634ecef43747b1baff01aac159a17713fc1c2f3b8d7e80ff02bcbad3bb8
+EBUILD samba-4.1.14.ebuild 4682 SHA256 d0ebb8d5200f0e96f232b7bfe7081b35789e84ca1eafe1b79b6023e536810958 SHA512 39c98d91389dc7d5875bd840978d14cffac50ff4849dae17b2af822d96667939a92b5f29c070dc9b7df52b3b4fcfa7b53a9fe8fb4f5b9b270c9a3ca58ceb58f2 WHIRLPOOL 5d885ebd269d78dbab33953be11a30707edd2cda20599df0c038ff9255a5783b19ade2b1c7d75a640874894a97bb378faea71a2ac7e25333fa7dc5ee674923a1
+MISC ChangeLog 8399 SHA256 e245c516ebd5177d5857f27aaeb6c0a0f13b283baf0dc73f56848570c5301cc9 SHA512 dce205ca3f4b50cd30cc862b38b2a43d592e506da6ecffb34c93acc33e7d93254fc7b3ca02a910c7a9766917f766ae224616067d0af81d19a9c69600de6509a9 WHIRLPOOL decb722d2d67e15a5179fcb6d54404b5ae23fd1df19c41a65fef9488e505a3c9d6e28efcb7a95c4922a1882f99ab5447240bb8bc7abcda3d8b30c5d057d65483
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnSfsAAoJELp701BxlEWfkrIQALxi8GRvOleY5LcTjFfhu8+P
-oq8opa36damItNmdcwGi4ufE9x7ZMc0PXON0teMiWDkbKR5zM6+C9Oybtu7L8scm
-22HdcWTXsngIJfVCQm2xfRCqfznK5fK8NPtyVlVZ7MmtL4FuRSVWb6+IAQbeWCxT
-iit72tlPALVFmDwA/PTCzRfrdhyiJM4nmTt5xECXmCLicVahmZ3Z7CIhvo+t1I4r
-6wUoSN8KtcAXvQ71Dk/Mtl/Cuq2m8mxewNbl/5MW9EoTXROYpz2igKSl5PU6TQfG
-lKDAjG+BH6S2GWEo4WWBnTCAJaJV5sj0aX2TNi7BZ6KX5jwmOKM1ipDY0xAH1sHF
-rj2xjdiHu4ggNxAtliZKJjg1GN+TJRapTqdetMjNGw0QYKmAY5KdvZSt7tdKVp/b
-SIoar4XPNsrXShK8+n9gyf8FJ8v+Pv7xsVMLY3hhYBqfLWZWo3hO9OEO0wB1+Jcy
-kPITtn/YPFGYEfKFx5T1YdWW5xKuKMP2sFSPMxozY1+KtzHdysMjk6hod7KgX/Xo
-taG9WOGa3onKPuHtqicVliLFW4tLvG1y8+Yn77IU6d40dw8FExIV9XDDXt/a9eds
-kUXdxixEAIzUJu+2+sg28MaarnJ7Sge1CPbM7K6FOQIrBSfs59gVEJS6i5QDfX+K
-pjiqAWW1IM2SKau7Ud2v
-=boUM
+iQJ8BAEBCABmBQJUqCanXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8VsQAJdkhV3OE3vqO4sCPYp0yCXl
+7ag6NdSP2YOzQrKwkXIHK8z5vLKoP2bYeoR5dCb461ZIWLB+6qKmgletyecT/sRy
+zKB1J6AjNXAg2UxsfMgeCc6OarknBPbkwbFnV93y8RTy3P4w1lT3UGrqN7XEQn7F
+Gbh3xAmC3C0ZZQkiLxJkZUi35zFAPWDTo4cTE5xzGBMZLBSZJpWLjMPSZklg9eBR
+BybmXS+OA946prAyBuDswAhpJhtAbn2ddhnuWCrQkrD7rDwfKXXwBAc4Bcb2wVJH
+hcDum9c5GCi2x6eC4YwNPCl9LFoDStykDYLnGNvzdDHPl1oLA8qaGG6ovqKNLYeF
+2HUrTyOBcwAn0dvZZBbkSeLZQQPyZgzg5HJ31Nm+7XV2Ph3dNBOtp649wK8WKVAp
+2Op5yoXRi5F8giVN1kmyy58mx2Mp+iL+WMiURCJil/zqOfjmhhHIvieymgetpjhh
+yOhIhIocBhg5x3SFY76PQStzqisMo2iGsSI282IZDWa3uQYLDMkYS+q7D7XKVmCg
+wcodi11Wr6v4FdDekHQFsnJvrxT8qz8gNzFyxH/R7ab2i//LJBmzmjyQQ5Z92Ctd
+hXoNaXT4uM01DLpKSZ9Le1UxnlYhSSi7O8JWtsarlSUEqMCzIRUKCIwS9DrkjkoF
+xLs+brYg3ourswhTWYT1
+=mOoZ
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.1.14.ebuild b/net-fs/samba/samba-4.1.14.ebuild
index fc27f347fe49..74d4208637d5 100644
--- a/net-fs/samba/samba-4.1.14.ebuild
+++ b/net-fs/samba/samba-4.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.1 2014/12/02 09:34:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.2 2015/01/03 17:28:06 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog test winbind"
+ldap quota selinux syslog systemd test winbind"
 
 # sys-apps/attr is an automagic dependency (see bug #489748)
 # sys-libs/pam is an automagic dependency (see bug #489770)
@@ -49,7 +49,8 @@ CDEPEND="${PYTHON_DEPS}
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt:0
 		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )"
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd:0= )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -122,6 +123,7 @@ src_configure() {
 		--with-pam_smbpass \
 		$(use_with quota quotas) \
 		$(use_with syslog) \
+		$(use_with systemd) \
 		$(use_with winbind)
 		"
 	use "ads" && myconf+=" --with-shared-modules=idmap_ad"