commit: b6ea41673e452922d3515f3dd266ae48b5b81e42 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Apr 17 15:09:25 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Apr 17 15:09:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ea4167
net-fs/samba: remove sys-libs/e2fsprogs-libs dep Bug: https://bugs.gentoo.org/806875 Signed-off-by: David Seifert <soap <AT> gentoo.org> net-fs/samba/{samba-4.14.12-r2.ebuild => samba-4.14.12-r3.ebuild} | 5 +---- net-fs/samba/{samba-4.15.4-r2.ebuild => samba-4.15.4-r3.ebuild} | 5 +---- net-fs/samba/{samba-4.15.5-r2.ebuild => samba-4.15.5-r3.ebuild} | 5 +---- net-fs/samba/{samba-4.15.6.ebuild => samba-4.15.6-r1.ebuild} | 5 +---- net-fs/samba/{samba-4.16.0.ebuild => samba-4.16.0-r1.ebuild} | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/net-fs/samba/samba-4.14.12-r2.ebuild b/net-fs/samba/samba-4.14.12-r3.ebuild similarity index 98% rename from net-fs/samba/samba-4.14.12-r2.ebuild rename to net-fs/samba/samba-4.14.12-r3.ebuild index 66cc611d9411..596a27073a1f 100644 --- a/net-fs/samba/samba-4.14.12-r2.ebuild +++ b/net-fs/samba/samba-4.14.12-r3.ebuild @@ -67,10 +67,7 @@ COMMON_DEPEND=" dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] net-libs/libnsl:=[${MULTILIB_USEDEP}] - || ( - >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] - ) + >=sys-fs/e2fsprogs-1.46.4-r51[${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.4-r2.ebuild b/net-fs/samba/samba-4.15.4-r3.ebuild similarity index 98% rename from net-fs/samba/samba-4.15.4-r2.ebuild rename to net-fs/samba/samba-4.15.4-r3.ebuild index d599fadd6538..bf1ff5956d07 100644 --- a/net-fs/samba/samba-4.15.4-r2.ebuild +++ b/net-fs/samba/samba-4.15.4-r3.ebuild @@ -64,10 +64,7 @@ COMMON_DEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - || ( - >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] - ) + >=sys-fs/e2fsprogs-1.46.4-r51[${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.5-r2.ebuild b/net-fs/samba/samba-4.15.5-r3.ebuild similarity index 98% rename from net-fs/samba/samba-4.15.5-r2.ebuild rename to net-fs/samba/samba-4.15.5-r3.ebuild index 26778db001e8..7da1b7b02cf4 100644 --- a/net-fs/samba/samba-4.15.5-r2.ebuild +++ b/net-fs/samba/samba-4.15.5-r3.ebuild @@ -64,10 +64,7 @@ COMMON_DEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - || ( - >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] - ) + >=sys-fs/e2fsprogs-1.46.4-r51[${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.6.ebuild b/net-fs/samba/samba-4.15.6-r1.ebuild similarity index 98% rename from net-fs/samba/samba-4.15.6.ebuild rename to net-fs/samba/samba-4.15.6-r1.ebuild index fc12bd068d9e..bfffbd68dc99 100644 --- a/net-fs/samba/samba-4.15.6.ebuild +++ b/net-fs/samba/samba-4.15.6-r1.ebuild @@ -64,10 +64,7 @@ COMMON_DEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - || ( - >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] - ) + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] >=sys-libs/ldb-2.4.2[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.16.0.ebuild b/net-fs/samba/samba-4.16.0-r1.ebuild similarity index 98% rename from net-fs/samba/samba-4.16.0.ebuild rename to net-fs/samba/samba-4.16.0-r1.ebuild index 54d617f29c82..dfb87123595c 100644 --- a/net-fs/samba/samba-4.16.0.ebuild +++ b/net-fs/samba/samba-4.16.0-r1.ebuild @@ -64,10 +64,7 @@ COMMON_DEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}] - || ( - >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}] - ) + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}] >=sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}] <sys-libs/ldb-2.6.0[ldap(+)?,${MULTILIB_USEDEP}] sys-libs/libcap[${MULTILIB_USEDEP}]
