| 1 |
commit: 5c30175570939acf4ec4d505175f328e491ee6e4 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 16:21:23 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 16:21:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c301755 |
| 7 |
|
| 8 |
net-fs/samba: More dependency fixes, bug 640416 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/640416 |
| 11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 12 |
|
| 13 |
net-fs/samba/samba-4.2.14.ebuild | 7 +++++-- |
| 14 |
net-fs/samba/samba-4.5.16.ebuild | 7 +++++-- |
| 15 |
net-fs/samba/samba-4.6.14.ebuild | 7 +++++-- |
| 16 |
net-fs/samba/samba-4.6.15.ebuild | 7 +++++-- |
| 17 |
net-fs/samba/samba-4.7.6.ebuild | 7 +++++-- |
| 18 |
net-fs/samba/samba-4.7.7.ebuild | 7 +++++-- |
| 19 |
net-fs/samba/samba-4.8.0.ebuild | 7 +++++-- |
| 20 |
net-fs/samba/samba-4.8.1.ebuild | 7 +++++-- |
| 21 |
8 files changed, 40 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 cead0276a7c..5a6e0f9fd13 100644 |
| 25 |
--- a/net-fs/samba/samba-4.2.14.ebuild |
| 26 |
+++ b/net-fs/samba/samba-4.2.14.ebuild |
| 27 |
@@ -48,7 +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/libnsl:=[${MULTILIB_USEDEP}] |
| 33 |
>=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}] |
| 34 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 35 |
sys-libs/libcap |
| 36 |
@@ -64,7 +64,10 @@ CDEPEND="${PYTHON_DEPS} |
| 37 |
acl? ( virtual/acl ) |
| 38 |
addns? ( net-dns/bind-tools[gssapi] ) |
| 39 |
aio? ( dev-libs/libaio ) |
| 40 |
- cluster? ( !dev-db/ctdb ) |
| 41 |
+ cluster? ( |
| 42 |
+ net-libs/rpcsvc-proto |
| 43 |
+ !dev-db/ctdb |
| 44 |
+ ) |
| 45 |
cups? ( net-print/cups ) |
| 46 |
dmapi? ( sys-apps/dmapi ) |
| 47 |
fam? ( virtual/fam ) |
| 48 |
|
| 49 |
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild |
| 50 |
index da917ce3f17..7c80d9db44e 100644 |
| 51 |
--- a/net-fs/samba/samba-4.5.16.ebuild |
| 52 |
+++ b/net-fs/samba/samba-4.5.16.ebuild |
| 53 |
@@ -53,7 +53,7 @@ CDEPEND="${PYTHON_DEPS} |
| 54 |
dev-libs/iniparser:0 |
| 55 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 56 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 57 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 58 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 59 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 60 |
>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
| 61 |
<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
| 62 |
@@ -68,7 +68,10 @@ CDEPEND="${PYTHON_DEPS} |
| 63 |
pam? ( virtual/pam ) |
| 64 |
acl? ( virtual/acl ) |
| 65 |
addns? ( net-dns/bind-tools[gssapi] ) |
| 66 |
- cluster? ( !dev-db/ctdb ) |
| 67 |
+ cluster? ( |
| 68 |
+ net-libs/rpcsvc-proto |
| 69 |
+ !dev-db/ctdb |
| 70 |
+ ) |
| 71 |
cups? ( net-print/cups ) |
| 72 |
dmapi? ( sys-apps/dmapi ) |
| 73 |
fam? ( virtual/fam ) |
| 74 |
|
| 75 |
diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild |
| 76 |
index 367a3693db5..5cb08f5d799 100644 |
| 77 |
--- a/net-fs/samba/samba-4.6.14.ebuild |
| 78 |
+++ b/net-fs/samba/samba-4.6.14.ebuild |
| 79 |
@@ -48,7 +48,7 @@ CDEPEND=" |
| 80 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 81 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 82 |
>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] |
| 83 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 84 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 85 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 86 |
~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 87 |
sys-libs/libcap |
| 88 |
@@ -66,7 +66,10 @@ CDEPEND=" |
| 89 |
dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 90 |
) |
| 91 |
ceph? ( sys-cluster/ceph ) |
| 92 |
- cluster? ( !dev-db/ctdb ) |
| 93 |
+ cluster? ( |
| 94 |
+ net-libs/rpcsvc-proto |
| 95 |
+ !dev-db/ctdb |
| 96 |
+ ) |
| 97 |
cups? ( net-print/cups ) |
| 98 |
debug? ( dev-util/lttng-ust ) |
| 99 |
dmapi? ( sys-apps/dmapi ) |
| 100 |
|
| 101 |
diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild |
| 102 |
index 367a3693db5..5cb08f5d799 100644 |
| 103 |
--- a/net-fs/samba/samba-4.6.15.ebuild |
| 104 |
+++ b/net-fs/samba/samba-4.6.15.ebuild |
| 105 |
@@ -48,7 +48,7 @@ CDEPEND=" |
| 106 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 107 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 108 |
>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] |
| 109 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 110 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 111 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 112 |
~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 113 |
sys-libs/libcap |
| 114 |
@@ -66,7 +66,10 @@ CDEPEND=" |
| 115 |
dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 116 |
) |
| 117 |
ceph? ( sys-cluster/ceph ) |
| 118 |
- cluster? ( !dev-db/ctdb ) |
| 119 |
+ cluster? ( |
| 120 |
+ net-libs/rpcsvc-proto |
| 121 |
+ !dev-db/ctdb |
| 122 |
+ ) |
| 123 |
cups? ( net-print/cups ) |
| 124 |
debug? ( dev-util/lttng-ust ) |
| 125 |
dmapi? ( sys-apps/dmapi ) |
| 126 |
|
| 127 |
diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild |
| 128 |
index 89b560c2ee9..6a4a386e8ba 100644 |
| 129 |
--- a/net-fs/samba/samba-4.7.6.ebuild |
| 130 |
+++ b/net-fs/samba/samba-4.7.6.ebuild |
| 131 |
@@ -47,7 +47,7 @@ CDEPEND=" |
| 132 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 133 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 134 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 135 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 136 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 137 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 138 |
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 139 |
sys-libs/libcap |
| 140 |
@@ -65,7 +65,10 @@ CDEPEND=" |
| 141 |
dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 142 |
) |
| 143 |
ceph? ( sys-cluster/ceph ) |
| 144 |
- cluster? ( !dev-db/ctdb ) |
| 145 |
+ cluster? ( |
| 146 |
+ net-libs/rpcsvc-proto |
| 147 |
+ !dev-db/ctdb |
| 148 |
+ ) |
| 149 |
cups? ( net-print/cups ) |
| 150 |
debug? ( dev-util/lttng-ust ) |
| 151 |
dmapi? ( sys-apps/dmapi ) |
| 152 |
|
| 153 |
diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild |
| 154 |
index 89b560c2ee9..6a4a386e8ba 100644 |
| 155 |
--- a/net-fs/samba/samba-4.7.7.ebuild |
| 156 |
+++ b/net-fs/samba/samba-4.7.7.ebuild |
| 157 |
@@ -47,7 +47,7 @@ CDEPEND=" |
| 158 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 159 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 160 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 161 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 162 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 163 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 164 |
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 165 |
sys-libs/libcap |
| 166 |
@@ -65,7 +65,10 @@ CDEPEND=" |
| 167 |
dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 168 |
) |
| 169 |
ceph? ( sys-cluster/ceph ) |
| 170 |
- cluster? ( !dev-db/ctdb ) |
| 171 |
+ cluster? ( |
| 172 |
+ net-libs/rpcsvc-proto |
| 173 |
+ !dev-db/ctdb |
| 174 |
+ ) |
| 175 |
cups? ( net-print/cups ) |
| 176 |
debug? ( dev-util/lttng-ust ) |
| 177 |
dmapi? ( sys-apps/dmapi ) |
| 178 |
|
| 179 |
diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild |
| 180 |
index 0e98d07710e..b21453151bb 100644 |
| 181 |
--- a/net-fs/samba/samba-4.8.0.ebuild |
| 182 |
+++ b/net-fs/samba/samba-4.8.0.ebuild |
| 183 |
@@ -47,7 +47,7 @@ CDEPEND=" |
| 184 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 185 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 186 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 187 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 188 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 189 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 190 |
>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 191 |
sys-libs/libcap |
| 192 |
@@ -65,7 +65,10 @@ CDEPEND=" |
| 193 |
dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 194 |
) |
| 195 |
ceph? ( sys-cluster/ceph ) |
| 196 |
- cluster? ( !dev-db/ctdb ) |
| 197 |
+ cluster? ( |
| 198 |
+ net-libs/rpcsvc-proto |
| 199 |
+ !dev-db/ctdb |
| 200 |
+ ) |
| 201 |
cups? ( net-print/cups ) |
| 202 |
debug? ( dev-util/lttng-ust ) |
| 203 |
dmapi? ( sys-apps/dmapi ) |
| 204 |
|
| 205 |
diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild |
| 206 |
index 789177de9d8..30c1346e24f 100644 |
| 207 |
--- a/net-fs/samba/samba-4.8.1.ebuild |
| 208 |
+++ b/net-fs/samba/samba-4.8.1.ebuild |
| 209 |
@@ -47,7 +47,7 @@ CDEPEND=" |
| 210 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 211 |
dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 212 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 213 |
- net-libs/libnsl[${MULTILIB_USEDEP}] |
| 214 |
+ net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 215 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 216 |
>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 217 |
sys-libs/libcap |
| 218 |
@@ -65,7 +65,10 @@ CDEPEND=" |
| 219 |
dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 220 |
) |
| 221 |
ceph? ( sys-cluster/ceph ) |
| 222 |
- cluster? ( !dev-db/ctdb ) |
| 223 |
+ cluster? ( |
| 224 |
+ net-libs/rpcsvc-proto |
| 225 |
+ !dev-db/ctdb |
| 226 |
+ ) |
| 227 |
cups? ( net-print/cups ) |
| 228 |
debug? ( dev-util/lttng-ust ) |
| 229 |
dmapi? ( sys-apps/dmapi ) |
Archives