projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b3d982)
net-fs/samba: More dependency fixes, bug 640416
authorAndreas K. Hüttel <dilfridge@gentoo.org>
Mon, 30 Apr 2018 16:21:23 +0000 (18:21 +0200)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Mon, 30 Apr 2018 16:21:23 +0000 (18:21 +0200)
Closes: https://bugs.gentoo.org/640416
Package-Manager: Portage-2.3.31, Repoman-2.3.9

net-fs/samba/samba-4.2.14.ebuild patch | blob | history
net-fs/samba/samba-4.5.16.ebuild patch | blob | history
net-fs/samba/samba-4.6.14.ebuild patch | blob | history
net-fs/samba/samba-4.6.15.ebuild patch | blob | history
net-fs/samba/samba-4.7.6.ebuild patch | blob | history
net-fs/samba/samba-4.7.7.ebuild patch | blob | history
net-fs/samba/samba-4.8.0.ebuild patch | blob | history
net-fs/samba/samba-4.8.1.ebuild patch | blob | history

diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index cead0276a7cb8fec91a86e28a0b70a1e82da22e7..5a6e0f9fd13deb2c93786e73c28b6eda33bef2d4 100644 (file)
--- 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 da917ce3f173d26a5cc04d5137a91d845ad5790a..7c80d9db44e7abdfa23eae9866ee004ff43b406f 100644 (file)
--- 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 367a3693db56f5e68ccbaed854f66a10a318e98b..5cb08f5d799bd5d6070e23fb6e68bf3e898f07a5 100644 (file)
--- 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 367a3693db56f5e68ccbaed854f66a10a318e98b..5cb08f5d799bd5d6070e23fb6e68bf3e898f07a5 100644 (file)
--- 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 89b560c2ee9b177aedf84c234f6e2acd1f934b87..6a4a386e8baec28c5a100298d49633477d203ed9 100644 (file)
--- 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 89b560c2ee9b177aedf84c234f6e2acd1f934b87..6a4a386e8baec28c5a100298d49633477d203ed9 100644 (file)
--- 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 0e98d07710e338324bba736c3d0ac8892a6d6571..b21453151bb43bf416d6fe182961e1cc9d4a088e 100644 (file)
--- 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 789177de9d871b8e3695b91b2d50bb9a0e55b7fa..30c1346e24f0d8e711e9564e3eca0539db6e9ee8 100644 (file)
--- 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 )
Unnamed repository; edit this file 'description' to name the repository.