commit: 6a23e0c4de4aeb29a4aa8bc84bd954020bf8c6a4 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Dec 31 17:49:45 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Dec 31 17:49:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a23e0c4
net-fs/samba: update for multilib sys-fs/e2fsprogs Bug: https://bugs.gentoo.org/806875 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-fs/samba/{samba-4.14.10-r1.ebuild => samba-4.14.10-r2.ebuild} | 5 ++++- net-fs/samba/{samba-4.15.2-r1.ebuild => samba-4.15.2-r2.ebuild} | 5 ++++- net-fs/samba/{samba-4.15.3.ebuild => samba-4.15.3-r1.ebuild} | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/net-fs/samba/samba-4.14.10-r1.ebuild b/net-fs/samba/samba-4.14.10-r2.ebuild similarity index 98% rename from net-fs/samba/samba-4.14.10-r1.ebuild rename to net-fs/samba/samba-4.14.10-r2.ebuild index b075f908df2a..a89e3d9692cc 100644 --- a/net-fs/samba/samba-4.14.10-r1.ebuild +++ b/net-fs/samba/samba-4.14.10-r2.ebuild @@ -67,7 +67,10 @@ COMMON_DEPEND=" dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] net-libs/libnsl:=[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] + || ( + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] + ) >=sys-libs/ldb-2.3.2[ldap(+)?,${MULTILIB_USEDEP}] <sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}] diff --git a/net-fs/samba/samba-4.15.2-r1.ebuild b/net-fs/samba/samba-4.15.2-r2.ebuild similarity index 98% rename from net-fs/samba/samba-4.15.2-r1.ebuild rename to net-fs/samba/samba-4.15.2-r2.ebuild index fcf892dc2388..20decb463cde 100644 --- a/net-fs/samba/samba-4.15.2-r1.ebuild +++ b/net-fs/samba/samba-4.15.2-r2.ebuild @@ -64,7 +64,10 @@ COMMON_DEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] + || ( + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] + ) >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}] <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}] diff --git a/net-fs/samba/samba-4.15.3.ebuild b/net-fs/samba/samba-4.15.3-r1.ebuild similarity index 98% rename from net-fs/samba/samba-4.15.3.ebuild rename to net-fs/samba/samba-4.15.3-r1.ebuild index 05c071ebef13..6efaacf348ca 100644 --- a/net-fs/samba/samba-4.15.3.ebuild +++ b/net-fs/samba/samba-4.15.3-r1.ebuild @@ -64,7 +64,10 @@ COMMON_DEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] + || ( + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] + sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] + ) >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}] <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}]
