1 |
commit: 2b3d982fa117098def5d6cf7bab4daa12e09595a |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 30 16:11:18 2018 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 16:11:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3d982f |
7 |
|
8 |
net-fs/samba: Fix libnsl dependencies for all versions, bug 639676 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/639676 |
11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
12 |
|
13 |
net-fs/samba/samba-4.2.14.ebuild | 1 + |
14 |
net-fs/samba/samba-4.5.16.ebuild | 1 + |
15 |
net-fs/samba/samba-4.6.14.ebuild | 1 + |
16 |
net-fs/samba/samba-4.6.15.ebuild | 1 + |
17 |
net-fs/samba/samba-4.7.6.ebuild | 5 +---- |
18 |
net-fs/samba/samba-4.7.7.ebuild | 5 +---- |
19 |
net-fs/samba/samba-4.8.0.ebuild | 5 +---- |
20 |
net-fs/samba/samba-4.8.1.ebuild | 5 +---- |
21 |
8 files changed, 8 insertions(+), 16 deletions(-) |
22 |
|
23 |
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild |
24 |
index 8fa65156a53..cead0276a7c 100644 |
25 |
--- a/net-fs/samba/samba-4.2.14.ebuild |
26 |
+++ b/net-fs/samba/samba-4.2.14.ebuild |
27 |
@@ -48,6 +48,7 @@ CDEPEND="${PYTHON_DEPS} |
28 |
sys-libs/readline:= |
29 |
virtual/libiconv |
30 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
31 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
32 |
>=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}] |
33 |
sys-apps/attr[${MULTILIB_USEDEP}] |
34 |
sys-libs/libcap |
35 |
|
36 |
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild |
37 |
index 775a8863623..da917ce3f17 100644 |
38 |
--- a/net-fs/samba/samba-4.5.16.ebuild |
39 |
+++ b/net-fs/samba/samba-4.5.16.ebuild |
40 |
@@ -53,6 +53,7 @@ CDEPEND="${PYTHON_DEPS} |
41 |
dev-libs/iniparser:0 |
42 |
dev-libs/popt[${MULTILIB_USEDEP}] |
43 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
44 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
45 |
sys-apps/attr[${MULTILIB_USEDEP}] |
46 |
>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
47 |
<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
48 |
|
49 |
diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild |
50 |
index ac34ac0c5aa..367a3693db5 100644 |
51 |
--- a/net-fs/samba/samba-4.6.14.ebuild |
52 |
+++ b/net-fs/samba/samba-4.6.14.ebuild |
53 |
@@ -48,6 +48,7 @@ CDEPEND=" |
54 |
dev-libs/popt[${MULTILIB_USEDEP}] |
55 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
56 |
>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] |
57 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
58 |
sys-apps/attr[${MULTILIB_USEDEP}] |
59 |
~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
60 |
sys-libs/libcap |
61 |
|
62 |
diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild |
63 |
index ac34ac0c5aa..367a3693db5 100644 |
64 |
--- a/net-fs/samba/samba-4.6.15.ebuild |
65 |
+++ b/net-fs/samba/samba-4.6.15.ebuild |
66 |
@@ -48,6 +48,7 @@ CDEPEND=" |
67 |
dev-libs/popt[${MULTILIB_USEDEP}] |
68 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
69 |
>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] |
70 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
71 |
sys-apps/attr[${MULTILIB_USEDEP}] |
72 |
~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
73 |
sys-libs/libcap |
74 |
|
75 |
diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild |
76 |
index 5b1399ed756..89b560c2ee9 100644 |
77 |
--- a/net-fs/samba/samba-4.7.6.ebuild |
78 |
+++ b/net-fs/samba/samba-4.7.6.ebuild |
79 |
@@ -47,6 +47,7 @@ CDEPEND=" |
80 |
dev-libs/popt[${MULTILIB_USEDEP}] |
81 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
82 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
83 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
84 |
sys-apps/attr[${MULTILIB_USEDEP}] |
85 |
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
86 |
sys-libs/libcap |
87 |
@@ -78,10 +79,6 @@ CDEPEND=" |
88 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
89 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) |
90 |
systemd? ( sys-apps/systemd:0= ) |
91 |
- || ( |
92 |
- net-libs/libnsl |
93 |
- <sys-libs/glibc-2.26[rpc(+)] |
94 |
- ) |
95 |
" |
96 |
DEPEND="${CDEPEND} |
97 |
${PYTHON_DEPS} |
98 |
|
99 |
diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild |
100 |
index 5b1399ed756..89b560c2ee9 100644 |
101 |
--- a/net-fs/samba/samba-4.7.7.ebuild |
102 |
+++ b/net-fs/samba/samba-4.7.7.ebuild |
103 |
@@ -47,6 +47,7 @@ CDEPEND=" |
104 |
dev-libs/popt[${MULTILIB_USEDEP}] |
105 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
106 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
107 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
108 |
sys-apps/attr[${MULTILIB_USEDEP}] |
109 |
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
110 |
sys-libs/libcap |
111 |
@@ -78,10 +79,6 @@ CDEPEND=" |
112 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
113 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) |
114 |
systemd? ( sys-apps/systemd:0= ) |
115 |
- || ( |
116 |
- net-libs/libnsl |
117 |
- <sys-libs/glibc-2.26[rpc(+)] |
118 |
- ) |
119 |
" |
120 |
DEPEND="${CDEPEND} |
121 |
${PYTHON_DEPS} |
122 |
|
123 |
diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild |
124 |
index 7a9862d6d28..0e98d07710e 100644 |
125 |
--- a/net-fs/samba/samba-4.8.0.ebuild |
126 |
+++ b/net-fs/samba/samba-4.8.0.ebuild |
127 |
@@ -47,6 +47,7 @@ CDEPEND=" |
128 |
dev-libs/popt[${MULTILIB_USEDEP}] |
129 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
130 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
131 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
132 |
sys-apps/attr[${MULTILIB_USEDEP}] |
133 |
>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
134 |
sys-libs/libcap |
135 |
@@ -78,10 +79,6 @@ CDEPEND=" |
136 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
137 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) |
138 |
systemd? ( sys-apps/systemd:0= ) |
139 |
- || ( |
140 |
- net-libs/libnsl |
141 |
- <sys-libs/glibc-2.26[rpc(+)] |
142 |
- ) |
143 |
" |
144 |
DEPEND="${CDEPEND} |
145 |
${PYTHON_DEPS} |
146 |
|
147 |
diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild |
148 |
index 1dfa9f27ec7..789177de9d8 100644 |
149 |
--- a/net-fs/samba/samba-4.8.1.ebuild |
150 |
+++ b/net-fs/samba/samba-4.8.1.ebuild |
151 |
@@ -47,6 +47,7 @@ CDEPEND=" |
152 |
dev-libs/popt[${MULTILIB_USEDEP}] |
153 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
154 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
155 |
+ net-libs/libnsl[${MULTILIB_USEDEP}] |
156 |
sys-apps/attr[${MULTILIB_USEDEP}] |
157 |
>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
158 |
sys-libs/libcap |
159 |
@@ -78,10 +79,6 @@ CDEPEND=" |
160 |
system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) |
161 |
system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) |
162 |
systemd? ( sys-apps/systemd:0= ) |
163 |
- || ( |
164 |
- net-libs/libnsl |
165 |
- <sys-libs/glibc-2.26[rpc(+)] |
166 |
- ) |
167 |
" |
168 |
DEPEND="${CDEPEND} |
169 |
${PYTHON_DEPS} |