gentoo resync : 29.08.2018

17 files changed, 46 insertions, 187 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 916f561c2719..f4f0c6a19944 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index eec03479d868..38beb3e7033c 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -3,5 +3,5 @@ DIST farstream-0.1.2.tar.gz 1265972 BLAKE2B 239deea639f3456170aee1633d0ec0856917
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.1.2-r2.ebuild 2374 BLAKE2B c4832a241cce39990bc5a396503cb29090a67799edb33018d2f25a8fee56eb77b9ffa17a04b05ec608dc28cc90382fd7f2620924bd1b506ffd8273f9a5c0bf15 SHA512 1222e9257b9ac280dd94b1e2f75f12369db67ae8efbce4ab6403404b37e60b63de9c06c797eb716ea8150c642cf323153e7ee4a1e246ff51b9a5de69e76ca56c
 EBUILD farstream-0.2.8-r1.ebuild 1805 BLAKE2B 60c9a9e789c6cbf48ff33e53b1a4bb7d0e59d88f7f3b8a71254d3b18809fa79667836c60f55a756c7d271ef09e40b173c7c573e6ebb530aaa97bd992d382da45 SHA512 99f415b8069ebfe61bcd65d7679d61d7c12188e3c95955bef8ec0fcff71a2ec9cb3ee5d3bed6db3b0411080c1bf625e210530d855a2f9abee716029128316ab8
-EBUILD farstream-0.2.8-r2.ebuild 1812 BLAKE2B a4f39f68e2b3533b512d50545037642f1d733180aa494b0a62abcc4254c39c8d03939b7082ce2036cf9dfc9ec82d69fb300c1817ddfe118b5af3971961f12378 SHA512 07604f2af4787b842aee1c9f6c8c72b38cf9234cb1dcd833ce97cceb5134f71b7c9b9b23da7d11dbfb306fac444ad9a132b7439099978aeec381892b04df919f
+EBUILD farstream-0.2.8-r2.ebuild 1819 BLAKE2B 9dcc52ac72766c36649fd13d75ca7efe7641237671a5bbd952fec059f3aee6150615c65d07a663117112dd8aaac3593b4e254c4e1002e99bb4f2066c86402607 SHA512 4c7308a49043f7b0b5801baefb43c83dec0bbb9c741e1a8d667190beeff8fa18f9b842bdd7bc6723a993d12368783d75893dff2e143d8f82d0848954cbf3ef1b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/farstream/farstream-0.2.8-r2.ebuild b/net-libs/farstream/farstream-0.2.8-r2.ebuild
index e199f1c8e300..5e47397a3ad9 100644
--- a/net-libs/farstream/farstream-0.2.8-r2.ebuild
+++ b/net-libs/farstream/farstream-0.2.8-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/Farstream"
 SRC_URI="https://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index ced44b65a9cc..04e2f92f2398 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -2,5 +2,5 @@ DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
 EBUILD libnsl-0-r1.ebuild 578 BLAKE2B 1ad99a98bb11433c7040daffccb5697f3984af7206b7e796a43337d0e1ec2a52c7bbd9dca4f33842b72030ed9576aaba86f4192eb4bf5e506dff0e2be5402f07 SHA512 05da30d3ad8120ee9e710e16edf3d44921e7a40bb2922ef017c9832e8413dd9c59ed40d20612e3897f13619a6c2726fb7638dd4697e82e5e7073abd995571ada
 EBUILD libnsl-1.1.0-r3.ebuild 892 BLAKE2B 1c243867c38ff5726b35d48f60f984fd950c6ca0968b5e8f6487e9b25108ed6cc3464201829424503a6dab92ba4b8e259bdde2533a1be5b8112f3e0fecd5567c SHA512 a3a17f4d91553e6fb5b5f154509e657be6c48454b9023b19410401bd307d7ca932bda806598db4a55644ee442b31ecde910298ac179f87d05f00ed5bf6ee3ad8
