From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D645213933E for ; Sat, 17 Jul 2021 09:37:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9EFFE0A94; Sat, 17 Jul 2021 09:37:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0EC0E0A94 for ; Sat, 17 Jul 2021 09:37:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A363B342AC3 for ; Sat, 17 Jul 2021 09:37:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C94B7D3 for ; Sat, 17 Jul 2021 09:37:15 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1626514619.f6843e30ac099f62bd722c481acd3a8631d71a6f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.13.10-r1.ebuild net-fs/samba/samba-4.13.10.ebuild net-fs/samba/samba-4.13.9-r1.ebuild net-fs/samba/samba-4.13.9-r2.ebuild net-fs/samba/samba-4.14.4-r1.ebuild net-fs/samba/samba-4.14.4-r2.ebuild net-fs/samba/samba-4.14.5-r1.ebuild net-fs/samba/samba-4.14.5-r2.ebuild net-fs/samba/samba-4.14.6-r1.ebuild net-fs/samba/samba-4.14.6.ebuild net-fs/samba/samba-4.15.0_rc1-r1.ebuild net-fs/samba/samba-4.15.0_rc1.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: f6843e30ac099f62bd722c481acd3a8631d71a6f X-VCS-Branch: master Date: Sat, 17 Jul 2021 09:37:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 419588bb-c25b-4257-8c81-39feabbc528c X-Archives-Hash: 2d9100f70221f0aa0afa35ce7f5ce6fb commit: f6843e30ac099f62bd722c481acd3a8631d71a6f Author: Sam James gentoo org> AuthorDate: Sat Jul 17 09:36:59 2021 +0000 Commit: David Seifert gentoo 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 gentoo.org> Signed-off-by: David Seifert 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