diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-libs/leatherman | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-libs/leatherman')
-rw-r--r-- | dev-libs/leatherman/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/leatherman/files/shared_nowide.patch | 108 | ||||
-rw-r--r-- | dev-libs/leatherman/leatherman-1.12.1-r2.ebuild | 61 | ||||
-rw-r--r-- | dev-libs/leatherman/leatherman-1.12.1.ebuild | 65 |
4 files changed, 238 insertions, 0 deletions
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest index 06787a33b371..d0ec8bf4cb52 100644 --- a/dev-libs/leatherman/Manifest +++ b/dev-libs/leatherman/Manifest @@ -1,8 +1,12 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2 +AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486 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.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b EBUILD leatherman-1.11.0.ebuild 1147 BLAKE2B c267b48f61cc2aa9f9c20ba4359c6bfe32454992d3604a6f09840eea6f009917ffe189f6571749d1955f0376233a1094f154dc7a329c88ad22ffcced7e7004e9 SHA512 d39ca1b889b5cb42125f52ffdd510712914041e0ad66835ad16a452989acf5636c66154ae29528ceefbb801e72e8c8206e741872403977d5d0865d22a891671f EBUILD leatherman-1.12.0-r1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b +EBUILD leatherman-1.12.1-r2.ebuild 1327 BLAKE2B 005078e2c9134eb470c2bd653ccd34b7131427d0d86b95bae5117df553b19888f218083c48ab7f4a9892e54dcffa3e7a67030b2b449cb9a297041bfe39b938b4 SHA512 35e7561d08c736cdfea0990183888094521541df8c18a88e937fa6f9dbb23ef56cad91ce042e2b0fc83a9e0e98516abcb5f9affa539095559947a461fc42bc72 +EBUILD leatherman-1.12.1.ebuild 1493 BLAKE2B df12a29ba362646dba648b0208a8d96cb2b7f5766626a32020618fdac4bb903457ab7ab12c5f23ffdfe8cbc2599eee8a29914559f1015a2fcb41ac707e465370 SHA512 60bb18f8c4b580d64e49eb594fa321e06b3167b8bea9edc4d019e639964ff02fe7ab2329518b0c0ef26cfa5e93db1f994ea1da4ccde62cd947e86eb0780e605b EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 256d795d7d96de0cbdc2da569049d4a9378c25b440b364d79d3e2144b25b565ca729028a63a21e5f9493effb252daf7f38ce693a90e5b06eaf0aea24206cc829 SHA512 a2cde05565eb7eca2410f556d87f999e098f8e17ad51686d0225be193da2e3a367137630461564c51fb1cc0b8b429f912a0defbeec823e89e842187737c14b87 MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1 diff --git a/dev-libs/leatherman/files/shared_nowide.patch b/dev-libs/leatherman/files/shared_nowide.patch new file mode 100644 index 000000000000..4f5f67045fb6 --- /dev/null +++ b/dev-libs/leatherman/files/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 <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> + + 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/leatherman-1.12.1-r2.ebuild b/dev-libs/leatherman/leatherman-1.12.1-r2.ebuild new file mode 100644 index 000000000000..c432e0dcd956 --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.1-r2.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}"/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 +} diff --git a/dev-libs/leatherman/leatherman-1.12.1.ebuild b/dev-libs/leatherman/leatherman-1.12.1.ebuild new file mode 100644 index 000000000000..9a442087026a --- /dev/null +++ b/dev-libs/leatherman/leatherman-1.12.1.ebuild @@ -0,0 +1,65 @@ +# 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 )" +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 ) + +src_prepare() { + sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + # vendored boost lib conflicts with boost 1.73 and above + sed -i '/nowide/d' CMakeLists.txt + sed -i '/nowide/d' file_util/CMakeLists.txt || die + sed -i '/nowide/d' windows/CMakeLists.txt || die + sed -i '/nowide/d' execution/CMakeLists.txt || die + sed -i '/nowide/d' logging/CMakeLists.txt || die + sed -i '/nowide/d' util/CMakeLists.txt || die + 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 +} |