[gentoo-commits] proj/musl:master commit in: net-fs/samba/files/, net-fs/samba/files/4.4/, net-fs/samba/

2021-03-13 Thread Sam James
commit: 28de7a61d38252fa922854eba018a046250976ed
Author: Dave Hughes  gmail  com>
AuthorDate: Sat Mar 13 17:10:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 13 21:25:46 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=28de7a61

net-fs/samba: sync with ::gentoo

Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes  gmail.com>
Closes: https://github.com/gentoo/musl/pull/421
Signed-off-by: Sam James  gentoo.org>

 net-fs/samba/Manifest  |  36 ++--
 net-fs/samba/files/4.4/samba4.initd-r1 |   3 +-
 ..._fn_t.patch => add_missing___compar_fn_t.patch} |   2 -
 .../samba/files/fix-musl-lib-without-innetgr.patch |  42 +
 9-remove-getpwent_r.patch => getpwent_r.patch} |  14 +-
 net-fs/samba/files/missing-headers.patch   |  38 +
 net-fs/samba/files/musl-disable-netgroup.patch |  15 --
 net-fs/samba/files/musl_rm_unistd_incl.patch   |  37 
 net-fs/samba/files/musl_uintptr.patch  |  35 
 net-fs/samba/files/nmbd.service|  12 --
 .../samba-4.10.0-disable_gnutls_build_fix.patch|  32 
 .../samba-4.13-vfs_snapper_configure_option.patch  |  56 ++
 net-fs/samba/files/samba-4.13-winexe_option.patch  |  67 
 .../samba/files/samba-4.5.1-compile_et_fix.patch   |  16 --
 .../files/samba-4.8.6-no-pydsdb-when-no-addc.patch |  36 
 net-fs/samba/files/samba-glibc-2.26-no_rpc.patch   |  14 --
 net-fs/samba/files/samba.conf  |   1 +
 net-fs/samba/files/samba.service   |  10 --
 net-fs/samba/files/smbd.service|  12 --
 net-fs/samba/files/smbd.socket |   9 -
 net-fs/samba/files/smbd_at.service |   7 -
 net-fs/samba/files/winbindd.service|  12 --
 net-fs/samba/metadata.xml  |   5 +
 ...samba-4.11.6-r2.ebuild => samba-4.12.12.ebuild} |  89 ++
 ...{samba-4.11.8.ebuild => samba-4.12.9-r1.ebuild} |  82 +
 .../{samba-4.11.8.ebuild => samba-4.13.5.ebuild}   | 190 -
 .../{samba-4.11.8.ebuild => samba-4.14.0.ebuild}   | 190 -
 27 files changed, 626 insertions(+), 436 deletions(-)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 876f207..22c3b6a 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,23 +1,25 @@
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA256
 
-DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 
2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461
 SHA512 
3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
-DIST samba-4.11.8.tar.gz 18571308 BLAKE2B 
024920789ac8fcedfc79f4d094a47e4c1399a0bbc3ad79908f66b9bbabd765865795763c1017cc0caba18dbc11ce6a7e25231804d7dff11ab3d97a599ab8d9ed
 SHA512 
a036c46e060d9edc11bf4e45e0449042fe44b74ff083d305779c68dad943f87fb6d2680f3a68e6bbcd0b19c8c397ec9fc5794229a311c25dad9efc366add613a
+DIST samba-4.12.12.tar.gz 18252232 BLAKE2B 
4e5fabdbbcbf1df5e4a8966fbd55923c7fe97c4449574f0c17864dd9376197539ea29f59e00fc4fbb58ce18d4c7fcd8ab24e8f892edc9b32c646215287fc4bb7
 SHA512 
45ebed4cc73990993e800605391715afa2aa044e92bf89a62eb3ccbff97be2c9c4bf4a1f840a5d5d1d0c02704435c074e4ae386ca1729066b706c236c898c08f
+DIST samba-4.12.9.tar.gz 18236198 BLAKE2B 
e19c8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c
 SHA512 
8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
+DIST samba-4.13.5.tar.gz 18426722 BLAKE2B 
d84b71cd8a925270670b7d302b527ee116cecf9d603baf1fc69c8527c657d5e2430e1b51e951476525fd95dc3392e5642a829a646c0eb254ccd7530bd393f1a4
 SHA512 
4187337fecf60fa133c6e81e894634f36028d34ccc521e5e856a5736a4f58fc2ad2cd136a206d141f17f7bc519a6168a27e83705fb2d38559667a60b24ad1c1f
+DIST samba-4.14.0.tar.gz 18635518 BLAKE2B 
ad1d091886b5da536a73bdbd4075f7ddc247e13a514e26c9bf993e8da5a3d737662ddd859c60d47a9a597e1326b96d7e8d083d5b15074f5875495cf68db58a24
 SHA512 
