gentoo resync : 15.12.2019

5 files changed, 11 insertions, 34 deletions

diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 380c9fb9964f..5b6086ad936c 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,8 +1,7 @@
-AUX zeromq-4.3.1-fix-test_security_zap.patch 1008 BLAKE2B 17f5a316601af1c8e7c307a964f69bf0d59c55ee0a9076eee4a909768307cef8be0d901d6ecae10381505b96bda95f20ffa0d1bde09e8c1bf6f0fc2959e9f065 SHA512 e813dc7488c5a81731f5649b2ecc533e55c4a3f69b904a1fbf2446ad6282ece96a64850b70f675c6cb0e20636c4654786ffdc99742ae1325c16469735e7ea616
 DIST zeromq-2.2.0.tar.gz 1899104 BLAKE2B 1c02629e33151db11c529d538ce519dae7f3426ee13f8a2b840960779cd7514f7cc3257983704f2c392a00ad62f4a955bc33fcbdadb8bada3858753a1790ab41 SHA512 fb3cf421b2dc48c31956b3e3ee4ab6ebc743deec3bf626c2238a1996c8c51be87260bd6aa662793a1f0c34dcda9b3146763777bb162dfad6fec4ca7acc403b2e
 DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb5e40aef85ae8cd8fedef4c655fd2698a7f81431e34550b5156814a75c0b1a738393e7c44acbfefe96acc4c4bc SHA512 3682204e5a47824d149968e62fbf9768134370e4f7debbbf8f2bfa24bdd0a781e50c4a9b4231af8a0c4bab61839169100525a91472448ef180a9672342e10a3f
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
-EBUILD zeromq-2.2.0.ebuild 1280 BLAKE2B 0471def5d47bf06f5560cef735faf909275404f8f9352578bba2e90b21e71b62cb00bbf002a84228d3ca316803ba9f58fbd3104403bbd72e244c1d1825e5d93a SHA512 12c947c2583f98d40c393cfd5e3dd04db3f9d8eab94195a75015dca7271feff15b3e5d3435b6d8b3dc8db87406a4e454ec36fb1e9f494ec555ecd779ab67c39d
-EBUILD zeromq-3.2.5.ebuild 1469 BLAKE2B 0c63cffa55d6ce54d430dfd3f4997f1426a80aec72e5778cdb3ba833c383d2c5d487824bda6ab413c7750de790755f266d3c69b79f8cdf6ae982fde417fb95d9 SHA512 85a0a5c8184dcafaa29d93e59568fb569ef015fc2f1cd7c26bd5c66f0333050c04505587e6922691641d43b679c34eac13dd7ced4cd2955a5c2e926ad559bfbc
-EBUILD zeromq-4.3.2.ebuild 1410 BLAKE2B 67d14de3edc28c07106685be656e92603347f0b5393cfc0d17ea5f6add9d5c6039e7a489b2558f36ccf8e211a332a5c107c8dc6a3643804a33cf6afeed04d233 SHA512 7ccd9ac284061cb9bf2fa615bb745f929f1e45acca46dde27b906b107d220550343964cbcb92d7677886d5a0dc99842351e05c0cbe6d02a4b4e3b0b5a362dec8
+EBUILD zeromq-2.2.0.ebuild 1230 BLAKE2B 3481bc6a49217938f6fff44ba4a72642ff3abb7dbc18bd911dafba960d698bc61ac88645dfeeca06b570d5730789c4d27344d60c2b75e188b30261b67465f5c1 SHA512 f11d23122d6ff6db52b5c625a5e2a994c0ab9741681e1be2dedd6f6bfdc3be9107141dedf9873a448447e61e1aeb1cab025ca37a2948930bc38ba780d25c612c
+EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
+EBUILD zeromq-4.3.2.ebuild 1437 BLAKE2B a46c410299ad9eb963c8caf1e5f08eed59d2bb90f7e66431ec48be38397f7ef35a6ee8b8b13191e3b87ad025b7d1569868389af88c6e3814125fc8453326af15 SHA512 3b1b7809d09e0f310682f73d1008962f37bcf40638482a833fc6c86e1628db7fa3b825a172f34a386c51c260368687835b160be52cb1a8da1806ce00caa5f038
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch b/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
deleted file mode 100644
index 3c89024b84bd..000000000000
--- a/net-libs/zeromq/files/zeromq-4.3.1-fix-test_security_zap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4147957a5eec57ec7a2a416dca74c3c0299a3432 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sun, 13 Jan 2019 13:08:10 +0000
-Subject: [PATCH] Problem: test_security_zap fails on architectures that
- disallow unaligned pointer access
-
-Solution: use memcpy instead of doing pointer arithmetics with casting
-and dereferencing to fix the error on sparc64
----
- tests/testutil_security.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testutil_security.hpp b/tests/testutil_security.hpp
-index 90999118c..437bfb298 100644
---- a/tests/testutil_security.hpp
-+++ b/tests/testutil_security.hpp
-@@ -345,7 +345,7 @@ static int get_monitor_event_internal (void *monitor_,
-     uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-     uint16_t event = *(uint16_t *) (data);
-     if (value_)
--        *value_ = *(uint32_t *) (data + 2);
-+        memcpy (value_, data + 2, sizeof (uint32_t));
- 
-     //  Second frame in message contains event address
-     zmq_msg_init (&msg);
diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild
index 3aa9e3dd9622..faa4e909ee3c 100644
--- a/net-libs/zeromq/zeromq-2.2.0.ebuild
+++ b/net-libs/zeromq/zeromq-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # NOTES:
@@ -16,6 +16,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="pgm test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND="!net-libs/cppzmq"
 DEPEND="pgm? (
@@ -39,9 +40,9 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed"
-	doman doc/*.[1-9] || die "doman failed"
+	emake DESTDIR="${D}" install
+	dodoc NEWS README AUTHORS ChangeLog
+	doman doc/*.[1-9]
 
 	# remove useless .la files
 	find "${D}" -name '*.la' -delete
diff --git a/net-libs/zeromq/zeromq-3.2.5.ebuild b/net-libs/zeromq/zeromq-3.2.5.ebuild
index 4f3efab45985..2d97ae7df61c 100644
--- a/net-libs/zeromq/zeromq-3.2.5.ebuild
+++ b/net-libs/zeromq/zeromq-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-3"
 SLOT="0/3"
 KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="pgm test static-libs elibc_glibc"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	|| ( sys-devel/gcc sys-devel/gcc-apple )
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
index d3ca50a8bf78..8535b875a1d0 100644
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.2.ebuild
@@ -13,6 +13,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )