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

["Petr Vaněk" <arkamar@gentoo.org>]

commit:     045c7303cb7651fe0560f80b906bc1e5343843d2
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 09:54:18 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 09:56:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045c7303

net-libs/zeromq: drop 4.3.3-r1, 4.3.4-r1, 4.3.4-r2, 4.3.5

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 net-libs/zeromq/Manifest                           |  2 -
 net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch    | 55 ----------------
 net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch | 52 ---------------
 net-libs/zeromq/metadata.xml                       |  4 --
 net-libs/zeromq/zeromq-4.3.3-r1.ebuild             | 65 -------------------
 net-libs/zeromq/zeromq-4.3.4-r1.ebuild             | 65 -------------------
 net-libs/zeromq/zeromq-4.3.4-r2.ebuild             | 75 ----------------------
 net-libs/zeromq/zeromq-4.3.5.ebuild                | 59 -----------------
 8 files changed, 377 deletions(-)

diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 277b438efc89..ac55fd67cb0b 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,3 +1 @@
-DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
-DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
 DIST zeromq-4.3.5.tar.gz 2530237 BLAKE2B 1ece80f4d4f6bba401c9801105cb9adecdde28c619035970a5d8e75ae4617e023c89857ef81179331cbe23b9bb69a0c15904ce9099fa59440829fb5986348d7e SHA512 a71d48aa977ad8941c1609947d8db2679fc7a951e4cd0c3a1127ae026d883c11bd4203cf315de87f95f5031aec459a731aec34e5ce5b667b8d0559b157952541

diff --git a/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch
deleted file mode 100644
index 79deeacc2bd8..000000000000
--- a/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d
-
-From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyich@gmail.com>
-Date: Tue, 20 Dec 2022 21:45:16 +0000
-Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type
-
-`gcc-13` added an assert to standard headers to make sure custom
-allocators have intended implementation of rebind type instead
-of inherited rebind. gcc change:
-    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
-
-Without the fix build fails on this week's `gcc-13` as:
-
-    [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o
-    In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
-                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64,
-                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69,
-                     from tests/../src/secure_allocator.hpp:42,
-                     from tests/../src/curve_client_tools.hpp:49,
-                     from tests/test_security_curve.cpp:53:
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>':
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:   required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]'
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:   required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]'
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:   required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>'
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21:   required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >'
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:   required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >'
-    tests/../src/curve_client_tools.hpp:64:76:   required from here
-    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
-       70 |                         _Tp>::value,
-          |                               ^~~~~
-
-The change adds trivial `rebind` definition with expected return type
-and satisfies conversion requirements.
---- a/src/secure_allocator.hpp
-+++ b/src/secure_allocator.hpp
-@@ -99,6 +99,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
- #else
- template <typename T> struct secure_allocator_t : std::allocator<T>
- {
-+    secure_allocator_t () ZMQ_DEFAULT;
-+
-+    template <class U>
-+    secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
-+    {
-+    }
-+
-+    template <class U> struct rebind
-+    {
-+        typedef secure_allocator_t<U> other;
-+    };
- };
- #endif
- }
-

diff --git a/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch b/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch
deleted file mode 100644
index 8374496e39e1..000000000000
--- a/net-libs/zeromq/files/zeromq-4.3.4-qemu-user.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-UPSTREAM: https://github.com/zeromq/libzmq/pull/4486
-BUG: https://bugs.gentoo.org/899986
-From: Han Gao <gaohan@iscas.ac.cn>
-
-In qemu-user, CACHELINE_SIZE probe is undefined
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8672d61799..072a6507e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -481,7 +481,8 @@ execute_process(
-   ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(CACHELINE_SIZE STREQUAL ""
-    OR CACHELINE_SIZE EQUAL 0
--   OR CACHELINE_SIZE EQUAL -1)
-+   OR CACHELINE_SIZE EQUAL -1
-+   OR CACHELINE_SIZE EQUAL "undefined")
-   set(ZMQ_CACHELINE_SIZE 64)
- else()
-   set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})
-diff --git a/RELICENSE/hangao.md b/RELICENSE/hangao.md
-new file mode 100644
-index 0000000000..de100bb59a
---- /dev/null
-+++ b/RELICENSE/hangao.md
-@@ -0,0 +1,13 @@
-+# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-+
-+This is a statement by Han Gao that grants permission to relicense its copyrights in the libzmq C++
-+library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-+Open Source Initiative approved license chosen by the current ZeroMQ 
-+BDFL (Benevolent Dictator for Life).
-+
-+A portion of the commits made by the Github handle "Rabenda", with
-+commit author "Han Gao <gaohan@iscas.ac.cn>" or "Han Gao <rabenda.cn@gmail.com>", are copyright of Han Gao .
-+This document hereby grants the libzmq project team to relicense libzmq, 
-+including all past, present and future contributions of the author listed above.
-+
-+Han Gao 2023/01/10
-diff --git a/acinclude.m4 b/acinclude.m4
-index ac55776e53..f27fc8e831 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1254,7 +1254,7 @@ AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{
-     AC_CHECK_TOOL(libzmq_getconf, getconf)
-     if ! test "x$libzmq_getconf" = "x"; then
-         zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64)
--        if test "x$zmq_cacheline_size" = "x0" -o  "x$zmq_cacheline_size" = "x-1"; then
-+        if test "x$zmq_cacheline_size" = "x0" -o  "x$zmq_cacheline_size" = "x-1" -o "x$zmq_cacheline_size" = "xundefined"; then
-             # getconf on some architectures does not know the size, try to fallback to
-             # the value the kernel knows on Linux
-             zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64)

diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 06a50dbf3eed..31b3348c3baf 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -33,10 +33,6 @@
 			Use strlcpy() from <pkg>dev-libs/libbsd</pkg> instead of internal
 			implementation.
 		</flag>
-		<flag name="pgm">
-			Build PGM (Pragmatic General Multicast)extention, a protocol for reliable 
-			multicast transport of data over IP networks.
-		</flag>
 		<flag name="sodium">
 			Use <pkg>dev-libs/libsodium</pkg> for cryptography
 		</flag>

diff --git a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
deleted file mode 100644
index 59154fd91b9b..000000000000
--- a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="https://zeromq.org/"
-SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	libbsd? ( dev-libs/libbsd:= )
-	sodium? ( dev-libs/libsodium:= )"
-DEPEND="${RDEPEND}
-	!elibc_Darwin? ( sys-apps/util-linux )
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	pgm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	sed \
-		-e '/libzmq_werror=/s:yes:no:g' \
-		-i configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--without-pgm
-		$(use_enable drafts)
-		$(use_enable libbsd)
-		$(use_enable static-libs static)
-		$(use_enable unwind libunwind)
-		$(use_with sodium libsodium)
-		$(use_with doc docs)
-	)
-	# Force bash for configure until the fixes for bug #923922 land in a release
-	# https://github.com/zeromq/zproject/pull/1336
-	# https://github.com/zeromq/libzmq/pull/4651
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Restricting to one job because multiple tests are using the same port.
-	# Upstream knows the problem and says it doesn't support parallel test
-	# execution, see ${S}/INSTALL.
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}"/usr/lib* -name '*.la' -delete || die
-}

diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
deleted file mode 100644
index 8521f1414077..000000000000
--- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="https://zeromq.org/"
-SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	libbsd? ( dev-libs/libbsd:= )
-	sodium? ( dev-libs/libsodium:= )"
-DEPEND="${RDEPEND}
-	!elibc_Darwin? ( sys-apps/util-linux )
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	pgm? ( virtual/pkgconfig )"
-
-src_prepare() {
-	sed \
-		-e '/libzmq_werror=/s:yes:no:g' \
-		-i configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--without-pgm
-		$(use_enable drafts)
-		$(use_enable libbsd)
-		$(use_enable static-libs static)
-		$(use_enable unwind libunwind)
-		$(use_with sodium libsodium)
-		$(use_with doc docs)
-	)
-	# Force bash for configure until the fixes for bug #923922 land in a release
-	# https://github.com/zeromq/zproject/pull/1336
-	# https://github.com/zeromq/libzmq/pull/4651
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Restricting to one job because multiple tests are using the same port.
-	# Upstream knows the problem and says it doesn't support parallel test
-	# execution, see ${S}/INSTALL.
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}"/usr/lib* -name '*.la' -delete || die
-}

diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
deleted file mode 100644
index ec4e113e34cb..000000000000
--- a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="https://zeromq.org/"
-SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	libbsd? ( dev-libs/libbsd:= )
-	sodium? ( dev-libs/libsodium:= )
-"
-DEPEND="
-	${RDEPEND}
-	!elibc_Darwin? ( sys-apps/util-linux )
-"
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	pgm? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-	"${FILESDIR}"/${P}-qemu-user.patch
-)
-
-src_prepare() {
-	sed \
-		-e '/libzmq_werror=/s:yes:no:g' \
-		-i configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--without-pgm
-		$(use_enable drafts)
-		$(use_enable libbsd)
-		$(use_enable static-libs static)
-		$(use_enable unwind libunwind)
-		$(use_with sodium libsodium)
-		$(use_with doc docs)
-	)
-	# Force bash for configure until the fixes for bug #923922 land in a release
-	# https://github.com/zeromq/zproject/pull/1336
-	# https://github.com/zeromq/libzmq/pull/4651
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Restricting to one job because multiple tests are using the same port.
-	# Upstream knows the problem and says it doesn't support parallel test
-	# execution, see ${S}/INSTALL.
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}"/usr/lib* -name '*.la' -delete || die
-}

diff --git a/net-libs/zeromq/zeromq-4.3.5.ebuild b/net-libs/zeromq/zeromq-4.3.5.ebuild
deleted file mode 100644
index 095d5bf4ea5d..000000000000
--- a/net-libs/zeromq/zeromq-4.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="High-performance asynchronous messaging library"
-HOMEPAGE="https://zeromq.org/"
-SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="doc drafts +libbsd +sodium static-libs test unwind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	libbsd? ( dev-libs/libbsd:= )
-	sodium? ( dev-libs/libsodium:= )
-"
-DEPEND="
-	${RDEPEND}
-	!elibc_Darwin? ( sys-apps/util-linux )
-"
-BDEPEND="
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-Werror
-		--enable-shared
-		$(use_enable drafts)
-		$(use_enable libbsd)
-		$(use_enable static-libs static)
-		$(use_enable unwind libunwind)
-		$(use_with sodium libsodium)
-		$(use_with doc docs)
-	)
-	# Force bash for configure until the fixes for bug #923922 land in a release
-	# https://github.com/zeromq/zproject/pull/1336
-	# https://github.com/zeromq/libzmq/pull/4651
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Restricting to one job because multiple tests are using the same port.
-	# Upstream knows the problem and says it doesn't support parallel test
-	# execution, see ${S}/INSTALL.
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}