net-fs/samba: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/net-fs/samba/samba-4.10.11.ebuild b/net-fs/samba/samba-4.10.11.ebuild
index 329dc7c24129eb54804afe7ac730aee47720f5d5..e782b5089c52ddd779b359a573b6786bf110865f 100644 (file)
--- a/net-fs/samba/samba-4.10.11.ebuild
+++ b/net-fs/samba/samba-4.10.11.ebuild
@@ -46,26 +46,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.10.13.ebuild b/net-fs/samba/samba-4.10.13.ebuild
index 329dc7c24129eb54804afe7ac730aee47720f5d5..e782b5089c52ddd779b359a573b6786bf110865f 100644 (file)
--- a/net-fs/samba/samba-4.10.13.ebuild
+++ b/net-fs/samba/samba-4.10.13.ebuild
@@ -46,26 +46,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
similarity index 93%
rename from net-fs/samba/samba-4.10.2.ebuild
rename to net-fs/samba/samba-4.10.2-r1.ebuild
index 8e78eb25717e9ba2304688612e3036c3319f64b0..78940866cb224ca5888c8f367b3765a771fddda5 100644 (file)
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2-r1.ebuild
@@ -45,26 +45,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.11.4.ebuild b/net-fs/samba/samba-4.11.4.ebuild
index 56647c0a98fa0ae71008a607d4bc2be4d4410ca5..fb5e20da359dfc2b841e6a0b033d8ce1a5ee6d4f 100644 (file)
--- a/net-fs/samba/samba-4.11.4.ebuild
+++ b/net-fs/samba/samba-4.11.4.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
        dev-libs/libgcrypt:0
        dev-libs/iniparser:0
        dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
        >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
        >=net-libs/gnutls-3.2.0
        net-libs/libnsl:=[${MULTILIB_USEDEP}]
        sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.11.6-r1.ebuild b/net-fs/samba/samba-4.11.6-r2.ebuild
similarity index 93%
rename from net-fs/samba/samba-4.11.6-r1.ebuild
rename to net-fs/samba/samba-4.11.6-r2.ebuild
index 139579aac45f5882b17756756cb019148fa4c662..511b8d74c73ea82d8001b728720491c8ba8ae486 100644 (file)
--- a/net-fs/samba/samba-4.11.6-r1.ebuild
+++ b/net-fs/samba/samba-4.11.6-r2.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
        dev-libs/libgcrypt:0
        dev-libs/iniparser:0
        dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
        >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
        >=net-libs/gnutls-3.2.0
        net-libs/libnsl:=[${MULTILIB_USEDEP}]
        sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.11.6.ebuild b/net-fs/samba/samba-4.11.6.ebuild
index 56647c0a98fa0ae71008a607d4bc2be4d4410ca5..fb5e20da359dfc2b841e6a0b033d8ce1a5ee6d4f 100644 (file)
--- a/net-fs/samba/samba-4.11.6.ebuild
+++ b/net-fs/samba/samba-4.11.6.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
        dev-libs/libgcrypt:0
        dev-libs/iniparser:0
        dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
        >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
        >=net-libs/gnutls-3.2.0
        net-libs/libnsl:=[${MULTILIB_USEDEP}]
        sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
similarity index 96%
rename from net-fs/samba/samba-4.5.16.ebuild
rename to net-fs/samba/samba-4.5.16-r1.ebuild
index 0a8cd5fdfec9ad938fbc2c451d4684a541c2c590..c9c162895ae321324d6e2a57c314e63fa36afeda 100644 (file)
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,9 @@ CDEPEND="${PYTHON_DEPS}
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+       ")
        net-libs/libnsl:=[${MULTILIB_USEDEP}]
        sys-apps/attr[${MULTILIB_USEDEP}]
        >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
@@ -60,8 +62,8 @@ CDEPEND="${PYTHON_DEPS}
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv

diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
index ad3cf03c2386e1a8be1f159c023f27baaba04318..5ddbdf19249f40a7e02c298fb6f7166fd477ecb1 100644 (file)
--- a/net-fs/samba/samba-4.8.12.ebuild
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r4.ebuild
similarity index 92%
rename from net-fs/samba/samba-4.8.6-r2.ebuild
rename to net-fs/samba/samba-4.8.6-r4.ebuild
index 4461b2d6f1cea8dc45ece19eda11f89f0267095c..edd8d3088f6bdf53c4d0d1601ea726a9238682b0 100644 (file)
--- a/net-fs/samba/samba-4.8.6-r2.ebuild
+++ b/net-fs/samba/samba-4.8.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,26 +45,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r5.ebuild
similarity index 93%
rename from net-fs/samba/samba-4.8.6-r3.ebuild
rename to net-fs/samba/samba-4.8.6-r5.ebuild
index 9d93bd81c79ef78520e59349aa92525d79aa6293..67b7b1eb3268ced121fbc11c499210e609755faf 100644 (file)
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ b/net-fs/samba/samba-4.8.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,26 +45,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.9.17.ebuild b/net-fs/samba/samba-4.9.17.ebuild
index 3ad0587ccb321e1ccec4fb14d7ab738c4da0762f..9d8f3c2110eafb0abffd6e0ec8c7b2f9625d8a5c 100644 (file)
--- a/net-fs/samba/samba-4.9.17.ebuild
+++ b/net-fs/samba/samba-4.9.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto

diff --git a/net-fs/samba/samba-4.9.18.ebuild b/net-fs/samba/samba-4.9.18.ebuild
index 3ad0587ccb321e1ccec4fb14d7ab738c4da0762f..9d8f3c2110eafb0abffd6e0ec8c7b2f9625d8a5c 100644 (file)
--- a/net-fs/samba/samba-4.9.18.ebuild
+++ b/net-fs/samba/samba-4.9.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
        dev-libs/libbsd[${MULTILIB_USEDEP}]
        dev-libs/iniparser:0
        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.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/libcap
        sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
        sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+       >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        virtual/libiconv
        pam? ( sys-libs/pam )
        acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
+       $(python_gen_cond_dep "
+               dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+               addns? (
+                       net-dns/bind-tools[gssapi]
+                       dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+               )
+       ")
        ceph? ( sys-cluster/ceph )
        cluster? (
                net-libs/rpcsvc-proto