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 ED73E1396D0 for ; Fri, 1 Sep 2017 07:55:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 215341FC008; Fri, 1 Sep 2017 07:55:07 +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 EEFD51FC008 for ; Fri, 1 Sep 2017 07:55:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AF98234165C for ; Fri, 1 Sep 2017 07:55:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5711989FA for ; Fri, 1 Sep 2017 07:55:04 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1504252443.ab53f947797c698fefc3a52f879015b47ba3b741.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libgeodecomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild X-VCS-Directories: sci-libs/libgeodecomp/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: ab53f947797c698fefc3a52f879015b47ba3b741 X-VCS-Branch: master Date: Fri, 1 Sep 2017 07:55:04 +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: 979fa0c1-80d4-4b4e-b7a2-12ab84df5623 X-Archives-Hash: 4b9dd770b963d2ded66be4f5b5f92d53 commit: ab53f947797c698fefc3a52f879015b47ba3b741 Author: Slawomir Lis gentoo org> AuthorDate: Fri Sep 1 07:54:03 2017 +0000 Commit: Slawek Lis gentoo org> CommitDate: Fri Sep 1 07:54:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab53f947 sci-libs/libgeodecomp: fixed multilib-check Bug report 629478 Package-Manager: Portage-2.3.8, Repoman-2.3.3 sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild index 15b6687669b..095cf09eafa 100644 --- a/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild +++ b/sci-libs/libgeodecomp/libgeodecomp-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,6 +23,9 @@ S="${WORKDIR}/${P}/src" src_prepare() { epatch "${FILESDIR}/libflatarray.patch" + sed -i 's/libdir=${CMAKE_INSTALL_PREFIX}\/lib/libdir=\/usr\/'$(get_libdir)'/' "${S}/CMakeLists.txt" + sed -i 's/install(TARGETS geodecomp DESTINATION lib)/install(TARGETS geodecomp DESTINATION '$(get_libdir)')/' "${S}/CMakeLists.txt" + if ! use examples ; then sed -i 's/examples//g' CMakeLists.txt fi