cf5767fc49b8c5832dd9711765e0b395a07964c3a618de10ae491123de7141eb4f083194b6120f302f5c4a196837a14070b8a8324412e8957af3706a5bbc6f11
 -BEGIN PGP SIGNATURE-
 
-iQKTBAEBCAB9FiEEOA+uIz0+s3MTYJHqpFO6gRhEr2EFAl7u72hfFIAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDM4
-MEZBRTIzM0QzRUIzNzMxMzYwOTFFQUE0NTNCQTgxMTg0NEFGNjEACgkQpFO6gRhE
-r2FPzw//cIo8r9QWWD4xVicZUU/FoXw63ZaIPfYwBJKP+RL9XKHFE0rv7CVZXJLx
-xH2hv4rfoMo11qzUrd3IYSh6xCV1568ikEDbWfwRqNEHlEBbmJ6xPuL9oCpl0TJM
-RSwRQut/fCeRyYH+odnO3v3eKmGVEUayz3ijwHtmwSK6oOs2xdp1hp2hb754eA13
-UgEiC9kp1pYiUpyMuLQYxsGbSV63znb4HgrJG6Dr9MjfpGks6kUeETkmM6qjU4aD
-Bqfeig2L3f6Flz1jnGBEkH/KcXMc6+2V8O9um+QMztR+UE/XlM8Saqg6WKGL71vA

[gentoo-commits] proj/musl:master commit in: net-fs/samba/files/, net-fs/samba/

2019-04-17 Thread Anthony G. Basile
commit: 93f9ad0756bc9d23a821c65970a69d01864578ef
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Apr 17 15:03:53 2019 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Apr 17 15:04:05 2019 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=93f9ad07

net-fs/samba: bumpt to 4.8.6-r2 and 4.9.6 to sync with main tree

Signed-off-by: Anthony G. Basile  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-fs/samba/Manifest  |  19 +-
 .../files/samba-4.8.6-no-pydsdb-when-no-addc.patch |  36 +++
 .../{samba-4.9.1.ebuild => samba-4.8.6-r2.ebuild}  |  25 +-
 net-fs/samba/samba-4.9.2-r1.ebuild | 293 -
 net-fs/samba/samba-4.9.4.ebuild| 293 -
 .../{samba-4.9.4-r1.ebuild => samba-4.9.6.ebuild}  |   5 +-
 6 files changed, 52 insertions(+), 619 deletions(-)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 1fa7571..666b10c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,19 +1,4 @@
--BEGIN PGP SIGNED MESSAGE-
-Hash: SHA256
-
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B 
c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae
 SHA512 
f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B 
e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9
 SHA512 
de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
-DIST samba-4.9.1.tar.gz 18018259 BLAKE2B 
783423098864c391f08b30e05b70308e922bdb4dad08b8b0b4d1112808357b9bb96aad7a094d0fe2e308f84a143d5f90be523b9c3551a3068ecdcad7347613f6
 SHA512 
267673b6d6ab0db59063480c20f02e5864ef96e9ad1097c23a99b2ab4b5fd2252193d7a152729b40cae0751fb9b0b108b087a190f5db11eabbd075224bd6e663
-DIST samba-4.9.2.tar.gz 18042752 BLAKE2B 
e6d361a38f1103c104015987fa2b67c49a91fb2fac77538b3d9fa0c1629348df00c8fb4ea0dbb1a1f3f62cd377699c1ebc00b1b1b7b1e0d073d3633d41a62e7b
 SHA512 
67de5faeda45e5c245bf02cc195cdf9ca4b63f17625837badf7c50d97250e94de5309c9ef824bd7890bc771b1dc0a3bfbafea09880850b5167f0bf8a8ef488ed
-DIST samba-4.9.4.tar.gz 18053738 BLAKE2B 
337444e55fc8a8864e3960609719087e64e7d14faaf150c510b9011f67ffdc8a9bd6533c60be938e742db8a2e5401a065e7d14fae0480ee7a996a1f71ef0448d
 SHA512 
