[gentoo-commits] repo/gentoo:master commit in: net-libs/zmqpp/, net-libs/zmqpp/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/zmqpp/, net-libs/zmqpp/files/

[Patrice Clement]

commit:     c668bef6158b10c416b42b9828b1ab918187b25d
Author:     Mathy Vanvoorden <mathy <AT> vanvoorden <DOT> be>
AuthorDate: Fri Dec  1 09:19:14 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 22:09:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c668bef6

net-libs/zmqpp: fix multilib-strict check failure.

Closes: https://github.com/gentoo/gentoo/pull/6368

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch | 15 +++++++++++++++
 net-libs/zmqpp/zmqpp-4.2.0.ebuild                      |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
new file mode 100644
index 00000000000..798c028396c
--- /dev/null
+++ b/net-libs/zmqpp/files/zmqpp-4.2.0-multilib-strict.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489916a..e6ca7d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -231,8 +231,8 @@ endif()
+ # -------
+ install(TARGETS ${INSTALL_TARGET_LIST}
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ install(DIRECTORY src/zmqpp DESTINATION include/
+         FILES_MATCHING PATTERN "*.hpp")

diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
index e60bfa0f62c..4eb86e192ea 100644
--- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild
+++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
@@ -23,6 +23,10 @@ IUSE="static-libs"
 DEPEND="net-libs/zeromq[static-libs?]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-multilib-strict.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DIS_TRAVIS_CI_BUILD=OFF

[gentoo-commits] repo/gentoo:master commit in: net-libs/zmqpp/, net-libs/zmqpp/files/

[Sam James]

commit:     c43578a484f9e5967c7f227bb700960edf8993f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 25 08:14:22 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 25 08:21:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43578a4

net-libs/zmqpp: wire up tests

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../zmqpp/files/zmqpp-4.2.0-boost-test-syntax.patch     | 11 +++++++++++
 net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild                    | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/net-libs/zmqpp/files/zmqpp-4.2.0-boost-test-syntax.patch b/net-libs/zmqpp/files/zmqpp-4.2.0-boost-test-syntax.patch
new file mode 100644
index 000000000000..3dc73e43fbeb
--- /dev/null
+++ b/net-libs/zmqpp/files/zmqpp-4.2.0-boost-test-syntax.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -223,7 +223,7 @@ if( ZMQPP_BUILD_TESTS )
+     src/tests/test_proxy.cpp
+     )
+   target_link_libraries( zmqpp-test-runner  ${LIB_TO_LINK_TO_EXAMPLES} ${Boost_LIBRARIES})
+-  add_test( zmqpp-test zmqpp-test-runner --log-level=test-suite )
++  add_test( zmqpp-test zmqpp-test-runner --log_level=test_suite )
+ endif()
+ 
+ 

diff --git a/net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild b/net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild
index 147cd25d9633..81b6308079fd 100644
--- a/net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild
+++ b/net-libs/zmqpp/zmqpp-4.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,19 +18,30 @@ HOMEPAGE="https://github.com/zeromq/zmqpp"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-IUSE="static-libs"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="net-libs/zeromq[static-libs?]"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-multilib-strict.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-multilib-strict.patch"
+	"${FILESDIR}/${PN}-4.2.0-boost-test-syntax.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
 		-DIS_TRAVIS_CI_BUILD=OFF
 		-DZMQPP_BUILD_SHARED=ON
 		-DZMQPP_BUILD_STATIC=$(usex static-libs)
+		-DZMQPP_BUILD_TESTS=$(usex test)
 	)
 
 	cmake_src_configure
 }
+
+src_test() {
+	# https://github.com/zeromq/zmqpp/issues/223
+	local -x BOOST_TEST_RUN_FILTERS='!socket/test_simple_monitor'
+	cmake_src_test
+}