-EBUILD libnsl-1.2.0.ebuild 900 BLAKE2B b8fbce8bf147208ad29a643a11bf35ce73c03f02307bacecae881c86ed6cdb9227cb51f39ab68c3e033b58ba0cea668f15e9164390111ddbcb963abca326282c SHA512 669a3c6d427adbca53c8a95852664af2bfc204773234e948ba52c074a1c1d18cbf4112ab9952d0dd8fcd5b3ee47e6e8097ab7a76005c8615fe7138bed096e26b
+EBUILD libnsl-1.2.0.ebuild 899 BLAKE2B beeeadd634ac21d663cbedce4dd18c68b8f156d399d9c06cebdd2cdabe21e53c5377760063f9b215b23be9f0b90a29a811d4ffa4af533d87f606f09eaacf27ea SHA512 b8c402b184713083dd8c5af7e512aaadc079d9845bc0cccf869984838f23eab918447c37decd43534e0875c432226396bb45b3e2f0eaf231d8381b68dbb82b66
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index ff489ae795a6..760503a9d2dc 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/net-libs/liboping/Manifest b/net-libs/liboping/Manifest
index e2a7b922dc14..11a3a50b53b0 100644
--- a/net-libs/liboping/Manifest
+++ b/net-libs/liboping/Manifest
@@ -1,7 +1,5 @@
+AUX liboping-1.10.0-gcc8-fix.patch 887 BLAKE2B c40500b5183eabe352e4a8b15c06f051de0240f1aadc43848e4f2b82c6e4feec44eed993d579ff04a1295eddf39bc312280396cfe3e1517c359f81f1a25f5230 SHA512 073ba6c52cf2c9f414e79a1411b7d7d4250c06dc32975bb96fba5df35ecf863e50bc3f8dd2c8b965e77890740b5414511bef2007f831d778c8527f27da87e834
 AUX liboping-1.6.2-nouidmagic.patch 741 BLAKE2B c8ee54176ded65740d5b035a4f572b45b42f8c4f6f99b723eef7c73d459c4b38907570c3da3dc54c2b71a360164ed1d84dce44a2053050c7ef13f72a13b36ba7 SHA512 d991b2871091c3e92d6b194bfdaa77db34455aec3c32087fff0a02ccee0e1f6fa0e0453a61d28a0fc9549644359f91425efef0b94e37c033d4d43b12bbd7b07d
-AUX liboping-1.8.0-remove-ncurses-automagic.patch 3192 BLAKE2B 4acbd0cffa4f1c5219e715c1194f800615c53ca152e7b3ae1f43d8556478ef2c410ceff4ea8bbfd28064e1818f1f708895a8322fce46553da34b5f1bb0e44315 SHA512 6bed10c7963f0ae3442e4ff4523985c61b8b8acca8bb39b511fb30b25133d50d31c642d181157216d903c647e585989e08892c4f61ffd9ee9964050769a8a656
 DIST liboping-1.10.0.tar.bz2 318150 BLAKE2B 2fa8719df251116c51aa93262697751df72b93368d543e5bb34668eb1bb07d7c0be143c943b32b23ee8d02e94ac2cc66f46f923ee4ab672b414ef16ce2f75acf SHA512 f1e9984cf0c1df89b29f7bc657c19a5439019db7643680744d8f353664b6a53070581f40b51e72f896c7df88799c6868257f6308e1a9d84b4d2a0666491214d8
