gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /net-libs
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
135 files changed, 269 insertions, 2545 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2586388b4d2c..27c146536f0c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/accounts-qt/Manifest b/net-libs/accounts-qt/Manifest
index feca9a30e25b..37b0d95a425c 100644
--- a/net-libs/accounts-qt/Manifest
+++ b/net-libs/accounts-qt/Manifest
@@ -1,3 +1,3 @@
 DIST accounts-qt-1.15.tar.gz 64190 BLAKE2B a00f4677d9e99304729af4768c288bce1b19f357e50db0db1264760114b6a9cea821bda112605a49dafa192e10d4d6454155fa94a3dd3cea2a6525d63c129bb4 SHA512 36c80a237bc2d427ce3acb62ac3b2e7878ac7e02b00f17022af326b52edbc7ad3d0cf428fb4e1e2bcc1d0d410054102926f549dc18bea137a9d9ea19a2d268d3
-EBUILD accounts-qt-1.15.ebuild 1014 BLAKE2B ca1778cae790fdb02d79a17747c019b027bc49db6a92e02a0d7e19b8c016ce7338dc4cbbcb34c283d5fce16dac144dfaac5dcf83532735cfd5992f2d60a88d73 SHA512 a37e191bcb7c1bfb37a6d63e94cf28f315a7aafdad17f70f0173324a8b3f555e0a0bfaf34e391a4597e355a85f42e8dc4a0e231bec0491ce8adf477b70a6b081
+EBUILD accounts-qt-1.15.ebuild 1013 BLAKE2B 91a8b9c7bcd3ab316d3fc1ba82cc61713d5e262a2f9a2ce5809885595dfa1c6cc368fb9a150878f870cfaf79de64e8fbf99ac7ab27cba6421fc7b36aa7462b5b SHA512 fc416204abb5b959be3a13e04f657620d6a3c2920a49e0e92c1b4f3d513d01c5afc81baf37a918ea02e03fa1788522c021dde85f6c036a76c8300089284e467b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/accounts-qt/accounts-qt-1.15.ebuild b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
index b6e99513ae72..19455ba7329a 100644
--- a/net-libs/accounts-qt/accounts-qt-1.15.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
 # dbus problems
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index 8f3263a281fa..be0b9f08c721 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -3,5 +3,5 @@ DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f7
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
 EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
 EBUILD courier-unicode-1.4.ebuild 479 BLAKE2B d7f051ef5cba4aa2641aa3dc6fba505a1dcd1fb13a59bd2b41d3ae9165dcdef37c20b98aedf2a5e9a9900dc9b54731e34261ed6fc5d9d8497b540e48fb85f154 SHA512 5a4c74f25b4e4a07f7b1be28385b990ddda5156a343330278191084b8baca73de3ec86044f73768638a9751354853d4205b9195f35e3577f5f9defe5721092e2
-EBUILD courier-unicode-2.1.ebuild 479 BLAKE2B 0ed53ffc60ba60482e61d9f66630152482e11d2885b5fdf491a922f45ae0a9cf2042efaa81dfa19a2fc568b3f1fc4cfbc252e10e01db71ad94503eed501cc678 SHA512 99d71a8c0191d591b1a03543693af9542cfcec833bcb95e3ba190c707d9fb23279f6fc7cc38b91e0ef5b2d343bb95f771a9fce89d63df5f15826350f4ee2350d
+EBUILD courier-unicode-2.1.ebuild 478 BLAKE2B fee5e5ed0a7c096bbfede8b71b3dd6058b6f70a09742ab49d32f1e91d15be9269eb531e6303f18799f44972d9d567e6ff9bbae8b44f21057476d39163eb9db1e SHA512 a389e97434eb0297e8d1e45c9fcb799d95f9cd5f13f8aa2be485070c94ae804e597b63ff3a9d8b195c08c03e05cb61929f1e8519f3a1a0b633d8f917e04ce572
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index 34109bb54422..bdd83b9ae951 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 958a09c69a97..a49dd66df647 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 DIST farstream-0.2.8.tar.gz 1315548 BLAKE2B 3f90e6150fd13d02369837b019ad3b935165130b8396133697d0819861f5a5ed79c6eab3efdc3bcc5a6887807285bece21f188bc756ec3cd64a57f5682f5b348 SHA512 7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e
 EBUILD farstream-0.2.8-r1.ebuild 1823 BLAKE2B ec2e9332008aff2e2b510a473addfc3d424152b25045714544a2b12d6bec84df95e82869a076ca6c0eaa8461ea1f1cf897e814ea817b3e2e74b30371be91e144 SHA512 11cdf3f595e40cd4dd6fd328313e4f8696a82f86083f9944ec60e25e68389aae8e54b7791b83cf7638becf92e1cf00badcbe5d669feb70412ecd1520528ac65f
-EBUILD farstream-0.2.8-r2.ebuild 1861 BLAKE2B b218f1e56b91164a4fb6490f534ae21d8de01dae513dd73ceadc25f81d44f1f4a1b2ccfe1ab76a5ea72c4a792c6b4391f99a0379146cf6f9f48189790ff9adca SHA512 2e98634d57b6d376ff026c23a2f8ebf56dffb3a6ebf89bae3909558f7a4faf5b791f660196fe57e14960bf1a150ebfb4bf1fdc7e34914e4be66976fc1204652b
+EBUILD farstream-0.2.8-r2.ebuild 1860 BLAKE2B b798fd68dfa57ff364343f14dc59993c4d16df38b894462e70e1decde85d56d445b518653162ccb7881231cd03ac150d88b62f8115e61935cbe7bbcdf635671e SHA512 6cf85ec283bffb51ec15ccd56f344c9c1483b30a9566e540230ae2e88cbb0333513f7754068d94cdaddee8c08c29c7790262c303edb9e50ede9d2f8aae80059a
 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 0073a65ba158..9734a66c0d9f 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="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+introspection test upnp"
 SLOT="0.2/5" # .so version
 
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 93185c1f97bb..1ddfe47fb723 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,4 +1,6 @@
 AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
+DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
+EBUILD glib-networking-2.60.3.ebuild 1775 BLAKE2B 1618245c9991aa7f8685823fb22b96c057ee4c67f9dcebf256e7e1b6da47487f3c82a36d07cd2ad01ca087854320656d4e9d5899460433399577ab92fd035d36 SHA512 62c2fd35d37b8f4d16bac850734c080a0b1bbd68f5723c7b231e2b2e4477edda25dece8b9f7bce76d4fb1d775a6a5c37b5228b9d050fd168d887f78d929ae07d
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
new file mode 100644
index 000000000000..8d703fcf458d
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.4.6:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index 866315a8ffef..cdba504d71c2 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -3,6 +3,7 @@ AUX 0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch 1340 BLAKE2B
 AUX 0002-cmake-set-library-soversions.patch 5439 BLAKE2B db60577550006e0088ca991bdad3792e68281f9717238c979be875011f3b870566b604fe0e56c0f05f87e981c0118b50050186f6992d1978980047a2d015ccea SHA512 b58b2a42f9676519866a7309e2e1788138d9c77316d8a5eb9f40e6ae27a2a64c54ed5b023574cd1a47c6f87fe14f96801c9b351066a28e258153282848d64c05
 AUX google-cloud-cpp-0.5.0-openssl.patch 792 BLAKE2B 1f234335c7552d8ada5b6eec9687f8ef33fbf67220e7cff2505f3815c3d93d5c9134a291a7df0acd2f654895606082e05e37b5e21b1e0adfb891017471f8bb14 SHA512 60a411c51f719359d64de9be76a3faff3fd26d08b9d159f3b6b9dfccb49b3660a0232732b06cb1cb515f1454c2160d8dd73dd7e980af967d4cdef52cf48a3bc0
 AUX google-cloud-cpp-0.9.0-offline_nlohmannjson.patch 680 BLAKE2B bf5fdffaad3ec131f71b5053bcabe05826c395eea3cb3f02579fa841d3e18f9f72d8359c66d715206fc7521be9dd678a5370250acae0cd9fab0a367935e414cb SHA512 6af1508b86add950d3df2c051b846caf8bf8a44d042b2934417cfaf79c130378637a4ba13775045163ad44ca913837cbcd53d52398250933f062158e4b58023e
+DIST google-cloud-cpp-0.10.0.tar.gz 2189161 BLAKE2B 1e599478db3f280cddc4232c7e6005c7b5a48b1f22aecc8a99dc60f461dad349d343b40e6545680e7b211ea40a07c9b069052c2a6e36cb7279e400cdebfa95a3 SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3
 DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e
 DIST google-cloud-cpp-0.5.0.tar.gz 1050893 BLAKE2B 6e96e2ca3f518f3c417d9d395001a42182aaeacdbbcfedc636387dbccedf5e570367bc66e5b3fecbe53d5b61e51b53709b83da90718826ac643fb2c43c1723c6 SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5
 DIST google-cloud-cpp-0.9.0.tar.gz 2209532 BLAKE2B 33b297d4836cf171833a4481b567d22f44aacdb0afd5422ec7da7f3c47fc1284a4a7723e306508c7dc7cc595166f040abe00a92eed58a07dfed77b94f99e9889 SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
@@ -10,6 +11,7 @@ DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c
 DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
 DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
 DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d
+EBUILD google-cloud-cpp-0.10.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
 EBUILD google-cloud-cpp-0.2.0-r1.ebuild 1665 BLAKE2B 7e581ee73e76a11a0662069c48f56420e19682d0ff50da239dabd554388192a49f905f290c89fd3e53f87d5051b2a0b501b950f71b53535d0e446ed32c88d955 SHA512 86e55d3ff6702482e7f9df3bda0989d93c5d0ebe1512af465e9bdca6b160cdf0ba15cd49db480887b78e4cc31d0d3c9d24eb0a54f0d23aa7cd83b67865d1edfe
 EBUILD google-cloud-cpp-0.5.0.ebuild 1668 BLAKE2B 07e76db614ffc35f1accc059f6cfefdc7f75009618ccfe04a69fb017babc52f9177d7c6bf8c44b64f9787b16d82c3776e56f0df7978c7eec42284bda1318fc97 SHA512 da75dae85dcfbc839b95dd00bcf42f65d31bfd4d315605cbe09db9971488a5347327e3f8b71563800ea16e3ac94309b7131c3ce4ca147b026e1ad611982e78bd
 EBUILD google-cloud-cpp-0.9.0.ebuild 1619 BLAKE2B 6fbec550d4745ac11f9cd61f3781220994dc4b57322b71949fee3ed4b44b561c4730ca81df959ea665fa247a08915b961e62468fbaf50d60e91ae1bac9784cf6 SHA512 7309088ff54ba12a75388b50a208c6d8d37e9ef8228c8ee0dc2f3fc00d7ed8a079b6bcd64c2e2fe77c775f2f3736d5acf57849423d0f1c1a9fdd93f49c385aca
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
new file mode 100644
index 000000000000..0575f7a04ab0
--- /dev/null
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+JSON_VER="3.4.0"
+GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
+
+DESCRIPTION="Google Cloud Client Library for C++"
+HOMEPAGE="https://cloud.google.com/"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
+	https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+RDEPEND="dev-libs/protobuf:=
+	dev-libs/crc32c
+	net-misc/curl
+	net-libs/grpc:="
+DEPEND="${RDEPEND}
+	dev-cpp/gtest"
+
+DOCS=( README.md )
+PATCHES=(
+	"${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch"
+	"${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING=OFF
+	)
+
+	cmake-utils_src_configure
+
+	mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
+	cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+
+	mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
+	cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
+		"${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
+}
+
+src_test() {
+	# test fails
+	local myctestargs=(
+		-E internal_parse_rfc3339_test
+	)
+
+	cmake-utils_src_test
+}
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 97fbf6db2a2b..3474c9b84881 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,25 +1,11 @@
-AUX 0001-grpc-1.11.0-Fix-cross-compiling.patch 2178 BLAKE2B 2f3cb67581ccc276c17033a29795c58a83ce7786ce233bbd26a6ed16b8efaaad0f164e855ce82f0512c76fbe7326643805eca924c5559a82b36f6e849a614c5e SHA512 02a4c07c7d4556d7d2ff448c1a6a02fdf41dbeabcaa1d62103bbbf8198a891f26bf54d3bb921d6b2c0966d577c0b54dee0052f555493f499d7ed6aa680b7b113
-AUX 0001-grpc-1.13.0-fix-host-ar-handling.patch 1654 BLAKE2B cb4172a31dbec91667661c1bbe4830a5485816f649f48637706de22502efc3f8d328a414e141b35c83b2b1f70b0b383d5e44caea8fc1de764d47671c064b8520 SHA512 67cd7832669b067e4acb85c01e46e9710a3e65523d84b5f932baed77c20c4bcf270bed77dd842610b7e0ceb36dbaa729912bd84e9496e172325714d9a55bc499
-AUX 0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch 1227 BLAKE2B 2791f596cc2e9feb633807171647be1785fd62243b323b6412d85eb8c6a3e964118fecadf93dabb6e9f41d6c778b970445737fc9176fa7631d3b875ca094f227 SHA512 377708ee7385b5c00a3b71f89b482c7488efbcad42854f255df9e20206c2940a9c3b6ff934a95ffe683d6eb605eb30d99782ec3a93d85e5240c08f1ef5729ca2
-AUX 0003-grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
-AUX 0004-grpc-1.11.0-fix-cpp-so-version.patch 3700 BLAKE2B 4d198daaff28d5a69b52594fb3d430e7013c15623e4becd1f0fe402a30d48da191b2920b650da5d84a09a16b136049b66678b5a6aad3963bb6bd2d4f2866b900 SHA512 484e535bcf3d18b780e0ae7b3ab82c23cac3d296af215876f73a07b869fad68e484a3de1a006cbdf4ee302582970b47c08aa4a0b34f59442509134316b6b3f82
-AUX 0005-grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
-AUX 0006-grpc-1.12.1-allow-system-openssl.patch 2691 BLAKE2B 078ff854f90f5dea0b5866f387b6bb6f6582aba95bc262208229434a245a46a5082ad84290cf93901aa2bdee8169df3d4df52c667d5b670ae4df9a5898f1b31a SHA512 4979bb97325bb8f1179362bb3fcffffd922899dbc2eaa69630de4751ad54e0dc5e5f6b96c3a4aa1e267700bdf25d7a8e59fab3c7ae04d4cdd70e0173c1d9dca9
-AUX 0007-grpc-1.12.1-allow-system-zlib.patch 2069 BLAKE2B 60b70714eca54ba0befffd36409dc4cb3983393f478e54dc1922bf7acbbe8122a2a7b76003842952a9d693a04adf84d1f6b7243a7034d181a0084620fdfec587 SHA512 22c4bcd909ad19989e72f8063b7b44f8f63d58119a19a92661734ba2bf0c4150b2e870fae45c4bf8c6411e1ca32e8bf713536c3f60d98763210231a0ac4fedde
-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.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
+AUX grpc-1.13.0-fix-host-ar-handling.patch 1654 BLAKE2B cb4172a31dbec91667661c1bbe4830a5485816f649f48637706de22502efc3f8d328a414e141b35c83b2b1f70b0b383d5e44caea8fc1de764d47671c064b8520 SHA512 67cd7832669b067e4acb85c01e46e9710a3e65523d84b5f932baed77c20c4bcf270bed77dd842610b7e0ceb36dbaa729912bd84e9496e172325714d9a55bc499
 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
 AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462005a0add69abf463e93f7d414360135d399dea3f7cbb282150f1e03a6e2df33ad9965327392aed32d76c2875f976c3 SHA512 ad46c4187604212d628004cc783a69d95e4378e83e2673fd99265f2929a000429a269abdb98936ad5611fe9d99df581ff5f122f51661227d13d9e7145ee0a40c
-DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
-DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
-DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
-DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
-DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385
-DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06
+AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
+AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
+AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
 DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
 DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
 DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
@@ -27,19 +13,11 @@ DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f7
 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
