net-fs/samba: conditionalise dependency on dev-python/subunit

Samba seems to configure + build + install fine without subunit
installed.

Revbumping to allow users to depclean subunit itself but also
a bunch of assorted Python dependencies. Also, to ensure that
users upgrading without dynamic deps enabled don't get stuck
on the "EAPI 8" trap discussed in the bug.

Closes: https://github.com/gentoo/gentoo/pull/21683
Closes: https://bugs.gentoo.org/801637
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>

6 files changed, 6 insertions, 6 deletions

diff --git a/net-fs/samba/samba-4.13.10.ebuild b/net-fs/samba/samba-4.13.10-r1.ebuild
index 91be7c012cec..11a2973e57fe 100644
--- a/net-fs/samba/samba-4.13.10.ebuild
+++ b/net-fs/samba/samba-4.13.10-r1.ebuild
@@ -81,7 +81,6 @@ COMMON_DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addns? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			net-dns/bind-tools[gssapi]
@@ -120,6 +119,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 	spotlight? ( dev-libs/glib )
 	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
 			>=net-libs/socket_wrapper-1.1.9
diff --git a/net-fs/samba/samba-4.13.9-r1.ebuild b/net-fs/samba/samba-4.13.9-r2.ebuild
index b63fcec649a1..4f9c3873ee67 100644
--- a/net-fs/samba/samba-4.13.9-r1.ebuild
+++ b/net-fs/samba/samba-4.13.9-r2.ebuild
@@ -81,7 +81,6 @@ COMMON_DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addns? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			net-dns/bind-tools[gssapi]
@@ -120,6 +119,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 	spotlight? ( dev-libs/glib )
 	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
 			>=net-libs/socket_wrapper-1.1.9
diff --git a/net-fs/samba/samba-4.14.6.ebuild b/net-fs/samba/samba-4.14.4-r2.ebuild
index 64232a3a2cd9..fb2a26e35c4f 100644
--- a/net-fs/samba/samba-4.14.6.ebuild
+++ b/net-fs/samba/samba-4.14.4-r2.ebuild
@@ -81,7 +81,6 @@ COMMON_DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addc? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
@@ -124,6 +123,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 	spotlight? ( dev-libs/glib )
 	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
 			>=net-libs/socket_wrapper-1.1.9
diff --git a/net-fs/samba/samba-4.14.4-r1.ebuild b/net-fs/samba/samba-4.14.5-r2.ebuild
index 64232a3a2cd9..fb2a26e35c4f 100644
--- a/net-fs/samba/samba-4.14.4-r1.ebuild
+++ b/net-fs/samba/samba-4.14.5-r2.ebuild
@@ -81,7 +81,6 @@ COMMON_DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addc? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
@@ -124,6 +123,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 	spotlight? ( dev-libs/glib )
 	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
 			>=net-libs/socket_wrapper-1.1.9
diff --git a/net-fs/samba/samba-4.14.5-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild
index 64232a3a2cd9..fb2a26e35c4f 100644
--- a/net-fs/samba/samba-4.14.5-r1.ebuild
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild
@@ -81,7 +81,6 @@ COMMON_DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addc? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
@@ -124,6 +123,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 	spotlight? ( dev-libs/glib )
 	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
 			>=net-libs/socket_wrapper-1.1.9
diff --git a/net-fs/samba/samba-4.15.0_rc1.ebuild b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
index bac64c865884..1921330d5a32 100644
--- a/net-fs/samba/samba-4.15.0_rc1.ebuild
+++ b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild
@@ -79,7 +79,6 @@ COMMON_DEPEND="
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
 		addc? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
@@ -122,6 +121,7 @@ DEPEND="${COMMON_DEPEND}
 	)
 	spotlight? ( dev-libs/glib )
 	test? (
+		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
 			>=net-libs/socket_wrapper-1.1.9