Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/p4est/
Date: Thu, 23 Apr 2020 21:41:10
Message-Id: 1587678031.6fefffcbfbf8feb4a4d33c1bc9cbb5b4b7311aa5.tamiko@gentoo
1 commit: 6fefffcbfbf8feb4a4d33c1bc9cbb5b4b7311aa5
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 23 21:37:42 2020 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 21:40:31 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fefffcb
7
8 sci-libs/p4est: fix library path
9
10 Closes: https://bugs.gentoo.org/680140
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
13
14 sci-libs/p4est/p4est-2.0.ebuild | 5 ++---
15 sci-libs/p4est/p4est-2.2.ebuild | 5 ++---
16 sci-libs/p4est/p4est-9999.ebuild | 5 ++---
17 3 files changed, 6 insertions(+), 9 deletions(-)
18
19 diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.0.ebuild
20 index 62bc613a260..8fd68ca09b1 100644
21 --- a/sci-libs/p4est/p4est-2.0.ebuild
22 +++ b/sci-libs/p4est/p4est-2.0.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 +# Copyright 1999-2020 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -73,9 +73,8 @@ src_prepare() {
30 "${S}"/configure || die "sed failed"
31
32 sed -i \
33 - "s/libsc\.la/libsc\.so/" \
34 + "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
35 "${S}"/configure || die "sed failed"
36 -
37 }
38
39 src_configure() {
40
41 diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
42 index 8cd883fb0d2..32ae041f931 100644
43 --- a/sci-libs/p4est/p4est-2.2.ebuild
44 +++ b/sci-libs/p4est/p4est-2.2.ebuild
45 @@ -1,4 +1,4 @@
46 -# Copyright 1999-2019 Gentoo Authors
47 +# Copyright 1999-2020 Gentoo Authors
48 # Distributed under the terms of the GNU General Public License v2
49
50 EAPI=7
51 @@ -73,9 +73,8 @@ src_prepare() {
52 "${S}"/configure || die "sed failed"
53
54 sed -i \
55 - "s/libsc\.la/libsc\.so/" \
56 + "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
57 "${S}"/configure || die "sed failed"
58 -
59 }
60
61 src_configure() {
62
63 diff --git a/sci-libs/p4est/p4est-9999.ebuild b/sci-libs/p4est/p4est-9999.ebuild
64 index a54c8b564e3..8fd68ca09b1 100644
65 --- a/sci-libs/p4est/p4est-9999.ebuild
66 +++ b/sci-libs/p4est/p4est-9999.ebuild
67 @@ -1,4 +1,4 @@
68 -# Copyright 1999-2017 Gentoo Foundation
69 +# Copyright 1999-2020 Gentoo Authors
70 # Distributed under the terms of the GNU General Public License v2
71
72 EAPI=6
73 @@ -73,9 +73,8 @@ src_prepare() {
74 "${S}"/configure || die "sed failed"
75
76 sed -i \
77 - "s/libsc\.la/libsc\.so/" \
78 + "s#lib/libsc\.la#$(get_libdir)/libsc\.so#" \
79 "${S}"/configure || die "sed failed"
80 -
81 }
82
83 src_configure() {