commit: f6843e30ac099f62bd722c481acd3a8631d71a6f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 17 09:36:59 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jul 17 09:36:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6843e30
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 <AT> gentoo.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> net-fs/samba/{samba-4.13.10.ebuild => samba-4.13.10-r1.ebuild} | 2 +- net-fs/samba/{samba-4.13.9-r1.ebuild => samba-4.13.9-r2.ebuild} | 2 +- net-fs/samba/{samba-4.14.6.ebuild => samba-4.14.4-r2.ebuild} | 2 +- net-fs/samba/{samba-4.14.4-r1.ebuild => samba-4.14.5-r2.ebuild} | 2 +- net-fs/samba/{samba-4.14.5-r1.ebuild => samba-4.14.6-r1.ebuild} | 2 +- net-fs/samba/{samba-4.15.0_rc1.ebuild => samba-4.15.0_rc1-r1.ebuild} | 2 +- 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 similarity index 99% rename from net-fs/samba/samba-4.13.10.ebuild rename to net-fs/samba/samba-4.13.10-r1.ebuild index 91be7c012ce..11a2973e57f 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 similarity index 99% rename from net-fs/samba/samba-4.13.9-r1.ebuild rename to net-fs/samba/samba-4.13.9-r2.ebuild index b63fcec649a..4f9c3873ee6 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 similarity index 99% rename from net-fs/samba/samba-4.14.6.ebuild rename to net-fs/samba/samba-4.14.4-r2.ebuild index 64232a3a2cd..fb2a26e35c4 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 similarity index 99% rename from net-fs/samba/samba-4.14.4-r1.ebuild rename to net-fs/samba/samba-4.14.5-r2.ebuild index 64232a3a2cd..fb2a26e35c4 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 similarity index 99% rename from net-fs/samba/samba-4.14.5-r1.ebuild rename to net-fs/samba/samba-4.14.6-r1.ebuild index 64232a3a2cd..fb2a26e35c4 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 similarity index 99% rename from net-fs/samba/samba-4.15.0_rc1.ebuild rename to net-fs/samba/samba-4.15.0_rc1-r1.ebuild index bac64c86588..1921330d5a3 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