From 6c8694a707151d59555b0e4e48235f085ce166c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 Feb 2023 21:26:27 +0000 Subject: gentoo auto-resync : 07:02:2023 - 21:26:27 --- dev-libs/leatherman/Manifest | 3 - dev-libs/leatherman/files/shared_nowide.patch | 108 -------------------------- dev-libs/leatherman/leatherman-1.12.8.ebuild | 56 ------------- 3 files changed, 167 deletions(-) delete mode 100644 dev-libs/leatherman/files/shared_nowide.patch delete mode 100644 dev-libs/leatherman/leatherman-1.12.8.ebuild (limited to 'dev-libs/leatherman') diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 5c1a0a583606..c9f5ec957d89 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,8 +1,5 @@ AUX 1.12.2-shared_nowide.patch 4647 BLAKE2B 602e72f4265a803b715b8605c1dee3ccec9c876c7d5d50208a4cf9c1e6ad277370cb110707404d52a24b53cdbb017b5d2fc9bbecb37f69eaacd10d9d892c4a25 SHA512 1f95d6e0ac1000d2eb8cdfee6184ca74d2bb96a9dec50cdd1539cb7e3060decbf1e4863fa2594ce1cf3405b1edf270b94b82f1c9ca79aaeb6f32f11d10c7eece AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2 -AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486 -DIST leatherman-1.12.8.tar.gz 815817 BLAKE2B b0844527a470c0e54983d49abc84a7331a07f3cac76919f56e58a01d60b794e422f3ef8342e046c483a83c428d2c80ff8e8d6b71375f45ddb03a5721e63c7aef SHA512 c6096a7c0e95fb43c6998f26e8f28157f46b78af4eaf2caaa1caae832d2f23aa7591e3a29a17f24bc9b993421645d37d44249fd8cae15a3d18b40d614acd23ad DIST leatherman-1.12.9.tar.gz 816107 BLAKE2B 1c2e50767585a30da40fdacde0aa8655cefc2a41cadd24a7689be5da0afcbe8627293d37780442873907996f01401b46340a3d7be5d9b2a65b2f87191daca6c3 SHA512 e69f2b0c04a1cbd20e097abcc020e7b27fb74f168207fcbcffce9fd0edd1760acc75d5c5f645d3a798f106e129ce73e512f0c11699733475b290dfc876de0565 -EBUILD leatherman-1.12.8.ebuild 1265 BLAKE2B fd240363bc78ddc11c796b2939ad4a4e3b9860bf4f75a0e78a8db284b90bd7d0803595758088b251a05a103a2f00e520f7c82708325b8a32bdd66b28f24b0367 SHA512 60a39204ad1f5a934407532f456008265b39299f1c0d29bb373a99fa279457de4f74cc9841c20fe13848918e4add4e8f6612fd42aa2271626a5aa6392b90134b EBUILD leatherman-1.12.9.ebuild 1272 BLAKE2B 203a4934e6a2fc4d650e18b9098796b0b3c42127c0bb289b14748d6cdbe308fc4172b053640b4c75b7141a1fcf08b79ca6285be148b5297917dc0a16b42fadc1 SHA512 616ba5f626163adeab958343ddc1d7c11473fe898b6a841d0a6b3a8d878baf084f3fee80d2721c99815e84fb4da3aa6b8fd46e0a2e2a16ae38d6987835816eb7 MISC metadata.xml 341 BLAKE2B 63e2c407d9e7f5dfcf324cba650e46ae440f9b365645b5bb51f943c3d003ce9a94522d512667879b1d4a22ba71b9ddce560606e52f5b6cdb84677d2a4efbba6e SHA512 5b2e4f0b7aa914686915312fe957f40ece7701168775e160730c76975af52530ad2d95595ab8c6b410470a0cd2ea11e3bdf2a9fd78d0926a6cbcc2628ff275d2 diff --git a/dev-libs/leatherman/files/shared_nowide.patch b/dev-libs/leatherman/files/shared_nowide.patch deleted file mode 100644 index 4f5f67045fb6..000000000000 --- a/dev-libs/leatherman/files/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 - #include --#include -+#include - #include - #include - #include ---- 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 --#include -+#include -+#include - - 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 - #include --#include -+#include - - using namespace std; - using namespace leatherman::util; diff --git a/dev-libs/leatherman/leatherman-1.12.8.ebuild b/dev-libs/leatherman/leatherman-1.12.8.ebuild deleted file mode 100644 index 06e7e264bf51..000000000000 --- a/dev-libs/leatherman/leatherman-1.12.8.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# 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:=[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 -} -- cgit v1.2.3