ecd9937caa12d409b9b4cf34982b1670346fa64c7ecd111b390e296771476e13eb7b868997bfe489f36b7bdc5c9fc3af42cd5ad276e9d85aaedfa8ac4cfc0617
--BEGIN PGP SIGNATURE-
-
-iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAlxCFGYACgkQPcxEeC7Q
-fhzVmgf/Rb7+LH6puZDEU31GxPYzxq0tePU7mu53wUaKBVVj/7QwPk9Q9iHqdy+G
-bYmZ2cYGF7YiRSUa8hNAU7RAHHrNF2c9PONqg0/T298qADCb64VlLtGMcD9tUfTv
-QMeVo6RUVjDbJTxtznj+HTKb5cbb+iaRppChJkrxucYjG1SX4uAMUe0q44ut2iGk
-QivT0dtPxdTU3ntN1yTliGJ+jfoiiajpVsAfqRSwT3Ee5v3E6LskajK4Sp/ZVntc
-1AGeg2y/meQM2MVURgNmUlbMqHlH83RlGeGHGLgAZhDpO2f716gNVF1fhMGwtzUk
-RKHbr9PJLZ6zK5zpzQ+31OIlAiUGUg==
-=JAYJ
--END PGP SIGNATURE-
+DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 
38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34
 SHA512 
f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
+DIST samba-4.9.6.tar.gz 18068196 BLAKE2B 
03a04abb430abc4b7ba6fc5ade8690c215948d24fe1044d79c2dd1f8242b6708f0618045e37ad73114413dcef70bcf45de15f358a0e012cecfea045b9ab9165c
 SHA512 
462774e60f0165aa445821795c373ab6845ac2790578a68e84c0c82f761ddf29bf5186106a95f394e24b8ef7393d7abe003f95e72f5c5892bbf992f58e350531

diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch 
b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
new file mode 100644
index 000..1093b1d
--- /dev/null
+++ b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
@@ -0,0 +1,36 @@
+Do not install the python DSDB modules when ADDC is disabled.
+This is a change integrated upstream in 4.9.1 (or earlier).
+
+Without this, the python dsdb_dns.so module is installed, which
+is linked to libdnsserver-common.so that is NOT installed, and so
+potential breakage ensues.
+
+--- a/source4/dsdb/wscript_build   2018-01-17 03:08:39.0 -0500
 b/source4/dsdb/wscript_build   2018-11-08 10:43:58.064486832 -0500
