From 87cdc44053f16ad612b0de1992a3b2a971b81e0b Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Fri, 21 Aug 2020 20:41:47 -0500
Subject: dev-libs/leatherman: fix error_code being missing

Closes: https://bugs.gentoo.org/736651
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
---
 dev-libs/leatherman/files/shared_nowide.patch   |  3 +-
 dev-libs/leatherman/leatherman-1.12.1-r1.ebuild | 60 -------------------------
 dev-libs/leatherman/leatherman-1.12.1-r2.ebuild | 60 +++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 61 deletions(-)
 delete mode 100644 dev-libs/leatherman/leatherman-1.12.1-r1.ebuild
 create mode 100644 dev-libs/leatherman/leatherman-1.12.1-r2.ebuild

(limited to 'dev-libs')

diff --git a/dev-libs/leatherman/files/shared_nowide.patch b/dev-libs/leatherman/files/shared_nowide.patch
index e0c4c832fb3e..4f5f67045fb6 100644
--- a/dev-libs/leatherman/files/shared_nowide.patch
+++ b/dev-libs/leatherman/files/shared_nowide.patch
@@ -88,10 +88,11 @@ index ff9dba6..5d1b9ce 100644
  #include <leatherman/logging/logging.hpp>
 --- leatherman-1.10.0/util/src/environment.cc~	2019-12-14 20:46:29.000000000 +0000
 +++ leatherman-1.10.0/util/src/environment.cc	2020-06-02 22:42:45.101963441 +0100
-@@ -1,5 +1,5 @@
+@@ -1,5 +1,6 @@
  #include <leatherman/util/environment.hpp>
 -#include <boost/nowide/cenv.hpp>
 +#include <boost/nowide/cstdlib.hpp>
++#include <boost/system/error_code.hpp>
  
  using namespace std;
  
diff --git a/dev-libs/leatherman/leatherman-1.12.1-r1.ebuild b/dev-libs/leatherman/leatherman-1.12.1-r1.ebuild
deleted file mode 100644
index 340f36608ce1..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.73:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-PATCHES+=( "${FILESDIR}"/shared_nowide.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild b/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild
new file mode 100644
index 000000000000..340f36608ce1
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/shared_nowide.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	# vendored boost lib conflicts with boost 1.73 and above
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
-- 
cgit v1.2.3-65-gdbad