Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/
Date: Wed, 11 Mar 2020 09:29:25
Message-Id: 1583918956.b7795325601bddde2e80f039d271c515d8f69561.polynomial-c@gentoo
1 commit: b7795325601bddde2e80f039d271c515d8f69561
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 11 09:29:05 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 11 09:29:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7795325
7
8 net-fs/samba: ebuild adjustments
9
10 Package-Manager: Portage-2.3.93, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-fs/samba/samba-4.12.0.ebuild | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-)
15
16 diff --git a/net-fs/samba/samba-4.12.0.ebuild b/net-fs/samba/samba-4.12.0.ebuild
17 index 2b2ba161404..7facbdd68cd 100644
18 --- a/net-fs/samba/samba-4.12.0.ebuild
19 +++ b/net-fs/samba/samba-4.12.0.ebuild
20 @@ -38,7 +38,6 @@ MULTILIB_WRAPPED_HEADERS=(
21 /usr/include/samba-4.0/ctdb_version.h
22 )
23
24 -# sys-apps/attr is an automagic dependency (see bug #489748)
25 CDEPEND="
26 >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
27 dev-lang/perl:=
28 @@ -164,8 +163,8 @@ src_prepare() {
29 sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
30 fi
31
32 - # ugly hackaround for bug #592502
33 - cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
34 + ## ugly hackaround for bug #592502
35 + #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
36
37 sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
38 -i source4/dsdb/samdb/ldb_modules/password_hash.c \