gentoo resync : 04.01.2022

3 files changed, 109 insertions, 0 deletions

diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 9898d772e567..d6b8a329abbd 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,6 +1,8 @@
 AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece
+AUX leatherman-1.12.6-SIGSTKSZ.patch 1863 BLAKE2B f244c82ef18441c115b435a1aaff06256f878597344ee8f4a8f66b721d165cc2f59eee92138bb01176ac0d6a479b361af9ab6e75e2a5ac6b56c895a286d2c09a SHA512 aff21afcbba6b1bef14a347b12e1de31a186d72ef601a80d76e0788b83479ea1cb095916e409a22ea9177ec66fb684a7a30f597fa64398e9881e76d5585303a9
 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
 EBUILD leatherman-1.12.6-r1.ebuild 1303 BLAKE2B 22629e094676e56567cabd366ee869c9ffb5fea05dcdd94a7b2dc01bb9329135c3b57be2b882d59e566743a4d9ae13c266d6df9f9651a7dda78d90f032c8b3c0 SHA512 0e41bed3e1097ddf40c102ccdf07ee8da8757cbf606579996d3f976edcf64e786e119248d1f883f83ab57c6901504eed43fa356e44468fff5df5ef8625ea10a3
+EBUILD leatherman-1.12.6-r2.ebuild 1369 BLAKE2B e0446cdff002e93a6076f4bceb38a93d35e17d4ce0e244957a3f82504d41adeec35ba85f465dd2a37fb9f34ff0ed5548145bcd68769f44c7d034d813956e084b SHA512 72cd33acae8899f0a7d49cbe422d3075d855bb685ee8d5b65b8edeaee5f939ce6512f917f0e7fa699ee88adf16dca282bbf956d56eff6cd1b30a947cae9cf976
 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2
diff --git a/dev-libs/leatherman/files/leatherman-1.12.6-SIGSTKSZ.patch b/dev-libs/leatherman/files/leatherman-1.12.6-SIGSTKSZ.patch
new file mode 100644
index 000000000000..e6c7349e814b
--- /dev/null
+++ b/dev-libs/leatherman/files/leatherman-1.12.6-SIGSTKSZ.patch
@@ -0,0 +1,45 @@
+diff -Naur a/src/Catch-1.10.0/single_include/catch.hpp b/src/Catch-1.10.0/single_include/catch.hpp
+--- a/src/Catch-1.10.0/single_include/catch.hpp	2021-07-05 07:30:43.000000000 -0500
++++ b/src/Catch-1.10.0/single_include/catch.hpp	2021-12-17 01:34:41.000000000 -0600
+@@ -6447,6 +6447,14 @@
+ 
+ #  else // CATCH_CONFIG_POSIX_SIGNALS is defined
+ 
++#    if defined(_SC_SIGSTKSZ_SOURCE) || defined(_GNU_SOURCE)
++// on glibc > 2.33 this is no longer constant, see
++// https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=85e84fe53699fe9e392edffa993612ce08b2954a;hb=HEAD
++static constexpr std::size_t sigStackSize = 32768;
++#    else
++static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
++#    endif
++
+ #include <signal.h>
+ 
+ namespace Catch {
+@@ -6470,7 +6478,7 @@
+         static bool isSet;
+         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+         static stack_t oldSigStack;
+-        static char altStackMem[SIGSTKSZ];
++        static char altStackMem[sigStackSize];
+ 
+         static void handleSignal( int sig ) {
+             std::string name = "<unknown signal>";
+@@ -6490,7 +6498,7 @@
+             isSet = true;
+             stack_t sigStack;
+             sigStack.ss_sp = altStackMem;
+-            sigStack.ss_size = SIGSTKSZ;
++            sigStack.ss_size = sigStackSize;
+             sigStack.ss_flags = 0;
+             sigaltstack(&sigStack, &oldSigStack);
+             struct sigaction sa = { 0 };
+@@ -6521,7 +6529,7 @@
+     bool FatalConditionHandler::isSet = false;
+     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+     stack_t FatalConditionHandler::oldSigStack = {};
+-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+ 
+ } // namespace Catch
+ 
diff --git a/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild b/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild
new file mode 100644
index 000000000000..3a12d519ae1c
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 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 ~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
+	cd "${BUILD_DIR}"
+	eapply "${FILESDIR}"/${P}-SIGSTKSZ.patch
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
+}
+
+src_install() {
+	cmake_src_install
+}