commit:     0d703862d3aaff18c541184abb3631327775c5de
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 16:07:39 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 16:17:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d703862

net-fs/samba: require keyutils only for -system-heimdal -system-mitkrb5

Only when both of these flags are turned disabled will samba build its
own heimdal libraries which link to keyutils.

Bug: https://bugs.gentoo.org/917006
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-fs/samba/samba-4.18.11.ebuild | 1 +
 net-fs/samba/samba-4.19.6.ebuild  | 1 +
 net-fs/samba/samba-4.20.0.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/net-fs/samba/samba-4.18.11.ebuild 
b/net-fs/samba/samba-4.18.11.ebuild
index aad41632fada..9d50fa3c279f 100644
--- a/net-fs/samba/samba-4.18.11.ebuild
+++ b/net-fs/samba/samba-4.18.11.ebuild
@@ -110,6 +110,7 @@ COMMON_DEPEND="
        snapper? ( sys-apps/dbus )
        system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
        system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+       !system-heimdal? ( !system-mitkrb5? ( 
sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
        systemd? ( sys-apps/systemd:= )
        unwind? (
                llvm-libunwind? ( sys-libs/llvm-libunwind:= )

diff --git a/net-fs/samba/samba-4.19.6.ebuild b/net-fs/samba/samba-4.19.6.ebuild
index 14523d446af3..ba6fde4a6f54 100644
--- a/net-fs/samba/samba-4.19.6.ebuild
+++ b/net-fs/samba/samba-4.19.6.ebuild
@@ -110,6 +110,7 @@ COMMON_DEPEND="
        snapper? ( sys-apps/dbus )
        system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
        system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+       !system-heimdal? ( !system-mitkrb5? ( 
sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
        systemd? ( sys-apps/systemd:= )
        unwind? (
                llvm-libunwind? ( sys-libs/llvm-libunwind:= )

diff --git a/net-fs/samba/samba-4.20.0.ebuild b/net-fs/samba/samba-4.20.0.ebuild
index bbddb3c9b0b7..0a0dad90e20e 100644
--- a/net-fs/samba/samba-4.20.0.ebuild
+++ b/net-fs/samba/samba-4.20.0.ebuild
@@ -110,6 +110,7 @@ COMMON_DEPEND="
        snapper? ( sys-apps/dbus )
        system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl(-),${MULTILIB_USEDEP}] )
        system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] )
+       !system-heimdal? ( !system-mitkrb5? ( 
sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
        systemd? ( sys-apps/systemd:= )
        unwind? (
                llvm-libunwind? ( sys-libs/llvm-libunwind:= )

Reply via email to