commit: 2b3d982fa117098def5d6cf7bab4daa12e09595a Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Apr 30 16:11:18 2018 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Apr 30 16:11:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3d982f
net-fs/samba: Fix libnsl dependencies for all versions, bug 639676 Closes: https://bugs.gentoo.org/639676 Package-Manager: Portage-2.3.31, Repoman-2.3.9 net-fs/samba/samba-4.2.14.ebuild | 1 + net-fs/samba/samba-4.5.16.ebuild | 1 + net-fs/samba/samba-4.6.14.ebuild | 1 + net-fs/samba/samba-4.6.15.ebuild | 1 + net-fs/samba/samba-4.7.6.ebuild | 5 +---- net-fs/samba/samba-4.7.7.ebuild | 5 +---- net-fs/samba/samba-4.8.0.ebuild | 5 +---- net-fs/samba/samba-4.8.1.ebuild | 5 +---- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild index 8fa65156a53..cead0276a7c 100644 --- a/net-fs/samba/samba-4.2.14.ebuild +++ b/net-fs/samba/samba-4.2.14.ebuild @@ -48,6 +48,7 @@ CDEPEND="${PYTHON_DEPS} sys-libs/readline:= virtual/libiconv dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] + net-libs/libnsl[${MULTILIB_USEDEP}] >=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] sys-libs/libcap diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild index 775a8863623..da917ce3f17 100644 --- a/net-fs/samba/samba-4.5.16.ebuild +++ b/net-fs/samba/samba-4.5.16.ebuild @@ -53,6 +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}] 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}] diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild index ac34ac0c5aa..367a3693db5 100644 --- a/net-fs/samba/samba-4.6.14.ebuild +++ b/net-fs/samba/samba-4.6.14.ebuild @@ -48,6 +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}] sys-apps/attr[${MULTILIB_USEDEP}] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild index ac34ac0c5aa..367a3693db5 100644 --- a/net-fs/samba/samba-4.6.15.ebuild +++ b/net-fs/samba/samba-4.6.15.ebuild @@ -48,6 +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}] sys-apps/attr[${MULTILIB_USEDEP}] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild index 5b1399ed756..89b560c2ee9 100644 --- a/net-fs/samba/samba-4.7.6.ebuild +++ b/net-fs/samba/samba-4.7.6.ebuild @@ -47,6 +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}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -78,10 +79,6 @@ CDEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) - || ( - net-libs/libnsl - <sys-libs/glibc-2.26[rpc(+)] - ) " DEPEND="${CDEPEND} ${PYTHON_DEPS} diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild index 5b1399ed756..89b560c2ee9 100644 --- a/net-fs/samba/samba-4.7.7.ebuild +++ b/net-fs/samba/samba-4.7.7.ebuild @@ -47,6 +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}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -78,10 +79,6 @@ CDEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) - || ( - net-libs/libnsl - <sys-libs/glibc-2.26[rpc(+)] - ) " DEPEND="${CDEPEND} ${PYTHON_DEPS} diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild index 7a9862d6d28..0e98d07710e 100644 --- a/net-fs/samba/samba-4.8.0.ebuild +++ b/net-fs/samba/samba-4.8.0.ebuild @@ -47,6 +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}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -78,10 +79,6 @@ CDEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) - || ( - net-libs/libnsl - <sys-libs/glibc-2.26[rpc(+)] - ) " DEPEND="${CDEPEND} ${PYTHON_DEPS} diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild index 1dfa9f27ec7..789177de9d8 100644 --- a/net-fs/samba/samba-4.8.1.ebuild +++ b/net-fs/samba/samba-4.8.1.ebuild @@ -47,6 +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}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] sys-libs/libcap @@ -78,10 +79,6 @@ CDEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) - || ( - net-libs/libnsl - <sys-libs/glibc-2.26[rpc(+)] - ) " DEPEND="${CDEPEND} ${PYTHON_DEPS}