-EBUILD grpc-1.12.1-r1.ebuild 4258 BLAKE2B 372198269d3e8422b0fcc7e1148066b9e0c4d5358d42e7e1ee0a1ac76221e40bd07b97f37a1abb3d70644b5054fdc3e5b6e99041f6c35d5c0932d3ad73c141c3 SHA512 e9aba2354c4f23e6d4b37f96570035f75c2ef719f42783127b785f6d6aefadd737e69c7f94d061301823b1f1f662c4bc977fd8d680eb1c9cbf3a5af84d5ec189
-EBUILD grpc-1.13.0-r1.ebuild 4367 BLAKE2B 60db5fa5681f2574b54b52fd06832f43f9de2902db43345d95541eb1e412a4a318c17f08b000ce6e7db0ffa9c749f0fe4a7c1ceca863e7e9414a4ef6cf5cbe06 SHA512 ee044858a4bd1b8c85cc021c329f8fae48511b99f23997b1af8ef3a26be7a8e3179d24c947d40ec7d1b510084a35618d86d928cf5e554e1d03b6eff7f41a46d2
-EBUILD grpc-1.13.1.ebuild 4380 BLAKE2B 6fc9c25ff651bab7903c3550b3c3eaf6c8dab361273d9fe8480abe874b6d46d9315973dafefe054b92bc900f4fc9a6fde783f23277b05b2cbc895995078385aa SHA512 250bd2fe515d305d4c093deca0c22f8e81b63ee2bf3c86dc3b8b83ff1ee65b99856ef1aa035e9ab6a5802ecb86657c61256727c36491a2c5a3c1c446fb354a76
-EBUILD grpc-1.14.2.ebuild 4483 BLAKE2B 74abe8b6c1686a92faa257379fa7085ad13bd6222557a3ac7701503a82f19d82bf87a1dc9a01a2f825d2a87de42e6bf3ec333ea2feb381a373ce7aa904a4d4b5 SHA512 f4353999761d8c438f2a4fc9618aa12e214bd01799722c252d4bfcc4f63bd4f914979dba8f62ffe2ef34277ef6495e363b6a10af6123d6f45ba339a25926fdbb
-EBUILD grpc-1.15.0.ebuild 4478 BLAKE2B b27a529156dca8385d57bdb38076d0292e1409aa2e328a008fa15b2cbae20172e4baeec06fe978d736fc8c29549c8172ccf1d01167ba2f376802e246c8db91b6 SHA512 8eb8cd1e05c7ba06b06879221cf598546143e5c510322cc66abce42d502a214fd81f98c81d2031fda04404d3b4dcacbed32603cdb138fcd3e3b7f1c017b539a2
-EBUILD grpc-1.16.1.ebuild 2420 BLAKE2B ffe4395b757612ff3f7aefd0ec1f88a39fd4b41dba202ac255897847601d3884a1ca8041d973b4cc16bc0e6dcd7f98c98e9c45699d31fa3b31bebbf1d65e4911 SHA512 ee73eb435828c9ec466efb8da1ee3585dd97b8b05df9c55173b192683b7e263d06743446ce1897d71f8905d4dbd280a078ad4acc949d05962af8a53884158ad1
-EBUILD grpc-1.17.1.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e78d2b36758f7044a1f6c4e4171457ba75db79b4e2d263e1482889fe2c7fbb251bcf2bca5324d03e4461e2c3c SHA512 6060b94f74e4ca5cdcd4b2a756ec860ca6557b7fdc3e8aa726d29cbd3f4104e4d7b258888d3036b60e19022512843a8f3db8619405344cac4b967996bacf7e57
-EBUILD grpc-1.18.0.ebuild 2444 BLAKE2B bdd53da589d3bc782d30084c550f1a862d04e47e78d2b36758f7044a1f6c4e4171457ba75db79b4e2d263e1482889fe2c7fbb251bcf2bca5324d03e4461e2c3c SHA512 6060b94f74e4ca5cdcd4b2a756ec860ca6557b7fdc3e8aa726d29cbd3f4104e4d7b258888d3036b60e19022512843a8f3db8619405344cac4b967996bacf7e57
-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
+EBUILD grpc-1.16.1.ebuild 2405 BLAKE2B 1f3e8e9383fcb1f4eb371abde99377f653aeac44dba6e268dcf760b3e2cf20015d08965f9a8b3a2ed1fc31626326239634977d6ecfea893b9e2ca5de2e2d6034 SHA512 695ea5cbd96bb1b49cd562677911d43cfdc78f9ca95240b9103e09f8027f75eb1effbf755adb0487f8a833cbd41d4b1c0ec2de31fe9069be049198b9c526c2d0
+EBUILD grpc-1.17.1.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
+EBUILD grpc-1.18.0.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
+EBUILD grpc-1.19.0.ebuild 2396 BLAKE2B 4a63200218f221390ec05f50699768c68110a460ae43d1b4122924a1c3ce1f16c0fdd0864592c45d423395cc5d4541692202aa05ea3341747eaea1cf5eb3ee2e SHA512 76dfe9ccb26eafcfa67fecf81d155fd35ccf390b46fa756a0475f3929c200d8a3e98af7e12d99f598f9a966505365194f6facb5cf38969d38dde307cb23e80f9
+EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc7041e303b8ac45d9b9415bb2792e21086e6f8ea214498224f50b0f6aefc9dad75a3a8bba14fc502c1432f2e120 SHA512 8c43c88a01143466e5cdb11b224da94b544becf0d7b73e247554b371445a1fd8462af9889d7fe343a508e4a4cc2560828ebea02ca03b4c4781fcddd6a4401c96
+EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e
+EBUILD grpc-1.22.0.ebuild 2539 BLAKE2B a149c117b60e5aa6af33606ca989ca672030b054601c28d8d75437edbe444a5048126836056f8f19b5571251e1fad15f220124644a898d45337963ad9b86613a SHA512 700b4147f8490fd87a7039cf40dc438576a3caf5b9de7dad26e48fd7453c7a7b9678f347b9bc1c8dbc0e3efd5c47d0700543122eb5948baed0be7ac4838e3a51
+MISC metadata.xml 684 BLAKE2B e2a167f68e05a7dbcef3ad7fa58ebcbde529d28ee5d5ad5dd73b2ee66a1bf21bc5041bbde089c6439c5cd4e800ab77edf647d8cc629f051b1a489327cc000cac SHA512 d3a9fda12fc9009e675ac6ea5112b9f8c8c4a316a45623e8e536821144c886b48c9f28b1c7bcc6362bd7ae7d71d0eec36b442fed5360924d7424095b2afd38f7
diff --git a/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch b/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch
deleted file mode 100644
index 6c4767759b4d..000000000000
--- a/net-libs/grpc/files/0001-grpc-1.11.0-Fix-cross-compiling.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b9e631dad111f725c1a4e8b69ff1960397a5cc22 Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:19:35 -0700
-Subject: [PATCH 2/5] grpc-1.3.0: Fix cross-compiling
-
-Cross-compiling was severely broken in the Makefile.  Fix it.
-
-Sent upstream as https://github.com/grpc/grpc/pull/11476.
----
- Makefile | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 95de4f6530..4f0680e1d2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -329,6 +329,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
- 
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- ifeq ($(HAS_CXX11),true)
-@@ -438,11 +439,12 @@ LDFLAGS += $(EXTRA_LDFLAGS)
- DEFINES += $(EXTRA_DEFINES)
- LDLIBS += $(EXTRA_LDLIBS)
- 
--HOST_CPPFLAGS = $(CPPFLAGS)
--HOST_CFLAGS = $(CFLAGS)
--HOST_CXXFLAGS = $(CXXFLAGS)
--HOST_LDFLAGS = $(LDFLAGS)
--HOST_LDLIBS = $(LDLIBS)
-+HOST_CPPFLAGS = $(CPPFLAGS_NO_ARCH) -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -fPIC
-+HOST_CFLAGS = -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
-+HOST_CXXFLAGS = -std=c++11
-+HOST_LDFLAGS = -g -fPIC -Llibs/$(CONFIG)
-+HOST_LDLIBS = -lprotoc
-+HOST_AROPTS = $(AROPTS)
- 
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-@@ -6838,10 +6840,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
- else
- 
- $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
--	$(E) "[AR]      Creating $@"
-+	$(E) "[HOSTAR]  Creating $@"
- 	$(Q) mkdir -p `dirname $@`
- 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
--	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
-+	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
- ifeq ($(SYSTEM),Darwin)
- 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif
--- 
-2.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch b/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch
deleted file mode 100644
index e6bde1321a46..000000000000
--- a/net-libs/grpc/files/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bc139f5b7ce6a2a6d7c67480a04e029955aec0ab Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:21:27 -0700
-Subject: [PATCH 3/5] grpc-1.3.0: Fix unsecure .pc files
-
-The *_unsecure.pc files were still linking against the secure versions
-of the grpc libraries.  Fix them to link against the unsecure versions.
-
-Sent upstream as https://github.com/grpc/grpc/pull/11448.
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4f0680e1d2..86bd66a5e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -778,7 +778,7 @@ PC_DESCRIPTION = high performance general RPC framework without SSL
- PC_CFLAGS =
- PC_REQUIRES_PRIVATE = $(PC_REQUIRES_GRPC)
- PC_LIBS_PRIVATE = $(PC_LIBS_GRPC)
--PC_LIB = -lgrpc
-+PC_LIB = -lgrpc_unsecure
- GRPC_UNSECURE_PC_FILE := $(CORE_PC_TEMPLATE)
- 
- PROTOBUF_PKG_CONFIG = false
-@@ -849,7 +849,7 @@ PC_DESCRIPTION = C++ wrapper for gRPC without SSL
- PC_CFLAGS =
- PC_REQUIRES_PRIVATE = grpc_unsecure $(PC_REQUIRES_GRPCXX)
- PC_LIBS_PRIVATE = $(PC_LIBS_GRPCXX)
--PC_LIB = -lgrpc++
-+PC_LIB = -lgrpc++_unsecure
- GRPCXX_UNSECURE_PC_FILE := $(CPP_PC_TEMPLATE)
- 
- ifeq ($(MAKECMDGOALS),clean)
--- 
-2.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch b/net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch
deleted file mode 100644
index 465520257cf6..000000000000
--- a/net-libs/grpc/files/0004-grpc-1.11.0-fix-cpp-so-version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-It creates the symlinks with the wrong versions
-
---- a/Makefile.orig	2018-05-02 14:19:10.007775576 +0800
-+++ b/Makefile	2018-05-02 14:20:59.414089065 +0800
-@@ -2928,7 +2928,7 @@
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -2937,7 +2937,7 @@
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -2946,7 +2946,7 @@
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -2955,7 +2955,7 @@
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -2964,7 +2964,7 @@
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
- ifneq ($(SYSTEM),MINGW32)
diff --git a/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
deleted file mode 100644
index 61fd830d64d4..000000000000
--- a/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 30ce693621d61efb8596503a0da212077a8c4daa Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Thu, 24 May 2018 17:12:13 +0200
-Subject: [PATCH] Allow building the python module with system openssl
-
-When building the python module and using the new
-GRPC_PYTHON_BUILD_SYSTEM_OPENSSL env variable, the third party
-boringssl code is not compiled. Instead, the openssl shared library
-installed on the system is used during runtime.
-This is useful for distributions who don't want to include code copies
-but use shared libraries instead.
----
- setup.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 99d1a1c504e..3a5ed56c641 100644
---- a/setup.py
-+++ b/setup.py
-@@ -35,7 +35,7 @@
- PY3 = sys.version_info.major == 3
- PYTHON_STEM = os.path.join('src', 'python', 'grpcio')
- CORE_INCLUDE = ('include', '.',)
--BORINGSSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
-+SSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
- ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
- CARES_INCLUDE = (
-     os.path.join('third_party', 'cares'),
-@@ -84,6 +84,12 @@
- # present, then it will still attempt to use Cython.
- BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
- 
-+# Export this variable to use the system installation of openssl. You need to
-+# have the header files installed (in /usr/include/openssl) and during
-+# runtime, the shared libary must be installed
-+BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
-+                                           False)
-+
- # Environment variable to determine whether or not to enable coverage analysis
- # in Cython modules.
- ENABLE_CYTHON_TRACING = os.environ.get(
-@@ -148,8 +154,13 @@
- if "win32" in sys.platform:
-   CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
- 
-+if BUILD_WITH_SYSTEM_OPENSSL:
-+  CORE_C_FILES = filter(lambda x: 'third_party/boringssl' not in x, CORE_C_FILES)
-+  CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
-+  SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = (
--    (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE +
-+    (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
-     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
- 
- EXTENSION_LIBRARIES = ()
-@@ -159,6 +170,8 @@
-   EXTENSION_LIBRARIES += ('m',)
- if "win32" in sys.platform:
-   EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
-+if BUILD_WITH_SYSTEM_OPENSSL:
-+  EXTENSION_LIBRARIES += ('ssl', 'crypto',)
- 
- DEFINE_MACROS = (
-     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch b/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
deleted file mode 100644
index 6964642b119d..000000000000
--- a/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3823d9048102bce79e165584c62a1a5b91810aeb Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Fri, 25 May 2018 06:52:23 +0200
-Subject: [PATCH] Allow building the python module with system zlib
-
-When building the python module and using the new
-GRPC_PYTHON_BUILD_SYSTEM_ZLIB env variable, the third party zlib code
-is not compiled. Instead, the zlib shared library installed on the
-system is used during runtime.
-This is useful for distributions who don't want to include code copies
-but use shared libraries instead.
----
- setup.py | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 3a5ed56c641..483d3ac1682 100644
---- a/setup.py
-+++ b/setup.py
-@@ -90,6 +90,12 @@
- BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
-                                            False)
- 
-+# Export this variable to use the system installation of zlib. You need to
-+# have the header files installed (in /usr/include/) and during
-+# runtime, the shared libary must be installed
-+BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
-+                                        False)
-+
- # Environment variable to determine whether or not to enable coverage analysis
- # in Cython modules.
- ENABLE_CYTHON_TRACING = os.environ.get(
-@@ -159,6 +165,10 @@
-   CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
-   SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
- 
-+if BUILD_WITH_SYSTEM_ZLIB:
-+  CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
-+  ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = (
-     (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
-     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
-@@ -172,6 +182,8 @@
-   EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
- if BUILD_WITH_SYSTEM_OPENSSL:
-   EXTENSION_LIBRARIES += ('ssl', 'crypto',)
-+if BUILD_WITH_SYSTEM_ZLIB:
-+  EXTENSION_LIBRARIES += ('z',)
- 
- DEFINE_MACROS = (
-     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
deleted file mode 100644
index c2e20f3994f4..000000000000
--- a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 78a6e04ec1efc2dc839f0329dcff732940e27fd9 Mon Sep 17 00:00:00 2001
-From: Thomas Bechtold <tbechtold@suse.com>
-Date: Fri, 25 May 2018 07:08:05 +0200
-Subject: [PATCH] Allow building the python module with system cares
-
-When building the python module and using the new
-GRPC_PYTHON_BUILD_SYSTEM_CARES env variable, the third party cares code
-is not compiled. Instead, the cares shared library installed on the
-system is used during runtime.
-This is useful for distributions who don't want to include code copies
-but use shared libraries instead.
----
- setup.py | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 483d3ac1682..43c25aafeb9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -96,6 +96,12 @@
- BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
-                                         False)
- 
-+# Export this variable to use the system installation of cares. You need to
-+# have the header files installed (in /usr/include/) and during
-+# runtime, the shared libary must be installed
-+BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES',
-+                                         False)
-+
- # Environment variable to determine whether or not to enable coverage analysis
- # in Cython modules.
- ENABLE_CYTHON_TRACING = os.environ.get(
-@@ -169,6 +175,10 @@
-   CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
-   ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
- 
-+if BUILD_WITH_SYSTEM_CARES:
-+  CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
-+  CARES_INCLUDE = (os.path.join('/usr', 'include'),)
-+
- EXTENSION_INCLUDE_DIRECTORIES = (
-     (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
-     CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
-@@ -184,6 +194,8 @@
-   EXTENSION_LIBRARIES += ('ssl', 'crypto',)
- if BUILD_WITH_SYSTEM_ZLIB:
-   EXTENSION_LIBRARIES += ('z',)
-+if BUILD_WITH_SYSTEM_CARES:
-+  EXTENSION_LIBRARIES += ('cares',)
- 
- DEFINE_MACROS = (
-     ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
deleted file mode 100644
index a9168f165e19..000000000000
--- a/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/tmp/alts_transport_security.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/tsi/alts_transport_security.cc	2018-05-20 16:54:49.995787548 +0200
-@@ -45,7 +45,7 @@
- }
- 
- void grpc_tsi_alts_init() {
--  memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
-+  memset((void*)&g_alts_resource, 0, sizeof(alts_shared_resource));
-   gpr_mu_init(&g_alts_resource.mu);
-   gpr_cv_init(&g_alts_resource.cv);
- }
---- a/tmp/client_channel.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/ext/filters/client_channel/client_channel.cc	2018-05-20 17:07:20.604746186 +0200
-@@ -416,7 +416,7 @@
-             grpc_uri* uri = grpc_uri_parse(server_uri, true);
-             GPR_ASSERT(uri->path[0] != '\0');
-             service_config_parsing_state parsing_state;
--            memset(&parsing_state, 0, sizeof(parsing_state));
-+            memset((void*)&parsing_state, 0, sizeof(parsing_state));
-             parsing_state.server_name =
-                 uri->path[0] == '/' ? uri->path + 1 : uri->path;
-             service_config->ParseGlobalParams(parse_retry_throttle_params,
---- a/tmp/channel.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/lib/surface/channel.cc	2018-05-20 16:58:01.632776988 +0200
-@@ -103,7 +103,7 @@
-     return channel;
-   }
- 
--  memset(channel, 0, sizeof(*channel));
-+  memset((void*)channel, 0, sizeof(*channel));
-   channel->target = target;
-   channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
-   size_t channel_tracer_max_nodes = 0;  // default to off
-@@ -280,7 +280,7 @@
-   }
- 
-   grpc_call_create_args args;
--  memset(&args, 0, sizeof(args));
-+  memset((void*)&args, 0, sizeof(args));
-   args.channel = channel;
-   args.parent = parent_call;
-   args.propagation_mask = propagation_mask;
---- a/tmp/flow_control.cc.ORIG	2018-04-13 20:08:11.000000000 +0200
-+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc	2018-05-20 17:09:47.055738116 +0200
-@@ -187,7 +187,7 @@
- uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
-   FlowControlTrace trace("t updt sent", this, nullptr);
-   const uint32_t target_announced_window =
--      static_cast<const uint32_t>(target_window());
-+      static_cast<uint32_t>(target_window());
-   if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
-       announced_window_ != target_announced_window) {
-     const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(
diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
index 257bef8aa140..257bef8aa140 100644
--- a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
+++ b/net-libs/grpc/files/grpc-1.11.0-pkgconfig-libdir.patch
diff --git a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
index 926952f47f2a..926952f47f2a 100644
--- a/net-libs/grpc/files/0001-grpc-1.13.0-fix-host-ar-handling.patch
+++ b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
diff --git a/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch
deleted file mode 100644
index cb61b5f26fee..000000000000
--- a/net-libs/grpc/files/grpc-1.14.2-gcc8-fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9c7db45da9a6ddc5d65cd19704539579eb31d2ce Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 12 Sep 2018 10:35:45 -0700
-Subject: [PATCH] Fix failures with gcc-8
-
-Based on this PR https://github.com/grpc/grpc/pull/15443
----
- src/core/ext/filters/client_channel/client_channel.cc          | 2 +-
- .../client_channel/lb_policy/grpclb/load_balancer_api.cc       | 3 ++-
- src/core/ext/transport/chttp2/transport/flow_control.cc        | 2 +-
- src/core/lib/surface/channel.cc                                | 2 +-
- src/core/tsi/alts_transport_security.cc                        | 2 +-
- 5 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
-index d2bf4f388d..503fb1ac87 100644
---- a/src/core/ext/filters/client_channel/client_channel.cc
-+++ b/src/core/ext/filters/client_channel/client_channel.cc
-@@ -457,7 +457,7 @@ get_service_config_from_resolver_result_locked(channel_data* chand) {
-         grpc_uri* uri = grpc_uri_parse(server_uri, true);
-         GPR_ASSERT(uri->path[0] != '\0');
-         service_config_parsing_state parsing_state;
--        memset(&parsing_state, 0, sizeof(parsing_state));
-+        memset(reinterpret_cast<void *>(&parsing_state), 0, sizeof(parsing_state));
-         parsing_state.server_name =
-             uri->path[0] == '/' ? uri->path + 1 : uri->path;
-         service_config->ParseGlobalParams(parse_retry_throttle_params,
-diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-index f24281a5bf..74baf430f1 100644
---- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-@@ -68,7 +68,8 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) {
-   req->has_initial_request = true;
-   req->initial_request.has_name = true;
-   strncpy(req->initial_request.name, lb_service_name,
--          GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH);
-+          GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH-1);
-+  req->initial_request.name[GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH] = '\0';
-   return req;
- }
- 
-diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
-index 53932bcb7f..4b1862735d 100644
---- a/src/core/ext/transport/chttp2/transport/flow_control.cc
-+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
-@@ -190,7 +190,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t,
- uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
-   FlowControlTrace trace("t updt sent", this, nullptr);
-   const uint32_t target_announced_window =
--      static_cast<const uint32_t>(target_window());
-+      static_cast<uint32_t>(target_window());
-   if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
-       announced_window_ != target_announced_window) {
-     const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(
-diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
-index 82635d3c21..f9d89657b3 100644
---- a/src/core/lib/surface/channel.cc
-+++ b/src/core/lib/surface/channel.cc
-@@ -100,7 +100,7 @@ grpc_channel* grpc_channel_create_with_builder(
-     return channel;
-   }
- 
--  memset(channel, 0, sizeof(*channel));
-+  memset(reinterpret_cast<void *>(channel), 0, sizeof(*channel));
-   channel->target = target;
-   channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
-   size_t channel_tracer_max_nodes = 0;  // default to off
-diff --git a/src/core/tsi/alts_transport_security.cc b/src/core/tsi/alts_transport_security.cc
-index 2fd408103b..51f9e9e85b 100644
---- a/src/core/tsi/alts_transport_security.cc
-+++ b/src/core/tsi/alts_transport_security.cc
-@@ -45,7 +45,7 @@ void grpc_tsi_alts_signal_for_cq_destroy() {
- }
- 
- void grpc_tsi_alts_init() {
--  memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
-+  memset(reinterpret_cast<void *>(&g_alts_resource), 0, sizeof(alts_shared_resource));
-   gpr_mu_init(&g_alts_resource.mu);
-   gpr_cv_init(&g_alts_resource.cv);
- }
--- 
-2.18.0
-
diff --git a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
index 213a39a38438..213a39a38438 100644
--- a/net-libs/grpc/files/1.21.0-fix-host-ar-handling.patch
+++ b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
diff --git a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
index 974d6fcc4351..974d6fcc4351 100644
--- a/net-libs/grpc/files/1.22.0-cxx_arg_list_too_long_forloop.patch
+++ b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
diff --git a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
index d18063f2ef1b..d18063f2ef1b 100644
--- a/net-libs/grpc/files/0003-grpc-1.3.0-Don-t-run-ldconfig.patch
+++ b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
diff --git a/net-libs/grpc/grpc-1.12.0.ebuild b/net-libs/grpc/grpc-1.12.0.ebuild
deleted file mode 100644
index 89cc2c83087e..000000000000
--- a/net-libs/grpc/grpc-1.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit python-r1 toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3:=
-	net-dns/c-ares:=
-	sys-libs/zlib:="
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch"
-	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-)
-
-src_prepare() {
-	 sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	 default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED%/}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=true \
-		install
-}
diff --git a/net-libs/grpc/grpc-1.12.1-r1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
deleted file mode 100644
index 51e73dd8c9cc..000000000000
--- a/net-libs/grpc/grpc-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.5:=
-	dev-util/google-perftools
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		doc? (
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		)
-	)
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch"
-	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/0006-grpc-1.12.1-allow-system-openssl.patch"
-	"${FILESDIR}/0007-grpc-1.12.1-allow-system-zlib.patch"
-	"${FILESDIR}/0008-grpc-1.12.1-allow-system-cares.patch"
-	"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
-)
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if use tools; then
-		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
-		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		# absolute symlinks will fail because out-of-source build
-		# ./src -> ${S}/src
-		ln -s ../../../../src ./ || die
-		# ./third_party -> ${S}/third_party
-		ln -s ../../../../third_party ./ || die
-		# ./grpc_root -> ${S}
-		ln -s ../../../../ ./grpc_root || die
-		# https://bugs.gentoo.org/661244
-		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-
-	use python && distutils-r1_src_compile
-}
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_compile
-		popd >/dev/null || die
-	fi
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-		mv doc/build doc/html || die
-	fi
-}
-
-src_install() {
-	emake \
-		prefix="${ED%/}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=true \
-		install
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use doc && local DOCS=( AUTHORS README.md doc/. )
-	einstalldocs
-
-	use python && distutils-r1_src_install
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_install
-		popd >/dev/null || die
-	fi
-}
diff --git a/net-libs/grpc/grpc-1.13.0-r1.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
deleted file mode 100644
index 45bfa5343f47..000000000000
--- a/net-libs/grpc/grpc-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should ~depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-${PROTOBUF_VERSION}:=
-	dev-util/google-perftools
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS}
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		>=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		python? (
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
-)
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if use tools; then
-		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
-		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		# absolute symlinks will fail
-		# ./src -> ${S}/src
-		ln -s ../../../../src ./ || die
-		# ./third_party -> ${S}/third_party
-		ln -s ../../../../third_party ./ || die
-		# ./grpc_root -> ${S}
-		ln -s ../../../../ ./grpc_root || die
-		# https://bugs.gentoo.org/661244
-		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		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_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-
-	use python && distutils-r1_src_compile
-}
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_compile
-		popd >/dev/null || die
-	fi
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-		mv doc/build doc/html || die
-	fi
-}
-
-src_install() {
-	emake \
-		prefix="${ED%/}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		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 README.md doc/. )
-	fi
-
-	einstalldocs
-
-	use python && distutils-r1_src_install
-
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_install
-		popd >/dev/null || die
-	fi
-}
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
deleted file mode 100644
index 12364479d275..000000000000
--- a/net-libs/grpc/grpc-1.13.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should ~depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-${PROTOBUF_VERSION}:=
-	dev-util/google-perftools
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS}
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		tools? ( >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}] )
-	)
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		python? (
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
-)
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if use tools; then
-		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
-		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		# absolute symlinks will fail
-		# ./src -> ${S}/src
-		ln -s ../../../../src ./ || die
-		# ./third_party -> ${S}/third_party
-		ln -s ../../../../third_party ./ || die
-		# ./grpc_root -> ${S}
-		ln -s ../../../../ ./grpc_root || die
-		# prevent above symlinks creating huge SOURCES.TXT files, bug #661244
-		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		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_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-
-	use python && distutils-r1_src_compile
-}
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_compile
-		popd >/dev/null || die
-	fi
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-		mv doc/build doc/html || die
-	fi
-}
-
-src_install() {
-	emake \
-		prefix="${ED%/}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		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 README.md doc/. )
-	fi
-
-	einstalldocs
-
-	use python && distutils-r1_src_install
-
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_install
-		popd >/dev/null || die
-	fi
-}
diff --git a/net-libs/grpc/grpc-1.14.2.ebuild b/net-libs/grpc/grpc-1.14.2.ebuild
deleted file mode 100644
index f3f61968210e..000000000000
--- a/net-libs/grpc/grpc-1.14.2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should >=depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.5.2"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-${PROTOBUF_VERSION}:=
-	dev-util/google-perftools
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS}
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${PYTHON_USEDEP}] )
-	)
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		python? (
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
-)
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if use tools; then
-		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
-		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		# absolute symlinks will fail
-		# ./src -> ${S}/src
-		ln -s ../../../../src ./ || die
-		# ./third_party -> ${S}/third_party
-		ln -s ../../../../third_party ./ || die
-		# ./grpc_root -> ${S}
-		ln -s ../../../../ ./grpc_root || die
-		# prevent above symlinks creating huge SOURCES.TXT files, bug #661244
-		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		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_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-
-	use python && distutils-r1_src_compile
-}
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_compile
-		popd >/dev/null || die
-	fi
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-		mv doc/build doc/html || die
-	fi
-}
-
-src_install() {
-	emake \
-		prefix="${ED%/}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		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
-
-	# only define DOCS array if requested, otherwise portage default is fine
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-
-	use python && distutils-r1_src_install
-
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_install
-		popd >/dev/null || die
-	fi
-}
diff --git a/net-libs/grpc/grpc-1.15.0.ebuild b/net-libs/grpc/grpc-1.15.0.ebuild
deleted file mode 100644
index 54b506a2c3a7..000000000000
--- a/net-libs/grpc/grpc-1.15.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-# should match pinned git submodule version of third_party/protobuf
-# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
-# also should >=depend on same version of dev-libs/protobuf below
-PROTOBUF_VERSION="3.6.1"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc python systemtap static-libs tools"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tools? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-${PROTOBUF_VERSION}:=
-	dev-util/google-perftools
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS}
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		virtual/python-enum34[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		tools? ( >=dev-python/protobuf-python-${PROTOBUF_VERSION}:=[${PYTHON_USEDEP}] )
-	)
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		python? (
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
-	"${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.14.2-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
-)
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare() {
-	if use tools; then
-		rm -r third_party/protobuf || die "removing empty protobuf dir failed"
-		ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		# absolute symlinks will fail
-		# ./src -> ${S}/src
-		ln -s ../../../../src ./ || die
-		# ./third_party -> ${S}/third_party
-		ln -s ../../../../third_party ./ || die
-		# ./grpc_root -> ${S}
-		ln -s ../../../../ ./grpc_root || die
-		# prevent above symlinks creating huge SOURCES.TXT files, bug #661244
-		echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
-		popd >/dev/null || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		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_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-
-	use python && distutils-r1_src_compile
-}
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_compile
-		popd >/dev/null || die
-	fi
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py doc
-		mv doc/build doc/html || die
-	fi
-}
-
-src_install() {
-	emake \
-		prefix="${ED%/}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		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
-
-	# only define DOCS array if requested, otherwise portage default is fine
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-
-	use python && distutils-r1_src_install
-
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use tools; then
-		pushd tools/distrib/python/grpcio_tools >/dev/null || die
-		distutils-r1_python_install
-		popd >/dev/null || die
-	fi
-}
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
index f04778edda6d..6ab28ceba67a 100644
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ b/net-libs/grpc/grpc-1.16.1.ebuild
@@ -30,9 +30,9 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.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}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
 	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
