From: Matthew Thode <prometheanfire@gentoo.org>
Date: Sat, 30 May 2020 20:36:11 +0000 (-0500)
Subject: dev-libs/leatherman: remove installing vendored boost library
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1767004bbffe39fca63e3e1aeee361c4bdea4004;p=gentoo.git

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 <prometheanfire@gentoo.org>
---

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 aef4cd923095..30ead889cde4 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
 }