[gentoo-commits] repo/gentoo:master commit in: dev-libs/leatherman/

[Matthew Thode]

commit:     3273bd78c5e306521b58b727aefb3216f8decab8
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 16:47:29 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun May 31 16:47:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3273bd78

dev-libs/leatherman: fix build (avoid vendored boost nowide)

Bug: https://bugs.gentoo.org/721652
Closes: https://bugs.gentoo.org/726406
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 dev-libs/leatherman/leatherman-1.12.0-r1.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild
index 30ead889cde..9a442087026 100644
--- a/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.0-r1.ebuild
@@ -24,7 +24,13 @@ 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
+	# vendored boost lib conflicts with boost 1.73 and above
+	sed -i '/nowide/d' CMakeLists.txt
+	sed -i '/nowide/d' file_util/CMakeLists.txt || die
+	sed -i '/nowide/d' windows/CMakeLists.txt || die
+	sed -i '/nowide/d' execution/CMakeLists.txt || die
+	sed -i '/nowide/d' logging/CMakeLists.txt || die
+	sed -i '/nowide/d' util/CMakeLists.txt || die
 	cmake-utils_src_prepare
 }