gentoo resync : 03.03.2021

4 files changed, 17 insertions, 11 deletions

diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index cc6e49cc1b94..b88de7a9ff28 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,5 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
-EBUILD zeromq-4.3.3.ebuild 1423 BLAKE2B a47babf7ee873b3d5365d3ab45b6f6e6f13192dfb58f839deee0733559b17600dba002629156f19516b4fe3802a45292f0ecc7fa15eda45cf2563e406be1685e SHA512 13586b401955d4dd783f7a7f67d168e2522b7d01c9dd16d577c042e61b3390f66489ee514e0151d0176456c33926165c61d24116e131a7e3b289b053b5d1294e
-EBUILD zeromq-4.3.4.ebuild 1430 BLAKE2B 07c4e86fddb2c04b52f2699dd1df0a32c6a3360ea7197fc3dd1721028e8d2fca1f4a210bd7166c51cadf26208ed89bf39335b8d3f08d8afb18f6cf1189d60339 SHA512 90fccb7313cefa3aa99d1149260a421cc3476dec4b08f3b61d9695116f29e435d6b057a6fcd45a9e49c429b29522b8e9975353b802abdbee48f5ef3c791d2889
-MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
+EBUILD zeromq-4.3.3-r1.ebuild 1447 BLAKE2B d800a1dbe54ba94b039b798d9fe7610a62e3ebcde63fba5205063305dbd0bf2fc80a4e1ce57120abd03904e201e159e62e2724935ebae3fc086c343116ef6fd9 SHA512 ac5b1d8570b6c6ee0de56615e4296a18148be0fd29bfad7a404f7d995d22d2d893399ffb2c6b31ca036b622556d3bb3274640ff224d41a49213f66f353302a21
+EBUILD zeromq-4.3.4-r1.ebuild 1454 BLAKE2B acf7b942a644f9a4f7422427a1d682545b0b95da0fab1bddf500d56c915d7412675c20e37c98181cfdd7c7ac19f474fcacd025302c8a71b77edfe35cdc1b4a4e SHA512 47aa6d638a425fc4957819c02c4eef956402d13d841d90f8be25059c8e0398d9cc82dece4229df990d161a1b8ccd492df16af0c3bbbc6c58548aecac2a969c41
+MISC metadata.xml 1624 BLAKE2B 7b976e279cfe109beb64a36ac3469bdbbad43efc7100f1d8d4322b0cab0ddb6921fe8457cec260e36b6830c6e8b4b070dc49c30cffa6597895d4fb87a3927b06 SHA512 9b970662649051cc83c5d2e483a344f377eeca2f0fa7bea7200af26fa35aa6cf88ac64875ed87e92a64cd06269fc09c449b45a3d388a58ce24ec02b29326c4cf
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 8d747a412580..e46f5a985b5c 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -32,6 +32,10 @@
 			Build draft API, which may change at any time without any notice, and
 			is therefore not recommended for normal use.
 		</flag>
+		<flag name="libbsd">
+			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.
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
index 54387064008c..da4a09e97c25 100644
--- a/net-libs/zeromq/zeromq-4.3.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
@@ -12,13 +12,13 @@ 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"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	sodium? ( dev-libs/libsodium:= )
-	pgm? ( ~net-libs/openpgm-5.2.122 )"
+	libbsd? ( dev-libs/libbsd:= )
+	sodium? ( dev-libs/libsodium:= )"
 DEPEND="${RDEPEND}
 	!elibc_Darwin? ( sys-apps/util-linux )
 	doc? (
@@ -38,11 +38,12 @@ src_prepare() {
 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 pgm)
 		$(use_with doc docs)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/net-libs/zeromq/zeromq-4.3.4.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index 21302e285a65..9a32f20db6b1 100644
--- a/net-libs/zeromq/zeromq-4.3.4.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
@@ -12,13 +12,13 @@ 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"
-IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
-	sodium? ( dev-libs/libsodium:= )
-	pgm? ( ~net-libs/openpgm-5.2.122 )"
+	libbsd? ( dev-libs/libbsd:= )
+	sodium? ( dev-libs/libsodium:= )"
 DEPEND="${RDEPEND}
 	!elibc_Darwin? ( sys-apps/util-linux )
 	doc? (
@@ -38,11 +38,12 @@ src_prepare() {
 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 pgm)
 		$(use_with doc docs)
 	)
 	econf "${myeconfargs[@]}"