diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-20 21:05:35 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-20 23:31:02 +0100 |
commit | 572dcd65b441136ad462d2d8b9651aa791ba6dac (patch) | |
tree | d2be91af05ab21b9fcd4ead0a793284a93b2358b /net-libs | |
parent | media-libs/libmatroska: drop 1.6.3 (diff) | |
download | gentoo-572dcd65b441136ad462d2d8b9651aa791ba6dac.tar.gz gentoo-572dcd65b441136ad462d2d8b9651aa791ba6dac.tar.bz2 gentoo-572dcd65b441136ad462d2d8b9651aa791ba6dac.zip |
net-libs/cppzmq: drop 4.6.0
Closes: https://bugs.gentoo.org/887527
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/cppzmq/Manifest | 1 | ||||
-rw-r--r-- | net-libs/cppzmq/cppzmq-4.6.0.ebuild | 45 | ||||
-rw-r--r-- | net-libs/cppzmq/files/cppzmq-disable-static.patch | 35 | ||||
-rw-r--r-- | net-libs/cppzmq/files/cppzmq-use-system-catch2.patch | 27 |
4 files changed, 0 insertions, 108 deletions
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest index 3a3ccc22362a..a146c041ae14 100644 --- a/net-libs/cppzmq/Manifest +++ b/net-libs/cppzmq/Manifest @@ -1,2 +1 @@ -DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027 DIST cppzmq-4.9.0.tar.gz 46936 BLAKE2B 230c5a983fb902bdf880b1b0464033a389c500cae635b501275cc3df0980765bd48c1e1a1bb4e1a3d49b1fe63648d77feebc39a7f35c0474bfdc7e2e918c920f SHA512 a9d1c25084b5b84dfa20a005299213c3bb610e46ac7433236fd8d3c60c7e71153c738da4645343080c0d1cad9008aca1a3091d4247c7a2f08c506ed3054d55a7 diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild deleted file mode 100644 index 48351df3d3b6..000000000000 --- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="High-level CPP Binding for ZeroMQ" -HOMEPAGE="https://github.com/zeromq/cppzmq" -SRC_URI="https://github.com/zeromq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux" - -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=net-libs/zeromq-4.3.1" -# Tests require cmake modules from catch2 and headers from older version of catch -DEPEND="${RDEPEND} - test? ( >=dev-cpp/catch-2.5.0 - <dev-cpp/catch-2 - )" - -PATCHES=( - "${FILESDIR}/${PN}-disable-static.patch" - "${FILESDIR}/${PN}-use-system-catch2.patch" -) - -src_configure() { - local mycmakeargs=( - -DCPPZMQ_CMAKECONFIG_INSTALL_DIR="/usr/$(get_libdir)/cmake/${PN}/" - -DCPPZMQ_BUILD_TESTS="$(usex test)" - ) - if has_version -d '>=net-libs/zeromq-4.3.1[drafts]'; then - mycmakeargs+=( -DENABLE_DRAFTS=on ) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - einstalldocs -} diff --git a/net-libs/cppzmq/files/cppzmq-disable-static.patch b/net-libs/cppzmq/files/cppzmq-disable-static.patch deleted file mode 100644 index 12b1c2231205..000000000000 --- a/net-libs/cppzmq/files/cppzmq-disable-static.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ - message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config") - endif() - --if (ZeroMQ_FOUND AND (NOT TARGET libzmq OR NOT TARGET libzmq-static)) -+if (ZeroMQ_FOUND AND NOT TARGET libzmq) - message(FATAL_ERROR "ZeroMQ version not supported!") - endif() - -@@ -43,19 +43,20 @@ - zmq_addon.hpp - ) - --foreach (target cppzmq cppzmq-static) -+set (cppzmq_targets cppzmq cppzmq-static) -+ -+foreach (target ${cppzmq_targets}) - add_library(${target} INTERFACE) - target_include_directories(${target} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include>) - endforeach() - - target_link_libraries(cppzmq INTERFACE libzmq) --target_link_libraries(cppzmq-static INTERFACE libzmq-static) - - include(GNUInstallDirs) - include(CMakePackageConfigHelpers) - --install(TARGETS cppzmq cppzmq-static -+install(TARGETS ${cppzmq_targets} - EXPORT ${PROJECT_NAME}-targets) - - install(FILES ${CPPZMQ_HEADERS} diff --git a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch b/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch deleted file mode 100644 index b15b9172ad43..000000000000 --- a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -9,9 +9,10 @@ - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) - -+find_package(Catch2 REQUIRED) - include(CTest) --include(cmake/catch.cmake) --include(${CATCH_MODULE_PATH}/Catch.cmake) -+include(Catch) -+find_path(CATCH_INCLUDE_DIR "catch.hpp" HINT /usr/include/catch/) - - find_package(Threads) - -@@ -31,9 +32,9 @@ - utilities.cpp - ) - --add_dependencies(unit_tests catch) -+add_dependencies(unit_tests Catch2::Catch2) - --target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH}) -+target_include_directories(unit_tests PUBLIC ${CATCH_INCLUDE_DIR}) - target_link_libraries( - unit_tests - PRIVATE cppzmq |