index 2774a877762b..a5959280313b 100644
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ b/net-libs/grpc/grpc-1.17.1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.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}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
index 2774a877762b..a5959280313b 100644
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ b/net-libs/grpc/grpc-1.18.0.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.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}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
index d944be59c386..a0877fb616b1 100644
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ b/net-libs/grpc/grpc-1.19.0.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.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}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
index f34a772f7781..d8c812cd259b 100644
--- a/net-libs/grpc/grpc-1.20.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.20.1-r1.ebuild
@@ -33,9 +33,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}/0001-grpc-1.13.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}/grpc-1.13.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
index f90bab18e1c5..bf11250c29cb 100644
--- a/net-libs/grpc/grpc-1.21.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.21.1-r1.ebuild
@@ -32,9 +32,9 @@ BDEPEND="virtual/pkgconfig"
 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}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
 	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
 )
 
diff --git a/net-libs/grpc/grpc-1.22.0.ebuild b/net-libs/grpc/grpc-1.22.0.ebuild
index 04e137d8d78c..4f597ba83570 100644
--- a/net-libs/grpc/grpc-1.22.0.ebuild
+++ b/net-libs/grpc/grpc-1.22.0.ebuild
@@ -32,10 +32,10 @@ BDEPEND="virtual/pkgconfig"
 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
+	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
+	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
+	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
+	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 3a3bfdc3d72d..ccbc56aeed7b 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -14,7 +14,6 @@
 	<use>
 		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
-		<flag name="tools">Install gRPC python tools</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">grpc/grpc</remote-id>
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index a68812f605f6..dd3c4c29b601 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,11 +1,8 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
 AUX gsoap-2.8.70-parallel.patch 229 BLAKE2B 2fb3b972b8201dae35911065df1b7555cbe6dd7bb1dc933216a1770accc94c2d1ef02fe6a3ad7643cb7d748a54e55e9ba3591d48f107485c9b9e4306763f2634 SHA512 d49527ae34788f8bc1a74c9a59890bdc13eb343fb3293fcc756b7dd7259cc7cd544bafc58a0c271cf7268b0a9c986db36e587fdc7fcc520ea05ab559e292649e
 AUX gsoap-2.8.70-shared_libs.patch 6177 BLAKE2B d599e56a83a3dec5dc0e6470531081af3a5d5778f3ba7f231e41d4b95a8fbffe2f94ab41b422cff21df3c25dbe5976da4da0626735fe84877407a6f0fa925247 SHA512 46cc3733f1b25c3c5ac81ff340b4254d29bdd8c93f5cc4cb5aad4a997e253aed513eb466070ae1697a308fba5cf2bb22bdda0c04eecd0979debe2b38c68fab83
-AUX gsoap-2.8.70-xlocale_h.patch 660 BLAKE2B afe47e3394b7417defc0cf38a08f1d0c44dbbe445f6042ea361011d97af3b321681912e3cecff574e218804aaf954239ef8eccb6a8dfd2e6d50c14afa4d70e2f SHA512 c86e465752a90519317d61399f09925d5dfaa6ce11651e5013d63ceb49a92aa3728c880d6d57c50e830b1fcabf359cbc18f1b78c0fc2168d98acfb73c89bf57f
-DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.83.zip 32703770 BLAKE2B 1750a25bcd38c020c83d644395e9b3ac3e0c1080fb82f26b11ea0d0beea98c7dc8f3f24a77e093c6ac7e3598d416430990105eeb93e565809844825e1e937ec1 SHA512 7f4ae6feea26ec2d0e970e77cf476a0049c2e3fe47feba4e3b3b57239e7ae0016c409a74d3e865e56d2c01a8098be282d74a33c686d177d203cb8c2dff6bc407
 DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79
