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 2E09E1396D0 for ; Mon, 28 Aug 2017 03:14:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68C79E0D1F; Mon, 28 Aug 2017 03:14:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 43C9AE0D1F for ; Mon, 28 Aug 2017 03:14:04 +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 1DA68341B82 for ; Mon, 28 Aug 2017 03:14:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 806F382CF for ; Mon, 28 Aug 2017 03:14:01 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1503889889.3e7c65e7104c14064f8cf6c9d5073bc3974197f7.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/waylandpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/waylandpp/waylandpp-0.1.0.ebuild dev-cpp/waylandpp/waylandpp-9999.ebuild X-VCS-Directories: dev-cpp/waylandpp/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 3e7c65e7104c14064f8cf6c9d5073bc3974197f7 X-VCS-Branch: master Date: Mon, 28 Aug 2017 03:14:01 +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-Archives-Salt: 181ffaf8-4b29-4ce8-b1f3-18e5a9931b51 X-Archives-Hash: 61c93a3142cd262f11f73b0695c59263 commit: 3e7c65e7104c14064f8cf6c9d5073bc3974197f7 Author: Craig Andrews gentoo org> AuthorDate: Mon Aug 28 03:09:25 2017 +0000 Commit: Craig Andrews gentoo org> CommitDate: Mon Aug 28 03:11:29 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7c65e7 dev-cpp/waylandpp: Fix multilib-strict workaround on non-multilib systems The first attempt missed a couple of places where "lib" was hardcoded. Gentoo-bug: 629110 Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-cpp/waylandpp/waylandpp-0.1.0.ebuild | 3 +-- dev-cpp/waylandpp/waylandpp-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild index ec39b8bc686..112c1a2776d 100644 --- a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild +++ b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} src_prepare() { default - sed -i -e "s:\$\${prefix}/lib:/usr/$(get_libdir):" SConstruct || die + sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" SConstruct || die } src_compile() { @@ -46,7 +46,6 @@ src_compile() { src_install() { CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install # fix multilib-strict QA failures - mv "${ED%/}"/usr/{lib,$(get_libdir)} || die if use doc; then doman doc/man/man3/*.3 local HTML_DOCS=( doc/html ) diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild index ec39b8bc686..112c1a2776d 100644 --- a/dev-cpp/waylandpp/waylandpp-9999.ebuild +++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild @@ -33,7 +33,7 @@ DEPEND="${RDEPEND} src_prepare() { default - sed -i -e "s:\$\${prefix}/lib:/usr/$(get_libdir):" SConstruct || die + sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(prefix, \"lib\":os.path.join(prefix, \"$(get_libdir)\":g" SConstruct || die } src_compile() { @@ -46,7 +46,6 @@ src_compile() { src_install() { CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install # fix multilib-strict QA failures - mv "${ED%/}"/usr/{lib,$(get_libdir)} || die if use doc; then doman doc/man/man3/*.3 local HTML_DOCS=( doc/html )