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 8AF681396D0 for ; Thu, 7 Sep 2017 13:44:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9EDCE0E0F; Thu, 7 Sep 2017 13:44:39 +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 A4102E0E0F for ; Thu, 7 Sep 2017 13:44:39 +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 7930233BE95 for ; Thu, 7 Sep 2017 13:44:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9BDA8EC2 for ; Thu, 7 Sep 2017 13:44:35 +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: <1504791856.41b1bcdf315fb667b5cade38d0f3f7392f199cd2.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-9999.ebuild X-VCS-Directories: dev-cpp/waylandpp/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 41b1bcdf315fb667b5cade38d0f3f7392f199cd2 X-VCS-Branch: master Date: Thu, 7 Sep 2017 13:44:35 +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: 8789ccb8-44e5-40f3-840b-a8b2a5e5d555 X-Archives-Hash: bc7bbfef6efbe76d7e68783721475f82 commit: 41b1bcdf315fb667b5cade38d0f3f7392f199cd2 Author: Craig Andrews gentoo org> AuthorDate: Thu Sep 7 13:44:00 2017 +0000 Commit: Craig Andrews gentoo org> CommitDate: Thu Sep 7 13:44:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b1bcdf dev-cpp/waylandpp: -9999 use newly added LIBDIR option Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-cpp/waylandpp/waylandpp-9999.ebuild | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild index 4b36e9aea8e..1dd04bc09c5 100644 --- a/dev-cpp/waylandpp/waylandpp-9999.ebuild +++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild @@ -31,20 +31,15 @@ DEPEND="${RDEPEND} ) " -src_prepare() { - default - sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e "s:os.path.join(root, prefix, \"lib\":os.path.join(root, prefix, \"$(get_libdir)\":g" SConstruct || die -} - src_compile() { - CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" escons + CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" LIBDIR="$(get_libdir)" escons if use doc; then doxygen || die "error making docs" fi } src_install() { - CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" escons install + CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" LIBDIR="$(get_libdir)" escons install # fix multilib-strict QA failures if use doc; then doman doc/man/man3/*.3