-DIST liboping-1.9.0.tar.bz2 313884 BLAKE2B faf22b008bc60d8000b44d9fd3082eb6beafc0b1622c144b8b8b2b9fc79e8dc93380973c6c0a85726c2d4de55d9b94ed15dce7394a0b74d724cbd2554aaf25e1 SHA512 dcbadeea5154d4f4c31f806cae4ee5b8d5a8dfe243a9de4dad4b81b5b227538e1bb0c20afef121bd8ad841346da39fd5fb4710db981b89c11acc573c4f401c85
-EBUILD liboping-1.10.0.ebuild 1324 BLAKE2B eb093c47417564dd78ca46860e3865c001609f7de532fcd09bdc140b1bc3ee023768981c7f81b23549204603386a03bc7113c12c6b12ee01508bc7901a71798d SHA512 f21074efebd8c5865a41ef9a0f955ff96579c13bc85e3694bcb18a607dfcc24cea0dcdcb76c8b8e9719251f5c833e2119c8bfe90177f34730a3214e63b0050c9
-EBUILD liboping-1.9.0.ebuild 1382 BLAKE2B 2fc0a30587d69a359f081d9fd70ea025c568ac06947eb027a87290cd6eaa38bf79f023132e29f7fea66ea83feed09258943666c43d49257a3fc9608c3acb8c12 SHA512 eea9f247a6177d28a0e2d732090412ba1fff276968e70e6307a7f7a7dc77469be2e821241bb0f7e5cbb85bedc96504eaac07eaa0a31192dd3faf09aec97a8ec0
+EBUILD liboping-1.10.0-r1.ebuild 1359 BLAKE2B b07c09f90235e14eaf13c68d2df9e6dddc79177d22f5d672867dea40c13608a71c032bb7e26b8f02c854eaeb4b91f3dbfd576ffe0134b66600050fa75f642627 SHA512 9180bae51161c65b53769a32af2212ecb92188f5509a666a520a0febdca44f1821ed2a88309e0aa12dd0c1fc44196fab1891b2e73a7cb12e39b154041c000733
 MISC metadata.xml 717 BLAKE2B dfa3179582723dc5deb92ec7a8c0bdb39151f99ef68cd5033dc867811574c3b46b1390813caaf65aa18d5e3fea13762b7f5d38069a775c703ee6e849275fe00e SHA512 ef68e308920311969fc83de9e82e6e97648b5376819a5a122e1aa4c68ef3f6ae0bad6dc95a28eb4629f8915c4658facbeabc7740df090cff2598b5ebbd049edd
