diff options
Diffstat (limited to 'net-libs/cppzmq')
| -rw-r--r-- | net-libs/cppzmq/Manifest | 6 | ||||
| -rw-r--r-- | net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild | 28 | ||||
| -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 |
5 files changed, 111 insertions, 30 deletions
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest index a5ba211010aa..f474a8ee3488 100644 --- a/net-libs/cppzmq/Manifest +++ b/net-libs/cppzmq/Manifest @@ -1,5 +1,7 @@ -DIST cppzmq-0_pre130717.tar.xz 3736 BLAKE2B ae894bd4436c9e4a4597d90c9ab2b06543ba51c847f6e2c0b655108e592e7c2c12f888e57a31e90f94f5f635d2c164c46bab5a73a305787c2f3a1ee32694927f SHA512 3dbff2d3c1cc9f40b58477d2654cd1af4b639c71ca332dd6bcf33cce3d420a2c9e56312c0824bbccc6cea721b5688f8ec255180aace898dca57eb98a8d40c142 +AUX cppzmq-disable-static.patch 1063 BLAKE2B 4361fed647857fecb98450a6dac6f46322bc960e624fa4ea85074c3c3d976f96c660697b5e21a465e778df20ef20d9490f04c6b2d66631fb00add199824a1032 SHA512 c5770c4b053b025ec205554b0d780d2f2c26b99c0111920b6990400270c896135391035e815ce14c7bb61e44180ed4242b36b95e42b5617637a2fea5d35e2d4f +AUX cppzmq-use-system-catch2.patch 784 BLAKE2B 15ad4fe99048651d9b1f00fb43e1da428e484f985f480d13011c75f0a2c9287ee7cc92225d1e2e44d39c21fb182bfd1189dcf7593212aaf988f015333fd0f57f SHA512 fa0ed955260c7902427f57f13781c9048754551b9b84cd77ee43454e1040ecc1dc6aa8f786d23432a81b74f1c7c34681a023998474562533159e8225f316cf43 DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B 80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3 SHA512 d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe -EBUILD cppzmq-0_pre130717-r1.ebuild 662 BLAKE2B 9328c3545534f960fcb499865f32803ce3bc3ea33f70738e29683c2c0ca12099e958b35dc1709a8bd79a361b57065a3bfc2a825421716f9708219caf1a0cc3b8 SHA512 7e50eb1243161ecc53f1c46cb5742cc18e57818f4f8cc81a2063db692d05928fe72ccec51e0b166aba3298676d7709940342e8959aa1094cd2ff199d409f1882 +DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B 282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0 SHA512 f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027 EBUILD cppzmq-0_pre150606.ebuild 664 BLAKE2B a782f9142c209224fde2b68505866e0901e7bed600cd0df3ff572aafd88b31b2aab08c9bc30ad2653d3ca1d61d56dc2b0912a85032370eadb48636b1502ce6d4 SHA512 9cc680f474dd763f3718d2d72d59f58215b8e058b7899fb3be2eb6bba79c05c5255f401407c1e97ac91a5bcb2ba7c7ee9ec5bd056a36b12993588f8f815445cc +EBUILD cppzmq-4.6.0.ebuild 1014 BLAKE2B 4c2c241abf6087dbffd9edb7588fa20cff52f21739becb9babe6edd65e3c2f34da20dc6cd11d6c9d03dadd4df631f8cffddc151076ffe623c4e00855a40e9a33 SHA512 8da33a0453425d20f009900b310ecc4a0a64be387c7f14255fad177c2f01d328a8bac5f8dd9d3b78501bbdf88a9d6ffefc9285e23a4bb8b441993f2c0c262dab MISC metadata.xml 341 BLAKE2B cebd14f5acb08924cfe8941e5ca4c5ff7894e2d52e5f8dbb9a9d648681b6dc7b68b6949e19497fdf34af84eff780e8b52e282d4b5eb48bc110e18f5538eee84c SHA512 20bc14d462ee04fe3bce142640dacf724ff8970bb23e71f97bad89a2837cd0184d77304f34faa8780436c1824d458433d4b0ad644150234d7b11be094963131b diff --git a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild b/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild deleted file mode 100644 index e4e77133a7d0..000000000000 --- a/net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="High-level CPP Binding for ZeroMQ" -HOMEPAGE="https://github.com/zeromq/cppzmq" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -SLOT="0" -LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=net-libs/zeromq-3" -DEPEND="" - -src_install() { - doheader zmq.hpp - dodoc README -} - -src_test() { - $(tc-getCC) -c ./zmq.hpp -L ./.libs/ -I ./include/ -o ./test.o || die "This version of cppzmq is not compatible with the installed version of net-libs/zeromq" - rm -f ./test.o -} diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild b/net-libs/cppzmq/cppzmq-4.6.0.ebuild new file mode 100644 index 000000000000..477975337ae1 --- /dev/null +++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 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 ~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 new file mode 100644 index 000000000000..12b1c2231205 --- /dev/null +++ b/net-libs/cppzmq/files/cppzmq-disable-static.patch @@ -0,0 +1,35 @@ +--- 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 new file mode 100644 index 000000000000..b15b9172ad43 --- /dev/null +++ b/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch @@ -0,0 +1,27 @@ +--- 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 |