-EBUILD gsoap-2.8.70.ebuild 1873 BLAKE2B 470be90c7eff0997b921d6ef7814437d9f98e4320c5f11dd4bfe310be23448b1bc4bdf621d47f17c34b19ac29941b080e4b765b63eb0d1e05ff1c788d552147c SHA512 6394da6872a8e2ca0755a35814809f79b669386ee871abb3b42466001ac87cdba366e00d83171cf50f7ae12d196efbd8ee64d424f0940c78734e0afaa2e4de27
-EBUILD gsoap-2.8.83.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
-EBUILD gsoap-2.8.84.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
+DIST gsoap_2.8.87.zip 32545316 BLAKE2B c2d0f9fafdfa9de83ea35f8dfc88e23d9d80967a2e58c30d554d539fd93056d7a8eb00ea9c928c6cf786e4888eb9f942ba4574e343de0c0104fce8b270494d6a SHA512 638bf9b2b8aca5facba518f136ad5af5bda41f2b92ee345ee6989d73223a571ce5ddab23c0b65259e9fd524039250d861defc8cfc2fc0a366a578ce3629b9ca4
+EBUILD gsoap-2.8.84.ebuild 1787 BLAKE2B b884b325f98f664ffe0955f35d818b323e50f33aa961720932b1e36512b97bd7e20006fc34eefb32c7d6f7b0b3e6fe8840c97ccc101deec93099d204aeaafaaa SHA512 890dd89c7b7eafde95caa5eb6a251801ce2a441bfbf6f392ba0cf6fcf2bb0cf17108c7cc57f14c66f070f490752bc85d00cbe7932ac3a00be98634569ddf7a02
+EBUILD gsoap-2.8.87.ebuild 1789 BLAKE2B f7da4457ee85e42d2f9d76db9b7361b689aeaddb73610c6d55e1be908b154a7226d3d5cbc47dda3d71be991163433c93dd1419997f84604903c269ccc4de850e SHA512 f0cc378b1988ba338398f58be7bd66e47fe397e6c90c0b5132e35c38a29b2b5cc4f9d2b9f95a3221c96ab8f868ec3624d71e5a09ef1df84da7bd07e8a70c3908
 MISC metadata.xml 451 BLAKE2B e3d387b04ad001e38538f12cace5f97f2f3b9311ecbb212d018a481945b593b07236a828181709a4c8c1aa7dc8a679ff1ae37c46d1d2ec213603a0db5080edfa SHA512 ec9e11f668d654db228da6e81da0ac048df98a45f35ec3bf73b7f6b6c050c99f7f064c264e3dc79fa07fc7a713f715ad8836eef6a4984e3786be52c448822ba1
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch b/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
deleted file mode 100644
index fd550dd2670d..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.70-xlocale_h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gsoap-2.8/configure.ac
-+++ gsoap-2.8/configure.ac
-@@ -196,15 +196,15 @@
- AC_ARG_ENABLE(xlocale,
-               [AC_HELP_STRING([--enable-xlocale],
-                               [compile library with forced inclusion of xlocale.h])],
--              [with_xlocale="$enable_xl"],
-+              [with_xlocale="$enableval"],
-               [with_xlocale="no"])
- 
- AC_MSG_CHECKING(for enable xlocale usage in library)
- if test "x$with_xlocale" = "xyes"; then
-   AC_MSG_RESULT(yes)
-+  SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
- else
-   AC_MSG_RESULT(no)
--  SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
- fi
- AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE)
- 
diff --git a/net-libs/gsoap/gsoap-2.8.70.ebuild b/net-libs/gsoap/gsoap-2.8.70.ebuild
deleted file mode 100644
index 7423a510e48c..000000000000
--- a/net-libs/gsoap/gsoap-2.8.70.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug examples ipv6 libressl gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.70-shared_libs.patch"
-
-	# Fix --enable-xlocale configure switch
-	"${FILESDIR}/${PN}-2.8.70-xlocale_h.patch"
-
-	# Fix parallel make
-	"${FILESDIR}/${PN}-2.8.70-parallel.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# Don't include xlocale.h as it got removed in >=glibc-2.26
-		--disable-xlocale
-		$(use_enable debug)
-		$(use_enable examples samples)
-		$(usex gnutls --enable-gnutls '')
-		$(usex ipv6 --enable-ipv6 '')
-		$(usex ssl '' --disable-ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	docinto html
-	dodoc changelog.md
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	if use examples; then
-		rm -r gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o || die
-		insinto /usr/share/doc/${PF}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.8.84.ebuild b/net-libs/gsoap/gsoap-2.8.84.ebuild
index a36f6c5466c9..4f0782b21282 100644
--- a/net-libs/gsoap/gsoap-2.8.84.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.84.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
 
 LICENSE="GPL-2 gSOAP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc debug examples ipv6 libressl gnutls +ssl"
 
 RDEPEND="
diff --git a/net-libs/gsoap/gsoap-2.8.83.ebuild b/net-libs/gsoap/gsoap-2.8.87.ebuild
index a36f6c5466c9..a36f6c5466c9 100644
--- a/net-libs/gsoap/gsoap-2.8.83.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.87.ebuild
diff --git a/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index d4f760fffcb4..cfea2fb360a8 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,3 +1,3 @@
 DIST gssdp-1.0.3.tar.xz 316740 BLAKE2B 50293e653ec5596a986770f3ea81a244b8f9772e9d0c13df0e48f00ee34445c2fc7250702d7928e7dba081715e6d4e379d7a899905c35da84915e6b4058a3307 SHA512 ef72335c3f796aff0d3dce1781d5a0b015508f614d4a73699ebce411b0593419b40c09839ffb62e50cf9d77e16ec0e31d0e23f92d35abb4d105dea47c00a0506
-EBUILD gssdp-1.0.3.ebuild 1427 BLAKE2B 3c8f417547f52a3d3e924e1f0d73fa6606c8edd11af669cefb0f442efb76ea9dc5aaf2e805e3196ba90bf62da04fb4a6f3272842911bbcb473c7819e1d1303ca SHA512 c13194ce03a1159d6e39b16387dd2a17d843979b33ff264ef25978cb09b2392e70cfcfd86ac935d8309b3b2a8278507d8255206f26b04e304a20c3ccb688fcd1
+EBUILD gssdp-1.0.3.ebuild 1426 BLAKE2B f23d9b15d3735ca2130452d544515a1a18b7f6760557b49f1c4c4b28df278cb003a70f9c6daf35cfe720432be7dda63fc6088ec2ab2ed02e1344296a5c9c32a6 SHA512 49fd4ca3b14450439e9ce47ef2a29d490f81d0bc5834c969878ec4cc226487954057b15d36fe90225cdb56c0f9d7544cdd3dc48e67729be2c64fd0558a6739ac
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gssdp/gssdp-1.0.3.ebuild b/net-libs/gssdp/gssdp-1.0.3.ebuild
index fd37730761b2..e293cf95d393 100644
--- a/net-libs/gssdp/gssdp-1.0.3.ebuild
+++ b/net-libs/gssdp/gssdp-1.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+introspection gtk"
 
 RDEPEND="
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index c7e668dd118a..2d30be1de6b1 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -1,3 +1,3 @@
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
-EBUILD gupnp-igd-0.2.5.ebuild 1180 BLAKE2B 21dd3249375595ba1c3a4196843f6afe93086a99468565c2a182af316618c60153841c7d59a9ca452cde44a83ce9af08ef5cf03b5fcaf7a4d766f8313825f3a0 SHA512 9f8f63f26d2db72b3435a109457d40f81f12344120398c66c90e7ea515f8b67370e340c1d99f71c12067b25347be46e651360d05d8d801cc21e6c1b998860367
+EBUILD gupnp-igd-0.2.5.ebuild 1186 BLAKE2B 77127e350625aff081c5cc8981cbe6e2555ad01948c24ae3d511786e196af7a6a0f24d306a6c26a299c5729476e481ab9f0cea4f9a67e7de4cc2065793de96af SHA512 7e3a47d3979a21a080824ffb0da9a4707e9589cedaf22c47fba66348389a5ceb7120fd4b8d3d85876405d424e15459f40c0b0a850fdfbec5a1504d88d12e67b0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
index 92cf19cf3430..4fdc73dc68bc 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 94c54b2ae3de..43976d3339d9 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
 DIST gupnp-1.0.3.tar.xz 422912 BLAKE2B 900a2a81982a50239b26ddd5df3f57caac1ee66103e857b9014db7dc694e303c1eaa0633cb467887f3370e97058abc221bd0175c9df11ca4af31e3f802145a66 SHA512 f256757ddf1a31f1dc93dc138401329e40aa063e7452dccaabe53682eebcb1b98cb6429c01d806290587ca9d01d91afce0603627d2d8675ddb68ef919efb6448
-EBUILD gupnp-1.0.3.ebuild 1949 BLAKE2B ce58a03211d074f71cf7464f566bb4ab462a5b0618eb34c03a86dc96fc2a19f0bd1a4eeb6ce8bec0a5f2f17aef1fe99a71b16de1f5324c1e20de0069d18c45b0 SHA512 74a323364230323db1c7a5f8533744c793523a0831d03530b77f33ab1b7b439228b4851370c2290e3501118a5dc1f92d6a237765f0b267a713c1a8a4bce4001c
+EBUILD gupnp-1.0.3.ebuild 1948 BLAKE2B c7515e47821d5e385d21f507a241f15b320645d88d94e3bb8cfd91574c40dcff36d52b412663723cfce4d59324034fd60de31175b0dbd878a41d0d184fc25c1a SHA512 495086fb7212e0f4bb864eefe84e6d895d9dba1939bf43f9a001deacb5389eb4dea136ccc39a469683d6a36e8e0b98d05ecece38e825ff1a395ac829ba84635d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.3.ebuild b/net-libs/gupnp/gupnp-1.0.3.ebuild
index 7da3070c8835..f4b45b131fa4 100644
--- a/net-libs/gupnp/gupnp-1.0.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 IUSE="connman +introspection kernel_linux networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index e31fdc48a86b..2af3a2d6e456 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -1,3 +1,3 @@
 DIST libaccounts-glib-1.23.tar.gz 127931 BLAKE2B 2379786bb4a658eaba632a1788782a0b5620e69fa058e991a41feeedf5b8f4786592077f237513fde9ed4ea00db015a7dd0be6ad852c265a5b7f8b1180ac01e4 SHA512 88fec1fed7a135375516363e4b7f1330d45a6337bbfb45dd35dabce87097ee4e550e968870541e1b496c2ee3db1bd26e0665f4155f1e64d1cc7b6b74d5b71b5c
-EBUILD libaccounts-glib-1.23.ebuild 856 BLAKE2B 479c9524dbd25b84c79542d4440529d721050b31887f30c5c8427f3fbe2a9ec5d55a7837e8b9428bd61713e9c6f44ddb7d57001f782428bd6adcd78595bd97d3 SHA512 6612b2b945dd0c80bc2f069ea749af7fae1a2465c55096572f15fcf8094bd4f3a283a4a6f6d2f1a9d99650067794d87976343316e9a799055db05945d11720e3
+EBUILD libaccounts-glib-1.23.ebuild 855 BLAKE2B 79ed3efe8e876ffc020b9264552228f56d3a7f2794f19275f18d8c45b1956042caf8103fe7fbf1aff5723945a03351fe44b502aac825988087e4e7076107e21d SHA512 ca131867785ab6b6cde4bf8b88c2460fb40b555c4a987cf4f67bb79c9a7d4ae65bdf91aa2583029b98f413bf446aa76a226b55da579bf49b0bb91be41135c162
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
index 3bd1313616a8..f012c74eff97 100644
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
+++ b/net-libs/libaccounts-glib/libaccounts-glib-1.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index a86ead087680..c455ca6eddda 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,5 @@
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
 EBUILD libgadu-1.11.4.ebuild 1301 BLAKE2B c5e78bcf29f9cf44871f66bbac467d5af33abae86c2ac456c8bfdb760fd8a6b1d589df7db6eb389b82d226c696222edbf90b69db358f5a0b3e521ae73d78ed0e SHA512 513bc3032113c4edaba532198eff84c04e34d158f68a6477a7cd7521ad7cbe99f04f33811f56a5c8fcca448b19fed97579fb519e12779874b8de031e62ad5324
-EBUILD libgadu-1.12.2.ebuild 1396 BLAKE2B b70be94f6a0a63a5c6c36064b04007104b3f4e4581cb826e2d832f534fea8d50861b499bd8054b33d18fff97cc2b05ad4d66ad9c22c78cd38b4f604bc7c433f8 SHA512 4038dc727d1c116c06b7633284bf0dae8e7396e9aeb45a5bd7ba599af1084116b880d0f92f8ba6cb4979d45b4c0a31f8a8e129e352cc27705edace463943fb86
+EBUILD libgadu-1.12.2.ebuild 1395 BLAKE2B 397a6d2d2a720a78aa1aac065d36dd68a61c99133dcb6d57a4e659e7e5967dfc8399a933d891462c6235df8af6dcc896394df1e5fd904f7f469a2183fa365ad8 SHA512 8c81326bf613a301c239f9a274b51814ab9586bce8ee0b8d9dad3f211f778796ca8f138e2c7a2c0f6ad12115f7c4cfcfcd84e4fef4b2654cda6df005f0580a45
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index 1704a7a3abee..0f59edce2afc 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index be5eecb91762..85e55aea5ad9 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,5 +1,5 @@
 AUX libktorrent-2.1-unused-link.patch 649 BLAKE2B 246274feed30df570ba174699b48c702a9b77bbbdda66d7ae44fa0a83993a007897ed2cc9193a4ddd8aba6c8ddc4b1319694246c0bb6bae94bf4dfc4c1591588 SHA512 94f2663bef9c5d31ebdc69538a4dc80b17b9f6835c4975f5b52f13a6bc03ba526b50ee91e1b4515c426e80e95e64f41e8d38980585638a4eb15c328e37fe6ac4
 DIST libktorrent-2.1.tar.xz 355476 BLAKE2B c86205174ac0526455cc9d2049cd918fa1127e85ca18422823f89c3714950d6e4f606dabbeca4d615a17fc18d8032ef0cf86aa4d80726116ea667d9f257e0ddc SHA512 28d7a4b8ee45ddcbadb3ca9d6e568120803081b0ecd3e9436ed721860717b98538c522653ea47975123f0819548d0cabe1973baffed887fcbbca11d84ea5ebe4
 EBUILD libktorrent-2.1-r1.ebuild 1326 BLAKE2B 1e04b16a55c073df66afe29fafa9d8ff1dd0002d4345a10d49e2e05761d3ee6bca908c8f114fd12fbfb6dff39bfd187f48c14713b289f2eea00c73344530f7ec SHA512 9193ee0e624eda49cdb70ae68fe8f48f7578b75ea7f07d60c8e8a06c408ae9582cff1c29d0261cdfd39e4bd94661b5400c3fe1191fe498683717551f1e7d6a4a
-EBUILD libktorrent-2.1-r2.ebuild 1358 BLAKE2B 82841bdd24bf9dad048f5947130ab721780037bc2bbd641450921884111363d6450d3ec5b65908254211aa57983a542f538ec42be075b529f92c065de3cdd6e1 SHA512 ae1c814a77cafa6880e224d2bbe7104af5608d66ebf0c3a84286cea84c14d95b40b96b92da245d5f992f8d515f86c38bf038c86b800ada95398d7ced339bcaab
+EBUILD libktorrent-2.1-r2.ebuild 1356 BLAKE2B 96889e470a10c24b1456c42da16ed52a479e3a89ada0d82c2b6edb2f42f2fe33956f74fad874b515793c09b882f3d48407c974fcc7c76810296eddf1230c254c SHA512 fcceb1e1051620ad457449792c7ccc25b2db7102258ddf71569b0660a01f5fcb6ed3be8ff001ab9ef3199b72193343c56c252da4f552dd9c29cd77fa65f48822
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
index 230154addc5c..6ddd9ce6d458 100644
--- a/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
+++ b/net-libs/libktorrent/libktorrent-2.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
 SRC_URI="mirror://kde/stable/ktorrent/5.1/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE=""
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index f52b1c0f0357..d5dae42c96a8 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -3,7 +3,7 @@ DIST libmicrohttpd-0.9.63.tar.gz 1840005 BLAKE2B 0fdbc97901a3c5fd9567e70c58e3ef9
 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 1264 BLAKE2B b74c0baa46a6951f4f923c2381ca3570d5f8e97cc38385978a94ff18c1dae89c285fb2fc887ad4fb7f0a6579166dfb00ddd8eb2eb8b34528fb051157f37075da SHA512 ea71bdbc1d78a0abf788c379f5ef273028f0611145dcf15e92e788a123d02ee37f22a729fd714d68594c0d7135b08fab9feecbf140d4d09c94b67e9bb12f1769
-EBUILD libmicrohttpd-0.9.63.ebuild 1266 BLAKE2B fab1dbc772137ed04949255c36c189916466356e30cbe568b0430010b92d995090fbc9d8d3ab99b447024c51226c0f2ffb9d8e2b159290347322ab6976cffd19 SHA512 81dc0cc39f05c1b6beceb01921803517d0608bdf2941c1ab2669be4619678b59e2a875de201e2d05ca69555280a234bde0a21c9831a1a3b8364d7cf070fc6616
+EBUILD libmicrohttpd-0.9.63.ebuild 1264 BLAKE2B 6cd0a690a3f344e6e6fd60cb7c7601f1c5abf9f8fcbcc4fc81e2b4b730ae037afda530e984318c7cdba26d6126f22f11d2747a56194047eacd69e86cf181abf4 SHA512 eac1917a4193109502a487008b23405a4f11acb437e87f3b444d328b41f228c5e3a08f78aa11b71d6471b64df294e594b5f56e1e64ef6b2abae49c0acd235cfb
 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.63.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
index 29169cf8841e..328d70812508 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.63.ebuild
@@ -13,7 +13,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"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 4be2cd44ab0d..2176c5569ea7 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,12 +1,3 @@
-AUX libnftnl-1.1.1-big-endian-1.patch 2069 BLAKE2B de0c7ac336dc01d25eb8f2a8ff837e35f9f95275ec1e0b1f32b113a1d2717e98d6281e3034a60a52b2f38e7b120f30dbba9137e330fe715793511ab3025843b0 SHA512 70cca0769923efc99f204608b59712862608e94d4030a1f16c5d8141896fb91c3e458054fd8e7b069014fe3279d209a7b5e7da996633e12781a28f224f0e9cf4
-AUX libnftnl-1.1.1-big-endian-2.patch 1383 BLAKE2B cae500d1ebdde1dd1d7dc7b572ab0a5b30f775b1c9b874ec889ef1bccb2981795e69107268b9ab67aad17864d648ce2c63e29ab54596dbf11072631fa868f44c SHA512 9cae1b05c3b3794219609c95ad547a51ec2249b2457531eb6be1450f0c17a5c4a91ce8b2d3694490e986dba1b587b2df8dcf4f014f6704bef7250f8ec2bfac69
-AUX libnftnl-1.1.1-big-endian-3.patch 1179 BLAKE2B 8ca66b878b2ddbe73aa361b3886e033662d585c5a6d35dfd693877b9f706cbfeec689272f8f43ea41bed77a908e69873f946f967d76bdae0fd45be6992f93b64 SHA512 c1249763339cb633ceb556d97c483f437d6fcc095253df076e46ff3c7c613455ea8296abca53656ad7fea14c7903373c115bb7344abb11acc17b67c67db4bf57
-DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabcc8a639eb61c844f7b941786a49b1c029e375977759717e5cb8f8dc2019ddcbf48223347f868713d1a077d51d8a8 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9
-DIST libnftnl-1.1.1.tar.bz2 372562 BLAKE2B 9dee45bb485399c4677f636c8aa065a7e4e80102f17beb4aa066278a6ef753e7c1aaf02c6a853edc70f018ebef5e8389a05ca384116ec06761f0a29e278f4e54 SHA512 87f092e2b6576121538c8ac7ce92d8c918723e36dd02e2fcfcb7dcaf2ae705bbcd62c79c9076574ef73f461f7df5d10e72bcaeda29e4a7e60ea1401d998424a6
-DIST libnftnl-1.1.2.tar.bz2 366014 BLAKE2B c9170b9a948b949e443fcbbc0b795095a8e51b0cb77e5ba23853fe8c3005baa476afd5d7fa4d7bfcb733b912f0ecb868d22aa2b4c88dbf68e7b56e1a5b23c1db SHA512 808e0efd2ff32a65cca1e6113cc29aece1335364b94ad87438d19b0887d0bd34de11942fa411e4105ef153f2cce862ded17ebc441c413b839ac506471e530569
 DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
-EBUILD libnftnl-1.0.8-r1.ebuild 1377 BLAKE2B e190c94cf83463237be825f2419d1597270d3dc712554ea15482471c6b117b2c5baa1012b27bda2c663da9c558289b53c144baedf055b1259aafa246bd62272e SHA512 e8da2ffced3cd834ab8a28d711493c018fd2e1102f0d36ec7a83955b457cccbacf9f38bf8cfacffe0bac133491045918c3452b643084a896e1e4dd296fa25b30
-EBUILD libnftnl-1.1.1-r1.ebuild 1508 BLAKE2B eb4514ffe545e8c94fcdafd5d63c1c54268c953655d7d6f61ffcc09a950030b0278f1ff7913c888f124af96139457abe7060e5e0c46fd09e3fffa740047ed704 SHA512 4cb3acc19da3de2a2e9035c105327b1b4d5c4e517fc65557a50418d4ee43f19c46c1f7f57a80459dfed9201303234690d692e3dbe7c5e85a1ed1b2e18fc78649
-EBUILD libnftnl-1.1.2-r1.ebuild 1182 BLAKE2B 0bdb1c075c1a79d3e7df690c26a7e5ac361807e32324e15ac316bed4f04ed82f4525b694c31c402b9f7da6d6155b82d6b2929071eb1cae263989d66fb21e8227 SHA512 da9db5505ddf227c70fde149faba980dcc300c2de0f8795db672938a4776cc5ab7ce6a01007e139b2aaa3d1be39c3c49ef6b2051f10721bd510cff1ec308abd2
-EBUILD libnftnl-1.1.3.ebuild 1166 BLAKE2B 7df3cdf25be2ba9ee17624afcaf55391b3f44e22a4cc6d6861a31f0a7ebe93308fd1f27b5312ec58439639b2d53e6fe4d3fe6e1287961b62c3149fbfb9126e05 SHA512 984843aa0c0cbc5b5e332ea7c0a791051929ca8b4062784ddf64b4ac131844c019dcfc008080f10b6c2e959f244cb88051bb461cc5848f6bc2096240bf06f024
-MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
+EBUILD libnftnl-1.1.3.ebuild 1164 BLAKE2B dc02a9509e9ccafa71367c221dadf10fd26b60110fe8eb86ea8f635f52ebcd12631fe875641be64707112a7ab59d43be15f55bb9c2e8578e216bd1478dd20022 SHA512 9b243c291ff51787ec8216701a5ec035fc08f0fb9691c2f2388d86fc539589a37ce52f73b6c5b2c9cd14cd02bc135dd44c96d13ecddbb7f7a7dd6ca6876e0d6f
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch
deleted file mode 100644
index e91333e21bb0..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 9737856067b97cbb869e04fc6b6e65c1d859f521 Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Fri, 22 Jun 2018 14:18:57 +0200
-Subject: utils: Fix nftnl_get_value() on big endian
-
-This function basically did:
-
-| memcpy(out, val, <len of requested type>);
-
-which works only for little endian integer types. Fix this by assigning
-the 64bit input value to a variable of the right size and use that as
-input for above memcpy() call.
-
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- src/utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/src/utils.c b/src/utils.c
-index 3e44960..4d9ee78 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -72,6 +72,15 @@ static struct {
- 
- int nftnl_get_value(enum nftnl_type type, void *val, void *out)
- {
-+	union {
-+		uint8_t u8;
-+		uint16_t u16;
-+		uint32_t u32;
-+		int8_t s8;
-+		int16_t s16;
-+		int32_t s32;
-+	} values;
-+	void *valuep = NULL;
- 	int64_t sval;
- 	uint64_t uval;
- 
-@@ -85,7 +94,6 @@ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
- 			errno = ERANGE;
- 			return -1;
- 		}
--		memcpy(out, &uval, basetype[type].len);
- 		break;
- 	case NFTNL_TYPE_S8:
- 	case NFTNL_TYPE_S16:
-@@ -97,10 +105,42 @@ int nftnl_get_value(enum nftnl_type type, void *val, void *out)
- 			errno = ERANGE;
- 			return -1;
- 		}
--		memcpy(out, &sval, basetype[type].len);
- 		break;
- 	}
- 
-+	switch (type) {
-+	case NFTNL_TYPE_U8:
-+		values.u8 = uval;
-+		valuep = &values.u8;
-+		break;
-+	case NFTNL_TYPE_U16:
-+		values.u16 = uval;
-+		valuep = &values.u16;
-+		break;
-+	case NFTNL_TYPE_U32:
-+		values.u32 = uval;
-+		valuep = &values.u32;
-+		break;
-+	case NFTNL_TYPE_U64:
-+		valuep = &uval;
-+		break;
-+	case NFTNL_TYPE_S8:
-+		values.s8 = sval;
-+		valuep = &values.s8;
-+		break;
-+	case NFTNL_TYPE_S16:
-+		values.s16 = sval;
-+		valuep = &values.s16;
-+		break;
-+	case NFTNL_TYPE_S32:
-+		values.s32 = sval;
-+		valuep = &values.s32;
-+		break;
-+	case NFTNL_TYPE_S64:
-+		valuep = &sval;
-+		break;
-+	}
-+	memcpy(out, valuep, basetype[type].len);
- 	return 0;
- }
- 
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch
deleted file mode 100644
index c6fb5a25a893..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5d592ce6c4596b25d5779a224d03c096bc25db54 Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Fri, 22 Jun 2018 14:18:58 +0200
-Subject: expr/data_reg: Fix JSON parsing on big endian
-
-Since reg->len is a 32bit variable, one needs to pass NFTNL_TYPE_U32 to
-nftnl_jansson_parse_val(). Otherwise, only the most significant byte in
-that variable is being written to.
-
-Since the value could potentially be larger than 255, increase node_name
-buffer to avoid a compiler warning.
-
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- src/expr/data_reg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
-index 1b28b29..ad7f4cb 100644
---- a/src/expr/data_reg.c
-+++ b/src/expr/data_reg.c
-@@ -59,10 +59,10 @@ static int nftnl_data_reg_verdict_json_parse(union nftnl_data_reg *reg, json_t *
- static int nftnl_data_reg_value_json_parse(union nftnl_data_reg *reg, json_t *data,
- 					 struct nftnl_parse_err *err)
- {
--	char node_name[8] = {};	/* strlen("data256") + 1 == 8 */
-+	char node_name[32] = {};
- 	int ret, remain = sizeof(node_name), offset = 0, i;
- 
--	if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U8, &reg->len, err) < 0)
-+	if (nftnl_jansson_parse_val(data, "len", NFTNL_TYPE_U32, &reg->len, err) < 0)
- 			return DATA_NONE;
- 
- 	for (i = 0; i < div_round_up(reg->len, sizeof(uint32_t)); i++) {
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch b/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch
deleted file mode 100644
index d726ccfdc2d9..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.1-big-endian-3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 043060b18d27f24fe723e39bc2c9e5f50dde60dd Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Fri, 22 Jun 2018 14:18:59 +0200
-Subject: expr/exthdr: Fix JSON parsing on big endian
-
-When setting NFTNL_EXPR_EXTHDR_TYPE, one needs to call
-nftnl_expr_set_u8() and not nftnl_expr_set_u32(). Otherwise 'type'
-variable is assigned to uint32_t parameter before being passed to
-nftnl_expr_exthdr_set() as void pointer which casts it to uint8_t.
-On big endian systems, the latter would only consider the most
-significant byte instead of the least significant one.
-
-Signed-off-by: Phil Sutter <phil@nwl.cc>
----
- src/expr/exthdr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
-index 75cafbc..a351835 100644
---- a/src/expr/exthdr.c
-+++ b/src/expr/exthdr.c
-@@ -270,7 +270,7 @@ nftnl_expr_exthdr_json_parse(struct nftnl_expr *e, json_t *root,
- 		type = str2exthdr_type(exthdr_type);
- 		if (type < 0)
- 			return -1;
--		nftnl_expr_set_u32(e, NFTNL_EXPR_EXTHDR_TYPE, type);
-+		nftnl_expr_set_u8(e, NFTNL_EXPR_EXTHDR_TYPE, type);
- 	}
- 
- 	if (nftnl_jansson_parse_val(root, "offset", NFTNL_TYPE_U32, &uval32,
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild b/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
deleted file mode 100644
index 469321c67eb3..000000000000
--- a/net-libs/libnftnl/libnftnl-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 x86"
-IUSE="examples json static-libs test threads"
-
-RDEPEND=">=net-libs/libmnl-1.0.0
-	json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="test? ( json )"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with json json-parsing)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild
deleted file mode 100644
index e6bf90ec6c46..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/7" # libnftnl.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86"
-IUSE="examples json static-libs test"
-
-RDEPEND=">=net-libs/libmnl-1.0.3
-	json? ( >=dev-libs/jansson-2.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-REQUIRED_USE="test? ( json )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-big-endian-1.patch
-	"${FILESDIR}"/${P}-big-endian-2.patch
-	"${FILESDIR}"/${P}-big-endian-3.patch
-)
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with json json-parsing)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
deleted file mode 100644
index b1708f1cde2b..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info toolchain-funcs usr-ldscript
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/11" # libnftnl.so version
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples static-libs test"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
index ac6405559337..0be1b2401e8a 100644
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/11" # libnftnl.so version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="examples static-libs test"
 
 RDEPEND=">=net-libs/libmnl-1.0.3"
diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
index cdf9238d83cd..56c124413057 100644
--- a/net-libs/libnftnl/metadata.xml
+++ b/net-libs/libnftnl/metadata.xml
@@ -5,7 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<use>
-	<flag name="json">Supports parsing of JSON</flag>
-</use>
 </pkgmetadata>
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 1381aeb674ec..754eaa2d386d 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -3,5 +3,5 @@ AUX libnice-0.1.15-libressl.patch 1961 BLAKE2B 7e06399def0beb5c744d97fc6ed3a73eb
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD libnice-0.1.13.ebuild 1566 BLAKE2B 4b5dcc470188b8fba4435ed7be47dacda438d59821ecc69f5f6875572d91b3bc6a4039febb7d2c241674122b6db0aecd1dfcf2c15a226bb144850d7b403fefb4 SHA512 85220da97849a1202ff57fc6864011bc5d6c7e2ebccdc7ca98a852af08defd5616dd55bea86cd101c60dda24444258d51374124ff2ce52c50f47a6dd7c0b0137
-EBUILD libnice-0.1.15.ebuild 1759 BLAKE2B 49508b99e5de682afb0a5e3ce82f3dc519e318c729704c082588047c598fc12e0182820b35902cf65c8fe010af0d1911ff9404f3fce8fc38b12989d3c1c3cc5d SHA512 07615c743a9c242dcd13b82ae078497d39b0e73426656a7f9505af0e41d1f1f75a6970a565124fc96d0b5f19a7ae710c99471ef6fc64c99d5595eaf44cbf4dc4
+EBUILD libnice-0.1.15.ebuild 1758 BLAKE2B 8798490dc67933705234fef225b13cdad5f650cdff5487dbe5c148a293c6f4866456675e92d3b0346cb64f3e63cc799341695f0b016215b7ba9451a3cc260682 SHA512 d1474f0149a757578eb4a1bffa0fa3559523c0d9c4294ba8f94fa41a7c6d57298df4d3d798236550feddae326e756419fad79d984b5d863793dfcfd929f7fe25
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libnice/libnice-0.1.15.ebuild b/net-libs/libnice/libnice-0.1.15.ebuild
index 9b7779ee8514..096899283e99 100644
--- a/net-libs/libnice/libnice-0.1.15.ebuild
+++ b/net-libs/libnice/libnice-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+gnutls +introspection libressl +upnp"
 
 RDEPEND="
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 837bf1fb0f9e..7f2d4483596f 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,3 +1,3 @@
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
-EBUILD libotr-4.1.1.ebuild 585 BLAKE2B a9d0fe006a8b3f0b59a779f99a7992db1fba50f37148b59f48f3e0f793575b9b5eb5dba6cf178082392e6a6bb6842cd9864bfd5ccb1efb8c56ff1fb1840240e5 SHA512 d31f89460a10e10eec5d0e783de34bd0d8cded7ec4065fb3034458bee18cd2630905aadbd7ef41413034d3c01d942686f18bd7c84f5b013135624d613e1233dd
+EBUILD libotr-4.1.1.ebuild 584 BLAKE2B c08a6cff7646e2cceac4e33ebf3b1621a8932ff8d9dafbd339fc9bdea40868ec0bf785226a3c67cfc743efe86d30be824cf2f31754539fb64d34c1f1d5fb03ef SHA512 a6c87ab4c0ae8f663ec0f7057a88db777dfa94d45847df7776c28cb6fb2ad6ae8e0ca0d40145e7b6e2e346dc2767960251f00fe051a58439db96aee5c9d9659b
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index 79640ff065fc..602159f6feb1 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgcrypt-1.2:0
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index 1d5fe55de05b..137ee253915d 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -5,5 +5,5 @@ AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf
 AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
-EBUILD libproxy-0.4.13-r2.ebuild 3149 BLAKE2B 1a80b00ab202e85a433b6550f8b8e091439643ba796540ad4b819f0de8a6fe8858333f1dab6017f59702fd8b7098d463af5f91760129688998194606413f2bc1 SHA512 792ab0512c0f36665c349a7ed526c04390aa17384015dbc78040a926a20bccf9e2d17c2230d914758cd392385b83224d69406bf4652ba5daa3437588bc99c4c4
+EBUILD libproxy-0.4.13-r2.ebuild 3145 BLAKE2B f446b95348715f757f652dee9a68eef98c2ec02bbe28248517dfd333233b104157033bf2d9f47f268cf9a96a5e2a3538933026cf1e38ea6e16851a5f247cbe8a SHA512 9dd5734fa6a71de4b5e7291f144044796080f1d4b9f148e22fc408bc257622cf9250f9fb951f2fc093a553de74624fac27f56af4d9439324203dadb7e200858f
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index f98dce01e0b7..90958fa58329 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.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=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 0359842f311e..bdc0cbd663f6 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1703 BLAKE2B 13bcf21991d2f108df3a4f794e2b413df276c277678009de0d72a23ffc86bf4422dde204330e13c604365c047ecc09b874f36f9deda1de56ae286a272bd1f34d SHA512 63a653279412ab2274591d2b4783250edec3727a67552c82985e35ed166fd847dc494a9d5de74a5ad7553c8431d2552dd33c9256dad2a059c92fe286d495b9b4
+EBUILD libsignon-glib-1.14.ebuild 1702 BLAKE2B 4275605165e5db245631e43d0dec26563e9d0ed04462be541412f42465770d88c2089ff1f997908bc773f1819a234d3e35a851e61eeec51a4f16b655b16ccb79 SHA512 36f714d100f0cae96b5bb67db9062024d542851709c6dfa456e0ce3909b1db7bd0edc858f628809a71ce976dcaab28d0182fba84b01e2f2bb447403c8148d942
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 8320fafb01b6..7d1ab6d192ab 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="debug doc +introspection python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index 8243dfe9c5d0..87fe0c88b493 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -6,7 +6,7 @@ AUX libsrtp-2.2.0-pcap-automagic-r0.patch 729 BLAKE2B 8933586830cab4c911ff5271cd
 AUX libsrtp-pcap-automagic-r0.patch 615 BLAKE2B 5e4edeafd8f9e921c211b67064c72aecd10a708d16c8e89ea6be01ff69126ca546528532b05bc23aae80f07bac6dd2dacfc0ce6b977f6f0efae44ab017ab03d9 SHA512 ee55bdf6f9c77ebacd7469db92f42ed09728fe91a81496ff425c07ad8610e9998fec2a8992b4fafd7c684bb06989837b0244172ed96483984d1c2e6ff6c0dc0c
 DIST libsrtp-1.6.0.tar.gz 1648862 BLAKE2B 5526d7659db160df3b6d9f14922bd731d083f04c6dd084ef473c439d720733d0fd8b38bdfe92e30e05a8a94c41df965d04bca52601b2644352428b49b1ed9093 SHA512 5ac712d0d343c3b63ed248503cc7d33c637895a274c4434c91f513be117836f27cd5daba83088b4647bbd9c82d841e216e6346af8d485cb9ddcd35dee21d4887
 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-r1.ebuild 2381 BLAKE2B 91099f3cf9f24457a123b83acca3270e571c6e0c580ba690b443cadb554c6491d186344db78d9968c1218190dbf06fbf982755fd3d7022695780a4cfde1cadef SHA512 93edf7e4e7a59e59b203b40fef6fdeec133316215aa96ec5b95a01804f0b7b1c3ff57cfbf08ab32a44cc21015bd62df3d039ba0c0b4630aecbb1cedb0426877d
 EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770bcc7471a1727e0872f8af655b3af9034831fa5d8800afb0492bf2b6bcc61f1aa9b3b1d6b39f065dee7b2787c0 SHA512 14f95b201db1eba997d54059ac6c54d0af5d5047bab001510bfa1fe6ed7ed3b3b29428a1221fb6c0e44fd0fc96b8a481416a912e4c0c79fab3f6b56afab29712
-EBUILD libsrtp-2.2.0.ebuild 1847 BLAKE2B 4d2feaf1826a58a73bba2cccd0a7ac3ca893b45e7209b5185d662347d8c382d5a07c878af83483e28e4041cb97fca1e6de1a92ade36ef8d158900b92cd06dc87 SHA512 e1e106896b6cc4f4a8cd5fe4324abd6c655fd5e8be511a148a461b2b449d7d60ff25556293274892641822b10eb745c7009781a648402a284467d9a0ce5da207
+EBUILD libsrtp-2.2.0.ebuild 1846 BLAKE2B bf7f66ca0ff3656ad4c10b1a576bce022945d779275b5b9bfe39786fddb7ca04c5166be31fd3d12dd09d70a9ad4460595c36b71d5407144f84e1168e8a915db7 SHA512 60b4ada0dd0d15571a14ed6cace2b2e305b65596620d8478b599fc829a9fd0b8b34a7d3db9a9ef45a03132ceceeafae1b4f96d54033e931a594f067a7c6419a5
 MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
index 424043f972f5..7d7450589b93 100644
--- a/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/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="
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 86ef0242fa60..16600b47f15b 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="
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index d6f36dde2dcf..dd701305ab9b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -6,6 +6,6 @@ DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040
 DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
 EBUILD libssh-0.8.6.ebuild 2937 BLAKE2B df427590602299e1c2fb18583c83d554f083db3ad474307002474793313a0aedf5d2108ad8116934fc4ebcc748391d16d6fab87f42b42aa56ca659031111ec26 SHA512 a7fe530b3714b126fab464b0acff0cb4321ea9c2594f8862eb184b6378a5febcf93042a6a18e329e3f5d39891ef335f2f9aac783ab4485ca6d9c18359a7a5f71
 EBUILD libssh-0.8.7.ebuild 3091 BLAKE2B ebd0ec869401d1dccab35911777e785afa7700969bd2ac0ca4f9e8e53685b36f0f4af952e1544a77fadd3708f5a5e7f4811a68ca35a87168bf7b0920dfe938c9 SHA512 930688de59ddbef12c114005e2e7e5cc39b3b1066463433a68486030d64ecd43382d2483fe0eb93f7378849a111bf37d5a05d8c4e4f4b2b78e7417a206a2994a
-EBUILD libssh-0.9.0.ebuild 3173 BLAKE2B 0ecedbbefe0f63e93101c4c0bfcab6d90e9f10c4297b312c222e158085c66c7f9656a69a7bee979e357c406fae69bef4fd03186fa5e4b8db566931d670bb7a2b SHA512 610785c3c06be56b81654cf165f968210965ca3faafea965b03ccd81ebda035f168a7f8830a4d2a983b639c68f565b2b172be42aef6a08326fd6a8ca8ff7788e
-EBUILD libssh-9999.ebuild 3173 BLAKE2B 0ecedbbefe0f63e93101c4c0bfcab6d90e9f10c4297b312c222e158085c66c7f9656a69a7bee979e357c406fae69bef4fd03186fa5e4b8db566931d670bb7a2b SHA512 610785c3c06be56b81654cf165f968210965ca3faafea965b03ccd81ebda035f168a7f8830a4d2a983b639c68f565b2b172be42aef6a08326fd6a8ca8ff7788e
+EBUILD libssh-0.9.0.ebuild 3166 BLAKE2B 58272c0762840b17d72d7ef056e8e7f5014a27a411c23a1d748a0118ac03d28daaabbb6fb142cc237dd6112d77d6d76bf33ce82f3ffc231b870d1e9031507a97 SHA512 a49b4b81dbf5adf4efc81469a2393baeaa269acb32cb4861e9f60cbef89e0a702b99f7743ce14ae6c50b1ba239eed316b39fbd01d5f09dfc7845cbdf2d2dcd07
+EBUILD libssh-9999.ebuild 3130 BLAKE2B 1d2083b1ba792c5e2e4309a2d9538f2c338a2e861d6fc35c57fe17ef6e1cd05295b4a2cf14e07efdc47f6425575fe2844c150bb9dabfa6a4a17178ea8103b343 SHA512 6f41f5577cfbe3937cc8e155f2b8ab623d648a6a3b1c45839d955208c67cb74fb8102c10feb801f803c715b8f0c1fca77e4a5e63e1f9de1b12ab525724c7ec6a
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild
index 14ceb5386a6f..6a62c77f19a2 100644
--- a/net-libs/libssh/libssh-0.9.0.ebuild
+++ b/net-libs/libssh/libssh-0.9.0.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 14ceb5386a6f..19777b48ff39 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -42,10 +42,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS README ChangeLog )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.0-tests.patch"
-	"${FILESDIR}/${PN}-0.9.0-libressl.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 515519aa0952..e377f9bbf9cc 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -9,6 +9,6 @@ DIST libssh2-1.9.0.tar.gz 888551 BLAKE2B 7bce5cd38b88654f0ca0f8b562e4bddc56346e3
 EBUILD libssh2-1.8.0-r1.ebuild 1362 BLAKE2B 0765a2ec7cfb2b0eb5ab4f52054d4cf8abebeda0b47814520ec76a5b3ff4299efa642483bfad8051788a27cc0934bdecf9a91bf6a17b49e81562e2b3a6b246d6 SHA512 61067547b394f9c5959bf7dec2ec2cb0a69629ca5a65f9f5dbc6f71b8664767802af0fe59eae210eefb165378c9f4af58eae0358421ae4f339da3812a80dd579
 EBUILD libssh2-1.8.0-r2.ebuild 1647 BLAKE2B 47a2d718a0a2bf40f31fa3a3251ddf64e44fdb2823b61a3c10b54cf34c41af01adc3831b99f25a8b012cf7ce54a0120d4216dd3c7ec9921b48df15d29d542561 SHA512 43bbf761c4075cbe523b1b5ab247ef7e69c800f529ac41981ff61cf53a0c37b3b2b989cd9a08e7e709b9ddc0cb9d2a86f31e7930b96c95a0e5857aadf2a3eda9
 EBUILD libssh2-1.8.2.ebuild 1637 BLAKE2B c1ee43a0355c0f6fd4d761355c9a10f2ec70ff5b6dcdd175ef5162a852921e747ddae104d429536978fee57042764155bc8785ca3c15d9d3462302ff978be4dd SHA512 772baee7fe1f82db778da86c7cd7490e3d2a5843eb130aef310b5ebbffaa317d55aeea1cfc17ed71ab3e467209edbe2f5ede66482337028a1ddf2b780fe3011e
