gentoo resync : 14.07.2019

15 files changed, 171 insertions, 43 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 321eafe466c3..18fb7ef39b71 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 6f829083fd70..97fbf6db2a2b 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -9,6 +9,7 @@ AUX 0007-grpc-1.12.1-allow-system-zlib.patch 2069 BLAKE2B 60b70714eca54ba0befffd
 AUX 0008-grpc-1.12.1-allow-system-cares.patch 2049 BLAKE2B 4f7e352f3efca21cbc918bf0a8510589c1f9a3b0ede344c83223cebfced42a65e5e3f2c5bebd1cf88d96dbc4d7f738f94b4484cfd23d5ebb1ff74a3370584d75 SHA512 3efffca62048d89430720237c8b51e82b2d2f02c067849d3a6506013b9c4fbda92037a70e3ff66e117465653ecb2a1db0d00857b6325c768ee1d2b122a44d26a
 AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec598a67247dbd064efd03cea660444ecb3afe3095e2b7c1c67b2e83423762ad1580636039e27004fe34c8ff0c3bdc9862a3c54 SHA512 dfdafec8efc8fc0f4bbcdcbb036fb7ee746c917c8dfe18338dbd20be40efe8e1b3fe77c6f66f0b050f6d078aaff81a78477980b63ad81288cae474af8c723420
 AUX 1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
+AUX 1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
 AUX grpc-1.14.2-gcc8-fixes.patch 4258 BLAKE2B 211847b5f493076ecdc13eef9567f5f088dfb1f0e1b7c61b69b6daeaeafa638262aea525063ac5a4612e12cb378d1231d30eb1ed86d781b6ee43b20d4fb68353 SHA512 20279e231042fa01ad0dffbfd731e2ea17d9ff4240a21204f672f88a4dca7302f1e8a4f4dbffbb4a5c2d321f47f735ef0411a2e2a44472494b518741a044ac4f
 AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c
 AUX grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch 3039 BLAKE2B 1da27e75874229261115b174b168e0b478add3c844c58e81a84bf74b699447310decda09e0cad89056a3f5d7fcc8d0bb1835889438ee8efab89471c66a77b69a SHA512 a6f59a3b518310c6150439fba5ad058048540f0f84152406f607873248e3e0d95cc0077b634164f4bdf391427c847614dd88e2ddac9feded0aa23044ea58c051
@@ -25,6 +26,7 @@ DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a95
 DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
 DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
 DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
+DIST grpc-1.22.0.tar.gz 15082718 BLAKE2B 679be0488fc02441d5ba555c9150532e6ceb00bbaee9fe8b22881bef8ab713f45f96283f123576738285cfe8d358eb458cac9252bac7766cfd8ee5ac6e97fda9 SHA512 e8181f01bc44dc7e7a9e8c74c0a9c3f25960bb9c88c239e7c75764105ca24ac173bab663130fb6349c7fa43cd57f35dd7927a369482b1e6a73224cb2174bd336
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 EBUILD grpc-1.12.0.ebuild 1533 BLAKE2B 8b5808b767a779c2e9d5baf53ba27e76ea78aa8433acf1b5c3254db134efbf82c0166963e9182111b1bd6dafdab8b7f6c66066e20676bf208aedb4b1286143e1 SHA512 2beaf3a5f7309fb756d3c90fa8444337fcea15ed7cc65adbce7951602a96e9d29d9389b540c5d92e6d4ef209b25b99b76328a52de7aef36b6c543bed10506017
@@ -39,4 +41,5 @@ EBUILD grpc-1.18.0.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e7
 EBUILD grpc-1.19.0.ebuild 2411 BLAKE2B 07dcdddf9de213e4a6304e25baaad18c55d0661bb2e7b280fb8e171b7fafcfa45fb156734ac3303c94c8cb9535bcefa0e67040016b0002adbafb578a905f5660 SHA512 11118c9854af50b3bda038388bf9174066c625a781bc8dc5f22a07f4d604fbc54537fbf65a4cacb8816e65800707f9290251e7421d0d7e783ff4018bd9e9c70d
 EBUILD grpc-1.20.1-r1.ebuild 2428 BLAKE2B 58420dd83cd4561dec2b1f22643c3fc77ce0cca3f6f47f7636029fa6a914df907206437618e44cca09733a5778f2247a8bcb103da66d794f53de7b22ea274cb4 SHA512 ca6357220aabc017a7bd2b0a22f8731c1a85967d7e4cb35e2390f5e9954771be26d254f96da474d213a1e2c3942a1dfe43f12a45cd544df746c2812444bb454d
 EBUILD grpc-1.21.1-r1.ebuild 2510 BLAKE2B 4682ad4a7b103c7a102cd9ad73d85331400b7216c572c8bf121001c5ccd0c32ab2e6c2f7c09e5245eb8c69011e55b3fc59b1d05e908e4a0a17af7b342705d3b1 SHA512 1cb0f897bf2d888e97df9208b9c30b6ceef08b29f08090457e65d903a810ca7ac09431e20835b722d84758bbdcd537437277504e492f05aef6d63fdf75ff3eb7