diff --git a/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch b/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch
new file mode 100644
index 000000000000..a7b3a3edd1c8
--- /dev/null
+++ b/net-libs/liboping/files/liboping-1.10.0-gcc8-fix.patch
@@ -0,0 +1,28 @@
+From 18ca43507b351f339ff23062541ee8d58e813a53 Mon Sep 17 00:00:00 2001
+From: Florian Forster <ff@octo.it>
+Date: Sun, 29 Jul 2018 14:34:19 +0200
+Subject: [PATCH] ping_host_add: Decrease buffer size to make GCC's truncation
+ check happy.
+
+Fixes: #38
+---
+ src/liboping.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/liboping.c b/src/liboping.c
+index 5253e8c..2470988 100644
+--- a/src/liboping.c
++++ b/src/liboping.c
+@@ -1636,10 +1636,8 @@ int ping_host_add (pingobj_t *obj, const char *host)
+ 		}
+ 		else
+ 		{
+-			char errmsg[PING_ERRMSG_LEN];
+-
+-			snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family);
+-			errmsg[PING_ERRMSG_LEN - 1] = '\0';
++			char errmsg[64];
++			snprintf (errmsg, sizeof(errmsg), "Unknown `ai_family': %d", ai_ptr->ai_family);
+ 
+ 			dprintf ("%s", errmsg);
+ 			ping_set_error (obj, "getaddrinfo", errmsg);
diff --git a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch b/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch
deleted file mode 100644
index 67e389ff139c..000000000000
--- a/net-libs/liboping/files/liboping-1.8.0-remove-ncurses-automagic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-configure: Make use of ncurses configurable
-
-https://github.com/octo/liboping/pull/15
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -206,27 +206,30 @@ AC_CHECK_FUNCS(nanosleep, [],
- 		AC_MSG_ERROR(cannot find nanosleep)))
- AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
- 
--with_ncurses="no"
--AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], [])
--if test "x$with_ncurses" = "xyes"
--then
--	have_ncursesw="no"
--	have_ncurses="no"
--	NCURSES_LIB=""
-+AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses], [Build oping CLI tool with ncurses support]))
-+AS_IF([test "x$with_ncurses" != "xno"], [
-+	can_build_with_ncurses="no"
-+	PKG_CHECK_MODULES([NCURSES], [ncursesw], [can_build_with_ncurses=yes], [
-+		PKG_CHECK_MODULES([NCURSES], [ncurses], [can_build_with_ncurses=yes], [
-+			AC_CHECK_LIB(ncursesw, mvwprintw, [NCURSES_LIBS="-lncursesw"; can_build_with_ncurses=yes], [
-+				AC_CHECK_LIB(ncurses, mvwprintw, [NCURSES_LIBS="-lncurses"; can_build_with_ncurses=yes])
-+			])
-+		])
-+	])
- 
--	AC_CHECK_LIB(ncursesw, mvwprintw, [have_ncursesw="yes"], [have_ncursesw="no"])
--	AC_CHECK_LIB(ncurses, mvwprintw, [have_ncurses="yes"], [have_ncurses="no"])
-+	AS_IF([test "x$can_build_with_ncurses" = "xyes"], [
-+		AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h], [can_build_with_ncurses=yes; break;], [can_build_with_ncurses=no])
-+	])
- 
--	if test "x$have_ncursesw" = "xyes"; then
--		NCURSES_LIB="-lncursesw"
--	else if test "x$have_ncurses" = "xyes"; then
--		NCURSES_LIB="-lncurses"
--	else
--		with_ncurses="no"
--	fi; fi
--	AC_SUBST(NCURSES_LIB)
--fi
--AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" = "xyes")
-+	AS_IF([test "x$can_build_with_ncurses" = "xno" && test "x$with_ncurses" = "xyes"], [
-+		AC_MSG_ERROR([ncurses not found but explicit enabled])
-+	],
-+	[test "x$can_build_with_ncurses" = "xno"], [
-+		AC_MSG_WARN([Will not build oping with ncurses support -- no suiteable ncurses installation found])
-+	])
-+])
-+
-+AM_CONDITIONAL(BUILD_WITH_LIBNCURSES, test "x$with_ncurses" != "xno" && test "x$can_build_with_ncurses" = "xyes")
- 
- AC_FUNC_STRERROR_R
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -43,8 +43,8 @@ if BUILD_WITH_LIBNCURSES
- bin_PROGRAMS += noping
- 
- noping_SOURCES = oping.c
--noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1
--noping_LDADD = liboping.la -lm $(NCURSES_LIB)
-+noping_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_NCURSES=1 $(NCURSES_CFLAGS)
-+noping_LDADD = liboping.la -lm $(NCURSES_LIBS)
- if BUILD_WITH_LIBRT
- noping_LDADD += -lrt
- endif
---- a/src/oping.c
-+++ b/src/oping.c
-@@ -82,11 +82,17 @@
- /* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
- # define _X_OPEN_SOURCE_EXTENDED
- 
--# if HAVE_NCURSESW_NCURSES_H
--#  include <ncursesw/ncurses.h>
--# elif HAVE_NCURSES_H
-+#if defined HAVE_NCURSESW_CURSES_H
-+#  include <ncursesw/curses.h>
-+#elif defined HAVE_NCURSESW_H
-+#  include <ncursesw.h>
-+#elif defined HAVE_NCURSES_CURSES_H
-+#  include <ncurses/curses.h>
-+#elif defined HAVE_NCURSES_H
- #  include <ncurses.h>
--# endif
-+#else
-+#  error "SysV or X/Open-compatible Curses header file required"
-+#endif
- 
- # define OPING_GREEN 1
- # define OPING_YELLOW 2
--- 
diff --git a/net-libs/liboping/liboping-1.10.0.ebuild b/net-libs/liboping/liboping-1.10.0-r1.ebuild
index 8f0bc99aa447..50dc00c8fb46 100644
--- a/net-libs/liboping/liboping-1.10.0.ebuild
+++ b/net-libs/liboping/liboping-1.10.0-r1.ebuild
@@ -19,6 +19,7 @@ RDEPEND=${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
+	"${FILESDIR}"/${P}-gcc8-fix.patch
 )
 
 src_prepare() {
diff --git a/net-libs/liboping/liboping-1.9.0.ebuild b/net-libs/liboping/liboping-1.9.0.ebuild
deleted file mode 100644
index 789d2a749265..000000000000
--- a/net-libs/liboping/liboping-1.9.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools fcaps perl-module
-
-DESCRIPTION="Protocol independent ANSI-C ping library and command line utility"
-HOMEPAGE="https://noping.cc/"
-SRC_URI="https://noping.cc/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/0.2"
-KEYWORDS="alpha amd64 arm x86"
-IUSE="+filecaps ncurses perl"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.2-nouidmagic.patch"
-	"${FILESDIR}/${PN}-1.8.0-remove-ncurses-automagic.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with perl perl-bindings INSTALLDIRS=vendor) \
-		$(use_with ncurses)
-}
-
-src_test() {
-	if use perl; then
-		pushd bindings/perl >/dev/null || die
-		perl-module_src_test
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	if use filecaps; then
-		local _caps_str="CAP_NET_RAW"
-		_files=( "${EROOT%/}/usr/bin/oping")
-
-		if use ncurses; then
-			_files+=( "${EROOT%/}/usr/bin/noping")
-		fi
-
-		fcaps "${_caps_str}" "${_files[@]}"
-
-		elog "Capabilities for"
-		elog ""
-
-		local _file=
-		for _file in "${_files[@]}"; do
-			elog "  ${_file}"
-		done
-
-		elog ""
-		elog "set to ${_caps_str}+EP due to set 'filecaps' USE flag."
-		elog
-	fi
-}
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 18c73217d233..e248b5c46af3 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -3,7 +3,7 @@ DIST mbedtls-2.11.0.tar.gz 2224911 BLAKE2B adbcdb9e002fc2d84e345aec00aaae1cbef67
 DIST mbedtls-2.12.0.tar.gz 2299830 BLAKE2B e65da9feaca4dc22e843cb645259ab8c81e24cec709f0f79475b53e3c319f6e5239bd6c82db07562252a35d9746600502c5a856bf6c0de67f2fbbea840b4491c SHA512 c7c2aeb1717886ad87486af2dccb05b2f051372c69fc914f30e4ace1067f5be39ba04e093ad522f904e23a576c1ff430bd772e77823d0f4720f6fc5c1b8aa98c
 DIST mbedtls-2.7.2.tar.gz 2127772 BLAKE2B d66c65f0d974baf97ae361e64db5028af6c402ea248a785009b422d993deaa4facee98dd338ee4b5d36087fd07e679069fc4fb57cce548097d1f788cedb825fa SHA512 52455b68744a3c220aed7346d19c7b9bebd3a065406242b446816a3b02325d72005b5c381b158bfff90e2fe5854064629b297fbec95fea3ad203bfae51a15cab
 EBUILD mbedtls-2.10.0.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
-EBUILD mbedtls-2.11.0.ebuild 2426 BLAKE2B de326fe91fd634ae0b54b90e6e77eb647194c37c6a6274cc385cf6d2ee43be6bb255b3d3bd4522796c7d934aaa747afc1b04cd94581a4f61225caa419fec273f SHA512 59bdb3b597fe5ccbf499f927acd2fdcd7e0f53ae42da744065ff94c02b1622733966eefdc2bdb0ca209acaaea88cf49851b81911bb13d44c10f8b890de324e48
-EBUILD mbedtls-2.12.0.ebuild 2426 BLAKE2B de326fe91fd634ae0b54b90e6e77eb647194c37c6a6274cc385cf6d2ee43be6bb255b3d3bd4522796c7d934aaa747afc1b04cd94581a4f61225caa419fec273f SHA512 59bdb3b597fe5ccbf499f927acd2fdcd7e0f53ae42da744065ff94c02b1622733966eefdc2bdb0ca209acaaea88cf49851b81911bb13d44c10f8b890de324e48
+EBUILD mbedtls-2.11.0.ebuild 2455 BLAKE2B 0f57b97cda5b255df96a725a919c89c0bc0b0a77c2718a7763b237be97c5028611d453ffe507e2f899c92b0dc2dec15529f70a8a5594757bedc1eb53a51967a0 SHA512 3131c793d93aa5b3fdfc9bb4ca23095fe09a07f850cbf6a7eec5416f4927d6b2ee94a2e17022646938e6d86880b3b4f318d42898da97def446f234a624dbfaa9
+EBUILD mbedtls-2.12.0.ebuild 2455 BLAKE2B 0f57b97cda5b255df96a725a919c89c0bc0b0a77c2718a7763b237be97c5028611d453ffe507e2f899c92b0dc2dec15529f70a8a5594757bedc1eb53a51967a0 SHA512 3131c793d93aa5b3fdfc9bb4ca23095fe09a07f850cbf6a7eec5416f4927d6b2ee94a2e17022646938e6d86880b3b4f318d42898da97def446f234a624dbfaa9
 EBUILD mbedtls-2.7.2.ebuild 2415 BLAKE2B 124241763616413f50d6180e83489a5d215236c7498a21ebe6915cdb193fb822e2b9bd39ec9226a97bce55ead0e4b43d029dee755d1b596a1657c4ccda9a7b75 SHA512 1dc5dcc839abca03ef4fb2d997498987ddc14ff6a1dd7fd51dd8922793f8398d2483d58956d6f459a844c4dfc18ba0c444f885c0fbf1dbf45ea6cc3dc8a836e5
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.11.0.ebuild b/net-libs/mbedtls/mbedtls-2.11.0.ebuild
index 3172e24a3923..ce835a31211c 100644
--- a/net-libs/mbedtls/mbedtls-2.11.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.11.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/11" # slot for libmbedtls.so
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
 	programs? (
@@ -47,7 +47,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
 		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 		-DENABLE_TESTING=$(usex test)
 		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
 		-DINSTALL_MBEDTLS_HEADERS=ON
diff --git a/net-libs/mbedtls/mbedtls-2.12.0.ebuild b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
index 3172e24a3923..ce835a31211c 100644
--- a/net-libs/mbedtls/mbedtls-2.12.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.12.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/11" # slot for libmbedtls.so
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 
 RDEPEND="
 	programs? (
@@ -47,7 +47,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
 		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
 		-DENABLE_TESTING=$(usex test)
 		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
 		-DINSTALL_MBEDTLS_HEADERS=ON
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 91972435f75f..553f7ad10f0b 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
-DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe66cdcff481615ac0bd9dcc92099946d9e5563a70137029dec54f8cc4244ef22813e0c2010572cd070ff272120bdb SHA512 a518ff1dcc9ae93f8228f4fa9110b9cbc460260a794d455530218c66317c6b96a5b14971aff25428e37326b5ce9f4d8480eefe6fcba17af23efa4ebceb56f23e
 DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
 DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
-EBUILD nghttp2-1.29.0.ebuild 1855 BLAKE2B 0793576995532dc0626a55ded3a58a9c821a8f982f7cf02457145893cd953f1d369454830f7882fd971cac20b7bfda05fea27e9012367433dedfec0b3e302022 SHA512 e52fce760a93bbc0dcaa3f1625bb7a3cd9abccd969881ed17e4e33d5f4a0bdd3f4ec805667c1f4dd98fdcbc3427fb3f0e60083543c80a0864733f4c358ce19fd
+DIST nghttp2-1.32.1.tar.xz 1548812 BLAKE2B a4c1f4f8d5070d1ddc5a5680d9fda28ad0b3ee6b1241b58b2be2b63026af249a1bcaf62c158c084061802ce93934dc5648e20c54887df330e07407d5879d1412 SHA512 477e6f4ccdba5c86436d554be819fd10a715896173029aa72f9c90c2ee64dbe20e2ff4cde614be3a7683dec9e0feaa21d124493ed5fc12ad4c63a37a83bad57c
 EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B 7a7dd9bb67e6f900d02ab38353764655ac32b5f7d62f44cbb0d6daca3e476626666330a27e85abb2297cc507206767f26fd7566c7e01b079d4ae213d552e2e4f SHA512 879b31dee79958bc567f0730718dbd2da3046e5a1104f8b619d2fe19f8fd3729dd3892a3e5c1856ef9cecb71bd4a2034e32ca99ef9121499ca5606bed06cf3ed
 EBUILD nghttp2-1.32.0.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
+EBUILD nghttp2-1.32.1.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
 EBUILD nghttp2-9999.ebuild 1937 BLAKE2B a3fbca3092493aa311acca430b3c741f3e5b7f2b573463a2f90c10c12c6e83a6a18c53ad993c5333895596862da9112ac8c8eac8ac63def6876dce426abb0de4 SHA512 5f978d788a709eff86996a1a6a080162d7c6d762c09fda34138001bdf32ae203cbe69556658271e1c7462f9c2405dc35e4619d41b5ebecedb0088f82d5611289
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.29.0.ebuild b/net-libs/nghttp2/nghttp2-1.32.1.ebuild
index 69ed1d8404fa..f472f1d77c9e 100644
--- a/net-libs/nghttp2/nghttp2-1.29.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.32.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index aee34d970914..7e3c9b0538ab 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -2,6 +2,6 @@ AUX rpcsvc-proto-1.3.1-old-preprocessor.patch 1018 BLAKE2B c65052ebb526976482c59
 DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 492 BLAKE2B 147d6d7a2bb633a6da0c7091fbcb772b65985ca55ab4a5aee026ef69468f0a6af7de19a04beafa3eecdb3e03fd1824285fa4f86ee44737c969e5e6b388cf5c00 SHA512 cdaccc05d65d1d4f7bc976b9d13fe097b49a0f7b004a626d5834b7a965305a21a22885459b6f7a7d5a68ce0d623b27da8ff796f257a4b5b25aa3c16b3e51b971
-EBUILD rpcsvc-proto-1.3.1-r1.ebuild 691 BLAKE2B 3cf0927cc8d54f05fe728e682b1b7a8d2829338039cab5d70d0904994ada24b4fac2267f0617798223695243beac73bb4044bc9fd905b77a4c944017b3169408 SHA512 799c8bb94d9a56c300e20a2487ebbba96da2d86572a15c7a2fd221e16ddd3ee72172c4390978727126926b9b3a542fa56f32836ba8a89f73f2d65b1e4eeb42be
+EBUILD rpcsvc-proto-1.3.1-r1.ebuild 690 BLAKE2B 8819414150e4f4d08548c6288175d2c097bbf7b42083fbcce84eb514951ca8ffc9825bd19cfbe63d95957f9f7305204fe6fb4cfc5d5fc8aa39f988ce0947b155 SHA512 d6fe026db629e0dc3f32d9d4fb759da865f293655f409708c051f0a914564cd11c3dab0133a1f546328aad938e0748fe1ae414229bebf77f39ed92787ef2f41d
 EBUILD rpcsvc-proto-1.4.ebuild 643 BLAKE2B 7172abfbf67547620ae634f806b19e6dc01a154747096a562bda7ff6a0f50122dcc9c7c1c0978a287421c6d662025342202e227b0552e49d55f15513c49b98fd SHA512 5008ae592acc11837cbaa3100b4f837e4673bf8e152863d41bc4ffb3777425b972851e3195236fcf190e90d4e5b2905ce3d10af4b7a2db909d388733f3269d93
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
index c3b42dd016e1..4c48b938ef68 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="!<sys-libs/glibc-2.26"