Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/
Date: Tue, 27 Mar 2018 07:52:18
Message-Id: 1522137127.fbf5b5f581406c9db5c524aa8c887c70a744ec1e.polynomial-c@gentoo
1 commit: fbf5b5f581406c9db5c524aa8c887c70a744ec1e
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 27 07:51:50 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 27 07:52:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf5b5f5
7
8 net-fs/samba: libnsl requires >=glibc-2.26
9
10 Bug: https://bugs.gentoo.org/651332
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 net-fs/samba/samba-4.7.6.ebuild | 8 ++++++--
14 net-fs/samba/samba-4.8.0.ebuild | 8 ++++++--
15 2 files changed, 12 insertions(+), 4 deletions(-)
16
17 diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild
18 index 339585353ef..b9cff1dabea 100644
19 --- a/net-fs/samba/samba-4.7.6.ebuild
20 +++ b/net-fs/samba/samba-4.7.6.ebuild
21 @@ -47,7 +47,6 @@ CDEPEND="
22 dev-libs/popt[${MULTILIB_USEDEP}]
23 dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
24 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
25 - net-libs/libnsl
26 sys-apps/attr[${MULTILIB_USEDEP}]
27 >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
28 sys-libs/libcap
29 @@ -78,7 +77,12 @@ CDEPEND="
30 ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
31 system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
32 system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
33 - systemd? ( sys-apps/systemd:0= )"
34 + systemd? ( sys-apps/systemd:0= )
35 + || (
36 + net-libs/libnsl
37 + <sys-libs/glibc-2.26[rpc(+)]
38 + )
39 +"
40 DEPEND="${CDEPEND}
41 ${PYTHON_DEPS}
42 app-text/docbook-xsl-stylesheets
43
44 diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild
45 index 2f07db8293d..8ffa5d8d74b 100644
46 --- a/net-fs/samba/samba-4.8.0.ebuild
47 +++ b/net-fs/samba/samba-4.8.0.ebuild
48 @@ -47,7 +47,6 @@ CDEPEND="
49 dev-libs/popt[${MULTILIB_USEDEP}]
50 dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
51 >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
52 - net-libs/libnsl
53 sys-apps/attr[${MULTILIB_USEDEP}]
54 >=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
55 sys-libs/libcap
56 @@ -78,7 +77,12 @@ CDEPEND="
57 ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
58 system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
59 system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
60 - systemd? ( sys-apps/systemd:0= )"
61 + systemd? ( sys-apps/systemd:0= )
62 + || (
63 + net-libs/libnsl
64 + <sys-libs/glibc-2.26[rpc(+)]
65 + )
66 +"
67 DEPEND="${CDEPEND}
68 ${PYTHON_DEPS}
69 app-text/docbook-xsl-stylesheets