Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-arch/libarchive-qt/
Date: Sat, 27 Feb 2021 21:15:00
Message-Id: 1614460484.67aa20071b773e4bce1b5d2e917a63b0a3d29216.andrewammerlaan@gentoo
1 commit: 67aa20071b773e4bce1b5d2e917a63b0a3d29216
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
3 AuthorDate: Sat Feb 27 21:14:44 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Sat Feb 27 21:14:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67aa2007
7
8 app-arch/libarchive-qt: fix ignoring lib install path
9
10 Closes: https://github.com/gentoo/guru/issues/42
11 Package-Manager: Portage-3.0.15, Repoman-3.0.2
12 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
13
14 app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild | 14 +++++++++++++-
15 1 file changed, 13 insertions(+), 1 deletion(-)
16
17 diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild b/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild
18 index ff6dfb33..b2e5605f 100644
19 --- a/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild
20 +++ b/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild
21 @@ -30,6 +30,18 @@ DEPEND="
22 "
23 RDEPEND="${DEPEND}"
24
25 +src_prepare() {
26 + default
27 +
28 + # remove override of the libpath
29 + sed -i -e '/^ target.path/d' lib/shared.pro || die
30 + sed -i -e '/^ target.path/d' lib/static.pro || die
31 +
32 + # fix prefix of lib files
33 + sed -i -e 's/$$INSTALL_PREFIX/$$PREFIX/g' lib/shared.pro || die
34 + sed -i -e 's/$$INSTALL_PREFIX/$$PREFIX/g' lib/static.pro || die
35 +}
36 +
37 src_configure() {
38 local lib="$(get_libdir)"
39 # '^^' because we need to upcase the definition
40 @@ -38,5 +50,5 @@ src_configure() {
41
42 src_install() {
43 einstalldocs
44 - emake INSTALL_ROOT="${D}" install
45 + emake INSTALL_ROOT="${ED}" install
46 }