commit: 2ccddfc03f756ab883d78f15949f282de814dbb6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 17 19:01:55 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 25 19:50:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ccddfc0
dev-libs/leatherman: treeclean Closes: https://bugs.gentoo.org/957238 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/leatherman/Manifest | 1 - .../leatherman/files/1.12.2-shared_nowide.patch | 108 --------------------- .../files/portage-sandbox-test-fix.patch | 38 -------- dev-libs/leatherman/leatherman-1.12.13.ebuild | 56 ----------- dev-libs/leatherman/metadata.xml | 11 --- profiles/package.mask | 1 - 6 files changed, 215 deletions(-) diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest deleted file mode 100644 index 57951b826a30..000000000000 --- a/dev-libs/leatherman/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST leatherman-1.12.13.tar.gz 818810 BLAKE2B 3caf99e7a266703e4c84797ecdb5f4006474c5bc7014dee2dddcbf51ec38c0337027c8ee49c52a54d68450abf57605a8482b52d6a63a0fe5f4eeb554adea90c7 SHA512 5d45036839270690f8f6649ea82d3800eec89a6fff92416a2e9831a177a1ddd6b42a33bc8af94a410c65c768c962b5fafc696f579f3de411b41cb5ae88b1372f diff --git a/dev-libs/leatherman/files/1.12.2-shared_nowide.patch b/dev-libs/leatherman/files/1.12.2-shared_nowide.patch deleted file mode 100644 index bac6fe7eb2dc..000000000000 --- a/dev-libs/leatherman/files/1.12.2-shared_nowide.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt -index ff9dba6..5d1b9ce 100644 ---- a/nowide/CMakeLists.txt -+++ b/nowide/CMakeLists.txt -@@ -1,7 +1,5 @@ - find_package(Boost 1.54 REQUIRED) - --add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include") --add_leatherman_headers(../vendor/nowide/include/boost) - if(WIN32) - add_leatherman_library(../vendor/nowide/src/iostream.cpp) - endif() ---- leatherman-1.10.0/execution/CMakeLists.txt~ 2020-06-03 10:30:05.027479897 +0100 -+++ leatherman-1.10.0/execution/CMakeLists.txt 2020-06-03 10:30:18.871483297 +0100 -@@ -1,4 +1,4 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) -+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") -@@ -10,7 +10,6 @@ - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - - leatherman_dependency(util) --leatherman_dependency(nowide) - leatherman_dependency(locale) - leatherman_dependency(logging) - leatherman_dependency(file_util) ---- leatherman-1.10.0/file_util/CMakeLists.txt~ 2020-06-03 10:30:05.031479898 +0100 -+++ leatherman-1.10.0/file_util/CMakeLists.txt 2020-06-03 10:31:04.550494516 +0100 -@@ -1,9 +1,8 @@ --find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) -+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) - - add_leatherman_deps("${Boost_LIBRARIES}") - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) - leatherman_dependency(locale) - leatherman_dependency(logging) - leatherman_dependency(util) ---- leatherman-1.10.0/logging/CMakeLists.txt~ 2020-06-03 10:30:05.035479898 +0100 -+++ leatherman-1.10.0/logging/CMakeLists.txt 2020-06-03 10:30:19.092483352 +0100 -@@ -4,7 +4,6 @@ - add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) - leatherman_dependency(locale) - - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") ---- leatherman-1.10.0/tests/CMakeLists.txt~ 2020-06-02 23:24:17.146002133 +0100 -+++ leatherman-1.10.0/tests/CMakeLists.txt 2020-06-02 23:26:17.780054923 +0100 -@@ -1,8 +1,8 @@ --set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex) -+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide) - if (LEATHERMAN_USE_LOCALES) - set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale) - endif() --find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) -+find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - - include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS}) - add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS}) ---- leatherman-1.10.0/util/CMakeLists.txt~ 2020-06-03 10:05:44.277172451 +0100 -+++ leatherman-1.10.0/util/CMakeLists.txt 2020-06-03 10:06:52.969185017 +0100 -@@ -1,10 +1,8 @@ --find_package(Boost 1.54 REQUIRED date_time chrono system) -+find_package(Boost 1.73 REQUIRED date_time chrono system nowide) - - add_leatherman_deps(${Boost_LIBRARIES}) - add_leatherman_includes("${Boost_INCLUDE_DIRS}") - --leatherman_dependency(nowide) -- - if(WIN32) - set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") - set(PLATFORM_TESTS "tests/windows/environment.cc") ---- leatherman-1.10.0/file_util/src/file.cc~ 2019-12-14 20:46:29.000000000 +0000 -+++ leatherman-1.10.0/file_util/src/file.cc 2020-06-02 22:42:45.100963441 +0100 -@@ -1,6 +1,6 @@ - #include <leatherman/file_util/file.hpp> - #include <boost/nowide/fstream.hpp> --#include <boost/nowide/cenv.hpp> -+#include <boost/nowide/cstdlib.hpp> - #include <boost/filesystem.hpp> - #include <sstream> - #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,6 @@ - #include <leatherman/util/environment.hpp> --#include <boost/nowide/cenv.hpp> -+#include <boost/nowide/cstdlib.hpp> -+#include <boost/system/error_code.hpp> - #include <stdexcept> - - using namespace std; ---- leatherman-1.10.0/util/tests/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 -+++ leatherman-1.10.0/util/tests/environment.cc 2020-06-02 22:42:45.103963442 +0100 -@@ -1,6 +1,6 @@ - #include <catch.hpp> - #include <leatherman/util/environment.hpp> --#include <boost/nowide/cenv.hpp> -+#include <boost/nowide/cstdlib.hpp> - - using namespace std; - using namespace leatherman::util; diff --git a/dev-libs/leatherman/files/portage-sandbox-test-fix.patch b/dev-libs/leatherman/files/portage-sandbox-test-fix.patch deleted file mode 100644 index 584bb229c051..000000000000 --- a/dev-libs/leatherman/files/portage-sandbox-test-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/execution/tests/posix/execution.cc 2017-07-20 13:38:22.166185428 -0500 -+++ b/execution/tests/posix/execution.cc 2017-07-20 13:59:51.549316930 -0500 -@@ -178,7 +178,7 @@ - REQUIRE(exec.exit_code == 0); - auto variables = get_variables(exec.output); - THEN("the child environment should only contain the given variables") { -- REQUIRE(variables.size() == 4u); -+ REQUIRE(variables.size() == 15u); - REQUIRE(variables.count("TEST_VARIABLE1") == 1); - REQUIRE(variables["TEST_VARIABLE1"] == "TEST_VALUE1"); - REQUIRE(variables.count("TEST_VARIABLE1") == 1); -@@ -212,7 +212,7 @@ - REQUIRE(exec.exit_code == 0); - auto variables = get_variables(exec.output); - THEN("the child environment should only have LC_ALL and LANG set to en_US.UTF-8") { -- REQUIRE(variables.size() == 2u); -+ REQUIRE(variables.size() == 13u); - REQUIRE(variables.count("LC_ALL") == 1); - REQUIRE(variables["LC_ALL"] == "en_US.UTF-8"); - REQUIRE(variables.count("LANG") == 1); -@@ -229,7 +229,7 @@ - auto variables = get_variables(exec.output); - CAPTURE(exec.output); - THEN("the child environment should not have LC_ALL and LANG set") { -- REQUIRE(variables.empty()); -+ REQUIRE(variables.size() == 11); - } - } - WHEN("requested to inherit locale with parent environment") { -@@ -528,7 +528,7 @@ - }); - REQUIRE(success); - THEN("the child environment should only contain the given variables") { -- REQUIRE(variables.size() == 4u); -+ REQUIRE(variables.size() == 15u); - REQUIRE(variables.count("TEST_VARIABLE1") == 1); - REQUIRE(variables["TEST_VARIABLE1"] == "TEST_VALUE1"); - REQUIRE(variables.count("TEST_VARIABLE1") == 1); diff --git a/dev-libs/leatherman/leatherman-1.12.13.ebuild b/dev-libs/leatherman/leatherman-1.12.13.ebuild deleted file mode 100644 index 8fe5106e4099..000000000000 --- a/dev-libs/leatherman/leatherman-1.12.13.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2025 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 ~riscv ~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:=[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 -} diff --git a/dev-libs/leatherman/metadata.xml b/dev-libs/leatherman/metadata.xml deleted file mode 100644 index cd2a3e5c1221..000000000000 --- a/dev-libs/leatherman/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Matthew Thode</name> - </maintainer> - <upstream> - <remote-id type="github">puppetlabs/leatherman</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 48a03dd5e174..24e58400722e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -231,7 +231,6 @@ dev-libs/redis-ipc # If you need them, raise your hand by doing the necessary EAPI-8 porting. # Bugs #957225, #957238. Removal on 2025-09-26. dev-cpp/cpp-hocon -dev-libs/leatherman # Andreas Sturmlechner <[email protected]> (2025-08-27) # Qt5 based and still EAPI-7, last release from 2016, broken Qt6 "support"
