Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbase58/
Date: Mon, 05 Oct 2020 14:32:19
Message-Id: 1601908329.aea981b2e5871a0853a28e73a8e5cada5bb4054b.juippis@gentoo
1 commit: aea981b2e5871a0853a28e73a8e5cada5bb4054b
2 Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 5 14:31:48 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 14:32:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea981b2
7
8 dev-libs/libbase58: add even better check for TRASH dir on 0.1.4-r1
9
10 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
11
12 dev-libs/libbase58/libbase58-0.1.4-r1.ebuild | 5 +++--
13 1 file changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
16 index 1cf48ca77e4..375b6956313 100644
17 --- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
18 +++ b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
19 @@ -46,7 +46,8 @@ multilib_src_configure() {
20 }
21
22 multilib_src_install_all() {
23 - if [[ -d ${ED}/TRASH ]]; then
24 - rm -r "${ED}/TRASH" || die
25 + if use test; then
26 + # It's hard to control this directory with multilib_is_native_abi && use tools, hence -f.
27 + rm -rf "${ED}/TRASH" || die
28 fi
29 }