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-libs/nghttp2/
Date: Thu, 18 Apr 2019 18:07:39
Message-Id: 1555610850.98d4dfcd351708fbb50a86f20ebf82d8d93096d2.polynomial-c@gentoo
1 commit: 98d4dfcd351708fbb50a86f20ebf82d8d93096d2
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 18 18:06:58 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 18 18:07:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d4dfcd
7
8 net-libs/nghttp2: Minor ebuild improvement
9
10 Package-Manager: Portage-2.3.63, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-libs/nghttp2/nghttp2-1.37.0.ebuild | 4 +++-
14 net-libs/nghttp2/nghttp2-1.38.0.ebuild | 4 +++-
15 net-libs/nghttp2/nghttp2-9999.ebuild | 6 ++++--
16 3 files changed, 10 insertions(+), 4 deletions(-)
17
18 diff --git a/net-libs/nghttp2/nghttp2-1.37.0.ebuild b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
19 index 20f89187f0f..f27032d7957 100644
20 --- a/net-libs/nghttp2/nghttp2-1.37.0.ebuild
21 +++ b/net-libs/nghttp2/nghttp2-1.37.0.ebuild
22 @@ -64,5 +64,7 @@ multilib_src_configure() {
23 }
24
25 multilib_src_install_all() {
26 - use static-libs || find "${ED%/}"/usr -name '*.la' -delete
27 + if ! use static-libs ; then
28 + find "${ED}"/usr -name '*.la' -delete || die
29 + fi
30 }
31
32 diff --git a/net-libs/nghttp2/nghttp2-1.38.0.ebuild b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
33 index 633fb68774c..1979bd70cc2 100644
34 --- a/net-libs/nghttp2/nghttp2-1.38.0.ebuild
35 +++ b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
36 @@ -83,5 +83,7 @@ multilib_src_configure() {
37 }
38
39 multilib_src_install_all() {
40 - use static-libs || find "${ED%/}"/usr -name '*.la' -delete
41 + if ! use static-libs ; then
42 + find "${ED}"/usr -name '*.la' -delete || die
43 + fi
44 }
45
46 diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
47 index e5d039fc718..0950bfb1def 100644
48 --- a/net-libs/nghttp2/nghttp2-9999.ebuild
49 +++ b/net-libs/nghttp2/nghttp2-9999.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2018 Gentoo Foundation
52 +# Copyright 1999-2019 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 # TODO: Add python support.
56 @@ -69,5 +69,7 @@ multilib_src_configure() {
57 }
58
59 multilib_src_install_all() {
60 - use static-libs || find "${ED%/}"/usr -name '*.la' -delete
61 + if ! use static-libs ; then
62 + find "${ED}"/usr -name '*.la' -delete || die
63 + fi
64 }