-EBUILD libssh2-1.9.0.ebuild 1431 BLAKE2B 6caea62b094f55ac37a13f3c9b6cf03d99a327d2be46fdea8f9dbc50f4ce2cd590931188a7c1bb9e408a32c919a5efac26c5af25f5022cf3c1353da769951211 SHA512 9ebf32223963a62259bd085818fce1e4594af9b21e41773ed822cce02ad84594a18885e623a4d011d3a0da38bf391a35ed16ee1160b965387f1d028d167e5f21
+EBUILD libssh2-1.9.0.ebuild 1421 BLAKE2B c8780ed527d063300fe4256af1d09ab67997b5cafcdbfd3dfdc1ab04db34130ff8e9dff1013148bf2d2442e29f2d1e962c638a7dc1ce059f9a2d4d194d1c961f SHA512 e53accd6d3a5cc15da88c6a8bfe8e7d82911e4cfef5cd45297459555dbe4b435db4860837f1159907b4bd069d5855e4384493dcb4711108875d8987292b6e4b0
 EBUILD libssh2-9999.ebuild 1237 BLAKE2B 0a4ace453cacc7e735fc5df42d1bbadfb3a231954a94e992b8c7141037cd07b73a3f262f3ad9dcad9e98d51fe024a41220e0d34593f96e563c26f632e0f172f7 SHA512 f8f597a5adee5b882d3e6d22ce1dd739d5f1a57da4466bfedeebe1d7bfecddac296f687cf4982ece60f5e3e0b52eb4ae8fda30a2e6e4d091f479fbb0872116e2
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.9.0.ebuild b/net-libs/libssh2/libssh2-1.9.0.ebuild
index 12ad74fa242b..6962cd5ca672 100644
--- a/net-libs/libssh2/libssh2-1.9.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl mbedtls zlib"
 REQUIRED_USE="?? ( gcrypt mbedtls )"
 RESTRICT="test"
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 2b09e38b4c1e..de84df9073c4 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -5,7 +5,7 @@ DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f
 DIST libupnp-1.8.2.tar.gz 1379953 BLAKE2B 472851bfd25530ead4c113657f0e30cf7a3a1a4c88b86864676a2b7096817c1780718710a9535068904901c21d70d92fb267f295e88531e3eeef7d9a0cee58f3 SHA512 026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511
 DIST libupnp-1.8.3.tar.gz 1382278 BLAKE2B 65774d46633d81fcc810f01339e0eac5d7c7313f69c1a467e6c0bbb26eeee03fdb4d8330f46e86346737cc17c1c953ef26045526bc9fe438f7e917928a3a3d0e SHA512 592a719614492ee1dad3630e5de2dca1dbe369faa3c87ba20fb939334c9d24f9dc869a457f5903cd28c5f7662145d1db4eeb512ee93b47adad4fc9b7d9171507
 DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
-EBUILD libupnp-1.6.21.ebuild 1055 BLAKE2B 5d99da65caf585e6e7905f8259f2e51afabcc5c31ad2bd97898cb3d7300e11966fc794829ea48defa2d5bba1d9dffff24129ddc885f55a7f2dbc21e9d91b61d7 SHA512 f2c5bb67af69945c261e8ccce5b0f247e585505924df9c0ad7785dca7febce2a69e1b1e529664530adc9070a8f72b708f6b793904fe325bb836a9c2c261c12f8
+EBUILD libupnp-1.6.21.ebuild 1058 BLAKE2B a770be35f6f001f17e10a9e6ed102bef62410321446098057d17f4ec75bcf56bc1267c9fedd59615d3397af22fca6e32eac558b12bb1d412980bb23fa9153048 SHA512 287a4acd2954fe276c07cc4a02b223356ca1b4a2adc902714cffd4b62daea6f8cebd2aaa836c77f50d4352aa92719a65bd3c0cc7e4a1ed386af873d46bd3b556
 EBUILD libupnp-1.6.25.ebuild 1060 BLAKE2B c729c01a2101d6d765da7ce04117746fd2da2b8b0bcd938e008d9c0aa6a51bfb0bb7e89889f74c76d74fbb4d9ed6eb0d3bfe1f998aad553b6e4a2bd15e590eb4 SHA512 7f6ed27ae13faaa69916cb2b37937cc7d5155317cb8c2099b22062ed971a31b246f6b35f7fc4a9e7fc4cca97c61043bf8e0b9a82ce4b16f1fdd0780ee5fe3ee1
 EBUILD libupnp-1.8.2.ebuild 1716 BLAKE2B a7a63be7eef83a56f8e6e1313d3d8368541d8282cb367834ebdf5854d46a38d723c23b8eabcbe568591af2adcd199a4170c08b6f0404f7e5c1349a1edf95a99c SHA512 2ea16eccfb1e22f4d4f306dd9b5301b2fbf5b913a4e9ac142b7a7412c83e3621f0ad22a74107886e8cef7d58e5353796c478dafad7ac666050f1ca9cf08e55bc
 EBUILD libupnp-1.8.3-r1.ebuild 1773 BLAKE2B 27ae00ecd8c1d01663b071f658dfb42b8eb6bca42087d6774c6139c56095014bd6713fe460eb391bce9e61ce2136c608b368c012e3292f3dd3d28d3525db69bb SHA512 36dc05b2d47a2f8b587cc424dad8d443d3a351ef2ee7d993b16f849f0126008b18b6babebbebe0dacd413f17146932bc4a92bf88b2ba9a7dc84a75ee0c28a83d
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index 5bb81687c448..ddf0f1a6bb2c 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS README ChangeLog"
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index 493ef1a22055..a0bb1046a381 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,9 +1,6 @@
 AUX libvncserver-0.9.12-cmake-libdir.patch 669 BLAKE2B 1906637be7180a884aa3daf8e6c670181a639a9646488830e3e84cf71ed927e656f51edd097145fac9c554d2f8af796300906ade5c3a5d910a49c4c486a8475f SHA512 e6833922d39ad13484a3ae96eb2ee5cda3ce52d41e0a0ea88281221f5378e7effa8f0a8eaac593e111e8e0b64de0f458d17df496fbdf124f2fbca2806f52012c
 AUX libvncserver-0.9.12-libgcrypt.patch 1526 BLAKE2B 83e042ff875844cced2cb1416477c9fa255f84e6cc40b9d1d5e7dfa3e2467effb3481155b5eeeb29835cf29c0a6aa0ed381862fc184e4070b149b3a1bfc84c9e SHA512 2b2aba010104b2206eab7bec1bc6a258edb28d43da2a376d03e063d9d5e7236d690388da8ccd501b22d3181b966d2b6ee1e6752153c1ff78ab498a59355fb385
 AUX libvncserver-0.9.12-sparc-unaligned.patch 1463 BLAKE2B 66ab54a68026de0c9ce5eb04333b24ae104bc24b2fcacf5c1aad2a7d019f94feef46b4588166d8063bd3e5c616b40092309306600328eb8e7597efba5e35952e SHA512 c2d26ca2a570de3fdbabef723cfe3cb6208aabe9d7222feb6f0128fba55370e0dff0b520ac84abdc6d1dc6c0762092d36dea21eccff68432cb1c6e5b1e3b79df
-DIST LibVNCServer-0.9.11.tar.gz 1413739 BLAKE2B e295d3aef7181cd767676c4e55130fa65ecf8ea92a659b6de82d2cc465f1c9e1a587839942fd89882126dc8ec54f9de20a78e799ea194f9ae227a82ae705721b SHA512 e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
 DIST LibVNCServer-0.9.12.tar.gz 2237447 BLAKE2B 583500c0bcfb6e9e3a02a33fb2701113b164851f0906fcc4845de7c7d82d4f7f65f5edd6c9a672348ee1deeefc65c1b0a257da024254598ba86d121d424f027e SHA512 60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
-EBUILD libvncserver-0.9.11-r1.ebuild 1921 BLAKE2B e324d043474b5575867592f07106ef8c6054004aed2dd46a1ac433962538b0203da3315a1025490de760960d58102935fd925ef77287af597ac18b363590c5c2 SHA512 33159e0e940be618bc4267e62f34555cc48726fab8db08097568e911f3fa5efdb1391ad0ee054e92db785811368943a601ce6434456177a0258c044431c9eaab
-EBUILD libvncserver-0.9.12-r2.ebuild 2110 BLAKE2B 4d13862d8f8a3a313d9adfcdbce9327168e7db31b36224a9801c6e791d12421c41104fe14d87c8f3d407a7c1c475b2ecd899ee19adbdcec9c1be0cf6b25951ec SHA512 2484d5e6313827fcb131c7b5c7682a2747781acc151c4ced1a089d9e762939b8b73bbf50e8caecdd73c18f35b939ae0d035f80bb558e59c018cee2b655fe31d9
-EBUILD libvncserver-0.9.12.ebuild 2110 BLAKE2B 970c3a5794a09ed58a814c5455028a38e1ebc022412a86c8198d3a40fcc39ec9d6db5d634af6ceb524dd35f280d216262b3d5dc7e7123637987af13b621d57be SHA512 9bb50f1bbc8565547ece02c7fb2d5e62c967932045d39783e64eae5b221592af88b5c566e368e5e1346b5e7086f20b0b791a35a3e2cef9bb91ccf715c7cd03ad
+EBUILD libvncserver-0.9.12-r2.ebuild 2107 BLAKE2B f2ac4aff85ee9c307aa500f54c1fa75a6acdacbe80e4bd47c3411bbdf8df406623dbc49d409e3c8343558dd973a695d302dbcae2d8bed29426157ae701da6f0f SHA512 e1fe1402c5215ac869c04eeee1b3fcee638b62274306a3afabb8ffc07f177db499601b699d7b3ec27a595c23baaa045b849484a93c7ace74a78bd06cddf1d1e6
 MISC metadata.xml 994 BLAKE2B 3c12097d08f89fadac86ad92efccccbb533c1ac018cf426aae4a45bbea33ae227dfaec320a7710eabff7da96d22229997dee72b2c84b1aedc575e21e0a5decff SHA512 0ca13849ab948490b862838bf3c2b87cb97ce1739369d23426e518197a786cf24fc79967c01072b710d37c298c792c45e61a55e558d692087800e834f93003e2