+EBUILD grpc-1.22.0.ebuild 2539 BLAKE2B 8d1cafe9b1b74403ece5c57b7064955c7c4b512742c3cecfd9bfdff0b632bc713fae61dbe24ec4773c49db175b0860f00ff0319298dd63c4dac344b770d6a63f SHA512 7fdb2c1eb9ad2d3d052e9cccc693870f800c030808245d68f179599c2e94b357f31746b7805535f8f002b7f05acf5928efd46e2781724a7e57da4681c1089165
 MISC metadata.xml 738 BLAKE2B cff2b1998bc69661baad2d711e3f6b333b641c8ce287cafe4db88f8582b4a73082aee86d35bb8ed575941f813451af032d9e9aa4654984f344bc357817cce3b6 SHA512 acc602accf74b98f978a3cab6b46f70c4730718c49a7dd7869687c899b2b0f72eb70dd90f783151ba1bf0f44ed9de028cead4c1ddcc6051509a04d38a50df4fb
diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
new file mode 100644
index 000000000000..974d6fcc4351
--- /dev/null
+++ b/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
@@ -0,0 +1,44 @@
+--- a/Makefile	2018-06-26 11:07:45.948160976 +0200
++++ b/Makefile	2019-06-26 11:04:25.798966336 +0200
+@@ -2820,13 +2820,15 @@
+ 
+ install-headers_c:
+ 	$(E) "[INSTALL] Installing public C headers"
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) for h in $(PUBLIC_HEADERS_C); do \
++	$(INSTALL) -D $$h $(prefix)/$$h ; \
++	done
+ 
+ install-headers_cxx:
+ 	$(E) "[INSTALL] Installing public C++ headers"
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
++	$(INSTALL) -D $$h $(prefix)/$$h ; \
++	done
+ 
+ install-static: install-static_c install-static_cxx
+ 
+--- a/templates/Makefile.template	2019-06-26 12:38:36.777292299 +0200
++++ b/templates/Makefile.template	2019-06-26 12:48:35.668550020 +0200
+@@ -1302,13 +1302,15 @@
+ 
+   install-headers_c:
+   	$(E) "[INSTALL] Installing public C headers"
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++  	$(Q) for h in $(PUBLIC_HEADERS_C); do \
++  	$(INSTALL) -D $$h $(prefix)/$$h ; \
++  	done
+ 
+   install-headers_cxx:
+   	$(E) "[INSTALL] Installing public C++ headers"
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++  	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
++  	$(INSTALL) -D $$h $(prefix)/$$h ; \
++  	done
+ 
+   install-static: install-static_c install-static_cxx
+ 
diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild
new file mode 100644
index 000000000000..04e137d8d78c
--- /dev/null
+++ b/net-libs/grpc/grpc-1.22.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc perftools systemtap static-libs"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/protobuf-3.7.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	perftools? ( dev-util/google-perftools:= )
+	systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# requires network
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	rm -r third_party/cares || die
+	sed -i 's:-Werror::g' Makefile || die
+	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+
+	default
+}
+
+src_compile() {
+	tc-export CC CXX PKG_CONFIG
+
+	local myemakeargs=(
+		V=1
+		prefix=/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		AR="$(tc-getAR)"
+		AROPTS="rcs"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		LD="${CC}"
+		LDXX="${CXX}"
+		STRIP=/bin/true
+		HOST_AR="$(tc-getBUILD_AR)"
+		HOST_CC="$(tc-getBUILD_CC)"
+		HOST_CXX="$(tc-getBUILD_CXX)"
+		HOST_LD="$(tc-getBUILD_CC)"
+		HOST_LDXX="$(tc-getBUILD_CXX)"
+		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
+		HAS_SYSTEMTAP="$(usex systemtap true false)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		V=1
+		prefix="${ED}"/usr
+		INSTALL_LIBDIR="$(get_libdir)"
+		STRIP=/bin/true
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.16.0; then
+			ewarn "python bindings and tools moved to separate independent packages"
+			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
+		fi
+	done
+
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 63f5977b608e..f52b1c0f0357 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -2,8 +2,8 @@ DIST libmicrohttpd-0.9.62.tar.gz 1837529 BLAKE2B eb06d6ee05af2b37909ad1c60e16de2
 DIST libmicrohttpd-0.9.63.tar.gz 1840005 BLAKE2B 0fdbc97901a3c5fd9567e70c58e3ef93517a2b7defd88313329fd2e9c8f610e41524291e877ba6633339a29df4f17a735416904651163c272eb2334fa5012f11 SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17
 DIST libmicrohttpd-0.9.64.tar.gz 1631384 BLAKE2B 15437188f0246ea0270338e45016c344d345c31954256b70de73a16d6858bf7eff03b796214463cd5e34c5c9f8b47e84fcfb80550659d3579031eb3697e8555c SHA512 2569bcfcbc16da988a236fe337b60c0c69c23e7e66e9c9459b26b0b09a4763a42e94db11c9f10fbaf424bdce2b60e7d2837ecdd65393134ff5bc06f8b23c6bd9
 DIST libmicrohttpd-0.9.65.tar.gz 1633346 BLAKE2B ce6ba2b6c52e30194872c66ab5b9e358f0979dd99ef24ce59fddf9e6fc2b76b01f424f9c9b511cf88c2dde2ca98d3f6a25cbcd26bdfadf0b9db65efd36435dc7 SHA512 751b7a5970cef07f260660254bfdeda4882e9e28d5cbdfbfed50e2c4583caf8f19c96ede6d368babc4223e7fbdf85d85eec37dc96abf333377dc13d6a9c6be12
-EBUILD libmicrohttpd-0.9.62.ebuild 1263 BLAKE2B 2ed2aa3c175c488d14b03e19651678166ba24b0d898ec901100622cc6841600a4ab8a056dafe90aa74dc3d2dcc1357a8d1664930f6cda26634c483eb71f43238 SHA512 91694bcc81e890f44600139f54bb1c1ab0fe05f70810ed826522bb338a0dea714b2ce2e0a2f76a41d7ed2d95846e84695dcb0df9309ca3a87eb5ce15776bb3af
-EBUILD libmicrohttpd-0.9.63.ebuild 1265 BLAKE2B 4d71af139647e5cb317704245eaf7b21f8e0fda9ae4b4dd0771f74e428f229a5c6290e8de04ba0b3f2f46089ede5c34695c23b2588c34e20560986b0dad40397 SHA512 cb3860f200a5c44fb7c83918f440880475752b59ae96717d41187d2c71b47ffb2ee0af8853be1d729ce80952db726be614d30ed9d0e5069ff3f880cc3e76de41
-EBUILD libmicrohttpd-0.9.64.ebuild 1271 BLAKE2B e3a9159dffa50ac50f8d8b98cde0ffd9f7b3cfac38b0becf105c68456e4649881007bd39cea9a954bb0db04e10f04c34ef69a054942cae0e8f147160e56a06be SHA512 578600917b0295118471ece4416459fee6fa62352144fd913ecfe2d6d701b067b1ff5f511a1a75c58a0722d83340403840b5272cc50d2dd2dca346d341317501
-EBUILD libmicrohttpd-0.9.65.ebuild 1271 BLAKE2B e3a9159dffa50ac50f8d8b98cde0ffd9f7b3cfac38b0becf105c68456e4649881007bd39cea9a954bb0db04e10f04c34ef69a054942cae0e8f147160e56a06be SHA512 578600917b0295118471ece4416459fee6fa62352144fd913ecfe2d6d701b067b1ff5f511a1a75c58a0722d83340403840b5272cc50d2dd2dca346d341317501
+EBUILD libmicrohttpd-0.9.62.ebuild 1264 BLAKE2B b74c0baa46a6951f4f923c2381ca3570d5f8e97cc38385978a94ff18c1dae89c285fb2fc887ad4fb7f0a6579166dfb00ddd8eb2eb8b34528fb051157f37075da SHA512 ea71bdbc1d78a0abf788c379f5ef273028f0611145dcf15e92e788a123d02ee37f22a729fd714d68594c0d7135b08fab9feecbf140d4d09c94b67e9bb12f1769
+EBUILD libmicrohttpd-0.9.63.ebuild 1266 BLAKE2B fab1dbc772137ed04949255c36c189916466356e30cbe568b0430010b92d995090fbc9d8d3ab99b447024c51226c0f2ffb9d8e2b159290347322ab6976cffd19 SHA512 81dc0cc39f05c1b6beceb01921803517d0608bdf2941c1ab2669be4619678b59e2a875de201e2d05ca69555280a234bde0a21c9831a1a3b8364d7cf070fc6616
+EBUILD libmicrohttpd-0.9.64.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
+EBUILD libmicrohttpd-0.9.65.ebuild 1272 BLAKE2B fa49ca2d92a50f4b171c6bdb1d833f0e4be13eefee103ab909ba0b026d0c240f66ab9d3c7079dce074f46a91b4ca2f0fad44ae7e887532b53dd8f7c38f155817 SHA512 c1bec32dcea42c581d7424e42942f62d5dcb60654fafa75bcdaa96038057c31e5f33b21c858f79296cecb2b3d7f4a0d691b740ef9a8ae0088c2c523d1a971385
 MISC metadata.xml 372 BLAKE2B d180fcd5efefd2e3578a0c24eceab503d896a3b194a15d3966bb2ccf4bc2bb4734951824b8f85b22f7a7dde6ca17b2e17026cd182788f2055f7cc37b9429032e SHA512 dfa7081c0ae502a60c5b86d7fb2aab3a23f77b08d0e638686fddba3e7976c917dd2392ba150365ffa411f2fcdd10483856b051bf1ee0ac519b74ce7b2672a8d7
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
index 19abf491bbfd..45a833af693a 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="epoll messages ssl static-libs test"
+IUSE="+epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
index de2fce1d175a..29169cf8841e 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="epoll messages ssl static-libs test"
+IUSE="+epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
index 7b1be999f8eb..300e0e2e916c 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.64.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
+IUSE="+epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
index 7b1be999f8eb..300e0e2e916c 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/12"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
+IUSE="+epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 5838d7de4e54..bf56625e7e63 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,5 +1,3 @@
-DIST libndp-1.6.tar.gz 364406 BLAKE2B 616bad28a38f40b32446431ada1ad786ea09e5fe8e58fe9d4944b2fc36ab7ad44258f9fb7b8cabcea47bfb366de3a4a93ef2bd1d032896f60cc35ac92e9c8438 SHA512 ad2df92c5b908f5c40e6e1920195ef97d560b667f78dd4ba5b5418d2dc294a69357fa704b9137f76a4d1ab473f0ec5f1bc4644f25f6a3f0802b75b961638be22
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
-EBUILD libndp-1.6-r1.ebuild 565 BLAKE2B e6c1dde7773367b73701af74d37c91cf5d1c41ac509cdb06d9649be49f4addf4bd178f92ff21d689028260a917fb54388aba8b235a7b3556894cdf564e64920e SHA512 c4d41e8490f65cb6703a9831c7be6b9e097ceab8373dd3760adc855e967dca6f0523e03864f6c9048197fe458d23e206e25927dbb4080339e8a6d761b498bf7b
 EBUILD libndp-1.7.ebuild 561 BLAKE2B c5338ef17843cac86e3f72a803e7f2b311da2bff20da3b36313d3fc97edd0c19b1bffe288479b1fa8c42dd976c2c5351c876d94c42924954bbc661256bb06f5d SHA512 3a1a4ef495a927f566f758bca34c3fe3a18c7c7fb1d6c16549d04af350168582d985b1d9b6108d5d04b5cdc4291d531f4b8deb5692fbaa4806a1fa4fb185a3ca
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libndp/libndp-1.6-r1.ebuild b/net-libs/libndp/libndp-1.6-r1.ebuild
deleted file mode 100644
index 0d6ddbdb8a12..000000000000
--- a/net-libs/libndp/libndp-1.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="Library for Neighbor Discovery Protocol"
-HOMEPAGE="http://libndp.org"
-SRC_URI="http://libndp.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	gnome2_src_configure \
-		--disable-static \
-		--enable-logging
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 79926a907971..3759d4a20e76 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 EBUILD libpsl-0.20.2.ebuild 1473 BLAKE2B c70153f34bd9da55823c004eb61fd10cd9f91bd04b55ad33d528d37dbd4bf32bbf3eb6b117adfcc1933099ea09a3f6ce1b490342386054662f7a9f97fc125699 SHA512 32ff684e4938c070a09ecf5410b35e50131716b4e694c798c6b7a9e6cbfb86d3145ab9b78ff7c2469bac74e43c579a131d64ae5dee4002723c15d46431af307a
-EBUILD libpsl-0.21.0.ebuild 1483 BLAKE2B a3fb11250ad3f73d30f803576a9c7c37adf15463b02a6eee55b56345fd224baecf5a45db1bece3f386f17dfdacf270a27975e3a5413142b9ba710003e6142572 SHA512 4c98fd8a4c121dfcaa721094997fed6f5a7a349183228acbde8df2e3a5c433bcfd867f1808a0c04396cd57df17e05c43321186923ca45509ea29b6895eede08d
+EBUILD libpsl-0.21.0.ebuild 1482 BLAKE2B 667dd387fca8947c16a170ec8694f61bf6a7489f2a33103c56e83c0e21ebf09b3b62413cf57e6b2121fda69c6320f6ffe87192a8bb87ed2cbbc8a488db40e78e SHA512 75f3c036d8dc692161705fa21ecb4f6e1119fda2df68df3c192f358b2189e620743f624d5ddf88d10e24ab7112717b0c028b8bb898173508994a25a61659219f
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index d3c46c206177..1c279f915499 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
 IUSE="icu +idn +man"
 
 RDEPEND="
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 952065a68486..8243dfe9c5d0 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -8,5 +8,5 @@ DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f0
 DIST libsrtp-2.2.0.tar.gz 308469 BLAKE2B 4ef318bdf5c69b69b5869f478d5f0b9ee82d7d8a52440d10e931722c75b2f3a62b59f7542bb932cc93a21b7af24e6b253d70b4722833c5e1e5afce052e3b00e2 SHA512 3a5214b02199ae8dff45a2ed225ed9b1dcb75a9c6b07669e23bf86f97ad26e3e22b4930acdf3c56b21b605211a89a53a17c61602195b391a5b29a09823ba868c
 EBUILD libsrtp-1.6.0-r1.ebuild 2382 BLAKE2B 46357f214e3bb13d64daf41157ab8d560dcc741933175252b97a42d84426497d5c596867c496d5ceef0f1ab36149eac3a9337c0c2e72c96503c696590198ed20 SHA512 eb599d95be055bcae54d06b8110fc6351f1b0048fa5566f87941ad7583c794b5c26db77dde153c0cef9b54d063aad7f2c130a7708b378ef1a45e68cc259f276a
 EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
-EBUILD libsrtp-2.2.0.ebuild 1848 BLAKE2B de13bc96422646659fd82fff3b9de1441743c585a74ea24499009fa20d20b9009bf7183385bec03a3d0c844367eb0526a329b1021d19536eb871ffbdc8f135a9 SHA512 df56545398885f53d6dbfee89a147f92d40cc03b8ca38a1addc58497d3dda5aa0df2c5434962fdd400481567bfb5b7f5e7d0fbf055de17123234fe7e38546e8f
+EBUILD libsrtp-2.2.0.ebuild 1847 BLAKE2B 4d2feaf1826a58a73bba2cccd0a7ac3ca893b45e7209b5185d662347d8c382d5a07c878af83483e28e4041cb97fca1e6de1a92ade36ef8d158900b92cd06dc87 SHA512 e1e106896b6cc4f4a8cd5fe4324abd6c655fd5e8be511a148a461b2b449d7d60ff25556293274892641822b10eb745c7009781a648402a284467d9a0ce5da207
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 241cce30c991..86ef0242fa60 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="