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: Fri, 16 Nov 2018 07:50:20
Message-Id: 1542354599.1345d0001598cd9960d6d63e69721d959e643154.polynomial-c@gentoo
1 commit: 1345d0001598cd9960d6d63e69721d959e643154
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 16 07:49:59 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 16 07:49:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1345d000
7
8 net-fs/samba: Minor ebuilds improvements.
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-fs/samba/samba-4.9.2-r1.ebuild | 6 ++++--
14 1 file changed, 4 insertions(+), 2 deletions(-)
15
16 diff --git a/net-fs/samba/samba-4.9.2-r1.ebuild b/net-fs/samba/samba-4.9.2-r1.ebuild
17 index 9552e026df2..6ce5625ef29 100644
18 --- a/net-fs/samba/samba-4.9.2-r1.ebuild
19 +++ b/net-fs/samba/samba-4.9.2-r1.ebuild
20 @@ -158,7 +158,9 @@ src_prepare() {
21 sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
22
23 # unbundle iso8601 unless tests are enabled
24 - use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
25 + if ! use test ; then
26 + sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
27 + fi
28
29 # ugly hackaround for bug #592502
30 cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
31 @@ -231,7 +233,7 @@ multilib_src_install() {
32 waf-utils_src_install
33
34 # Make all .so files executable
35 - find "${ED}" -type f -name "*.so" -exec chmod +x {} +
36 + find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
37
38 if multilib_is_native_abi ; then
39 # install ldap schema for server (bug #491002)