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 F12571382C5 for ; Sat, 30 May 2020 20:36:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32BE3E086F; Sat, 30 May 2020 20:36:45 +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 96828E086F for ; Sat, 30 May 2020 20:36:44 +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 8334034F031 for ; Sat, 30 May 2020 20:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 340E31DA for ; Sat, 30 May 2020 20:36:42 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1590870982.1767004bbffe39fca63e3e1aeee361c4bdea4004.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/leatherman/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/leatherman/leatherman-1.12.0-r1.ebuild dev-libs/leatherman/leatherman-1.12.0.ebuild X-VCS-Directories: dev-libs/leatherman/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 1767004bbffe39fca63e3e1aeee361c4bdea4004 X-VCS-Branch: master Date: Sat, 30 May 2020 20:36:42 +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: 9ccf1f68-263f-46c9-bbbf-6c73c8be3cbe X-Archives-Hash: c94dc897b74713567383130ac2803888 commit: 1767004bbffe39fca63e3e1aeee361c4bdea4004 Author: Matthew Thode gentoo org> AuthorDate: Sat May 30 20:36:11 2020 +0000 Commit: Matthew Thode gentoo org> CommitDate: Sat May 30 20:36:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1767004b dev-libs/leatherman: remove installing vendored boost library Closes: https://bugs.gentoo.org/721652 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Matthew Thode gentoo.org> .../{leatherman-1.12.0.ebuild => leatherman-1.12.0-r1.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/leatherman/leatherman-1.12.0.ebuild b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild similarity index 89% rename from dev-libs/leatherman/leatherman-1.12.0.ebuild rename to dev-libs/leatherman/leatherman-1.12.0-r1.ebuild index aef4cd92309..30ead889cde 100644 --- a/dev-libs/leatherman/leatherman-1.12.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" SLOT="0/${PV}" RDEPEND="net-misc/curl" -DEPEND=">=dev-libs/boost-1.54:=[nls] +DEPEND=">=dev-libs/boost-1.73:=[nls] net-misc/curl >=sys-devel/gcc-4.8:*" @@ -24,6 +24,7 @@ PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) src_prepare() { sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + sed -i '/nowide/d' CMakeLists.txt || die # vendored boost lib conflicts with boost 1.73 and above cmake-utils_src_prepare }