commit: 5c30175570939acf4ec4d505175f328e491ee6e4 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Apr 30 16:21:23 2018 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Apr 30 16:21:23 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c301755
net-fs/samba: More dependency fixes, bug 640416 Closes: https://bugs.gentoo.org/640416 Package-Manager: Portage-2.3.31, Repoman-2.3.9 net-fs/samba/samba-4.2.14.ebuild | 7 +++++-- net-fs/samba/samba-4.5.16.ebuild | 7 +++++-- net-fs/samba/samba-4.6.14.ebuild | 7 +++++-- net-fs/samba/samba-4.6.15.ebuild | 7 +++++-- net-fs/samba/samba-4.7.6.ebuild | 7 +++++-- net-fs/samba/samba-4.7.7.ebuild | 7 +++++-- net-fs/samba/samba-4.8.0.ebuild | 7 +++++-- net-fs/samba/samba-4.8.1.ebuild | 7 +++++-- 8 files changed, 40 insertions(+), 16 deletions(-) diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild index cead0276a7c..5a6e0f9fd13 100644 --- a/net-fs/samba/samba-4.2.14.ebuild +++ b/net-fs/samba/samba-4.2.14.ebuild @@ -48,7 +48,7 @@ CDEPEND="${PYTHON_DEPS} sys-libs/readline:= virtual/libiconv dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - net-libs/libnsl[${MULTILIB_USEDEP}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] >=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] sys-libs/libcap @@ -64,7 +64,10 @@ CDEPEND="${PYTHON_DEPS} acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild index da917ce3f17..7c80d9db44e 100644 --- a/net-fs/samba/samba-4.5.16.ebuild +++ b/net-fs/samba/samba-4.5.16.ebuild @@ -53,7 +53,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/iniparser:0 dev-libs/popt[${MULTILIB_USEDEP}] dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] - net-libs/libnsl[${MULTILIB_USEDEP}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}] @@ -68,7 +68,10 @@ CDEPEND="${PYTHON_DEPS} pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild index 367a3693db5..5cb08f5d799 100644 --- a/net-fs/samba/samba-4.6.14.ebuild +++ b/net-fs/samba/samba-4.6.14.ebuild @@ -48,7 +48,7 @@ CDEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] - net-libs/libnsl[${MULTILIB_USEDEP}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -66,7 +66,10 @@ CDEPEND=" dev-python/dnspython:=[${PYTHON_USEDEP}] ) ceph? ( sys-cluster/ceph ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild index 367a3693db5..5cb08f5d799 100644 --- a/net-fs/samba/samba-4.6.15.ebuild +++ b/net-fs/samba/samba-4.6.15.ebuild @@ -48,7 +48,7 @@ CDEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}] - net-libs/libnsl[${MULTILIB_USEDEP}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -66,7 +66,10 @@ CDEPEND=" dev-python/dnspython:=[${PYTHON_USEDEP}] ) ceph? ( sys-cluster/ceph ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild index 89b560c2ee9..6a4a386e8ba 100644 --- a/net-fs/samba/samba-4.7.6.ebuild +++ b/net-fs/samba/samba-4.7.6.ebuild @@ -47,7 +47,7 @@ CDEPEND=" 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}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -65,7 +65,10 @@ CDEPEND=" dev-python/dnspython:=[${PYTHON_USEDEP}] ) ceph? ( sys-cluster/ceph ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild index 89b560c2ee9..6a4a386e8ba 100644 --- a/net-fs/samba/samba-4.7.7.ebuild +++ b/net-fs/samba/samba-4.7.7.ebuild @@ -47,7 +47,7 @@ CDEPEND=" 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}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -65,7 +65,10 @@ CDEPEND=" dev-python/dnspython:=[${PYTHON_USEDEP}] ) ceph? ( sys-cluster/ceph ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild index 0e98d07710e..b21453151bb 100644 --- a/net-fs/samba/samba-4.8.0.ebuild +++ b/net-fs/samba/samba-4.8.0.ebuild @@ -47,7 +47,7 @@ CDEPEND=" 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}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -65,7 +65,10 @@ CDEPEND=" dev-python/dnspython:=[${PYTHON_USEDEP}] ) ceph? ( sys-cluster/ceph ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild index 789177de9d8..30c1346e24f 100644 --- a/net-fs/samba/samba-4.8.1.ebuild +++ b/net-fs/samba/samba-4.8.1.ebuild @@ -47,7 +47,7 @@ CDEPEND=" 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}] + net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -65,7 +65,10 @@ CDEPEND=" dev-python/dnspython:=[${PYTHON_USEDEP}] ) ceph? ( sys-cluster/ceph ) - cluster? ( !dev-db/ctdb ) + cluster? ( + net-libs/rpcsvc-proto + !dev-db/ctdb + ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi )
