* [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/
@ 2017-05-15 10:01 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2017-05-15 10:01 UTC (permalink / raw
To: gentoo-commits
commit: a48ec0a85e36706424dbdac3192a508c6206f3c1
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 10:00:50 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 15 10:00:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48ec0a8
net-libs/zeromq: Rev bump to disable exp. zmq_poll implementation
A feature under development has sneaked in as active by default in the
recent releases of libzmq.
This feature completely changes the internal implementation for
zmq_poll, a very widely used API, and as such upstream do not believe
this should be shipped yet, hence the initial severity choice.
Debian-Bug: https://bugs.debian.org/861416
Package-Manager: Portage-2.3.5, Repoman-2.3.2
...able-experimental-zmq_poll-implementation.patch | 35 +++++++++++++
net-libs/zeromq/zeromq-4.2.2-r1.ebuild | 57 ++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch b/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
new file mode 100644
index 00000000000..3efe2153bfa
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
@@ -0,0 +1,35 @@
+From 90c76fbd6069b8e1e98236f31317ed22792ab739 Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <luca.boccassi@gmail.com>
+Date: Fri, 28 Apr 2017 16:08:46 +0100
+Subject: [PATCH] Problem: new zmq_poller used by zmq_poll without DRAFTs
+
+Solution: do not define ZMQ_HAVE_POLLER in src/zmq_drafts.h otherwise
+src/zmq.cpp will implement zmq_poll using the new poller classes.
+Same for ZMQ_HAVE_TIMERS, even though it has no internal effect, but
+to be safe against future development.
+---
+ src/zmq_draft.h | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/zmq_draft.h b/src/zmq_draft.h
+index bfbf9e3..9aed6dd 100644
+--- a/src/zmq_draft.h
++++ b/src/zmq_draft.h
+@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg);
+ /* Poller polling on sockets,fd and thread-safe sockets */
+ /******************************************************************************/
+
+-#define ZMQ_HAVE_POLLER
+-
+ typedef struct zmq_poller_event_t
+ {
+ void *socket;
+@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd);
+ /* Scheduling timers */
+ /******************************************************************************/
+
+-#define ZMQ_HAVE_TIMERS
+-
+ typedef void (zmq_timer_fn)(int timer_id, void *arg);
+
+ void *zmq_timers_new (void);
diff --git a/net-libs/zeromq/zeromq-4.2.2-r1.ebuild b/net-libs/zeromq/zeromq-4.2.2-r1.ebuild
new file mode 100644
index 00000000000..995ecf31a70
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.2.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="pgm +sodium static-libs test"
+
+RDEPEND="
+ sys-libs/libunwind
+ sodium? ( dev-libs/libsodium:= )
+ pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto
+ sys-apps/util-linux
+ pgm? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.1-disable-experimental-zmq_poll-implementation.patch )
+
+src_prepare() {
+ sed \
+ -e '/libzmq_werror=/s:yes:no:g' \
+ -i configure.ac || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-shared
+ $(use_enable static-libs static)
+ $(use_with sodium libsodium)
+ $(use_with pgm)
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/
@ 2017-07-15 12:09 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2017-07-15 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 1eccba62f0f71438a1db0838c54c7fc5947cacc1
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 12:08:22 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 12:09:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eccba62
net-libs/zeromq: make 'sys-libs/libunwind' an optional depend
Closes: https://github.com/gentoo/gentoo/pull/5105
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../files/zeromq-4.2.2-optional-libunwind.patch | 70 ++++++++++++++++++++++
net-libs/zeromq/zeromq-4.2.2-r2.ebuild | 59 ++++++++++++++++++
2 files changed, 129 insertions(+)
diff --git a/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch b/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
new file mode 100644
index 00000000000..36a5f66bbc9
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
@@ -0,0 +1,70 @@
+Accepted upstream as: https://github.com/zeromq/libzmq/pull/2625
+
+From 88487e7da3e0412abde30af2855a667ab973f9fc Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 14 Jul 2017 21:44:30 +0100
+Subject: [PATCH] configure.ac: allow user to disable libunwind discovery via
+ --disable-libunwind
+
+on ia64 architecture libunwind comes with gcc. Unfortunately
+libunwind is not directly usable as-is and fails at link time:
+
+```
+ ia64-unknown-linux-gnu-g++ -o perf/.libs/local_lat perf/local_lat.o src/.libs/libzmq.so -lsodium -lrt -lpthread -ldl
+ src/.libs/libzmq.so: undefined reference to `_ULia64_step'
+```
+
+The change adds --{enable,disable}-libunwind flag to control
+automatic dependency. The default is unchanged: use if available.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 32 ++++++++++++++++++++++----------
+ 1 file changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c10f8445..ad193871 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -721,16 +721,28 @@ else
+ AC_SUBST(pkg_config_defines, "")
+ fi
+
+-PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
+- [
+- AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
+- AC_SUBST([LIBUNWIND_CFLAGS])
+- AC_SUBST([LIBUNWIND_LIBS])
+- AC_CHECK_LIB([dl], [dladdr])
+- ],
+- [
+- AC_MSG_WARN([Cannot find libunwind])
+- ])
++AC_ARG_ENABLE([libunwind],
++ [AS_HELP_STRING([--enable-libunwind],
++ [enable libunwind [default=auto]])],
++ [enable_libunwind=$enableval],
++ [enable_libunwind="auto"])
++
++if test "x$enable_libunwind" != "xno"; then
++ PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
++ [
++ AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
++ AC_SUBST([LIBUNWIND_CFLAGS])
++ AC_SUBST([LIBUNWIND_LIBS])
++ AC_CHECK_LIB([dl], [dladdr])
++ ],
++ [
++ if test "x$enable_libunwind" = "xyes"; then
++ AC_MSG_ERROR([Cannot find libunwind])
++ else
++ AC_MSG_WARN([Cannot find libunwind])
++ fi
++ ])
++fi
+
+ # Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
+ AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
+--
+2.13.3
+
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
new file mode 100644
index 00000000000..5a7e6a8072b
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="pgm +sodium static-libs test unwind elibc_Darwin"
+
+RDEPEND="
+ !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+ sodium? ( dev-libs/libsodium:= )
+ pgm? ( =net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto
+ !elibc_Darwin? ( sys-apps/util-linux )
+ pgm? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.1-disable-experimental-zmq_poll-implementation.patch
+ "${FILESDIR}"/${PN}-4.2.2-optional-libunwind.patch )
+
+src_prepare() {
+ sed \
+ -e '/libzmq_werror=/s:yes:no:g' \
+ -i configure.ac || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-shared
+ $(use_enable static-libs static)
+ $(use_enable unwind libunwind)
+ $(use_with sodium libsodium)
+ $(use_with pgm)
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/
@ 2019-04-05 17:22 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2019-04-05 17:22 UTC (permalink / raw
To: gentoo-commits
commit: ba0378bf154e007fbd1c68bdfe20bd12a5f92674
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 5 17:20:33 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 17:22:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0378bf
net-libs/zeromq: security cleanup
Bug: https://bugs.gentoo.org/675376
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-libs/zeromq/Manifest | 8 ---
.../zeromq/files/zeromq-4.2.0-dl-backport.patch | 25 --------
...able-experimental-zmq_poll-implementation.patch | 35 -----------
.../files/zeromq-4.2.2-optional-libunwind.patch | 70 ----------------------
net-libs/zeromq/zeromq-4.1.1.ebuild | 49 ---------------
net-libs/zeromq/zeromq-4.1.6.ebuild | 55 -----------------
net-libs/zeromq/zeromq-4.2.0-r1.ebuild | 59 ------------------
net-libs/zeromq/zeromq-4.2.1.ebuild | 55 -----------------
net-libs/zeromq/zeromq-4.2.2-r1.ebuild | 57 ------------------
net-libs/zeromq/zeromq-4.2.2-r2.ebuild | 63 -------------------
net-libs/zeromq/zeromq-4.2.2.ebuild | 55 -----------------
net-libs/zeromq/zeromq-4.2.3.ebuild | 62 -------------------
net-libs/zeromq/zeromq-4.2.5.ebuild | 62 -------------------
net-libs/zeromq/zeromq-4.3.0.ebuild | 62 -------------------
14 files changed, 717 deletions(-)
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 611ca7c0ce5..8891a3de024 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,12 +1,4 @@
DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
DIST zeromq-3.2.3.tar.gz 2072758 BLAKE2B ee295219e4709396f5a7e2774f8f6e53ad081c8b83302d9fe163d5523b6060401251c9ecc0bd423168ccbe156d6a0e26454515cf50780e5c8a07f9f6f4d50ee5 SHA512 34ffb6aa645f62bd1158a8f2888bf92929ccf90917a6c50ed51ed1240732f498522e164d1536f26480c87ad5457fe614a93bf0e15f2f89b0b168e64a30de68ca
DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
-DIST zeromq-4.1.1.tar.gz 1383196 BLAKE2B f0c5e05a11288f28b97a27894479287652c1152d12906764f060372e7a4c7e6a70daea047d7f07ec2ac919d61ba04b65b1f8e316a474e93164c0dba86c3b7ac7 SHA512 6f626c89e573900d3b094ea6058693dee290eb9e4039a8a03d61d41b1d8976ed5596027ca76a43f371dbf86820edfbd56a84ecfab6864adfeee73035df7b5353
-DIST zeromq-4.1.6.tar.gz 799771 BLAKE2B 91ecc39122199846bfe0d9ea49c2acc076d0f827cee55c1b35fcb9d56a8bc1d174789829d5e672bba77fee442f996ca56f69385ece156fb759c363b1dc38cf43 SHA512 c04a6bb7a719687d8e8e5e8a103f93ab75ead3fcd3516e6089959e4f02cff7c18e9d7a8696af4245d434b45e6aa6e2ca8f73d98db058df621bca3def97bf7af1
-DIST zeromq-4.2.0.tar.gz 1046254 BLAKE2B d14bad19861cef7bfd58f571118e5dce89afecf1b80c05c6089f7669b702c38a93825e736e73988cae3f2ce90ab4a3fc28dc34b5ca2e6ff0a12707eb238bc05e SHA512 3b6f0a1869fb1663ea40b3c3aa088b81399a35c051e4ade2b30bbac60bfceefe6b4403248a4635fb31d33767c1e478342f61c47b0ffdb4501419c13590ebeb96
-DIST zeromq-4.2.1.tar.gz 1243428 BLAKE2B 2112f127d5e9624861adad455e77c21b17db09123adbe6473e86575a63ca1c21634078cce9af13e9ea1cc24e68658ae56172d98f24478161c14c5be56a922739 SHA512 6ef52edff930be34451e81bd21a7e23f08e135c8e10e006d0a6146e7fa4171e9dcf9065f77c33cb0c0db4c16cff4a50cab2a9d612e306490a02bc6a4a913ba6a
-DIST zeromq-4.2.2.tar.gz 1236437 BLAKE2B 7104f8ad28cc00f1ba6d6cb5dbb9aa466971c73a513e206eee77db293f4e4845106910d539363dc0c21de7e83885056453a530c941c38e19c5ec1fa836e1bca0 SHA512 d78813a61ce3311a1f8c230f7da0f5aedc97ef4b792afb6d398c5710da239348c0c7a67bdfeb38a7ab0282af498f1ed173649aff4add1bc35f0ef1b66f965443
-DIST zeromq-4.2.3.tar.gz 1326780 BLAKE2B f76ff6461e5a180221b1fff471e795a457fe4f26ec1ca725438aff4e240be7da80e42b2aea49845b5712e1d63590f64bc681f9a793bcf4d32fe0ee08bcab482c SHA512 8ac588a7a4db9d65586dd7b501999edac151e1d03056c1014d7ded6cd4bcf5bb4f81252b47d89d60c3ad7d527685218992bf5853b4656c0702e0f64c2d77712b
-DIST zeromq-4.2.5.tar.gz 1409447 BLAKE2B 9309cff20192c4e0d9e34992cc3168c219ae63e8258362483d15f3315436324454603739393d2fa2628fb4cf7a94954c1643de07c3a28e86933fcd53aa2e0fac SHA512 4556cb50d05a6d133015a0ba804d6d951a47479a33fa29561eaeecb93d48b7bb6477365d0986c38b779f500cadaf08522c4a7aa13f5510303bd923f794d37036
-DIST zeromq-4.3.0.tar.gz 1487771 BLAKE2B 3783eb2505c2e42fc2c03cd9a280b0e2a70758d4046bd0c5b0f43a5a0630655ff06665c30fdfe222fb077ff966a9d5e0c762f65370804dee2eb25fa8215d5e2b SHA512 593239f66c4157e596874832378c9405d79c915a5895503bdbc87304df0ab49311b96f92ba6492396b4bf25d2007689099730995f7c335a51fbf42a9aafb02e4
DIST zeromq-4.3.1.tar.gz 1490122 BLAKE2B 95d0a1359e85a3868ae0b1cd4f711d9715ddc07d21fbb7799c6beaa269aa77fb68e087898033f8a515be974a799c1ee2f2afba1f50b1bc806255750b95990367 SHA512 b80388a3703993425cdd73054139a8e2895aedb9992ea68d6eadb4ea39b9af576ea14f306dfb432e4c24535feb6b293f82fac5679b655d258f0f921f2b71e772
diff --git a/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch b/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
deleted file mode 100644
index c00001d632a..00000000000
--- a/net-libs/zeromq/files/zeromq-4.2.0-dl-backport.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1b3fcbd3eead8f1f59f3e9472319d58ce6b52bb7 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@gmail.com>
-Date: Thu, 10 Nov 2016 22:49:41 +0000
-Subject: [PATCH] Problem: linker fails looking for dladdr
-
-Solution: search and add it via AC_CHECK_LIB when building with
-libunwind, as the backtrace function uses dladdr. This problem
-only appears on some distributions and with some compiler/toolchain
-versions.
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 4fb2757..d548f9f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -650,6 +650,7 @@ PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
- AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
- AC_SUBST([LIBUNWIND_CFLAGS])
- AC_SUBST([LIBUNWIND_LIBS])
-+ AC_CHECK_LIB([dl], [dladdr])
- ],
- [
- AC_MSG_WARN([Cannot find libunwind])
diff --git a/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch b/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
deleted file mode 100644
index 3efe2153bfa..00000000000
--- a/net-libs/zeromq/files/zeromq-4.2.1-disable-experimental-zmq_poll-implementation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 90c76fbd6069b8e1e98236f31317ed22792ab739 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <luca.boccassi@gmail.com>
-Date: Fri, 28 Apr 2017 16:08:46 +0100
-Subject: [PATCH] Problem: new zmq_poller used by zmq_poll without DRAFTs
-
-Solution: do not define ZMQ_HAVE_POLLER in src/zmq_drafts.h otherwise
-src/zmq.cpp will implement zmq_poll using the new poller classes.
-Same for ZMQ_HAVE_TIMERS, even though it has no internal effect, but
-to be safe against future development.
----
- src/zmq_draft.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/zmq_draft.h b/src/zmq_draft.h
-index bfbf9e3..9aed6dd 100644
---- a/src/zmq_draft.h
-+++ b/src/zmq_draft.h
-@@ -67,8 +67,6 @@ const char *zmq_msg_group(zmq_msg_t *msg);
- /* Poller polling on sockets,fd and thread-safe sockets */
- /******************************************************************************/
-
--#define ZMQ_HAVE_POLLER
--
- typedef struct zmq_poller_event_t
- {
- void *socket;
-@@ -103,8 +101,6 @@ int zmq_poller_remove_fd (void *poller, int fd);
- /* Scheduling timers */
- /******************************************************************************/
-
--#define ZMQ_HAVE_TIMERS
--
- typedef void (zmq_timer_fn)(int timer_id, void *arg);
-
- void *zmq_timers_new (void);
diff --git a/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch b/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
deleted file mode 100644
index 36a5f66bbc9..00000000000
--- a/net-libs/zeromq/files/zeromq-4.2.2-optional-libunwind.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Accepted upstream as: https://github.com/zeromq/libzmq/pull/2625
-
-From 88487e7da3e0412abde30af2855a667ab973f9fc Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 14 Jul 2017 21:44:30 +0100
-Subject: [PATCH] configure.ac: allow user to disable libunwind discovery via
- --disable-libunwind
-
-on ia64 architecture libunwind comes with gcc. Unfortunately
-libunwind is not directly usable as-is and fails at link time:
-
-```
- ia64-unknown-linux-gnu-g++ -o perf/.libs/local_lat perf/local_lat.o src/.libs/libzmq.so -lsodium -lrt -lpthread -ldl
- src/.libs/libzmq.so: undefined reference to `_ULia64_step'
-```
-
-The change adds --{enable,disable}-libunwind flag to control
-automatic dependency. The default is unchanged: use if available.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- configure.ac | 32 ++++++++++++++++++++++----------
- 1 file changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c10f8445..ad193871 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -721,16 +721,28 @@ else
- AC_SUBST(pkg_config_defines, "")
- fi
-
--PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
-- [
-- AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-- AC_SUBST([LIBUNWIND_CFLAGS])
-- AC_SUBST([LIBUNWIND_LIBS])
-- AC_CHECK_LIB([dl], [dladdr])
-- ],
-- [
-- AC_MSG_WARN([Cannot find libunwind])
-- ])
-+AC_ARG_ENABLE([libunwind],
-+ [AS_HELP_STRING([--enable-libunwind],
-+ [enable libunwind [default=auto]])],
-+ [enable_libunwind=$enableval],
-+ [enable_libunwind="auto"])
-+
-+if test "x$enable_libunwind" != "xno"; then
-+ PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
-+ [
-+ AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-+ AC_SUBST([LIBUNWIND_CFLAGS])
-+ AC_SUBST([LIBUNWIND_LIBS])
-+ AC_CHECK_LIB([dl], [dladdr])
-+ ],
-+ [
-+ if test "x$enable_libunwind" = "xyes"; then
-+ AC_MSG_ERROR([Cannot find libunwind])
-+ else
-+ AC_MSG_WARN([Cannot find libunwind])
-+ fi
-+ ])
-+fi
-
- # Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
- AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
---
-2.13.3
-
diff --git a/net-libs/zeromq/zeromq-4.1.1.ebuild b/net-libs/zeromq/zeromq-4.1.1.ebuild
deleted file mode 100644
index f1bcf9d04ae..00000000000
--- a/net-libs/zeromq/zeromq-4.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="http://download.zeromq.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/4"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="pgm static-libs test"
-
-RDEPEND="
- dev-libs/libsodium:=
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- sys-apps/util-linux
- pgm? ( virtual/pkgconfig )"
-
-src_prepare() {
- einfo "Removing bundled OpenPGM library"
- rm -fr "${S}"/foreign/openpgm/libpgm* || die
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=()
- use pgm && myeconfargs+=( --with-system-pgm ) || myeconfargs+=( --without-pgm )
- autotools-utils_src_configure
-}
-
-src_test() {
- autotools-utils_src_test -j1
-}
-
-src_install() {
- autotools-utils_src_install
-
- doman doc/*.[1-9]
-}
diff --git a/net-libs/zeromq/zeromq-4.1.6.ebuild b/net-libs/zeromq/zeromq-4.1.6.ebuild
deleted file mode 100644
index ffa1660ff95..00000000000
--- a/net-libs/zeromq/zeromq-4.1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
-SRC_URI="https://github.com/zeromq/zeromq4-1/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="pgm static-libs test"
-
-RDEPEND="
- dev-libs/libsodium:=
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- sys-apps/util-linux
- 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
- $(use_enable static-libs static)
- --with-relaxed
- --with-libsodium
- $(use_with pgm)
- )
- 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
- prune_libtool_files
-}
diff --git a/net-libs/zeromq/zeromq-4.2.0-r1.ebuild b/net-libs/zeromq/zeromq-4.2.0-r1.ebuild
deleted file mode 100644
index d69a469b3b2..00000000000
--- a/net-libs/zeromq/zeromq-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="pgm +sodium static-libs test"
-
-RDEPEND="
- sys-libs/libunwind
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- sys-apps/util-linux
- pgm? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-dl-backport.patch
-)
-
-src_prepare() {
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable static-libs static)
- $(use_with sodium libsodium)
- $(use_with pgm)
- )
- 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.2.1.ebuild b/net-libs/zeromq/zeromq-4.2.1.ebuild
deleted file mode 100644
index 586cff09f38..00000000000
--- a/net-libs/zeromq/zeromq-4.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="pgm +sodium static-libs test"
-
-RDEPEND="
- sys-libs/libunwind
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- sys-apps/util-linux
- 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
- $(use_enable static-libs static)
- $(use_with sodium libsodium)
- $(use_with pgm)
- )
- 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.2.2-r1.ebuild b/net-libs/zeromq/zeromq-4.2.2-r1.ebuild
deleted file mode 100644
index 5f72e2a7662..00000000000
--- a/net-libs/zeromq/zeromq-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="pgm +sodium static-libs test elibc_Darwin"
-
-RDEPEND="
- !elibc_Darwin? ( sys-libs/libunwind )
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- !elibc_Darwin? ( sys-apps/util-linux )
- pgm? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.1-disable-experimental-zmq_poll-implementation.patch )
-
-src_prepare() {
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable static-libs static)
- $(use_with sodium libsodium)
- $(use_with pgm)
- )
- 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.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
deleted file mode 100644
index 8c2ee822f16..00000000000
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
-
-RDEPEND="
- !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- !elibc_Darwin? ( sys-apps/util-linux )
- doc? (
- app-text/asciidoc
- app-text/xmlto
- )
- pgm? ( virtual/pkgconfig )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.1-disable-experimental-zmq_poll-implementation.patch
- "${FILESDIR}"/${PN}-4.2.2-optional-libunwind.patch )
-
-src_prepare() {
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable drafts)
- $(use_enable static-libs static)
- $(use_enable unwind libunwind)
- $(use_with sodium libsodium)
- $(use_with pgm)
- $(use_with doc docs)
- )
- 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.2.2.ebuild b/net-libs/zeromq/zeromq-4.2.2.ebuild
deleted file mode 100644
index 6c9a850b617..00000000000
--- a/net-libs/zeromq/zeromq-4.2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="pgm +sodium static-libs test"
-
-RDEPEND="
- sys-libs/libunwind
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- sys-apps/util-linux
- 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
- $(use_enable static-libs static)
- $(use_with sodium libsodium)
- $(use_with pgm)
- )
- 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.2.3.ebuild b/net-libs/zeromq/zeromq-4.2.3.ebuild
deleted file mode 100644
index d29132acaae..00000000000
--- a/net-libs/zeromq/zeromq-4.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
-
-RDEPEND="
- !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- !elibc_Darwin? ( sys-apps/util-linux )
- doc? (
- app-text/asciidoc
- app-text/xmlto
- )
- pgm? ( virtual/pkgconfig )"
-
-PATCHES=()
-
-src_prepare() {
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable drafts)
- $(use_enable static-libs static)
- $(use_enable unwind libunwind)
- $(use_with sodium libsodium)
- $(use_with pgm)
- $(use_with doc docs)
- )
- 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.2.5.ebuild b/net-libs/zeromq/zeromq-4.2.5.ebuild
deleted file mode 100644
index d29132acaae..00000000000
--- a/net-libs/zeromq/zeromq-4.2.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
-
-RDEPEND="
- !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- !elibc_Darwin? ( sys-apps/util-linux )
- doc? (
- app-text/asciidoc
- app-text/xmlto
- )
- pgm? ( virtual/pkgconfig )"
-
-PATCHES=()
-
-src_prepare() {
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable drafts)
- $(use_enable static-libs static)
- $(use_enable unwind libunwind)
- $(use_with sodium libsodium)
- $(use_with pgm)
- $(use_with doc docs)
- )
- 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.0.ebuild b/net-libs/zeromq/zeromq-4.3.0.ebuild
deleted file mode 100644
index 8eae7c54383..00000000000
--- a/net-libs/zeromq/zeromq-4.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.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 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
-
-RDEPEND="
- !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
- sodium? ( dev-libs/libsodium:= )
- pgm? ( =net-libs/openpgm-5.2.122 )"
-DEPEND="${RDEPEND}
- !elibc_Darwin? ( sys-apps/util-linux )
- doc? (
- app-text/asciidoc
- app-text/xmlto
- )
- pgm? ( virtual/pkgconfig )"
-
-PATCHES=()
-
-src_prepare() {
- sed \
- -e '/libzmq_werror=/s:yes:no:g' \
- -i configure.ac || die
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable drafts)
- $(use_enable static-libs static)
- $(use_enable unwind libunwind)
- $(use_with sodium libsodium)
- $(use_with pgm)
- $(use_with doc docs)
- )
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/
@ 2023-02-02 7:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-02-02 7:02 UTC (permalink / raw
To: gentoo-commits
commit: a47fe1a0456d92e34a2773b4f4393fa95254d860
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 06:51:03 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 06:51:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47fe1a0
net-libs/zeromq: fix build w/ gcc 13
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch | 55 +++++++++++++++++++
net-libs/zeromq/zeromq-4.3.4-r2.ebuild | 71 +++++++++++++++++++++++++
2 files changed, 126 insertions(+)
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
new file mode 100644
index 000000000000..79deeacc2bd8
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch
@@ -0,0 +1,55 @@
+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/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
new file mode 100644
index 000000000000..06892942f602
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 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 ~ia64 ~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 )
+"
+BDEPEND="
+ doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )
+ pgm? ( virtual/pkgconfig )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-13.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)
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/
@ 2023-12-04 7:32 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-04 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 222e3b5dbb3168acf6c63e32bebabe7aedadee27
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 07:28:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 07:32:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222e3b5d
net-libs/zeromq: fix modern c issues in configure
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/zeromq/files/zeromq-4.3.5-c99.patch | 37 +++++++++++++++
net-libs/zeromq/zeromq-4.3.5-r1.ebuild | 69 ++++++++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/net-libs/zeromq/files/zeromq-4.3.5-c99.patch b/net-libs/zeromq/files/zeromq-4.3.5-c99.patch
new file mode 100644
index 000000000000..7f15ef6c6981
--- /dev/null
+++ b/net-libs/zeromq/files/zeromq-4.3.5-c99.patch
@@ -0,0 +1,37 @@
+https://github.com/zeromq/libzmq/pull/4635
+https://github.com/zeromq/libzmq/commit/665d1d46576f9a4eff6fa42a11c54f23b6b11803
+
+From 665d1d46576f9a4eff6fa42a11c54f23b6b11803 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Wed, 29 Nov 2023 14:14:30 +0100
+Subject: [PATCH] Build with -D_DEFAULT_SOURCE along with -std=c11
+
+On its own, -std=c11 hides POSIX and other extensions from C headers
+such as <stdlib.h> when building against glibc. This causes the
+posix_memalign probe to fail incorrectly with compilers that do not
+accept implicit function declarations. _DEFAULT_SOURCE is ignored by
+most non-GNU/Linux systems or not relevant in this context, so there
+is no separate check for adding it.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ if (NOT MSVC)
+ if(NOT CMAKE_C_FLAGS MATCHES "-std=" AND NOT C_STANDARD AND NOT CMAKE_C_STANDARD)
+ check_c_compiler_flag("-std=c11" COMPILER_SUPPORTS_C11)
+ if(COMPILER_SUPPORTS_C11)
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -std=c11")
+ else()
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ endif()
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,7 +66,7 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
+
+ # Checks for programs.
+ AC_PROG_CC
+-AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99])
++AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11 -D_DEFAULT_SOURCE"], [AC_PROG_CC_C99])
+ AC_PROG_CXX
+ AX_CODE_COVERAGE
+ AM_PROG_CC_C_O
+
diff --git a/net-libs/zeromq/zeromq-4.3.5-r1.ebuild b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
new file mode 100644
index 000000000000..72bd07bb595b
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+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 ~ia64 ~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
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.5-c99.patch
+)
+
+src_prepare() {
+ default
+
+ # Only here for the c99 configure patch
+ eautoreconf
+}
+
+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)
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/
@ 2024-09-23 9:59 Petr Vaněk
0 siblings, 0 replies; 6+ messages in thread
From: Petr Vaněk @ 2024-09-23 9:59 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-23 9:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-04 7:32 [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-23 9:59 Petr Vaněk
2023-02-02 7:02 Sam James
2019-04-05 17:22 Thomas Deutschmann
2017-07-15 12:09 Thomas Deutschmann
2017-05-15 10:01 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox