gentoo auto-resync : 21:12:2022 - 01:52:55

5 files changed, 2 insertions, 113 deletions

diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index 380aac6598df..52c1d4aaf7c0 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1,8 +1,4 @@
 AUX cppzmq-4.9.0-disable-static.patch 731 BLAKE2B 15a1a8b688b0449e98e0ac10aa1f150ca7eed30ac6a24507496a85deb50b8e31d9e8f005f97454e77c317faefa96997827a579d8e2adbcb3b671617c39bff3db SHA512 11d106f8df432b1be041cbc66a990eb09eeed7cb39c128419749b8b8d854b0d2d83a6eb179571d22dc06e306dd9b18abfe9ac17665275646090ec570ab0e944a
-AUX cppzmq-disable-static.patch 1063 BLAKE2B 4361fed647857fecb98450a6dac6f46322bc960e624fa4ea85074c3c3d976f96c660697b5e21a465e778df20ef20d9490f04c6b2d66631fb00add199824a1032 SHA512 c5770c4b053b025ec205554b0d780d2f2c26b99c0111920b6990400270c896135391035e815ce14c7bb61e44180ed4242b36b95e42b5617637a2fea5d35e2d4f
-AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428e484f985f480d13011c75f0a2c9287ee7cc92225d1e2e44d39c21fb182bfd1189dcf7593212aaf988f015333fd0f57f SHA512 fa0ed955260c7902427f57f13781c9048754551b9b84cd77ee43454e1040ecc1dc6aa8f786d23432a81b74f1c7c34681a023998474562533159e8225f316cf43
-DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
 DIST cppzmq-4.9.0.tar.gz 46936 BLAKE2B 230c5a983fb902bdf880b1b0464033a389c500cae635b501275cc3df0980765bd48c1e1a1bb4e1a3d49b1fe63648d77feebc39a7f35c0474bfdc7e2e918c920f SHA512 a9d1c25084b5b84dfa20a005299213c3bb610e46ac7433236fd8d3c60c7e71153c738da4645343080c0d1cad9008aca1a3091d4247c7a2f08c506ed3054d55a7
-EBUILD cppzmq-4.6.0.ebuild 1031 BLAKE2B 57a0f80648816c8a03b488cb03414d5a6269708f634e64138c4be47b10de481b0f8ba99c3ac31df0c7a0ad4ceb7147b16a0c9a0192c07f893da6c8ff22d289e8 SHA512 014d046b2ff7b1b1ea497bcb107b0e33f9979af8f96eb0e5917d495b2ff558f2e1506c25b80496711e38a75789618f6c6be4430dee3f51692c10f795f5c146ec
-EBUILD cppzmq-4.9.0.ebuild 911 BLAKE2B c25c7d326e378f4740e3893808ccc1c4c1e672c97da6af107b13a149ba3e5465954c0df568e0acca7dbfddff6329b8f81f2839e52fec8c95679cbdf0d5ef66fb SHA512 8ef31604f9658c54cc59dd57e5d03234b2253028896260a9eb4157f332979a8d0de17e582e5c3f45a0a317d6e7b9728c148c3bca3ad544e56cdd3f9cdda3e734
+EBUILD cppzmq-4.9.0.ebuild 909 BLAKE2B 6756a012f93031e8c68d8a9162153c0b33513a05dbde5de5cce05c4c13b98191bbcd607c625f55fe91bc20e13809a1b69066c908dd5f8928eecdcc576e0df284 SHA512 05f2cb418fb10e031bdf1f3a12ae5369090952e2e18389dde332e8c4dba100a2a0e208780f5865d9d4fb5bfe3fdc03b92c3b29cb1115ce9d2512c7e8a11f9d32
 MISC metadata.xml 342 BLAKE2B 3f1f8953b404646ff1422274eb10abe3317e208d7bca49588f4fae0abd6f0cdd4aacbf7771ddbce132544a917491b99e75a8bdfedfea87b94f62035e6bf67589 SHA512 feedfe1b5e32d93b41f37b12339bff6a3878ea1a9269b4ccf73a8cee54f2387c4a260b8c01ad4c4d443eab155612a1b169fbf5cda38c2d9cd80d6d5385b6607e
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/cppzmq-4.9.0.ebuild b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
index 1cf6afcb3d30..2b4063863cad 100644
--- a/net-libs/cppzmq/cppzmq-4.9.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux"
 
 IUSE="test"
 RESTRICT="!test? ( test )"
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