[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/, net-libs/cppzmq/files/
commit: 572dcd65b441136ad462d2d8b9651aa791ba6dac
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 20 20:05:35 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 20 22:31:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572dcd65
net-libs/cppzmq: drop 4.6.0
Closes: https://bugs.gentoo.org/887527
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-libs/cppzmq/Manifest | 1 -
net-libs/cppzmq/cppzmq-4.6.0.ebuild| 45 --
net-libs/cppzmq/files/cppzmq-disable-static.patch | 35 -
.../cppzmq/files/cppzmq-use-system-catch2.patch| 27 -
4 files changed, 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..
--- 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
- =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..
--- 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
$
- $)
- 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..
--- 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
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: f49c33f65a130673ea5b1f8a4506221b6030b53e
Author: Sam James gentoo org>
AuthorDate: Tue Dec 20 20:00:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 20 20:00:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f49c33f6
net-libs/cppzmq: Stabilize 4.9.0 x86, #887527
Signed-off-by: Sam James gentoo.org>
net-libs/cppzmq/cppzmq-4.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/cppzmq/cppzmq-4.9.0.ebuild
b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
index 1cf6afcb3d30..9b9a439919d5 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 )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: d8bd8b97b48e112b79c423bbd8f6ad25c48c0d26
Author: Sam James gentoo org>
AuthorDate: Tue Dec 20 20:00:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 20 20:00:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8bd8b97
net-libs/cppzmq: Stabilize 4.9.0 amd64, #887527
Signed-off-by: Sam James gentoo.org>
net-libs/cppzmq/cppzmq-4.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/cppzmq/cppzmq-4.9.0.ebuild
b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
index 9b9a439919d5..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 )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/, net-libs/cppzmq/files/
commit: 9e74b3947d088a9d0fedc61bc1aa2f4d5763a5a1
Author: David Roman gmail com>
AuthorDate: Mon Nov 21 10:30:55 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon Nov 21 14:18:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e74b394
net-libs/cppzmq: add 4.9.0
Signed-off-by: David Roman gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28363
Signed-off-by: Andrew Ammerlaan gentoo.org>
net-libs/cppzmq/Manifest | 1 +
net-libs/cppzmq/cppzmq-4.9.0.ebuild| 37 ++
.../cppzmq/files/cppzmq-4.9.0-disable-static.patch | 21
3 files changed, 59 insertions(+)
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index c871669859bc..3a3ccc22362a 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1 +1,2 @@
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.9.0.ebuild
b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
new file mode 100644
index ..1cf6afcb3d30
--- /dev/null
+++ b/net-libs/cppzmq/cppzmq-4.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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* )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disable-static.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
+}
diff --git a/net-libs/cppzmq/files/cppzmq-4.9.0-disable-static.patch
b/net-libs/cppzmq/files/cppzmq-4.9.0-disable-static.patch
new file mode 100644
index ..d34893a60f05
--- /dev/null
+++ b/net-libs/cppzmq/files/cppzmq-4.9.0-disable-static.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 05001ad..c640fd7 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -21,7 +21,7 @@ if (NOT TARGET libzmq AND NOT TARGET libzmq-static)
+ 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 TARGET libzmq-static))
++ if (ZeroMQ_FOUND AND NOT TARGET libzmq)
+ message(FATAL_ERROR "ZeroMQ version not supported!")
+ endif()
+ endif()
+@@ -52,7 +52,6 @@ foreach (target cppzmq cppzmq-static)
+ endforeach()
+
+ target_link_libraries(cppzmq INTERFACE libzmq)
+-target_link_libraries(cppzmq-static INTERFACE libzmq-static)
+
+ include(GNUInstallDirs)
+ include(CMakePackageConfigHelpers)
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: 1d58b92768fdd6460c7ca60ea20ffe998e8029a7
Author: Marek Szuba gentoo org>
AuthorDate: Sat Apr 30 15:52:11 2022 +
Commit: Marek Szuba gentoo org>
CommitDate: Sat Apr 30 15:53:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d58b927
net-libs/cppzmq: keyword 4.6.0 for ~riscv
Signed-off-by: Marek Szuba gentoo.org>
net-libs/cppzmq/cppzmq-4.6.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 8ac687bd6ab7..48351df3d3b6 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: acd2a6ecf06d88f8c0a0e2cc0beb165746b1b5ce
Author: David Seifert gentoo org>
AuthorDate: Sun Nov 29 09:55:36 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Nov 29 09:55:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd2a6ec
net-libs/cppzmq: Remove old
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: David Seifert gentoo.org>
net-libs/cppzmq/Manifest | 1 -
net-libs/cppzmq/cppzmq-0_pre150606.ebuild | 28
2 files changed, 29 deletions(-)
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index 7bf6243468d..c871669859b 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1,2 +1 @@
-DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B
80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3
SHA512
d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B
282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0
SHA512
f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
diff --git a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
b/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
deleted file mode 100644
index 09045e0d47e..000
--- a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~arm64 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
-}
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: 235056daa00fe490caf5085bffa5a427a317becb
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Nov 29 08:12:54 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Nov 29 08:12:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235056da
net-libs/cppzmq: amd64 stable wrt bug #757180
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-libs/cppzmq/cppzmq-4.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index d5656c9ebac..8ac687bd6ab 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.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 x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: 7d1abe3aca2c7565908af5b9a02262db8f25521b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Nov 27 16:43:53 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Nov 27 16:43:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d1abe3a
net-libs/cppzmq: x86 stable (bug #757180)
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
net-libs/cppzmq/cppzmq-4.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 9929c655b61..d5656c9ebac 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.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 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: 73e05596ba80ac128e50b78f1ff6a7a76747ca4c
Author: Sam James (sam_c) cmpct info>
AuthorDate: Sat Jun 27 22:06:56 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jun 29 06:33:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e05596
net-libs/cppzmq: arm keyworded (bug #727560)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) cmpct.info>
Signed-off-by: Michał Górny gentoo.org>
net-libs/cppzmq/cppzmq-4.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
b/net-libs/cppzmq/cppzmq-4.6.0.ebuild
index 477975337ae..a9d24c47068 100644
--- a/net-libs/cppzmq/cppzmq-4.6.0.ebuild
+++ b/net-libs/cppzmq/cppzmq-4.6.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 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: ded871264d0254a5f7e38045f10d0261d5fb7f46
Author: Konstantin Podshumok gmail com>
AuthorDate: Mon May 18 15:10:58 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jun 8 17:56:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded87126
net-libs/cppzmq: drop old
Bug: https://bugs.gentoo.org/634076
Signed-off-by: Konstantin Podshumok gmail.com>
Signed-off-by: Michał Górny gentoo.org>
net-libs/cppzmq/Manifest | 1 -
net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild | 28
2 files changed, 29 deletions(-)
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index 278b8a7d224..cc3967202d1 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1,2 +1 @@
-DIST cppzmq-0_pre130717.tar.xz 3736 BLAKE2B
ae894bd4436c9e4a4597d90c9ab2b06543ba51c847f6e2c0b655108e592e7c2c12f888e57a31e90f94f5f635d2c164c46bab5a73a305787c2f3a1ee32694927f
SHA512
3dbff2d3c1cc9f40b58477d2654cd1af4b639c71ca332dd6bcf33cce3d420a2c9e56312c0824bbccc6cea721b5688f8ec255180aace898dca57eb98a8d40c142
DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B
80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3
SHA512
d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
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 e4e77133a7d..000
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/files/, net-libs/cppzmq/
commit: fca729a33472e3af4d8d54acedfe6a7da3f70640
Author: Konstantin Podshumok gmail com>
AuthorDate: Mon May 18 17:47:20 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Jun 8 17:56:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca729a3
net-libs/cppzmq: bump v4.6.0, add tests
Closes: https://bugs.gentoo.org/634076
Closes: https://github.com/gentoo/gentoo/pull/15868
Signed-off-by: Konstantin Podshumok gmail.com>
Signed-off-by: Michał Górny gentoo.org>
net-libs/cppzmq/Manifest | 1 +
net-libs/cppzmq/cppzmq-4.6.0.ebuild| 45 ++
net-libs/cppzmq/files/cppzmq-disable-static.patch | 35 +
.../cppzmq/files/cppzmq-use-system-catch2.patch| 27 +
4 files changed, 108 insertions(+)
diff --git a/net-libs/cppzmq/Manifest b/net-libs/cppzmq/Manifest
index cc3967202d1..7bf6243468d 100644
--- a/net-libs/cppzmq/Manifest
+++ b/net-libs/cppzmq/Manifest
@@ -1 +1,2 @@
DIST cppzmq-0_pre150606.tar.xz 4032 BLAKE2B
80918dc148d22a4ddced41bd9dbec2a39f5d69d73724177b186fda490b899ed7dbeaa5aa67a348411b5a34948b167f8def6dfe688a9facd2d56ca6fe41df32d3
SHA512
d5ab584989f0eec7ce227de4534820f6e00582b8f45ebab5472c8244823a14a89e74005edb8ae933037a1df9684cc21641cd271a147f39577331b96474927efe
+DIST cppzmq-4.6.0.tar.gz 35078 BLAKE2B
282cc8db524eb76a35835db12ae1d5f18d7729149979afb9e7a364497b8fb1db1f65b4df5c0aa905440e260cc797d45e839fc61694560cf60c20f855e34eb2c0
SHA512
f30b37c970790de2684086638084e65310396072c1c1d00415c9a36b7ef6d79fe500ce174fddab699a602a80341e2fb7f309dec2eb96252531b5ca5cf7ac5027
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 000..477975337ae
--- /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
+ =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 000..12b1c223120
--- /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
$
+ $)
+ 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 000..b15b9172ad4
--- /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(
+
[gentoo-commits] repo/gentoo:master commit in: net-libs/cppzmq/
commit: 67d48ad7eb13ab6b58b12cac9c33818fe1094f5f
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Feb 6 13:13:55 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Feb 6 15:09:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d48ad7
net-libs/cppzmq: x86 stable (bug #579052)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-libs/cppzmq/cppzmq-0_pre150606.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
b/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
index fd690b68cd0..a1d5fd9c531 100644
--- a/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
+++ b/net-libs/cppzmq/cppzmq-0_pre150606.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz;
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=net-libs/zeromq-3"