diff --git a/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild
deleted file mode 100644
index e075c4351e86..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils multilib-minimal
-
-MY_PN="LibVNCServer"
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-# No sub slot wanted (yet), see #578958
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl +png ssl static-libs systemd test +threads +zlib"
-REQUIRED_USE="!gnutls? ( ssl? ( threads ) )"
-
-DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
-		>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	)
-	!gnutls? (
-		ssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PN}-${PV}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	default
-
-	sed -i -r \
-		-e "/^SUBDIRS/s:\<$(usex test '' 'test|')client_examples|examples\>::g" \
-		Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static) \
-		$(use_with 24bpp) \
-		$(use_with gnutls) \
-		$(usex gnutls --with-gcrypt $(use_with gcrypt)) \
-		$(usex gnutls --without-ssl $(use_with ssl)) \
-		$(use_with ipv6) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with threads pthread) \
-		$(use_with zlib)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
index c53f57b56df4..13a8e923f07e 100644
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-libs/libvncserver/libvncserver-0.9.12.ebuild b/net-libs/libvncserver/libvncserver-0.9.12.ebuild
deleted file mode 100644
index 10cbd56dcaf4..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake-multilib
-
-MY_PN="LibVNCServer"
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/${PN}/archive/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-# No sub slot wanted (yet), see #578958
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="+24bpp gcrypt gnutls ipv6 +jpeg libressl lzo +png sasl sdl ssl static-libs systemd test +threads +zlib"
-REQUIRED_USE="!gnutls? ( ssl? ( threads ) ) png? ( zlib )"
-
-DEPEND="
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}]
-		>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	)
-	!gnutls? (
-		ssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( >=dev-libs/libressl-2.7.0:0=[${MULTILIB_USEDEP}] )
-		)
-	)
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	lzo? ( dev-libs/lzo )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( media-libs/libsdl2 )
-	systemd? ( sys-apps/systemd:= )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PN}-${PV}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-libdir.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_ZLIB=$(usex zlib ON OFF)
-		-DWITH_LZO=$(usex lzo ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_PNG=$(usex png ON OFF)
-		-DWITH_SDL=$(usex sdl ON OFF)
-		-DWITH_THREADS=$(usex threads ON OFF)
-		-DWITH_GNUTLS=$(usex gnutls ON OFF)
-		-DWITH_OPENSSL=$(usex gnutls OFF $(usex ssl ON OFF))
-		-DWITH_GCRYPT=$(usex gnutls ON $(usex gcrypt ON OFF))
-		-DWITH_SYSTEMD=$(usex systemd ON OFF)
-		-DWITH_FFMPEG=OFF
-		-DWITH_24BPP=$(usex 24bpp ON OFF)
-		-DWITH_IPv6=$(usex ipv6 ON OFF)
-		-DWITH_SASL=$(usex sasl ON OFF)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/net-libs/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index fa77aab249ae..e1171dc8c5d2 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,5 +1,5 @@
 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70
 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-EBUILD meanwhile-1.0.2-r1.ebuild 1049 BLAKE2B c7db9234c31838ec2118fea603a39723c072de23f3ed7f8e390fdc683eb76592ed36684f1a6804d12412302a4a1ae980369563d589f630b0cffb68cb616119c3 SHA512 390211eaeba857ff7c4e9761b5043f3ab9aa4cbbc363fc12e458c84d455546cbe2b0b23ffe75d13fb9922973820cd0b0041f124cfb70bb484391146be85bb6b4
+EBUILD meanwhile-1.0.2-r1.ebuild 1045 BLAKE2B 62d7edc2bab5100881a00c3ca3b7536719f2a78013f94996d4403b193c18cf042e61a271b6bf98cfb71142190a30507d9fe14c17caefd4b8cdf4f4cc13f7fa0c SHA512 7d2e600a405a05ea15aebb0205017f11aeccedac44e8bb86a570e730e8ecd58bf4ecffc87c1a4e60498a6e1790c23cf108b0c3f127a9e0cc7d36ef1168574ae6
 MISC metadata.xml 246 BLAKE2B a740e9a1a3e17c2fa628a8e04b07077f2495eda755cbd903ea5934b0409f05f7297ddc90aa9693b9d7f1b7b3bbf3f2070f5e266cfbe230cf07d71749ba54df95 SHA512 9131560c103b0fbf21dae354b0a00ac68bee1b326a3e38b3c18fa7396b4369c4c29a0e550344cb219fd48c94b2d1c21b185a329c992096c0693ea2bf24aa31b2
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
index 01fbe0866470..7190a087afbb 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 IUSE="doc debug"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-libs/glib-2:2"
 
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index bf797ce7f4d4..20847c43357d 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -2,6 +2,6 @@ DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14
 DIST miniupnpc-2.1.20190408.tar.gz 94216 BLAKE2B 19b0bee46d2f738939fda31c465779a6e6c7c04b2e975aed77c3a642bbfd1c61813367da5f2aa3f351fe1e5a71a842bfcd7b54c4faf589e345ddb1551bc322c6 SHA512 faa0f1363ebb59ca636b6c974188c52903ad07652f8268563c9c1a5826fafc2458d9f521efd3546fbbd4b71b3b14a50ba89dda52757adad1db81c31d9ba0987a
 DIST miniupnpc-2.1.20190625.tar.gz 94461 BLAKE2B 26c881c2ef99640e99a5c9cb138cc88dc29a25cd57fffaeaffcf521ded11402fd34ad1001639cd0659fdef9debd247dded5c1903b69f36b74b059c1e282bcdfb SHA512 d55a959bb2fce2c1747fa95da53d9993220403d2c511b12f489b80a7941b28238561f90a1cd60be9fa2bd62777fbfd3cef370db694b9970f73ccbdf3ef49aa48
 EBUILD miniupnpc-2.1.20190210.ebuild 1334 BLAKE2B 237a6940686e9ca218a181a37ff5220969466fe0766d63923b12996e4f5bede6cddf67ebaf820e56beb4cde31f7ea81c42fcad532d03da8515827f9ebcb4407a SHA512 60bb5c23c47dc83c1ee5d0e84ad89beb769271ae33aa55b4b851a18dddd22c529b9c702326ae3603d6853e1a52e1d9a280d142b4a018d83a34c27c1168a9c59c
-EBUILD miniupnpc-2.1.20190408.ebuild 1335 BLAKE2B af06f563e38a3fc50bdc673bbb39fe7d1d3892d92ba7b136db18f32d78d5d0d501a4f22c3166070ca64ccf70d068d663ae776e72a8a2b51f18d4609476db682c SHA512 5eb85d7c2c75eedf2c964dc4d552a2b53c6b91989858e3e770d0b68abc91c3fb91fc387bb7d6080a9c818e79587e23628785161980787670704ec99a78111e6d
-EBUILD miniupnpc-2.1.20190625.ebuild 1342 BLAKE2B f12bd5c9837665f4d53fcffb68dd94886e5a526d84e48414b7c06f1a227c7508a73cc582060edc2dc9be67a54d5404182c03cb89c30ca556de0e9ab9c97726ea SHA512 e28384448ff3a40f5e71625073fab0fc2b0a1c4c5a10e545377df60ca89b9d1c497677b34c1571c6f7696411498bc38a1206c66b94f3f139a37380324a72c43d
+EBUILD miniupnpc-2.1.20190408.ebuild 1334 BLAKE2B 65d5b1380e81c86f035f46765a1a57f4ef3670dfad73a54bdca1e6347ae38db2fcfae9279baede1b2fdc42a4727ab79106124c63566a541875e5c3c8215ea5b7 SHA512 321de8dee4bb986c578203ef9f27e5ba6a8cb830d756edf54eafdb6e240a1120d435c12f5638984f0bb27a56a6f049e76fa382935e4e2b0162d7fa254761cc48
+EBUILD miniupnpc-2.1.20190625.ebuild 1333 BLAKE2B 1cbe9aead1d890e3f72e899dc29c1edb4cb0b0da2fe1ac492871093dca397ee0d7bae4446740083b283fb09014017d3cbdb446aac6c68d8b23db03dc89788b86 SHA512 5547277b02ff777c3d79ed2bfda70da4a3cf9346af4098a475901d9ba85e30c4cd3b9dd2af1be0f0020bdbb139b41537adc63c7da8145ad4b879eb222b09d8ee
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
index bf331893f289..84a21887ff3f 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
index daca72280309..ec25ddae0e6b 100644
--- a/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.1.20190625.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index a831e14c596f..cc8127a9aa86 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,4 @@
-AUX nghttp2-1.38.0-boost-1.70.0.patch 1950 BLAKE2B ed9f72c2f01912176d963fdfb955388c7d40a9ec4e7674f0629166de1d3c249c2f31a3e06c2f82c4186e1f48319bf0bc367e4b4aa25c10faa26ac6e0a118af25 SHA512 7da6199d64b2b1b6b5258841d2ef52fb5617f200de4c63021b4e9b85b9faa6894f4a9c8c9b1b0c35b2984845de5bd80c3ff6d1a67c1fb44cfb24eae0f0afa806
-DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
-DIST nghttp2-1.38.0-unbundle_http_parser.patch.xz 2616 BLAKE2B 3f15154d33f32c91aad87f23f56d761501e19e0b53b99d4df720f9e04d6d9c49a52118acbe3da87f8585c2b71b7b430ef60fc33465605f3bf9933635aabb924d SHA512 1b4377b34cf6428164011be9fc86efdd7ab8d3443edf197c45768beea0f843084a842c4cb2abc5179d6036ec99174557e06344ce67a07d98992de64d99faf3a6
-DIST nghttp2-1.38.0.tar.xz 1628356 BLAKE2B 0568d4ac5c1e5e6d7adf762815836502524d59fb55c623f344a8427638407a19447fe1a7753142aa205898f7bda6ebce8ef6f4d85edc6da98ffa98b83d4e363e SHA512 e432d52bcf77379ed5c10ceafb587ec8d66c56bb728cda56487b237cbab1d0073689624419ed306162dab3a51b91cfe0f59cb173b5d81346e2b6d0abd56635bc
 DIST nghttp2-1.39.1.tar.xz 1634512 BLAKE2B 66444de067200a7dd66f162c22fd258471d336b1ba02f579a675b5d9dfcbf1600fcfb92a37797842a0482bd0f5c850008508d3d41f7afddc47f7c9330fb34b43 SHA512 36558ed03c59086086abbf144ec7c54c60de3fea00a9ea594feea7186a779781cbb66a08c9b34265892dea382b42b875f551e85331cfa0086e357f9b27b919fa
-EBUILD nghttp2-1.33.0.ebuild 1861 BLAKE2B 6bf71fd220cacaa02e17ee2ecc6c7dbd9810a0c45d92f63cc09bbf6631d27a4c9126a1691f42b7a42db4ea934c38c1cb753b364577ca89cc4ec318947cb2bdc0 SHA512 9026b56ba1d3b18b02473da0de7d880c95aae9eb208705938142be394424db9d9c7ed2d2033252cf68861f9b1ccb6811f68ed4f660bd92f38f320df5b8456c10
-EBUILD nghttp2-1.38.0.ebuild 2339 BLAKE2B 72c0ef2b68b53ac0958777a24aea5ac86ce6af3645997c807b362330b390448086a90824880f62af8e8e83775c0f749c810f11130ddeb25f5ccbce63fc11145f SHA512 ace59fb64bf3e442c0717a72f94cf85f3c3af3b024bc531b7c16689cadb6511d26779c381933912480bb80c03fe0f1cc062ee2d397ad1d3d4c480c790025eecc
-EBUILD nghttp2-1.39.1.ebuild 1957 BLAKE2B b7aa27c5b2b60331f42fb38776805ab23b17da6a025639bf888a62aa89628537bc210ccf6663df690f85aa0fe123eedcdfc753805166032e83181f46a17d737e SHA512 cf34402a23e858044441e81c164f7437c5f7eefc2047d1c0197a54f96c8fcccd96159452d5cc14472e60db3c3f734b15eaf7b145f44a1460ff874a4d10e91a5c
+EBUILD nghttp2-1.39.1.ebuild 1955 BLAKE2B 60502c5f8505c6b83441dd6f92b1a6b232a5025b96922341ffe3be0b7543ffe95484be0c38b757849432d02d39d749165a24a9b9c4d7148451d5b8da6772d552 SHA512 3075acc15ecb395a3fea2963652bf0bcdbe8678d1061afe728a7f149722d3bc4ffd1042b2e5987b7f69a78d2070be977e1c8407480d5bd29cfc1743530ef9037
 EBUILD nghttp2-9999.ebuild 1966 BLAKE2B 13541411bb8f29654a24fbfd9bfdcc299ce78dff30bfc05de6d66c433cc12f258d9dcad25d222cc9e9f991322d4ff626a220478f5a7c6c61d6009b920f203938 SHA512 d851b5061afdf03f4724c696489915a820437ae62e927e66c3c4089392f8e01fc62e434718391d255d51f42fe61d420cec3de957b81d3c63103b58ffda3ca4e3
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch b/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
deleted file mode 100644
index cc1100a0b0ba..000000000000
--- a/net-libs/nghttp2/files/nghttp2-1.38.0-boost-1.70.0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org>
-Date: Thu, 18 Apr 2019 12:35:54 +0200
-Subject: [PATCH] asio: support boost-1.70
-
-In boost 1.70, deprecated get_io_context() has finally been removed.
-Introduce GET_IO_SERVICE macro that based on boost version uses
-old get_io_service() interface (boost < 1.70), or get_executor().context()
-for boost 1.70+.
-
-Commit based idea seen in monero-project/monero@17769db9462e5201befcb05f86ccbaeabf35caf8
----
- src/asio_server_connection.h | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/asio_server_connection.h b/src/asio_server_connection.h
-index 6be794060..56924c71a 100644
---- a/src/asio_server_connection.h
-+++ b/src/asio_server_connection.h
-@@ -51,6 +51,12 @@
- #include "util.h"
- #include "template.h"
- 
-+#if BOOST_VERSION >= 107000
-+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
-+#else
-+#define GET_IO_SERVICE(s) ((s).get_io_service())
-+#endif
-+
- namespace nghttp2 {
- 
- namespace asio_http2 {
-@@ -71,7 +77,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>,
-       SocketArgs &&... args)
-       : socket_(std::forward<SocketArgs>(args)...),
-         mux_(mux),
--        deadline_(socket_.get_io_service()),
-+        deadline_(GET_IO_SERVICE(socket_)),
-         tls_handshake_timeout_(tls_handshake_timeout),
-         read_timeout_(read_timeout),
-         writing_(false),
-@@ -82,7 +88,7 @@ class connection : public std::enable_shared_from_this<connection<socket_type>>,
-     boost::system::error_code ec;
- 
-     handler_ = std::make_shared<http2_handler>(
--        socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
-+        GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
-         [this]() { do_write(); }, mux_);
-     if (handler_->start() != 0) {
-       stop();
diff --git a/net-libs/nghttp2/nghttp2-1.33.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
deleted file mode 100644
index 8e3d343e95f3..000000000000
--- a/net-libs/nghttp2/nghttp2-1.33.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	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 ~amd64-fbsd"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-	)
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-werror
-		--without-cython
-		--disable-python-bindings
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.38.0.ebuild b/net-libs/nghttp2/nghttp2-1.38.0.ebuild
deleted file mode 100644
index 23ae1e8d57ba..000000000000
--- a/net-libs/nghttp2/nghttp2-1.38.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
-	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"
-fi
-
-# 675772
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.38.0-unbundle_http_parser.patch.xz"
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
-	!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	cxx? (
-		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
-		>=net-libs/http-parser-2.9.1:=[${MULTILIB_USEDEP}]
-	)
-	hpack-tools? (
-		>=dev-libs/jansson-2.5
-		>=net-libs/http-parser-2.9.1:=
-	)
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		${SSL_DEPEND}
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-		net-dns/c-ares:=[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-1.38.0-unbundle_http_parser.patch" # 675772
-	"${FILESDIR}/${P}-boost-1.70.0.patch" #683368
-)
-
-src_prepare() {
-	default
-	# Remove bundled stuff
-	rm -r third-party/http-parser || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-examples
-		--disable-failmalloc
-		--disable-python-bindings
-		--disable-werror
-		--without-bundled-http_parser
-		--without-cython
-		$(use_enable cxx asio-lib)
-		$(use_enable debug)
-		$(multilib_native_use_enable hpack-tools)
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(multilib_native_use_enable utils app)
-		$(multilib_native_use_with jemalloc)
-		$(multilib_native_use_with xml libxml2)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/net-libs/nghttp2/nghttp2-1.39.1.ebuild b/net-libs/nghttp2/nghttp2-1.39.1.ebuild
index 6d97e672ca5c..2142ab3bd2e9 100644
--- a/net-libs/nghttp2/nghttp2-1.39.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.39.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools 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 ~amd64-fbsd"
+	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/nodejs/Manifest b/net-libs/nodejs/Manifest
index cb1a03081c78..7dc671df31e3 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,8 +6,8 @@ DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e847
 DIST node-v10.16.0.tar.xz 21480088 BLAKE2B de91e718893aa0bb87b75225a484281370ca1054fed919d6177911ca8e57228a0925c077a02397efd05594f72438d47b264d6f4b91623173e3a577a58a5d86db SHA512 df197c7b929fe1e0acf0334dbeb45be4c0cfa3266f9ddb513eafffcd6405bc02cba2fcbd34a7a5bef2e45a1d61ef3734ca0afe7295904ed563744fe06751cc62
 DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
 DIST node-v11.15.0.tar.xz 22115480 BLAKE2B ed1f621e46d24051f8d84255875e7cb2c1bc0f9432a12fcc35dc5e336a71bb3e7f511146d112d1f236f9f978a68987d80331c22699479ce63b7bf30e50643219 SHA512 48270620fab3eef86c21387b316ce9054e2b0aac60a36f7fc08d18ad4a11c8d2082886ca20a455fb4a74a561d7e97c77403227ec9a83a13c47fa230b47a5af2e
-DIST node-v12.5.0.tar.xz 22565576 BLAKE2B dadda02d43d63f69b387c81784d76d756f0c132abef7746c9a36f5fe3fcdd3d74d9ef3fd5d8d3afd7983f28f9514cc981bfc48dff9fcd155ad002e4ef012aea3 SHA512 ae1133b6cb0856c10a081dee1f8b21f279b366f99efd6dcd24b9768b0928088ef89c3cd34ed5dd683459d30cbb54015e20616d8dfeda4a522f457d23f80a2f8f
 DIST node-v12.6.0.tar.xz 22609832 BLAKE2B cc304e0b41bd7c455d4a014b612259c5f91d897432bd1f02bd6088fcb5c7acf0c11d323b44e842bb699003b760425b0c9fd3c9a3587abba9ba25652ca1f2decb SHA512 cd6c1b9c0d1f9db6d3a413f1b437cfaff51a67e66033d2235eaacb49650fe9789cd8994cb374cc8aeccfc82f1dd6e6cc5aed1f39a751d7044a5af45c74d6013f
+DIST node-v12.7.0.tar.xz 22657592 BLAKE2B 21e74b42769bad5aa41b08d0e96b2dc44821eef8f1dbe7a10412935f6b69d49591f6fd42a25b1a3624bb230b88eb53a5f77a231c4c6925244438c833004a0018 SHA512 314baaa0ad30b592f63ece22c87c734b794af3bd630c16306017249cbbbcd77a75f8d5073c5a17578589fd1a502cb736bc75b69e6ffb2a4cc66927c69b62a3e8
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
@@ -18,12 +18,12 @@ EBUILD nodejs-10.15.3.ebuild 6442 BLAKE2B 8ae691a1aa9e3a2eeec5096c5890fa6ae2d877
 EBUILD nodejs-10.16.0.ebuild 6444 BLAKE2B b2b9b7389dc48866543b7bbba9745587e954309160d6158df1339116a67e0cd7a74c0ff4cdbc024d90f4b26f731b3b4ad42c294f792550c110ac32e7df832169 SHA512 ae9b06ec1e04fd41044a8f0dad681df222e7384ca9fd01b461e475d0b60b88b9b9481303a6801c085d1ee31d1a9bede849dd35927fe99b3d96a2aef321e8a997
 EBUILD nodejs-11.14.0.ebuild 6486 BLAKE2B e0381342bb84e0eaac80634d98867239abea61f796d9b9bbe67811e41fa8d3fb8a9704063193427805b2e53185390a5a43855def061b1e15375e7d3b7c602800 SHA512 2708070e482616d57abef012dbe6ae969c4f83ec3d440e6acb3f7d0880d3edcb25494ccd5c5748a36fe95b78b686aab070d06eed123706cb1b8669bafa830c99
 EBUILD nodejs-11.15.0.ebuild 6458 BLAKE2B 788e4ab7a29a5cf271417687608986751c68dcd493032c7d147cb9b7ea6c4f31cb4febd7c5c0dcfcc1055967dce7537bae9fc8463754e8867327329b7cd94940 SHA512 82040a14496991061a20c1cfea50bf8bb30d99d7427f9db01736547b210ffb19d166c724d354953f833ef6aaf6f2a4779ec65b503c4a28a988fb1e0a09fa58a8
-EBUILD nodejs-12.5.0.ebuild 6464 BLAKE2B 5b0b3a2d086f787e38f782ac17f608208bac066a38b293d51fe9f2cd1a93fba2749338600a14037d6c1193b336baa0703b3cc4c38c356084787edcd4ebd6ee7e SHA512 fbde4d8d4017cad90c9bee6b5c3dd92cea4d066b09230e9dba9ac2cd029e4fcf937104e7e624dada880f9a3f1a8042a9e074088412f2d46d2c3d39f1d378597e
 EBUILD nodejs-12.6.0.ebuild 6464 BLAKE2B ba07f72d1e8920e627f6a995fe4ff42ba345401d411159868c451925d4c7e4652f9d118b32f84dcd5f4dadac937c7196bbf04cab5bff18435de9783a62b2facc SHA512 bf1e34211ea705ec63047af213a67e8efd53ea09443aa11def5f1882e9c9dbcb99b774bab67502e8322308e8bab2a9b220723f811868db40e370bd800783fb1a
+EBUILD nodejs-12.7.0.ebuild 6464 BLAKE2B bef67c4b18497d4378f3561b439f2991a7859209978946807f71fbe9c8fe79b5a3d87f9d19cbf9bbf0656e6ec7a9e5e662cbfacad22417dc45528e3757b9dea4 SHA512 faaa65963fafb5d29a0b4d666d7328fe8209cfe49437250384a4d1538047588432c605e744fe68b985c8715afb6aa3d3a4ff264204cc2085ad369f49e60016eb
 EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e
 EBUILD nodejs-6.14.4.ebuild 6153 BLAKE2B 6b358c6e4361f34761a577c10f0bcdf9273ee75dbbbafb652df8a374db376257c968ba9bc40142920266cf58b857f055ee46f161f31e756ba6f7124414976380 SHA512 0513974058c7c878f1104ab95b14d6788e293e4850b0d2d72979f3a3f9538854564eb6bb55b788f3616a4a0cd18d9f8b20e407c5aa221195a185ffbea5d9ccb7
 EBUILD nodejs-6.17.1.ebuild 6202 BLAKE2B f0bc03d031211502a09878f0177729f00c1625a91ec89b6971cd1329d4f05bee838e04ae066f84bf7555f844fc0fff6d33cf15c80fdb800ee0bfb40a1c1ef79f SHA512 9ec3f757e9bd5dbb375bf03820ea277315f974b76029422d12c9fcef5e86c1b704203a21079384e5375968d1654d325d583cd09e89fa9bf1e8e62fe65c7b770a
 EBUILD nodejs-8.12.0.ebuild 6362 BLAKE2B d2caec942c787ff4af79633f40d145d459df2e7ff7b15c7807a44086aa93dd3f21f4f0a84879ab61f9792d72c0855c3745400b6d791086184649bc22999e4f05 SHA512 b698140ab323e29eddfa4f3d579618206c4a31023ee25be2aff6ca03f321f4e9d3bde7735ac821093bdef62000e0d458e9fe4ae5cc9883b9bff9eb559135326e
 EBUILD nodejs-8.16.0.ebuild 6464 BLAKE2B 047682cbf31f62246cc571d5385918ca8563f83f11f659382ad660867fc3e8cd95bef0940fbb2b4adbcfa82a7e97fb34ccea4037be3eb8cdb3f07af3c6e8ebf9 SHA512 28aebffa55645c850572f8aac9d7aa0f0c233d0abe5b829f80a971e55a65f3b0621e69b52fe8ab2eb3000fe6b84c603bb7f99a56172bed0d9840830222e521a5
-EBUILD nodejs-99999999.ebuild 6372 BLAKE2B 7693f820dbbe93314c5b8ce3a346e6dbe2c75f6e4d2aeb63d916629571bb36c18431cfbc4d003f697665138494fd7d5df89518a70419e63bf0154e14617148ec SHA512 1a7a07d20ad6b42ae7f26b935d11731c711628060d71d953dfec1f6b71f227368d5ead3f9ee56d5c13723f154adf89bde64fed6e6c1a62f94a6e574db5ee391a
+EBUILD nodejs-99999999.ebuild 6372 BLAKE2B a51d6e22a864ff3359a69b28efa8590f9f25d097c64a16d25774a32b7536532ce5a8144e468a4705cd7eca55dce310556ec0fb1f422e9af2ca87d5da0de29686 SHA512 79cf1bba5b40f0dc3cc28b1d7e06a385b418f17a7a7a2a5346ea198521bccfac80dbeed9ed4fc958a818473d34b689c40a50d84ecc62920e2e28b647e536c721
 MISC metadata.xml 473 BLAKE2B c5c4f0ad6470bd70570d1f547d1355977be676a252416f3fe005733386fa84536aaac9b8e93fb70405fd76608ab2df281c586d80a2f9cc443acd5ca26dc8752a SHA512 f2911891d28329b3f6a21b56976f1507939bd51cb65581f73c2b5716c4610551cbc225450755be2e649e2070e1810ef41ca641d105155ceb1847e9a93ad2ee85
diff --git a/net-libs/nodejs/nodejs-12.5.0.ebuild b/net-libs/nodejs/nodejs-12.7.0.ebuild
index 1d6bf82084f3..f14881f3a8a7 100644
--- a/net-libs/nodejs/nodejs-12.5.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.7.0.ebuild
@@ -21,10 +21,10 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.29.1:=
+	>=dev-libs/libuv-1.30.1:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.38.0
+	>=net-libs/nghttp2-1.39.1
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 7ccae4c7d0cc..278f578dfb34 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -21,10 +21,10 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.29.1:=
+	>=dev-libs/libuv-1.30.1:=
 	>=net-dns/c-ares-1.15.0
 	>=net-libs/http-parser-2.8.0:=
-	>=net-libs/nghttp2-1.38.0
+	>=net-libs/nghttp2-1.39.1
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-64.2:= )
 	ssl? ( >=dev-libs/openssl-1.1.1:0= )
diff --git a/net-libs/openpgm/Manifest b/net-libs/openpgm/Manifest
index 59e408f7f7c3..20b973dd5b1a 100644
--- a/net-libs/openpgm/Manifest
+++ b/net-libs/openpgm/Manifest
@@ -1,5 +1,5 @@
 DIST openpgm-5.1.118.tar.gz 557816 BLAKE2B b066aabb71701f6b1d33313e95212ec37aec4ddab8b56a0a44f5ed862bca8a5ac5846150ba766340a66ee82d5a579a84348ae0e232238664202f1c37a405ab52 SHA512 50acd102f03fb250cd027c8f4843749641c7b1a4c1dfc41b136627feb59209bc7a2bbd08b7edeac603fb820118c6683ae9377a692949608bad455fef91c97274
 DIST openpgm-5.2.122.tar.gz 583469 BLAKE2B e3520f88282eed7da7890d678a25252a43157982955fab2740766cda9ce6c475ac5f5e3897c6dc1312a19d17e9e6ba94638f4d6fb93e42599359927e29f0962c SHA512 f8b29fb69acb548536179262665c0cdcc8bb1510d3e970d6abebaf33e301f87fbfa7e2c46e387973d8b65470350af66b3130482269b9fbb15fe7bf98b52f6404
-EBUILD openpgm-5.1.118-r1.ebuild 756 BLAKE2B 68403546d2e81f5218176fab9f5bfc8b82db9174b8f432999e4b08308f74e6341bd2a887b2474055fa2402ab4336a6987673ad6312fc0f16c2e1b587029cc41d SHA512 21a78fddc51bb0c38725458533937e6083b23bbd4dae427d48713d098c1359258c38818279fbdc73872154ff6dbaa71f0d1dcd05096a3526f082c12b30d3f9e4
-EBUILD openpgm-5.2.122.ebuild 768 BLAKE2B 4067132252ebecaa1cac5dd22580413bbc272c2747e9c6aae150946c8651e9225cf465c6422b74a794188a4f2bc8871802442a8c06a932158538e2638f3519be SHA512 4bc16591463d7175498ab4145fcc77a89657d1534af4affac81ea00dde574a10c782fa0158f1c778d1ae038f86ce322a94ecd0227ea4b3d31a62cbd6046489e2
+EBUILD openpgm-5.1.118-r1.ebuild 714 BLAKE2B 3ea1e96b5f5bbbfb098dcf4b4164dfddb219dda22b01e9132005b1ec80c5121c7fea83df62638460275b501960e7dac46bc49adbc432174ed775941e34a515d0 SHA512 15544faa781efd16cc5b76b4727183b7ca0ae09b1bce7e4aff87f18604e725c6b9d008e889220b1889339996b8f5dc164167e841571c12f694755c7599e498cb
+EBUILD openpgm-5.2.122.ebuild 726 BLAKE2B 4005c68e327797356a5fc7ac61e9a8eb3ecb033233069711d7092705a714faade5de3ea21ee78f5e8f147079a0f64337011ea7dd06241d79657d478808fb70c4 SHA512 935e40a92425ee6125f12b558bd62c67a28beb703b57d657fac8b0bed1303c4515736afa9d4c7303bf4ec7bacb7c3b9bf9f3fb2bb923760d64e716f8beddf181
 MISC metadata.xml 252 BLAKE2B 6c3a806621bff6345c81c8745469d37c6dea7b0f4e3053a8e768420e72a6e19dc5be32c070d25df570f5cc25083218920d6cb7398a0a67061eda42b9fa45cce8 SHA512 a630f122a596a2325eb582cbaf062dcbd4e27bf2bf5677b8ef0695cd61434c1d96a2c33ef353b6e9659c5fee62a98edfe652474a2150b6ca159e71b146199773
diff --git a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
index 9afff1551e09..4fed6c8c659b 100644
--- a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
+++ b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,8 +19,6 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="static-libs"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 DEPEND="${PYTHON_DEPS}"
 
 S="${WORKDIR}/${PN}-release-${MY_PV}/${PN}/pgm"
diff --git a/net-libs/openpgm/openpgm-5.2.122.ebuild b/net-libs/openpgm/openpgm-5.2.122.ebuild
index 4222de5a36b9..b77b082298ef 100644
--- a/net-libs/openpgm/openpgm-5.2.122.ebuild
+++ b/net-libs/openpgm/openpgm-5.2.122.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
@@ -19,8 +19,6 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 DEPEND="${PYTHON_DEPS}"
 
 S="${WORKDIR}/${PN}-release-${MY_PV}/${PN}/pgm"
diff --git a/net-libs/ortp/Manifest b/net-libs/ortp/Manifest
index 20b666b069fa..b4f01dd599b9 100644
--- a/net-libs/ortp/Manifest
+++ b/net-libs/ortp/Manifest
@@ -1,3 +1,3 @@
 DIST ortp-0.23.0.tar.gz 540135 BLAKE2B 46bc411df48f7f8a2fd180ff75dc5f515c36a71bcaced0d3fcf5336ee8e142c6ae6d597ba39a92c38be78ce74d3eb79692f26596f37075829850222cdf381793 SHA512 70560168f1b138ad825e4e836e7ee218bd24b92a2d76666ba2794a4b31cadbdd8fdd40fee78d612187cde6a827005cbd836cdfc13a70947374356fb84a853ea4
-EBUILD ortp-0.23.0-r1.ebuild 1865 BLAKE2B c004f76cacde3985184965f1352cebd5f73d5566f067a355132bdd77f3b6a1edfe60e6c9dbe6e38ae0dedd6f722590d23838989104ce31448ad2fb05eb73f467 SHA512 ece4486e8743a48a2a3647cbdfdf3c7b9f3f48d175bd1f87ba2b7627d1c0cbffce259cc01e427775cf7e8b2d63419d89550d05bddfff7d039522f4ca257915ee
+EBUILD ortp-0.23.0-r1.ebuild 1864 BLAKE2B ed15ba43a7c568756b17ffcf88f0774a878c4ea070843f8606d85afaa494892b17f317b8b445ccc4d2b42c3a03a4522c5ee2f6472c56ff95adf166329334adfc SHA512 3488b8230fb0eeff5141cc381df068c320d0bd7de7fcc11b6d069e7dadf57c4ece62b74a5d562d0d76d198768073cb06d7c527b10c71c3c3e397c48e38d24775
 MISC metadata.xml 362 BLAKE2B e561cbf846ef904afde531f0cdba64d3855a93766622d90a393e45f0d5ad3da533afac394ba031edbb4afa6ca8a4b95c101f76f2f96450edecaf617ea24dc996 SHA512 6a9fd13fe951f0cdd6574a83f53a0c21324fa9cf45c878e71fe1c6aefa6a52ca8e285f2d433d2bd62723241b59793c06d66e4e9f6f8be1530f8377de224a66c7
diff --git a/net-libs/ortp/ortp-0.23.0-r1.ebuild b/net-libs/ortp/ortp-0.23.0-r1.ebuild
index 781dc1a78cb2..a935eef5e2a3 100644
--- a/net-libs/ortp/ortp-0.23.0-r1.ebuild
+++ b/net-libs/ortp/ortp-0.23.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/linphone/${PN}/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/9"
-KEYWORDS="alpha amd64 ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples ipv6 libressl minimal ntp-timestamp ssl srtp"
 
 RDEPEND="
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 523844e2e9e6..74113aa5086c 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -7,5 +7,5 @@ DIST serf-1.3.8.tar.bz2 143337 BLAKE2B 873f78ec7fab6323e3351e43ed7b03e8208be8d7c
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.8-r1.ebuild 2125 BLAKE2B f8276c9af00f571b33933b2a6b2676694c8dfa7fdd1f465c3171997936468094a793ac747e419457addca1dd358983dcff2155cc72bfbb577d1c8f8b88eb85c1 SHA512 4db061cb8b0d4af9555eaef6ca6be13b2a731091974086cde09cd6f36b537047265fd56bff4cd46b1739915160a7705bca6e391045c5bc81628f3fe08b90d406
 EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
-EBUILD serf-1.3.9.ebuild 2128 BLAKE2B ecb76eb9d649cee61ee96464ac74d5de65623753693f30de0853e8d0cb1183333183ce5178d52ef80748b4370c94ef8c3c17c33efee7290da33b2f696e4cb197 SHA512 f2efbd21895ee9002dd54530d57315aba0011c3ec97ef101b7bdbc4051217a48132a5791adf6b2f1cc49860c01824d5f053f16c17d3cfd299ac7b87f6d5d30eb
+EBUILD serf-1.3.9.ebuild 2127 BLAKE2B 419bc569c5160f8406ac098b959238a47230d0bf762f7644e420168dd6b252e835616a88598573e66e144747bea5923e5c5e49892a2644aab90bfe22939bce4b SHA512 23ba5aa3fbb59ce5b3140a1a281c3868dbf378c1dc93555ffa5634267ca89c9b0a1109aa8240fcca25ad6ae2178d00db7f4e41db7f9e4405429a6ad359e3e4cf
 MISC metadata.xml 339 BLAKE2B ff1bd30899bf67f73610a584e1d012632c801f3fecc39b5dc1a79025abdc151c650d26e5363bce5aace53798b20ec8931fc3532e83814b89fce767a2ecdc4e0d SHA512 b98b7e682407dd662a866336f76031793f13b0d76a7dae86b542afb515fdda1224b8141c71ff1f502294c2bcd88f3f80d18d654dcabe77088bef049bf462f18c
diff --git a/net-libs/serf/serf-1.3.9.ebuild b/net-libs/serf/serf-1.3.9.ebuild
index 7a9412df1fc4..32cf476c801f 100644
--- a/net-libs/serf/serf-1.3.9.ebuild
+++ b/net-libs/serf/serf-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index d599bb895ab2..d8a1e534e16e 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1,5 +1,5 @@
 AUX signon-oauth2-0.24-disable-examples.patch 331 BLAKE2B 259170e4ef75d002dbdcb8494cd0a3e6ea7fb77e5222db600c8d7a5d731af147cd5c7149b7e15e724607018331a29a53d589c2e6f60f614248e7badff5e63056 SHA512 a12e14d59987925dc0c14d407455c95d49751fc3bda66211898c1308a76d4f910b7ba4fdbfe98902a457980f7037f9853c5a007ee82df690375e5e430afa587d
 AUX signon-oauth2-0.24-dont-install-tests.patch 352 BLAKE2B 6dfa625f68f0178947414dee97ab22a34e366353a7b5b07e166c426a5b86ab418faf31a8bcd868d297ae4b92d10a8231f403810f66d6f4dbfd31a0afeba4165a SHA512 af1908f5e2549182823847df5ef80b933adc6d4a15f39c63d4a82cb8540e97a29c60c7056f17fb2db314ed92d51594d5f76687862018a70f1de592ecb3a928d1
 DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
-EBUILD signon-oauth2-0.24.ebuild 947 BLAKE2B d8075bc16f502a369580a1e12a1b39f936fa966a54a3356899767cc9527456eae6f6f3655f3cb4dbd10e841835bd6810b94c3cad3f8e9c777c4dec6cb4a46635 SHA512 4d1d5020e945d680db631b432c55f3b655ebb64c8e1d7413713d6b6be922c35b6d2b1c85ba7551ea8c96251b4192b8f2acb2ad000cf72fca54e33785f7c05179
+EBUILD signon-oauth2-0.24.ebuild 946 BLAKE2B 12b54b0456d31a69c58709907901919637adf5058e1e272c7054d112d6b6dbc01caa675e545b3bf9bef83089b9abb875d7be1bebf03802e337fc7151ec56409d SHA512 374796f93b011729351f6bcd508d4758e1c4d53bd1b9401b20dcfcaa7b11efed27c2d8306a88eae4e564f87c024452f141d46593c3a0c04eb0ab756214715c5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
index 6f4859a594a1..28d8ae826baa 100644
--- a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-libs/signon-ui/Manifest b/net-libs/signon-ui/Manifest
index e5da09858d3d..62212e67d633 100644
--- a/net-libs/signon-ui/Manifest
+++ b/net-libs/signon-ui/Manifest
@@ -1,5 +1,5 @@
 AUX signon-ui-0.15_p20171022-fix-username-field-reading.patch 4338 BLAKE2B ef44759dde1e1f393ce6a6e6a30528049ef1ce480ae9721f006dd4a37ebfc0c0a36937472fcc74731072229894c1a280c2b50e92e059d000d1de5e91435d8fc3 SHA512 2414ffaacb13224bd4edb4beec1cb6c8e576401d2a3b3677b5aaa9140eeea99077c37fcb0115c2400987722d23f822844d3f4cc901adbc85be6d4e098072d28d
 AUX signon-ui-0.15_p20171022-webengine-cachedir-path.patch 925 BLAKE2B 5ead2d7a75d2dc011d84a476f0cd1b80c72a54dbb9d06a6d151f9940bbdbcb20494a2ad388aa0590b2148cf0d5d2e455d50425d0292bbeda7e41de366172227e SHA512 e21aafb1cb79033619dc50ee41a81efe8e02be7ce71382ab532beb48d720a514bb7d4abe588c117685b4b643865c4a11eb304a8e0107104393de08afa1d162f7
 DIST signon-ui-0.15_p20171022.tar.bz2 55849 BLAKE2B 6b97b3f673fb4494c7e32dc345f6c4697acdb19305b9459fe954d88983e4666211926921dac70829435706cdd9a41f36d36241a73905b2a795873c2894ffa8d7 SHA512 d0a4ca222de00abf4000905d917799fc6f9e04a2c3f49d0d0882dc4e90fdbcde14da91f355d10f8a3feac03661febd321ea6de1df227fa5a3c404eaefa7c2d60
-EBUILD signon-ui-0.15_p20171022.ebuild 1166 BLAKE2B d582a271f43cfbd334ad5e8843290aeff0aff2eed23a4c5332833da7b19322f1fa6e6d1e902548e6e747db45a5bc7cc783e10161fd19891072f760c15fdc5a73 SHA512 26d357b854d13707fcefef6f769558bfd924960ac9de50826677a6edc105442b3627d3dfa9899afcc0d57e25ff2d8c8e1e520abe8873143f93e2c71eded3cc11
+EBUILD signon-ui-0.15_p20171022.ebuild 1165 BLAKE2B 732d8910aa71a29bbe660f349182d550dc40b315f0b8275e6b430c9348b6a9dba84ffadd133fce014b54975f4b909f0267d346458d7419c09808ed909ee9ff79 SHA512 3c5749bb6224881b2ecaaed13d47bfa12442051de91f6b4dd7ae049aff31de51f312fa7814b56762997914e3e2461a5e34936cc925ac57e102bc98c8ea47735b
 MISC metadata.xml 326 BLAKE2B 896ee331ecb5fc149dbd576756e92fd439e6e5b3364e487de418428eb47502cadbb7826c433ce8bf348a7c70e5215dc073aa75a93b8a853920dd9fbacc139927 SHA512 5fae353739749bdc5a688a5819992063f045818006124b8cefbb4ef6a3452d91122931aae8286627b9121f893b97e66a44caa732edfbc2aab9301d8d039b0a7f
diff --git a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
index 0e1560485cac..e909bb787db9 100644
--- a/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
+++ b/net-libs/signon-ui/signon-ui-0.15_p20171022.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/${COMMIT}/${PN}-${COMMI
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-qt/qttest:5 )"
diff --git a/net-libs/signond/Manifest b/net-libs/signond/Manifest
index 5d70fcf33406..1da44b090d4c 100644
--- a/net-libs/signond/Manifest
+++ b/net-libs/signond/Manifest
@@ -1,3 +1,3 @@
 DIST signond-8.59.tar.gz 281298 BLAKE2B 29b97705b6e774f65b42a7ef9a253b08b1f4caf46141e3d761aabd9ef641dbe1301ef2fac0f46d8073e815bb97bc64bfbbf4b19d9c6644e2369f3abe538a50af SHA512 b8db03127df7b62dbf046841568c12f29c48c0b3272751600637864caa1c10b05ee9abce20fa41fb8eb7133c6bb20d18ca40803077e9e7808dba5afd108a36bb
-EBUILD signond-8.59-r1.ebuild 1584 BLAKE2B 5781c90c807cda11c86c418b05ef8609eb3a84973151f5f803a1d77d5a7c2b9023b5d303d62c4c3b5c8bfff892eb263eeb9fac3408c26a400d361c26cb3d2fa9 SHA512 a092be30ad7f3dd8e7073e75d8cf0127155679b158c4c741840a35f3520dc8f468d930c238410ab28205eb81f49dc2a9d31221106d897bdbd1f447cb29060462
+EBUILD signond-8.59-r1.ebuild 1583 BLAKE2B c37317a68f2d839b5d9be9e8cef75fa1d6d04563fd7496580b40fd58ce3b7bdfdfaa934f4ca9570b62b82e06c6e0ef391e7415d3090b176e7968fb2f2021b109 SHA512 2300c0b0cfd3b1384ef4a74a81d77885c8042b5f3f5c03a77c9da814178012b918c77b288fd4ef0dc9169aac6cfd5bbc9adb09a009c377ccbdc92aa3d43f5bcb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/signond/signond-8.59-r1.ebuild b/net-libs/signond/signond-8.59-r1.ebuild
index bd19b36952cc..8c546f616ebf 100644
--- a/net-libs/signond/signond-8.59-r1.ebuild
+++ b/net-libs/signond/signond-8.59-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=V
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test"
 
 RESTRICT="test"
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 750c6b4d00cb..c66d27201fca 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c
-EBUILD sofia-sip-1.12.11.ebuild 862 BLAKE2B 33fa31f28f78e5cd5e20b7b72e6b4c757c17288b235dd4755d93c56c232a0e0c92192bf24d80ab169ee06e2e6c3c9589e93b34341274b9afe335ef478e778b60 SHA512 10fcb9d9d0740105957483b3bdd1c4879b7449794d979877d684146c2aae57f32718e527c47b8af5c3b9575d7c4bea3a25eeb951ac171512560708f9ba5b0d49
+EBUILD sofia-sip-1.12.11.ebuild 861 BLAKE2B 1a1b07d9c49ea9a960c29a8a9c4bcccdc56a435501012dc24f9bbb0af6b51fe4a5b341ac18b1ffdea6a2f563dfa31c8946738389f5f9903b39940226fa1d0ddd SHA512 aa4c31f618b79b664d887d93e9c1829c9d4d78746730edfdb874800e8aff0cfd75fa74f179bf7fe69f40dee91f38f6a2b0b4e573205b0d96ff87ff9e4eef7bdb
 MISC metadata.xml 332 BLAKE2B 20075415729415694d925419349c24403e4dd8181e0e3e2b6dbdb682d0cd9625dcf6196152ee4983615fa34c7b972e10799d190fcde04f4e4ebd4e41c3fb942f SHA512 cd0911cea94332c8e64908a7537ea78683c562638aac05ab1659873ce5c43d378fedb09f848badb12258078779a172ef87313a2b6fb5001a3f33bd954ce7d420
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 7eaaf899d669..2de4dec94174 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="libressl ssl static-libs"
 
 RDEPEND="dev-libs/glib:2
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index 09c0f90c8485..f1e4e68e497b 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -1,11 +1,5 @@
-AUX srt-1.3.1-no-rpath.patch 1199 BLAKE2B f813d6203a1c1cb55380b651202ffa577c45b16b07764b0d674fba9e8e5fa2e3ac59c36bee328f490f7a75ee1aa53201a415307c2d1484d83c59944d046195b7 SHA512 a824f88f8ca1494ee86708662fda7340cb215ef6b12ef8dbcfaef9ece0d4cc82c42c1122aef163430244869e5bc2019566d3e481d64c881bec901591a426fa65
-AUX srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch 2750 BLAKE2B 6e25055db2a54cf046fc848619700bf0c7eaf85201ee910a0f32e968a8abf94cb02e1c3415b77e2d01c0f311387d5120f4b12bc727ff7915d1afd8dedb92a464 SHA512 947dacf17f899ee3657feb121e8840457c9f5a428d50b835b20bd39aa554e002050e8fe1f1e63dd829bde325ae8e1ba311c0cc9acccbb38a44bda971d284edb4
 AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be1d96dbc7929dc211e04aef129dc8d700d298a0e51ebaecdeb67f689f08ec07c76b6f5da0fc0e04a3328db10ca4eb107d SHA512 a85bab8e2c0b10e0aa91cae302005f37851c2387a5e841a391b68ed8b93f088c4b914776c9a2172f914dba5853b78190209d9b3afc5a7c8b320e71707b1a2ea7
-DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a
-DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41668f3b3db76055917cff767b6d04b1fdd97b676772fbb561f36f3d2f712e1d1165a26033f728c1bf9efdc SHA512 1f8fdfc0e1d92bc8c477651982c23afeacb65e2293a7225227927e1b6f71a01355a3311600097d77b3df638503e4856acbcb52ed270b650480f20b98c1be5ec2
 DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817
-EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
-EBUILD srt-1.3.1-r1.ebuild 1347 BLAKE2B 99c91c175f9c3102e1b29a6f9802c4a73576c2840c5d815494632a77c2ff9334a17ae2cc4b5709132de4dd52bc7cb0db482fa6f5c6f85dfe532e03cefdeed543 SHA512 76c669ab9a37339d041a28fdd888fbab0ea1e36f4f29705fa262b7d68a4cce1d80b9f3e29289f342b951d20a61f65b0b074a03b42cf1ec62fe54ffc1f2d064b5
-EBUILD srt-1.3.2.ebuild 1213 BLAKE2B 4fdff2527035526fcacd3263d54e52dc146d974c9b67377e0baf807b5ba9f7fa0d5131899a2a2ebc583c938c83f909527417ecd077e65ab6395dd2a6c3c0f59d SHA512 db006c8e6736eb63b3e81a94ba78fc3b278222291d5eaddc0caf5f86927b80339d54e13b513b5b0d53b2eca5c2cb22ee69e6bc818546540b34ca961bcb09c068
+EBUILD srt-1.3.2.ebuild 1212 BLAKE2B 48b3642928d55c296ec7d874a932f3d966e447d05c06f5be4f2e25facc1d0c8f57f125abf044b59c9aa1bc269eb69588f222e8bf9ff7b95bcd7f5a5c9b2ab9cf SHA512 775c84e4611618ef0fff1edaec95d2da9cc85ba1f06a094421c797bf54419be35b0b0f56f3f4c659a19c1ed7a8c2edfc3e3744ee07539b91746d06dee5b058c3
 EBUILD srt-9999.ebuild 1314 BLAKE2B 190493cd65e60dfb2131cd64910dde9b4d62b10aca1dba5143dd1a34d5f353c22b89b9cfaaae03a3cf3b8f27ed31304aa10533f9c062d396a57be7943e3bd138 SHA512 4c7857ebec342fab43372b5baf7af31455a6a82addff0b5bdaba4df78f733abbaa75f4da5d263313962db51464ab496aca797d00a500bf1f8b0400c9dea1c596
 MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/files/srt-1.3.1-no-rpath.patch b/net-libs/srt/files/srt-1.3.1-no-rpath.patch
deleted file mode 100644
index 6e3650709c63..000000000000
--- a/net-libs/srt/files/srt-1.3.1-no-rpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a90e6ab27bc20fa34536c19828db5be44be4ef4d Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 26 Nov 2018 21:51:20 -0500
-Subject: [PATCH] Do not force rpath on Linux
-
----
- CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb2582c..60c4507 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -663,14 +663,6 @@ macro(srt_make_application name)
- 	# set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- 	# set (FORCE_RPATH BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
- 
--	if (LINUX)
--		# This is only needed on Linux, on Windows (including Cygwin) the library file will
--		# be placed into the binrary directory anyway.
--		# XXX not sure about Mac.
--		# See this name used already in install(${TARGET_srt} LIBRARY DESTINATION...).
--		set(FORCE_RPATH LINK_FLAGS -Wl,-rpath,.,-rpath,../${CMAKE_INSTALL_LIBDIR} BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE)
--	endif()
--
- 	# We state that Darwin always uses CLANG compiler, which honors this flag the same way.
- 	set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${CFLAGS_CXX_STANDARD} ${EXTRA_stransmit}" ${FORCE_RPATH})
- 
diff --git a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch b/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
deleted file mode 100644
index 2859ed1bac3b..000000000000
--- a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 09afc227e0880b12a98e18ee8182f89c3a80e3a6 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@gmx.net>
-Date: Sat, 15 Dec 2018 23:21:17 +0100
-Subject: [PATCH] CMakeLists.txt: Respect DESTDIR when creating stransmit
- symlink
-
-Fixes: #357
----
- CMakeLists.txt        | 20 ++++++--------------
- scripts/haiUtil.cmake |  5 -----
- 2 files changed, 6 insertions(+), 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb2582c..fe45919 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -705,28 +705,20 @@ if ( ENABLE_CXX11 )
- 	# For backward compatibility with the old name
- 	if (SYMLINKABLE)
- 		set (REPLI_COMMAND create_symlink )
-+		# It appears impossible to get the filename component from the generator
-+		# expression $<TARGET_FILE:srt-live-transmit>, hence we predict it as:
-+		set (srt_live_transmit_name srt-live-transmit${CMAKE_EXECUTABLE_SUFFIX})
- 	else()
- 		set (REPLI_COMMAND copy)
-+		set (srt_live_transmit_name $<TARGET_FILE:srt-live-transmit>)
- 	endif()
- 
- 	set (stransmit_path $<TARGET_FILE_DIR:srt-live-transmit>/stransmit${CMAKE_EXECUTABLE_SUFFIX})
- 	add_custom_command(
- 		TARGET srt-live-transmit
- 		POST_BUILD
--		COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} $<TARGET_FILE:srt-live-transmit> ${stransmit_path})
--
--	if (SYMLINKABLE)
--		message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use symbolic link")
--		srt_install_symlink(srt-live-transmit ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/stransmit)
--	elseif(${CMAKE_MAJOR_VERSION} LESS 3)
--		message(FATAL_ERROR "Your system can't install symbolic link to 'stransmit', copy-on-install requires cmake at least 3.0.2")
--	else()
--		# This installation doesn't work with cmake earlier than 3.0
--		# (looxlike cmake 2.8 somehow doesn't have a problem with resolving the $<TARGET_FILE_DIR:...>
--		# inside the generated makefile, but does have problem with its own generated cmake_install.cmake :D)
--		message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use copying")
--		install(PROGRAMS ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR})
--	endif()
-+		COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} ${srt_live_transmit_name} ${stransmit_path})
-+	install(FILES ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
- 	srt_add_application(srt-file-transmit ${VIRTUAL_srtsupport})
- 
-diff --git a/scripts/haiUtil.cmake b/scripts/haiUtil.cmake
-index 417128d..f60bc11 100644
---- a/scripts/haiUtil.cmake
-+++ b/scripts/haiUtil.cmake
-@@ -48,5 +48,0 @@ FUNCTION(join_arguments outvar)
--macro(srt_install_symlink filepath sympath)
--    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} ${sympath})")
--    install(CODE "message(\"-- Created symlink: ${sympath} -> ${filepath}\")")
--endmacro(srt_install_symlink)
--
--- 
-2.20.0
-
diff --git a/net-libs/srt/srt-1.2.2.ebuild b/net-libs/srt/srt-1.2.2.ebuild
deleted file mode 100644
index 66d1b1dadb46..000000000000
--- a/net-libs/srt/srt-1.2.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/Haivision/srt"
-SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc libressl gnutls"
-
-RDEPEND="
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-#PATCHES=( "${FILESDIR}/${P} )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GNUTLS=$(usex gnutls)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/srt/srt-1.3.1-r1.ebuild b/net-libs/srt/srt-1.3.1-r1.ebuild
deleted file mode 100644
index 4233da5f8f4a..000000000000
--- a/net-libs/srt/srt-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
-HOMEPAGE="https://github.com/Haivision/srt"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="gnutls libressl"
-
-DEPEND="
-	gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-always-GNUInstallDirs.patch"
-	"${FILESDIR}/${P}-no-rpath.patch"
-	"${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
-	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_GNUTLS=$(usex gnutls)
-	)
-	cmake-multilib_src_configure
-}
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index a0f93824ca65..998bdd69626e 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/telepathy-accounts-signon/Manifest b/net-libs/telepathy-accounts-signon/Manifest
index 0dc0594ae538..408cea57b15a 100644
--- a/net-libs/telepathy-accounts-signon/Manifest
+++ b/net-libs/telepathy-accounts-signon/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-accounts-signon-1.0.tar.xz 17584 BLAKE2B 6b28df37eca0ce78b11d66cf96b7508bc3e8cf3457b5df2b61bf63666c8b4d4c0bed41cdea9b0135e631c7b663275eef303496724aad342b06fad3ff512f669f SHA512 10058570efbd7dc916a3102b72e506999793ca0ad9ce79f5b33f20d207ec3396fb067242558d2903e49a04b14e7f4717e43475aaaf902a03fc7d4a0bb52c717c
-EBUILD telepathy-accounts-signon-1.0.ebuild 628 BLAKE2B ac1be67b511b272bebb8fb4b44a2d49bc094f446a1662521b633f2818904c61c28177a633a82584ffe10028f878d91eba7579f5163104a4c7ef8346a0096ae2f SHA512 4fc7514bcf61bea2309e45ab1b881272728510c2ce3bcdd258c2a3a8c141d29e193262bc3721fa0fd42afca46352dc47d4b26aecf4107ddcc78911883d7d85c6
+EBUILD telepathy-accounts-signon-1.0.ebuild 627 BLAKE2B 0fb6da51de74b800444089b1195d99932cbe1994b573605d5295fedb6e658881f3f3a7344fb3e315e2dc746531396c4e22185132d3e3e249131383ecef4a6acf SHA512 129a9aa640fe61e58c1bbb2beeb388062340f6c7a75159bdc53a0b1577f902cb6f13fa07a3d2847298f719710b1d8ec5a060bcf40ad58536d038994248573ef5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-1.0.ebuild b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-1.0.ebuild
index 5f65cc3a937d..3d665b5302e7 100644
--- a/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-1.0.ebuild
+++ b/net-libs/telepathy-accounts-signon/telepathy-accounts-signon-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-libs/telepathy-farstream/Manifest b/net-libs/telepathy-farstream/Manifest
index f6280b5c7e0a..e72b792ce0c9 100644
--- a/net-libs/telepathy-farstream/Manifest
+++ b/net-libs/telepathy-farstream/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-farstream-0.6.2.tar.gz 601409 BLAKE2B 0e130f657fe888e7be732aff2d14782f9b650a004aff1962f0df99f88537a9425acc88764b1945c6fef1e6e53edfafce08c3e1f81530a3703f9c09bc61e6ca2c SHA512 ef9c07df607add411df404f5e2dfbf92afde8387291980e59f9e0b85d6edf0904582f10491316ae01349fe242d44a3579a27663127d5a91cb7b06ad163b6e4a6
-EBUILD telepathy-farstream-0.6.2.ebuild 1139 BLAKE2B 9a225f92dc073ae294a9524d301a53488b59d6ddc42299129b3ab36eb445142f0d60ade9e48ba02d9585da7007ee997a1e3a30731805ee6d71ef756dcc1f6d2f SHA512 db9db5dea51f70d76a12e56808037b34e1fdb0ace7e5bd706738df6b695944a65dd58038e4e08d0bde6bbe019481e13095cf6af5f23cbf0ae347e793b5fe2495
+EBUILD telepathy-farstream-0.6.2.ebuild 1138 BLAKE2B 879cc4d9963577f5c4c1131a985b14a9fd4fb9e726a6ed6715f75243fc966d515b73ea9c3294d9c6991e8d7b917048be8561e59f692d5b677b510c08b771476d SHA512 d7541d0760e9282c1edf2734174a2141078aa9ebaddc3114117fce6452649c3e884639b7f02c0b1f26f5c8c9ce3c4dfcc7d80364b660f3c1877d143bc16cedcd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
index faf903c2f21f..258733ee6ce2 100644
--- a/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
+++ b/net-libs/telepathy-farstream/telepathy-farstream-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples +introspection"
 
 RDEPEND="
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 06d49b28f7b6..06bf0bbf5fbb 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-glib-0.24.1.tar.gz 3898149 BLAKE2B a4bc704b5b98c9e6df656833eec38b5f69a0b5d2621a6816ffa6c7da64f2c512cb992ffadd2ec2ac89a1b8cf6581c28aedad6b4019b3d16d9165c7d874370eb6 SHA512 2fed94f76a19d6069f671cdd45d2fd8a4b4ad27c4601aff66041ca205456be397c76a86f92cc9bf20fa4eb6d4c15a67ed8196644c143c37e945f382229a63335
-EBUILD telepathy-glib-0.24.1.ebuild 1540 BLAKE2B 94ddc615e7b176fad63249befdd31198776e5f7b18e9b237f2e1383243149d564d51909f39a855a2289c16fe581c1eb137233be790f0d252053ddf98e67d3251 SHA512 41e8a99610f40af64aa5da3692b76f5142fd5d5e6df0df0ec86821a1beade8861b17a104c53dd9b3104f19204e5a8323948467e05b52ca568d41da5f17d70277
+EBUILD telepathy-glib-0.24.1.ebuild 1539 BLAKE2B 086d1bde9c8cb6a35b79ad12762555d1ec2a4f5ae25ffc170bcceb5f0c21529878d28451de73a5d4266bfccefc5f2449681403e59c66dc4f191992021cd57afe SHA512 fd1493bd6ae89af799937a77931f48270a8188112fa2f145c35c887b2dee20d7121d5419cf8aeb2def87065827882b686ec34d6538987ba89f5675dda3f78779
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
index daa7ae76ac8b..ef22c6ee2bec 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="debug +introspection +vala"
 REQUIRED_USE="
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index d2625573a68d..68381363f0ed 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
-EBUILD telepathy-logger-qt-17.08.0.ebuild 686 BLAKE2B b8c9b88ad9889e5219e42d65507517ec9810a6712ca3715ddd6ef00f8a16691f4e9765d6277b878b8944638dc37c9af3223264155d8b5cb6f38d10ed3ecea04c SHA512 52be4907bd28015bb10837ef78efd7198d60339c26dc0989b13acdc12455a3c73e5dd4e60a83ef6c500178cc9744b295518bf36fbcfc744b281a231b47a87c40
+EBUILD telepathy-logger-qt-17.08.0.ebuild 685 BLAKE2B 0bc1287ad89bc2f6aa78362470f8bd8bdae42753960105d627f7550848b9714a32bd4a8ee12d808c7a329f60801103deefe9cfac30b9db3b5c6475a5e7bf9079 SHA512 9b05246bdc3ec66418261bfe8b1d2c04671c3a0521015df09e892f0cce8991c49719475610024751f7069bd6b71da054b7d5b1a96985f1bb45b15dde6d4cde15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
index 5506d98d64aa..5e3b122b8ed9 100644
--- a/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
+++ b/net-libs/telepathy-logger-qt/telepathy-logger-qt-17.08.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/telepathy-logger-qt.git"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/telepathy-logger-qt/${PV%.*}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/telepathy-qt/Manifest b/net-libs/telepathy-qt/Manifest
index aa3f9931a2e1..8b2dd8fc3741 100644
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@@ -2,5 +2,5 @@ AUX telepathy-qt-0.9.6.1-qtpath.patch 935 BLAKE2B ee54f49734a52387c68c60ebd32d2a
 AUX telepathy-qt-0.9.6.1-yes-release.patch 578 BLAKE2B fd8581e60b4f526681946c7c45638c85f3a5ad0448d71dbdfd2b4a8a5f72f423ae2d8514c2459f817c9b0aff35db8c257d827e6e25f75037fd867df18fcb3e36 SHA512 c0c3e3e6b698aa5410d33653f36a1dac044054fa03830f1c78c1a1d82aa74e24ef84d4ccfc8b3ce295e655f2618aa318c863b8b49303097d5774e789efb4cc80
 AUX telepathy-qt-0.9.7-deps.patch 2017 BLAKE2B f8f0d4eb3362b1b0d4fb628dfa773bced0eebaa359340f6b95d0d37077083f90979dd557775cc5a44b74c0b78f4741b5c03b589feedff0b0d32d51f3883b6513 SHA512 202974d14ee316e713138e5ee88a5b6ec4f613af567b83ac4dc4aec8bc39dcb6cd65d1be6724189e48cccfc526ad8bd7151a7a5420a5d5f44071ccd50a0ecae1
 DIST telepathy-qt-0.9.7.tar.gz 6213405 BLAKE2B 13e2ae73bba74b4aedd55b46d0816744a4485a2a39faed610439fff40a65065a12606080012e220fc30a9d2642aba311aca6a24b540d8d22a140197911343eb8 SHA512 081daecb2509ea690079014bcc88eacbf2b3e4f4ac42aaf1b0cb264c01b801bc499a041482571d383f258cb3d3e2c6ffa5682fbe417fe807fcc25a06d2ead877