+@@ -63,10 +63,11 @@
+   )
+ 
+ bld.SAMBA_PYTHON('python_dsdb',
+   source='pydsdb.c',
+   # the dependency on dcerpc here is because gensec
+   # depends on dcerpc but the waf circular dependency finder
+   # removes it so we end up with unresolved symbols.
+   deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util 
dsdb_garbage_collect_tombstones',
+-  realname='samba/dsdb.so'
++  realname='samba/dsdb.so',
++

[gentoo-commits] proj/musl:master commit in: net-fs/samba/files/, net-fs/samba/

2018-11-18 Thread Anthony G. Basile
commit: 89ad3152c133ea64b34c4e84911ef76f6237d04a
Author: xdch47  posteo  de>
AuthorDate: Sun Nov 18 19:26:24 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Nov 18 20:22:34 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=89ad3152

net-fs/samba: version bump to 4.9.2-r1

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Manifest-Sign-Key: 0DEDF1A904568BAD1FC45C283DCC44782ED07E1C
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-fs/samba/files/samba-4.9.2-timespec.patch   | 21 +
 .../{samba-4.9.2.ebuild => samba-4.9.2-r1.ebuild}   |  9 ++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch 
b/net-fs/samba/files/samba-4.9.2-timespec.patch
new file mode 100644
index 000..c82f4af
--- /dev/null
+++ b/net-fs/samba/files/samba-4.9.2-timespec.patch
@@ -0,0 +1,21 @@
+From 11e8c14b78e2423041f3846882f74cd6490a3e44 Mon Sep 17 00:00:00 2001
+From: Joan Karadimov 
+Date: Thu, 18 Oct 2018 18:16:17 +0300
+Subject: [PATCH] Fix compatibility issues with the timespec struct
+
+---
+ source3/include/libsmbclient.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
+index 5e4a1715402..6487ea7a8aa 100644
+--- a/source3/include/libsmbclient.h
 b/source3/include/libsmbclient.h
+@@ -78,6 +78,7 @@ extern "C" {
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #define SMBC_BASE_FD1 /* smallest file descriptor returned */

diff --git a/net-fs/samba/samba-4.9.2.ebuild 
b/net-fs/samba/samba-4.9.2-r1.ebuild
similarity index 97%
rename from net-fs/samba/samba-4.9.2.ebuild
rename to net-fs/samba/samba-4.9.2-r1.ebuild
index 21c71a2..34d9cd9 100644
--- a/net-fs/samba/samba-4.9.2.ebuild
+++ b/net-fs/samba/samba-4.9.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/;
@@ -132,6 +132,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+   "${FILESDIR}/${PN}-4.9.2-timespec.patch"
"${FILESDIR}/netdb-defines.patch"
 )
 
@@ -159,7 +160,9 @@ src_prepare() {
sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
 
# unbundle iso8601 unless tests are enabled
-   use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+   if ! use test ; then
+   sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+   fi
 
# ugly hackaround for bug #592502
cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
@@ -232,7 +235,7 @@ multilib_src_install() {
waf-utils_src_install
 
# Make all .so files executable
-   find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+   find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
 
if multilib_is_native_abi ; then
# install ldap schema for server (bug #491002)



[gentoo-commits] proj/musl:master commit in: net-fs/samba/files/, net-fs/samba/

2018-11-09 Thread Anthony G. Basile
commit: c3102928fba8ca33d26f2ab72f073ce619be57df
Author: xdch47  posteo  de>
AuthorDate: Fri Nov  9 21:41:58 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov  9 23:32:30 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c3102928

net-fs/samba: adapt for musl build

Package-Manager: Portage-2.3.49, Repoman-2.3.11
RepoMan-Options: --force
Signed-off-by: Anthony G. Basile  gentoo.org>

 net-fs/samba/Manifest  |   1 +
 net-fs/samba/files/musl-disable-netgroup.patch |  15 ++
 net-fs/samba/samba-4.9.1.ebuild| 291 +
 3 files changed, 307 insertions(+)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 221af4b..7ca77f1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,2 +1,3 @@
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B 
c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae
 SHA512 
f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B 
e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9
 SHA512 
de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
+DIST samba-4.9.1.tar.gz 18018259 BLAKE2B 
783423098864c391f08b30e05b70308e922bdb4dad08b8b0b4d1112808357b9bb96aad7a094d0fe2e308f84a143d5f90be523b9c3551a3068ecdcad7347613f6
 SHA512 
267673b6d6ab0db59063480c20f02e5864ef96e9ad1097c23a99b2ab4b5fd2252193d7a152729b40cae0751fb9b0b108b087a190f5db11eabbd075224bd6e663

diff --git a/net-fs/samba/files/musl-disable-netgroup.patch 
b/net-fs/samba/files/musl-disable-netgroup.patch
new file mode 100644
index 000..719a2e6
--- /dev/null
+++ b/net-fs/samba/files/musl-disable-netgroup.patch
@@ -0,0 +1,15 @@
+diff --git a/source3/wscript b/source3/wscript
+index bcdfc17..361ae23 100644
+--- a/source3/wscript
 b/source3/wscript
+@@ -600,8 +600,8 @@ msg.msg_accrightslen = sizeof(fd);
+ headers='unistd.h sys/types.h dirent.h',
+ define='HAVE_DIRENT_D_OFF')
+ 
+-if (conf.CONFIG_SET('HAVE_YP_GET_DEFAULT_DOMAIN')):
+-   conf.DEFINE('HAVE_NETGROUP', '1')
++#if (conf.CONFIG_SET('HAVE_YP_GET_DEFAULT_DOMAIN')):
++#   conf.DEFINE('HAVE_NETGROUP', '1')
+ 
+ # Look for CUPS
+ if Options.options.with_cups:

diff --git a/net-fs/samba/samba-4.9.1.ebuild b/net-fs/samba/samba-4.9.1.ebuild
new file mode 100644
index 000..f088275
--- /dev/null
+++ b/net-fs/samba/samba-4.9.1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/;
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg 
iprint json ldap
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test 
winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/samba-4.0/policy.h
+   /usr/include/samba-4.0/dcerpc_server.h
+   /usr/include/samba-4.0/ctdb.h
+   /usr/include/samba-4.0/ctdb_client.h
+   /usr/include/samba-4.0/ctdb_protocol.h
+   /usr/include/samba-4.0/ctdb_private.h
+   /usr/include/samba-4.0/ctdb_typesafe_cb.h
+   /usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+   >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+   dev-lang/perl:=
+   dev-libs/libaio[${MULTILIB_USEDEP}]
+   dev-libs/libbsd[${MULTILIB_USEDEP}]
+   dev-libs/iniparser:0
+   dev-libs/popt[${MULTILIB_USEDEP}]
+   dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+   >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+   net-libs/libnsl:=[${MULTILIB_USEDEP}]
+   sys-apps/attr[${MULTILIB_USEDEP}]
+   
>=sys-libs/ldb-1.4.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+   
=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+   >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+   >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+   sys-libs/zlib[${MULTILIB_USEDEP}]
+   virtual/libiconv
+   pam? ( virtual/pam )
+   acl? ( virtual/acl )
+   addns? (
+