gentoo resync : 02.02.2022

2 files changed, 58 insertions, 0 deletions

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index d6b8a329abbd..a3af31633cd2 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,8 @@ AUX leatherman-1.12.6-SIGSTKSZ.patch 1863 BLAKE2B f244c82ef18441c115b435a1aaff06
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
 DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386
+DIST leatherman-1.12.7.tar.gz 815838 BLAKE2B 21284f5128c9264b751011b1d68c6baf553037612cab39cc339920091ae42980f6c3920f5b339d4cba31a40b190fa73d779f45dcc30b78e866708c3178ac6699 SHA512 dd763bf89d8356aa00805817af7029ee77452a9210b6aded16ac1434f233fbba9b41014ab55a076773f50da6d16e1cffae50e2a23d1c4b336df9cc88c05ede56
 EBUILD leatherman-1.12.6-r1.ebuild 1303 BLAKE2B 22629e094676e56567cabd366ee869c9ffb5fea05dcdd94a7b2dc01bb9329135c3b57be2b882d59e566743a4d9ae13c266d6df9f9651a7dda78d90f032c8b3c0 SHA512 0e41bed3e1097ddf40c102ccdf07ee8da8757cbf606579996d3f976edcf64e786e119248d1f883f83ab57c6901504eed43fa356e44468fff5df5ef8625ea10a3
 EBUILD leatherman-1.12.6-r2.ebuild 1369 BLAKE2B e0446cdff002e93a6076f4bceb38a93d35e17d4ce0e244957a3f82504d41adeec35ba85f465dd2a37fb9f34ff0ed5548145bcd68769f44c7d034d813956e084b SHA512 72cd33acae8899f0a7d49cbe422d3075d855bb685ee8d5b65b8edeaee5f939ce6512f917f0e7fa699ee88adf16dca282bbf956d56eff6cd1b30a947cae9cf976
+EBUILD leatherman-1.12.7.ebuild 1277 BLAKE2B 24fcba03f516fcce116529325c974363d93c3c3870a65fe12e8edf43e7ab81f681d1502e560ccb0ebbcb69393f36294b8905328cf54e7f97c19df7a61548b2ae SHA512 2899a47ab0b5acb37a306fe4df959c075ba8024415b3b28bfac5bd892d1cb7b3cceecdaf5ed204091f08ad284b3eb519e2613c3e151610b12e3f34b9b91a555f
 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2
diff --git a/dev-libs/leatherman/leatherman-1.12.7.ebuild b/dev-libs/leatherman/leatherman-1.12.7.ebuild
new file mode 100644
index 000000000000..ec52f32f8a1a
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test"  # restricted til we don't need the shared_nowide patch
+
+RDEPEND=">=dev-libs/boost-1.73:=[nls]
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/portage-sandbox-test-fix.patch
+	"${FILESDIR}"/1.12.2-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_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DLEATHERMAN_ENABLE_TESTING=$(usex test)
+		# We depend on Boost with nls, so this is always true
+		-DLEATHERMAN_USE_ICU=ON
+
+		-DLEATHERMAN_SHARED=$(usex !static-libs)
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			-DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
+}