From ba7ddc14024195bccdab546b4392ad5531485335 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Tue, 20 Oct 2020 15:44:00 -0500 Subject: dev-libs/leatherman: 1.12.2 bump Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Matthew Thode --- dev-libs/leatherman/Manifest | 1 + .../leatherman/files/1.12.2-shared_nowide.patch | 108 +++++++++++++++++++++ dev-libs/leatherman/leatherman-1.12.2.ebuild | 61 ++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 dev-libs/leatherman/files/1.12.2-shared_nowide.patch create mode 100644 dev-libs/leatherman/leatherman-1.12.2.ebuild diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 8d3637dc9612..163f321decee 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,4 +1,5 @@ DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c764bbfb223357b14a6a3f864ff614d178e7a71293eb533f09013fe3f64d5afe40c9404882d2fe6836da7322e869d8f SHA512 0cbc558ba6976d4f14947efbc59e2ebc306a8c7e4590a22fa2e2f044b37ffd8804dbabaf96c599c47394fd9379f2de1330ce5282237b5009730d8d3b87349ae5 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2 DIST leatherman-1.12.1.tar.gz 816002 BLAKE2B 286bbc24971b2769c8fae73a274b05ce34ad5469f8647681869cecf133f2c3d9c9fab75327fd610aa8957c359baed645c221aa0670789a0f75888f624ea473a7 SHA512 d2bb2b9aab2749df61fb29e984a9058165851c0d4dce45efb102673dbb2e7b56d12005db106f967a6e5ad93b37ea7f7ed88337bf41ffb503db8b2152c87151ad +DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b diff --git a/dev-libs/leatherman/files/1.12.2-shared_nowide.patch b/dev-libs/leatherman/files/1.12.2-shared_nowide.patch new file mode 100644 index 000000000000..bac6fe7eb2dc --- /dev/null +++ b/dev-libs/leatherman/files/1.12.2-shared_nowide.patch @@ -0,0 +1,108 @@ +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 + #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.2.ebuild b/dev-libs/leatherman/leatherman-1.12.2.ebuild new file mode 100644 index 000000000000..37b42a9bc12b --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.2.ebuild @@ -0,0 +1,61 @@ +# 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 )" +RESTRICT="test" # restricted til we don't need the shared_nowide patch +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}/${PV}"-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