From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8DD413835C for ; Sat, 27 Feb 2021 21:23:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A3C1E0935; Sat, 27 Feb 2021 21:23:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02923E0935 for ; Sat, 27 Feb 2021 21:23:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12917341129 for ; Sat, 27 Feb 2021 21:23:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51B2756F for ; Sat, 27 Feb 2021 21:23:54 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1614460484.67aa20071b773e4bce1b5d2e917a63b0a3d29216.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-arch/libarchive-qt/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild X-VCS-Directories: app-arch/libarchive-qt/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 67aa20071b773e4bce1b5d2e917a63b0a3d29216 X-VCS-Branch: master Date: Sat, 27 Feb 2021 21:23:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9897160c-8df0-4be2-a449-0283bca93df4 X-Archives-Hash: d6da2e000f45272ffd44a507454b21dd Message-ID: <20210227212354.WZve0lfjen46WSVK2gAU1cAXSIa6eMukRyV2USWpRrg@z> commit: 67aa20071b773e4bce1b5d2e917a63b0a3d29216 Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Feb 27 21:14:44 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Feb 27 21:14:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67aa2007 app-arch/libarchive-qt: fix ignoring lib install path Closes: https://github.com/gentoo/guru/issues/42 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild b/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild index ff6dfb33..b2e5605f 100644 --- a/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild +++ b/app-arch/libarchive-qt/libarchive-qt-2.0.2.ebuild @@ -30,6 +30,18 @@ DEPEND=" " RDEPEND="${DEPEND}" +src_prepare() { + default + + # remove override of the libpath + sed -i -e '/^ target.path/d' lib/shared.pro || die + sed -i -e '/^ target.path/d' lib/static.pro || die + + # fix prefix of lib files + sed -i -e 's/$$INSTALL_PREFIX/$$PREFIX/g' lib/shared.pro || die + sed -i -e 's/$$INSTALL_PREFIX/$$PREFIX/g' lib/static.pro || die +} + src_configure() { local lib="$(get_libdir)" # '^^' because we need to upcase the definition @@ -38,5 +50,5 @@ src_configure() { src_install() { einstalldocs - emake INSTALL_ROOT="${D}" install + emake INSTALL_ROOT="${ED}" install }