Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/
Date: Fri, 31 Dec 2021 17:50:13
Message-Id: 1640972985.6a23e0c4de4aeb29a4aa8bc84bd954020bf8c6a4.soap@gentoo
1 commit: 6a23e0c4de4aeb29a4aa8bc84bd954020bf8c6a4
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 31 17:49:45 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 31 17:49:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a23e0c4
7
8 net-fs/samba: update for multilib sys-fs/e2fsprogs
9
10 Bug: https://bugs.gentoo.org/806875
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 net-fs/samba/{samba-4.14.10-r1.ebuild => samba-4.14.10-r2.ebuild} | 5 ++++-
14 net-fs/samba/{samba-4.15.2-r1.ebuild => samba-4.15.2-r2.ebuild} | 5 ++++-
15 net-fs/samba/{samba-4.15.3.ebuild => samba-4.15.3-r1.ebuild} | 5 ++++-
16 3 files changed, 12 insertions(+), 3 deletions(-)
17
18 diff --git a/net-fs/samba/samba-4.14.10-r1.ebuild b/net-fs/samba/samba-4.14.10-r2.ebuild
19 similarity index 98%
20 rename from net-fs/samba/samba-4.14.10-r1.ebuild
21 rename to net-fs/samba/samba-4.14.10-r2.ebuild
22 index b075f908df2a..a89e3d9692cc 100644
23 --- a/net-fs/samba/samba-4.14.10-r1.ebuild
24 +++ b/net-fs/samba/samba-4.14.10-r2.ebuild
25 @@ -67,7 +67,10 @@ COMMON_DEPEND="
26 dev-perl/Parse-Yapp
27 >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
28 net-libs/libnsl:=[${MULTILIB_USEDEP}]
29 - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
30 + || (
31 + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
32 + sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
33 + )
34 >=sys-libs/ldb-2.3.2[ldap(+)?,${MULTILIB_USEDEP}]
35 <sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
36 sys-libs/libcap[${MULTILIB_USEDEP}]
37
38 diff --git a/net-fs/samba/samba-4.15.2-r1.ebuild b/net-fs/samba/samba-4.15.2-r2.ebuild
39 similarity index 98%
40 rename from net-fs/samba/samba-4.15.2-r1.ebuild
41 rename to net-fs/samba/samba-4.15.2-r2.ebuild
42 index fcf892dc2388..20decb463cde 100644
43 --- a/net-fs/samba/samba-4.15.2-r1.ebuild
44 +++ b/net-fs/samba/samba-4.15.2-r2.ebuild
45 @@ -64,7 +64,10 @@ COMMON_DEPEND="
46 dev-libs/popt[${MULTILIB_USEDEP}]
47 dev-perl/Parse-Yapp
48 >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
49 - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
50 + || (
51 + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
52 + sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
53 + )
54 >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
55 <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
56 sys-libs/libcap[${MULTILIB_USEDEP}]
57
58 diff --git a/net-fs/samba/samba-4.15.3.ebuild b/net-fs/samba/samba-4.15.3-r1.ebuild
59 similarity index 98%
60 rename from net-fs/samba/samba-4.15.3.ebuild
61 rename to net-fs/samba/samba-4.15.3-r1.ebuild
62 index 05c071ebef13..6efaacf348ca 100644
63 --- a/net-fs/samba/samba-4.15.3.ebuild
64 +++ b/net-fs/samba/samba-4.15.3-r1.ebuild
65 @@ -64,7 +64,10 @@ COMMON_DEPEND="
66 dev-libs/popt[${MULTILIB_USEDEP}]
67 dev-perl/Parse-Yapp
68 >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
69 - sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
70 + || (
71 + >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
72 + sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
73 + )
74 >=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
75 <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
76 sys-libs/libcap[${MULTILIB_USEDEP}]