-EBUILD telepathy-qt-0.9.7-r1.ebuild 1144 BLAKE2B bba0b5ed4594aaeaa04671b7badc995a242e65f7c135bc7d8e9f9d5240a9e38613199c9ad0c7a3d86cce252817d0eb7da239307cfbd92854196176a3783ddcb0 SHA512 8bd436119d992d510e89ced67e40076e76e4ea16543a84b04da8f3a972cb19b4a25a77934e40de16d2ff645dfa1d5bcb6990af72fb068500399bbc8566ea3039
+EBUILD telepathy-qt-0.9.7-r1.ebuild 1143 BLAKE2B fd407ea1f38641b790e182e87c953a4ede015132f92354980f48abd96d2e4c9e2b4ccf941ee234b913b09a687515d1e80309de853913c03f6eddf023d44497ad SHA512 ad539634ee8081f27018004d7ef2a145148f9fc199c3367c4108a859fd32216f785fe2934257315f6277852abcf7e7ac2ee9bc129a736ccc5338c0b713e15ebc
 MISC metadata.xml 691 BLAKE2B 6539a5f9248a6f49fe13ba408b6c04a54f212c684e0dae59cbc6b510e4ddb0440dd74f9afa0540308f1c1239fcf044531d8a088b7cb98da39896a54e6c82b848 SHA512 9fd71fef229868f3b0495ad64e5845420258b92f4773da7a74e45d3c5f0d23ae738cb219bb5050c68223950652f32ed6e31ccd580f732ebc26700cda64b44891
diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
index 9f8b817787e8..493cfb62bd24 100644
--- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug farstream"
 
 RDEPEND="
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 83d3a8ebbd86..237a3c29a76f 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -6,5 +6,5 @@ DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b6
 EBUILD zeromq-2.2.0.ebuild 1290 BLAKE2B 41766c48411cb623c574f20b72d9190877c0f4a53708c132863986059b620f0175a46fa3ed840dcc38298419642f186124289db64bbc9c092dfd896788c26eb7 SHA512 83c7f2b4f30aa15b44c2761c879762cb8cef3e19ba84f9bc95ab6e8f7bb0e3d01c0fbf91688be12ac662c231929793544d7769f2dafcec718f2e22764b76b9a0
 EBUILD zeromq-3.2.5.ebuild 1469 BLAKE2B 0c63cffa55d6ce54d430dfd3f4997f1426a80aec72e5778cdb3ba833c383d2c5d487824bda6ab413c7750de790755f266d3c69b79f8cdf6ae982fde417fb95d9 SHA512 85a0a5c8184dcafaa29d93e59568fb569ef015fc2f1cd7c26bd5c66f0333050c04505587e6922691641d43b679c34eac13dd7ced4cd2955a5c2e926ad559bfbc
 EBUILD zeromq-4.3.1.ebuild 1470 BLAKE2B d92608ac7308724a73b12d83f9915bcdeea6f6710a5542dc16db3f6a69c7570ecedad7956047aa14aff6f18953a4fd2a846baddb04f94cc6e9c168a9071d40c9 SHA512 dee5f94ed614f3e98152f4634e3094c96d691b7861c7790125f69a428daa2519aa63045efc4f37eb82490de32e82ae72d88bdad338ca72150d6b898b203f9264
-EBUILD zeromq-4.3.2.ebuild 1412 BLAKE2B b47970b4dffc3ae355fe592f7eca2ccbeaad4b0329e9457ce867edee7a15b9ba3d5e0266b3e29cf77015d5fcecc83802f4872acf78e2c4f6e285b796c4eb6174 SHA512 f69d8ba953108b6721097522e03c1dbd51ea7e2849a819ae65a302f6bb20f2a09abdf23e0f137c4b97f23a1b5e99cd217321f7346af40da74fec5b1af1f2b2bc
+EBUILD zeromq-4.3.2.ebuild 1410 BLAKE2B 67d14de3edc28c07106685be656e92603347f0b5393cfc0d17ea5f6add9d5c6039e7a489b2558f36ccf8e211a332a5c107c8dc6a3643804a33cf6afeed04d233 SHA512 7ccd9ac284061cb9bf2fa615bb745f929f1e45acca46dde27b906b107d220550343964cbcb92d7677886d5a0dc99842351e05c0cbe6d02a4b4e3b0b5a362dec8
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
index 95609cc8efd5..d3ca50a8bf78 100644
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.2.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /net-libs
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)