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

diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 8fa65156a5390afec82280cf1e05a9b712f22ca7..cead0276a7cb8fec91a86e28a0b70a1e82da22e7 100644 (file)
--- 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 775a8863623db7b35cb93fdb4241ddfaeda102a5..da917ce3f173d26a5cc04d5137a91d845ad5790a 100644 (file)
--- 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 ac34ac0c5aa6eab7e9869041d85c2a25e8018dc9..367a3693db56f5e68ccbaed854f66a10a318e98b 100644 (file)
--- 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 ac34ac0c5aa6eab7e9869041d85c2a25e8018dc9..367a3693db56f5e68ccbaed854f66a10a318e98b 100644 (file)
--- 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 5b1399ed756fe3c42a3b95830666046ca28d90fc..89b560c2ee9b177aedf84c234f6e2acd1f934b87 100644 (file)
--- 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 5b1399ed756fe3c42a3b95830666046ca28d90fc..89b560c2ee9b177aedf84c234f6e2acd1f934b87 100644 (file)
--- 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 7a9862d6d28e2a94050115ac4daf9dbd2d02a55c..0e98d07710e338324bba736c3d0ac8892a6d6571 100644 (file)
--- 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 1dfa9f27ec73749386e234022764d5cee51cee77..789177de9d871b8e3695b91b2d50bb9a0e55b7fa 100644 (file)
--- 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}