gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-libs
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
60 files changed, 368 insertions, 1166 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 591b9fe2b7f6..c4fe11fa8f46 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 7fc673da578b..0ccd9ab28182 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,7 +1,7 @@
 DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
 DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
-DIST enet-1.3.16.tar.gz 703461 BLAKE2B 30046a50a00eb3ccdb24e69a7f315555b1b395f42e30efff55c09bab28f4f2404c5183da2bce166f719956a9286ebfbc91d184cb146c252351909eb04ac1b345 SHA512 79761749d0f127c30b3c7186ca3c73795532d2e96ac1c152cd1fb5ca422b020f75e0c08ef9c9744e16866f8e5261dc24985e0421be56bcb0a4b072411af425ae
+DIST enet-1.3.17.tar.gz 703278 BLAKE2B d31838a173f629a2216f59173c259cf7cb35985913c5f8f016641ceb189dc20308effa206f03391cafde842ad6e43ec1776d38ce02283bd5990ccf38eadf4d6b SHA512 efa0cb093a6ca295e5012a4fdebc5ffd6516a66a967e97b386b72781b18ce4a118c9bf94e87adbbdcd0ed441e22c62a05c24ff39fd6b475919e8efe9ab4715e4
 EBUILD enet-1.2.2-r1.ebuild 499 BLAKE2B 05ec1dc7aaecfb189a06dfdba15f4770491062f334830e6f9eb1ea5a3729f3ebd39951f6d5008902ba66f84640aca16c74473fc7705e00c6eeeb7b257bbc2a3b SHA512 1700ffc1e2129992d9f1bd4fac27a033a948e237349b38ac75cae19ccd479f1b8b2b1bcee114db196c8b8e24ba58a4fcb3e17cbcd194a32b63925302799cf3ec
 EBUILD enet-1.3.13.ebuild 543 BLAKE2B 77646d41979e890867c803d1e7056b17b63ffb76ec70d6ad5fe9eed99603634946a783e86dba66a957cf90609227e5c4d7d32fcafaf991df89e79eb864498002 SHA512 437dcd55c7d87514cde3c4a0a821cb7615349cdeacfab1be8759a0a9b318881d50f0c1dfbf4f097c9ec1426c63ea47b437d93b1f664ec7246aa4c1ca157017a7
-EBUILD enet-1.3.16.ebuild 579 BLAKE2B 56d7f9aa4a91a58d15f73442f00ab6c4933e83eb609957ac08ac158898ef8a8ae580b976574d391725c60ce27fcb5e2f6574f092916237182707727906cbe173 SHA512 518d5fc298c1bb0460f7d6a18157057a49ea0183fcb6d5c7cb26f35cd146abc8dcd601efae18b1662a5368b37187861db08c47f9e44cbc3f898582fb5969e7a3
-MISC metadata.xml 325 BLAKE2B 7cd79c3bb3092d60d0e02dddddcfd62c4a3992b1701f4092b234efaebc5010a3ed0755b7be879f59adb0d36b53d8ba5e39dde647080e45b2799985401f81ca8a SHA512 2f3908ab3033a97cad879679339bc29743107baa299dae476d3cbc728a7b5267b215467a6908996da25832cc6045b7b1aa67bf23b728fb74656a69988d5a026c
+EBUILD enet-1.3.17.ebuild 579 BLAKE2B 991009c402515f89539b81cd0fa78ae16d07c7edeed3910eb1a526b98e76f3c106a23995de08da4aea700c1152e28ec7b5eed3954a479846df7af69220304284 SHA512 0743c73183e6d1935667b0e79d53ef3f0f6090502f4e3289a0c42d7d66f34689b8bec48f75abc610895d891595654b6fa39cc3b570da160c3cb51f6cfdaa6456
+MISC metadata.xml 411 BLAKE2B b9eb718dfb7d13df6c449555ba81f06e1cbf92a760612a7d692f9d7dbf7fb9a34b625164de587a633523c38ea33a7b62fb9ccb9119a9a11c0cde571b11a4d3db SHA512 0667fe732e7a080ce7b0aafefd6f8457bdbc5e69dc975171850ed8b0fd0cb4ef576e812ad627eede5de9614b3deda26a1c27340d93db6ff54bfa11dadaa9b7c2
diff --git a/net-libs/enet/enet-1.3.16.ebuild b/net-libs/enet/enet-1.3.17.ebuild
index 89a85f45470f..b7142681cf15 100644
--- a/net-libs/enet/enet-1.3.16.ebuild
+++ b/net-libs/enet/enet-1.3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-libs/enet/metadata.xml b/net-libs/enet/metadata.xml
index 5b861b1b37a3..18db954d2782 100644
--- a/net-libs/enet/metadata.xml
+++ b/net-libs/enet/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<changelog>https://github.com/lsalzman/enet/blob/master/ChangeLog</changelog>
 		<remote-id type="github">lsalzman/enet</remote-id>
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 5e0d9730a736..5f358d72ea48 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,7 +1,8 @@
 AUX gloox-1.0.24-Makefile.patch 664 BLAKE2B cf2e193f4378f8bea9798053f61044037ae69710328836970f3f56770fb07504c901fa083e81b227d3ccf1b43434cf51ba86cd602a3d7929c7017614ac9be987 SHA512 e54676464e08e9ee4fe7a5e19fd5abfad8333ebafbabb31a99b326e7725733f6ee18ae65329461a4b5fe89b398a10415d518780da685a1bc728a76ef45b2c2e1
 AUX gloox-1.0.24-musl.patch 339 BLAKE2B e3cb58c64057fb991050544b4886827031b574ba95eea10eaffc8d49e741f69499aefa197995ce9525554f9079ce54ff4bf72634810bb1823133585198cd4b9d SHA512 d19dbd9f4e2db63b6b05a514357c6165900c4557de180a87691e815cf72f2a116b806854eef1060b08b30ffda0679956fd8d374f87a714be48b95bb32c388f68
+AUX gloox-1.0.24-slibtool.patch 503 BLAKE2B c760faea8d4aaa9adb3d70494b55a0a327456f8976f8c017dd3326cde93147f126d9e53390e9b47c0555ae9a8a7bd0259cff8b0e86b4f845aef99222bf3c001e SHA512 bede6b41aa5695de8d7caff391eda0c75a2fbeffd0d3bc2a8e0cb943123283fca7519d4406c3d5f5db1585976dd84d2023554c7f5a42c74683fb38336d1f3904
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
 DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
 EBUILD gloox-1.0.22.ebuild 1124 BLAKE2B 5dd191732bd7ee3c09bbb262189a5ad2d6fe73a4f6fa8834f804072771a5e3624f4504a1678b02fa8c3957502d7187a7832dfcabc878409a9c6f6f15dec6f65d SHA512 a12832ab6146e042f88bedab8c53ad683c46379fde248f61da2d103b90e06977d27ad32fded46eeb32fca873e156ad5b794c0e126110e76cc3bad594dbdcf2c6
-EBUILD gloox-1.0.24.ebuild 1327 BLAKE2B c0ea949018b1ea4cc27d7f71dd63160f6f85bd51b1e8e2be1547ebacabc21bf56cf5569e2879097f354a4f354e1f07fed1f72c10fcf2d996632921838c4ad4f5 SHA512 d0e22822f288c91e0f938b4b41ceb06fc944700777bbbe73e8ff8ef18e432db1130abcfba8ae90ba3b9ec8f4f83436533c19997c484966eb2a34eafd3a781a1a
+EBUILD gloox-1.0.24.ebuild 1370 BLAKE2B 861af564b4f1d40152546127c9a6f372d1225bd594ed3a63520895df93d98648d56d7b7f929660620c6ae4cbf5ccaf30374f69097545da660c872f26009ca80c SHA512 34ef2097bdd013384cf57b391dfdb0d2895a25e212cfc5226e8c80b4f29ca862507fadd046ef98a23c10868f45c7729a83f23e63f98a94ac1977313f8c385d72
 MISC metadata.xml 253 BLAKE2B d71cef1027d455987adc9c6421216c7c2c1db2615b0e7beeb8e8ea22fb64f1d6da1067363164f9d4d970af759d9a71be31eb55890a6bba420efb09efbe917c66 SHA512 4a632f8fe7d7808076ecc07be60de72762423ecea35ef546a6e2b0a15eb90c018e1ab06c5169b1b5613451049965bd8d3a4ad6cf898845f6a871b46135f8d186
diff --git a/net-libs/gloox/files/gloox-1.0.24-slibtool.patch b/net-libs/gloox/files/gloox-1.0.24-slibtool.patch
new file mode 100644
index 000000000000..eba7ffb40613
--- /dev/null
+++ b/net-libs/gloox/files/gloox-1.0.24-slibtool.patch
@@ -0,0 +1,13 @@
+This fixes build with sys-devel/slibtool
+
+--- gloox-1.0.24/src/Makefile.am
++++ gloox-1.0.24/src/Makefile.am
+@@ -46,7 +46,7 @@
+                         carbons.cpp jinglepluginfactory.cpp jingleiceudp.cpp jinglefiletransfer.cpp \
+                         iodata.cpp
+ 
+-libgloox_la_LDFLAGS = -version-info 18:0:0 -no-undefined -no-allow-shlib-undefined
++libgloox_la_LDFLAGS = -version-info 18:0:0 -Wl,--no-undefined -Wl,--no-allow-shlib-undefined
+ libgloox_la_LIBADD =
+ libgloox_la_CFLAGS = $(CPPFLAGS)
+ 
diff --git a/net-libs/gloox/gloox-1.0.24.ebuild b/net-libs/gloox/gloox-1.0.24.ebuild
index e7a34c9e3dc3..f69f54f3f6a0 100644
--- a/net-libs/gloox/gloox-1.0.24.ebuild
+++ b/net-libs/gloox/gloox-1.0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.24-musl.patch"
 	"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
+	"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
 )
 
 src_prepare() {
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index ec61b69ceaa8..a7d0c193a61b 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,13 +1,4 @@
-DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
-DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
-DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
-DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
-EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59
-EBUILD libbitcoinconsensus-0.19.1.ebuild 2388 BLAKE2B 58146351171676bddb3744b2cc1dda21d552a0302e8007dc8f828fe1ac89430d4eed2189c8d945acb5f8f85ff080da1e08af1b8798532221d46b9380473950ac SHA512 54804c8e95c92b3b057a817d681a24211196f2f2b18eafa8defe159aa41ca71140a430edcd4c400fccb0d6656b1661ca9c7fafa6169aaa9c4664f50d2aba3b6b
-EBUILD libbitcoinconsensus-0.20.0.ebuild 2431 BLAKE2B caa4cc6dd6fb317b2710f59076e7da0a72617a08aa7b0154372a169447e9f87e0e02dba6d610047a124e1d266fc51eac04baf09dbb927aa39f56d3dedc5229a8 SHA512 317c2502ab76b070e4afb9f4708c3da46f89cfd4b2a7e1b3de5e51d18127bae34b53693596d7f7e9642d22e5d5524d43efe37d126b0b2043273970e602f6541c
 EBUILD libbitcoinconsensus-0.20.1.ebuild 2338 BLAKE2B 8a430de5b3110161dd2274cb49f704e448bbdc847e2bc0a762e1d6dc5858b3bf76639287aeab91bf1b25013010511df9e00ac1bcad224bd780ab69fe051f3ef4 SHA512 ce6847c95c6f2f1df8b085adf48548322e1a9d156bc69867189402579ef25436382c561b12ae6c8f5a987c55a31a8777c257992bb6c215c76209e476a59486be
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
deleted file mode 100644
index 3d00e4c0f957..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.16.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2010-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
-KNOTS_PV="${PV}.knots20180918"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild
deleted file mode 100644
index dd26ed1999c7..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.19.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
-KNOTS_PV="${PV}.knots20200304"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--without-rapidcheck
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild
deleted file mode 100644
index 0f5c0bfb4ec2..000000000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.20.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-BITCOINCORE_COMMITHASH="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd"
-KNOTS_PV="${PV}.knots20200614"
-KNOTS_P="bitcoin-${KNOTS_PV}"
-
-DESCRIPTION="Bitcoin Core consensus library"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-SRC_URI="
-	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm knots libressl"
-
-DEPEND="
-	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-"
-
-DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
-
-S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		elog "You are building ${PN} from Bitcoin Knots."
-		elog "For more information, see:"
-		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-	else
-		elog "You are building ${PN} from Bitcoin Core."
-		elog "For more information, see:"
-		elog "https://bitcoincore.org/en/2020/06/03/release-${PV}/"
-	fi
-}
-
-src_prepare() {
-	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
-
-	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
-
-	if use knots; then
-		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
-		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm)
-		--without-qtdbus
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--with-libs
-		--disable-util-cli
-		--disable-util-tx
-		--disable-util-wallet
-		--disable-bench
-		--without-daemon
-		--without-gui
-		--disable-fuzz
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 15607a3bd28c..abe5d38a9591 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,5 +1,5 @@
 AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
-EBUILD libesmtp-1.0.6-r3.ebuild 1035 BLAKE2B 0f0039cbafe529d8ad5ed6c54b364fbaf87bb68a76251fe31ef2906aad44d42eb5320fd7b0ec89b5760153bba7e3a3a61ba6de4232664cbe9e2c350a0a0412a4 SHA512 327d8e6d6e5cc8322218736be49435f6b395245f62f894e7b2b990926c4a5df6acd9b5ac18b03e925d6d0a20b21f5cc943bae8a5aeb65f8b95c618427229268c
-EBUILD libesmtp-9999.ebuild 1002 BLAKE2B 7001ffe5dce88ca349c0ce2ef93c8702aeb906c0a94fe70a33db99de5cf1b0fea5e391278fb77db2fca0b2e6270f26bbe9a5f2953eb6a67d501de045c5011f45 SHA512 c59dcbf04253b8b8774a9c5174183e65e296b3f59facd1e7b034c95c0bc347e276e76398c5287f29091791490e91c4ac91f3f6ee7dd2196c618974ab168eb068
-MISC metadata.xml 245 BLAKE2B 8d60530acac96088463f7357d79430c34c12384bcda5df24a93a92789a40fb34014c14fb73ea1e80f7e96f5afb8e70a4600a651b46322af25c404bea3c75e004 SHA512 8f811f556e1fb3b6c4955a0815435a2b54897133a5a545d05fc3c47a6f8ad2448fcce4644e2f7f3d5b6835fdbfccba521a49a8c11629a89ab53770d6bc620c25
+EBUILD libesmtp-1.0.6-r3.ebuild 1018 BLAKE2B 96c8a363e5081dd00979e96e78f1cd361e5410beeb5ff62775f19e9c1c1c46d8c140269fa734acb6b1056340e8a5393038a9698d3f041151a6f675e5e27276a2 SHA512 131ca73a72e43d9f46977ffd0b44322fe47db8055ffde87ecb7f0cf1423b11f66703d10d7a5ba00a5c09936579bbd250b4e73b1de3037c2a653179c4207e5092
+EBUILD libesmtp-9999.ebuild 1004 BLAKE2B 11b92522d84e9bad7c52fc7ee0836f429549c3a5107ed1385fc04c9a58054fc5abf3feb700599213087c1a2cac91a584e8ac3b8d0f4ddd99eb62dbc56f64f8f1 SHA512 2f943a1c80b1fbccea90c8a87f8d1904fc287b05547209670705ae19ca05827ccf4642e1bc909fba139619655d532fb6aaf915131367a8106099aa8f5b3d2105
+MISC metadata.xml 330 BLAKE2B 960a34feef0d9e57b37adc3e5776686215c7476dc5331f39b247786ecec58407e74aae1898d60d54209e00573e5486e3b042ebabfb686d4840172371ed1d5509 SHA512 97671749440b8ca99218706c398b65e45fdd0c6a4529877aafad2deb0598c7a7fdd7b6aa84079b194c345b4eee550551aa5d2af60216f95fa0701f6b4ac3c1d6
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index cedef690ec47..c2724ec96bce 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="lib that implements the client side of the SMTP protocol"
@@ -19,7 +20,9 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)"
 DEPEND="${RDEPEND}"
+
 DOCS=( AUTHORS ChangeLog NEWS Notes README TODO )
+
 PATCHES=(
 	"${FILESDIR}/${P}-openssl-1.1-api-compatibility.patch"
 )
@@ -31,8 +34,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
 		--enable-all \
+		$(use_enable static-libs static) \
 		$(use_enable ntlm) \
 		$(use_enable threads pthreads) \
 		$(use_enable debug) \
@@ -41,6 +44,7 @@ src_configure() {
 
 src_install() {
 	default
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/api.xml
+
+	docinto xml
+	dodoc doc/api.xml
 }
diff --git a/net-libs/libesmtp/libesmtp-9999.ebuild b/net-libs/libesmtp/libesmtp-9999.ebuild
index 78e059810faf..20a4ae8e7534 100644
--- a/net-libs/libesmtp/libesmtp-9999.ebuild
+++ b/net-libs/libesmtp/libesmtp-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit meson
 
 DESCRIPTION="lib that implements the client side of the SMTP protocol"
@@ -13,6 +14,7 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
+
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
 IUSE="libressl ssl static-libs threads"
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
index 01f637ed0fad..a70818477078 100644
--- a/net-libs/libesmtp/metadata.xml
+++ b/net-libs/libesmtp/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="ntlm">Enable support for NTLM authentication</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="ntlm">Enable support for NTLM authentication</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">libesmtp/libESMTP</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 73e023fb7c12..8c49833dfd81 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -6,5 +6,5 @@ DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da
 DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
 EBUILD libgsasl-1.10.0.ebuild 1385 BLAKE2B 45a230b39ac4c7e99406d8e8db7e4376ad2ee5ada309bde355e23b1c7133f29ae841178bf48b9f472096a7fe392bd972170a3d780fb65d96a405333b97a4037d SHA512 1e1f25c712adbd97f0d7426aeadd592a468a9f68e61ef2792800bb96b9e678744f81f1da6ed7500aa2a870e2bec5a2af77336b8d69d84752939fa5d28cbcac31
 EBUILD libgsasl-1.8.0-r1.ebuild 1376 BLAKE2B eca42e946308e49ba0b584b80cbbdbdd69552de11a58c255628ee81021df92be78562f55cc495109d73913f1a9b84ddaf38d84093d642de72ae9dca435b15b44 SHA512 0bfd8b43ae7563d916bcff17a6a05ff366e1658dbdf99d55870ba4e50001ee0a121eb1ad8c13d95da285f9cf898a737050627c9111ccdbce580bf9ef9670f505
-EBUILD libgsasl-1.8.1.ebuild 1417 BLAKE2B 89a305d385263f30cbef33b8afc5b41adeb4089882e76b0c0b439ca432999be7550a7e89bfc61e7439b49ea8e5352b1e8f6db7d844cc7f8cd6d844e8165a90f1 SHA512 533831d14922552290bf7b8dfb2417cdbeec3355d734a620cc0b5b1974b1623637583b7d66a82e84acae756f46d5be6ac1710d302b411811ad0add8578b2d246
+EBUILD libgsasl-1.8.1.ebuild 1416 BLAKE2B cc950971edc41402ef5985463b6c63cfdcf0408467822cbf87532848f131bd3187714650e01b3e7d0dd6a062b0db8a8b9303c2f8c5519d3782881d38e8adc116 SHA512 2f732e08d4859062df117351f8de80716fc8ca0350d3946030c1578d5d6c905dc62ef039e64078805efdce43da210957798d34cca99466fb9c69dd8afd581436
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
index 06a3058dc239..1cb716fb63b5 100644
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 
 DEPEND="
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 6572f0eb600d..10085e7b33cc 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,6 +1,4 @@
-DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
 DIST libisds-0.11.1.tar.xz 741992 BLAKE2B e1895450b1148c63a365a569fcdfa0d3cf3f2cdd011da6dbe92ea876aa1a9082470f3c7efc5757766df7e870559dd4ba62b59973e22d47401ef575e0fd412ec1 SHA512 8baf126ebf49c5eae6aa7b8f872ad90882a9a5088c8a33ffb415983eaf1ffc1df489f44ae6ba14a69a94bc4f79f455c7937276885afaa29e61c5c67408f7080a
-EBUILD libisds-0.10.8.ebuild 1183 BLAKE2B 609e17accfe1f3b0c149890cc81a38f5d03f9d63e826e64b8e0dd48842d17c1292acc27ba58f9f7a1158db292b2a27ee9f0e6165d2a5e0d254d9f9470d4903bb SHA512 4111123c6388132aa065df5c9c1dd4d73f44223086577ef0a3c9afaedf22052ef54f78b762b45e0b950aa41b96e9ee80cb2fc073698661b14e881fad035ee9fd
-EBUILD libisds-0.11.1.ebuild 1127 BLAKE2B 7cee56d6661f5af830a1b1ab866fd0e422e01f5a51745a914727d0296fa8ee45fb6d666c2feb649a84e7e21e48891eb5e34e9fbae42ac040deb7c4ba411dcf34 SHA512 1a90290df87abcaf721e95fc4b8ba47b2db57e25f28c48f887ce2f74b6853e785d6d40bad093dedd9f003b26c246d83c171c49753048715f478577cf27199ddc
+EBUILD libisds-0.11.1.ebuild 1125 BLAKE2B 3403b3684ca0fca0f956bccea15fa998d1eb997f3974b45f576cee64e797fee6c858ac1f1452a4239d3e4521c2fee6330aff11309c688192ce00fc4788fe1fd7 SHA512 da3ca32f39d13ebf5b73b7dd07092e345325a97900dbe2c01557dae1f323f73852c96330eaf1a4c6c18b00918315c026bd2c6280f05feb5bda49df683f6d93cd
 EBUILD libisds-9999.ebuild 1154 BLAKE2B 0b944facaec152943b9cac24ffb6f9e6f46b2be459e16d38b327d3a76f566420ff759fb318406546a46af5a3f0e53e25f14314945d37bd33fbcffff188b70918 SHA512 33d0fd8dd98c0dca1e33a748ba9a8780913360cb49decc9b872ae143d6078f9fb6d4166221f9bc3478821ffd703070c40d71e3ffe3e8cba60b374215e10fc9ee
 MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.10.8.ebuild b/net-libs/libisds/libisds-0.10.8.ebuild
deleted file mode 100644
index f2a22ddd2c9c..000000000000
--- a/net-libs/libisds/libisds-0.10.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Client library for accessing ISDS Soap services"
-HOMEPAGE="http://xpisar.wz.cz/libisds/"
-SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="amd64 ~mips x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="+curl debug nls openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/libxml2
-	curl? ( net-misc/curl[ssl] )
-	openssl? ( dev-libs/openssl:= )
-	!openssl? (
-		app-crypt/gpgme
-		dev-libs/libgcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=net-libs/gnutls-2.12.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!openssl? ( >=app-crypt/gnupg-2 )
-"
-
-DOCS=( NEWS README AUTHORS ChangeLog )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-fatalwarnings
-		$(use_with curl libcurl)
-		$(use_enable curl curlreauthorizationbug)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable openssl openssl-backend)
-		$(use_enable static-libs static)
-		$(use_enable test)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/libisds/libisds-0.11.1.ebuild b/net-libs/libisds/libisds-0.11.1.ebuild
index d9a4859a617a..adb792d36841 100644
--- a/net-libs/libisds/libisds-0.11.1.ebuild
+++ b/net-libs/libisds/libisds-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Client library for accessing ISDS Soap services"
 HOMEPAGE="http://xpisar.wz.cz/libisds/"
 SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index f924d86c3c5b..5c20732ee400 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -4,10 +4,10 @@ DIST libmicrohttpd-0.9.69.tar.gz 1884511 BLAKE2B 6470b52e58d82a7fee17d8545e546cb
 DIST libmicrohttpd-0.9.70.tar.gz 1886435 BLAKE2B 09ae33c66f151d9ce03b8333b26c32e2c0896d150441f39da632fe1316c66123f343d021d7fc9a974fbbab7e642d253138d071d4ee506477de46bffd3ce4691c SHA512 391293688d5ef51cf8d918294000384cb291f46bf767295af5a97123c06c75573d480a6c4b2486712b53636fe3e5dc1f8827ccf4335ac435ec85c3529733d8f5
 DIST libmicrohttpd-0.9.71.tar.gz 1894695 BLAKE2B 46bee477972a1bf791f9edaa7451790e03fccfac9a8b79fd6fb4038fbd2c3c0f268df787894cd21ddba2640fa087537f681dec4765fe03064a3c9f79aa708b26 SHA512 dab92c0979f8016844970ce4e110469e608e2e15b4096cf518350541248f123e40a4c0289ba025302e318e0bf47a957e9a3dcdee6f55936504b6c1c4f02efb86
 DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316
-EBUILD libmicrohttpd-0.9.65.ebuild 1292 BLAKE2B d0be1dcbb538eda2814e853c153df3121e5c9ccd64e5f422754a636c0078e4a701b08ccbc69103c1780b76dd8839b20bbda79125e4029e30594ad4cda8166362 SHA512 fde791d2ac45759eb1f0170607ee84dcddb26230b3721f54a95c3adca12c65a0361446d95fd7e73e33479eefef6a9b4082e3b1041034f8db166aaa6c54c7faaf
-EBUILD libmicrohttpd-0.9.68.ebuild 1279 BLAKE2B 03e4684290e50bf89b3270c7916bdbc72da590b747aac3e7cf6e72f98331c2abeffa61de886b3a87dfc49e941f33ab165e77c24e186a1631d21ff0c3b51a77a4 SHA512 82ab3db6aae947b5aca12ce0c4fb5728f77d95db4bf5b04feab81b0ce89cc58840bb1bcd1c7f7459a8a3db9182442f92b777ba232e890ad0f7620cd022dd98c3
-EBUILD libmicrohttpd-0.9.69.ebuild 1285 BLAKE2B ce52828fe3645d47525d8b31eebdced9d5eb5262244279d910afb7106c775a923b1cdf408950aa0f330c2800619b432a0a2029b13c9d5bc7c9c9bb6becbc76e9 SHA512 a767bf9a0aeb8b1bd14728496e8d442b59b862ceda2db42ddef5227afe18313a1b315326256ad431f873e2c4944968641d3a423252118a7c1bb049aecab2faea
-EBUILD libmicrohttpd-0.9.70.ebuild 1278 BLAKE2B 0a361a0fddf1144fcf3b4f4afe0e3929f08ce313016d0fd1f91d1e9e05d826e92eb27210ee23a897ba58ee9f8c7ee3adf00c23a7e4bde8789cfb8397908ef647 SHA512 37c415ca81a4aa782a4d98fdaa9e0618f547de9779d68119ff9bc7aa3ef3c965d3a67349a9893079d5b6f87523b1a6a8c02bcb3fe777b09671b588fa3544b10f
-EBUILD libmicrohttpd-0.9.71.ebuild 1292 BLAKE2B 605b86e2828210a06c790870876dac23ff79f2b7bb6a721c037c66b75d5beb595b1376966be5a5430736187e42bdcab5ea97cd9ec9b1f00ebd9751d18555ed6d SHA512 0b3e74600e69099dd8955dba261f8b2997d5a12e3dd606640a1627ce7a266ea780d2b586fc0056994a6131da296f3d9acc5bce06c4ca2c5a591ff44934d7d96b
-EBUILD libmicrohttpd-0.9.72.ebuild 1241 BLAKE2B 9c893cc0bcc0ca5c513bf84b2f4e07e485c1587fdb9f2e0e16699ff5b22fd78ac4268bca41791b89e26eb4eb90880d2af7cbfabc75c0b2571a61c6539bc44ec7 SHA512 d315bdf86686a8d7e16c34eaef2ae9a8735b0ad8b7b880a667aa1aafe7e16078767fbaa6c2482669bd5b7debfa873f05253bbbc12c21930d78e8f53a99f16fda
+EBUILD libmicrohttpd-0.9.65-r1.ebuild 1265 BLAKE2B 2d824f55d76f8e0808fbd3ce6020670fa36cb2a84aa5a0f214e1f7f0332b751dbc8c7ff28b785a58162a8f4ca3443520470b9c617edd3df092b33ccbc4c41e22 SHA512 88f138438c69164eb12e6f74385cbe01463c32f1096e3bea96142a703a4ccb538ce46318a4f1ae170b2e38d191870c28cf7d9ec67223b5a548964a21444817cf
+EBUILD libmicrohttpd-0.9.68-r1.ebuild 1252 BLAKE2B a151461c9b8f4f65d040e7b4bb14bbc77a76d287c137754b952003a2fd45d6d68385cd40b965a9729aebf2757003f089ad17f7bb39c06be42c6c30414d6f9e1f SHA512 399295c2e4eac2bc8ef0e8a8590a317e292494bee5f77e22ce8257cbee2f0abf8ab0d51caf9fb7292fb271c4cba6a32263805216f9a9bb17763d0b79812fb341
+EBUILD libmicrohttpd-0.9.69.ebuild 1287 BLAKE2B a9607356e4ba7c1c6e348b038968aae662e8185b78df4533767dd5577be96e50b351c5d80e76e02a57b40ef83565627f8bafa9848154e89647ef1913c01458fe SHA512 f6a9f15268e8410c038a2b02b8e10d94be4d7dcd63aa772db138817cead05bcde3bd342fb26df49b52d43775fe190220205f7a13abebda327771ca850a51799c
+EBUILD libmicrohttpd-0.9.70-r1.ebuild 1251 BLAKE2B 9479488e6702f6ca4cbf57ec4791b33b136b91f8a92a1f5ab54e38262038e138399bef68f1daaf9ef68b566488ab586e464310420df886717dc790ce9c67d1eb SHA512 0cda74bdede70b9e9118f0ab6d52b8f404f348fbdf48dd1b2a6d4cb99f795f0dc46c589e9a21f8a7ce315b03c86c2ed268633a76bb269be6a617e949229589a3
+EBUILD libmicrohttpd-0.9.71.ebuild 1294 BLAKE2B 25be4be610b51c671f74d1c8261350a1b316536b8abecad71a5fd980a8fc7c02006ec6f751409aafb6f7262f6b8f613419c6634dd4f74e0028441c70d08e7049 SHA512 c520a4c3231fb4aeb8550b1de44a92007e0e040c6e272625fe45497d85a04756eeff0a587ee0ba149330504dd661eff8bbb6a72b22297471239a4e4f27411720
+EBUILD libmicrohttpd-0.9.72.ebuild 1243 BLAKE2B 97562fd5237bf9a3937aabd8c000be131f65c309de84f945bcf998127dede3a9f5881c5ce95545239c9a4ba2e7f4f98dd82ec376df4ac86168ebbe9a35840b21 SHA512 bb8e51b5934a6cce6df69c19e9419efd568b87c2580e4db8241c34e35944550e89b04ba3febc07c11e3dcba679dd23e1823071304eb00dd73dac1f5e9aec3245
 MISC metadata.xml 633 BLAKE2B 86539f6b9e7a5cc59a1490371d665e5fa5d49f1f2fda9448d83a7ce63ce8cb5ca374362073c36c7b81943c781f371e3f5f128acc546010f9522dff917181c38e SHA512 9d4b499711a91d707cb64610779afe3dc99baf90ac1444faf43b6151e8ebe454e774c9fe473769d592de3ac54995008f33e50eeca1afde2b1eabd6983b6fb329
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild
index e8edd69c90fc..a63868673689 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.65.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.65-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll messages ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 # We disable tests below because they're broken,
 # but if enabled, we'll need this.
 DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
+	test?	( net-misc/curl[ssl?] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
index 455a6c307e14..00526a94512d 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.68.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.68-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 # We disable tests below because they're broken,
 # but if enabled, we'll need this.
 DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
+	test?	( net-misc/curl[ssl?] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
index c17a93c12ff6..74e07fa7baab 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
-		net-libs/gnutls
+		net-libs/gnutls:=
 	)"
 
 # We disable tests below because they're broken,
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild
index e131da4973db..a73721de9062 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.70.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.70-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,12 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+epoll ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 # We disable tests below because they're broken,
 # but if enabled, we'll need this.
 DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
+	test?	( net-misc/curl[ssl?] )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
index 919f28a7b44c..18d6a3dce369 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? (
 		dev-libs/libgcrypt:0=
-		net-libs/gnutls
+		net-libs/gnutls:=
 	)"
 
 # We disable tests below because they're broken,
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
index b8e3599fc5f8..09b440b4bf51 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc
 IUSE="+epoll ssl static-libs test thread-names"
 RESTRICT="!test? ( test )"
 
-RDEPEND="ssl? ( >net-libs/gnutls-2.12.20 )"
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
 
 DEPEND="${RDEPEND}
 	test?	( net-misc/curl[ssl?] )
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index 3dd6b48f50da..04f8860e8d63 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,3 +1,3 @@
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
-EBUILD libndp-1.7.ebuild 561 BLAKE2B c5338ef17843cac86e3f72a803e7f2b311da2bff20da3b36313d3fc97edd0c19b1bffe288479b1fa8c42dd976c2c5351c876d94c42924954bbc661256bb06f5d SHA512 3a1a4ef495a927f566f758bca34c3fe3a18c7c7fb1d6c16549d04af350168582d985b1d9b6108d5d04b5cdc4291d531f4b8deb5692fbaa4806a1fa4fb185a3ca
+EBUILD libndp-1.7.ebuild 531 BLAKE2B 81df5537eb9ab4324862b956ffbe2bb05d18256d6f045faa8414e6fdb4d6274cb3974e52e634c93ce90fb50190fd12b65e81e942ecaa91e5e5e5789576093ccd SHA512 42a9455b62bfca06a528bd06354d237db6271355c575e8fdfb418b136825d6f1bf2c764a59d8d7fcf81ca2238fe059cd34c1f6430a7cd3012f54a212814bc23c
 MISC metadata.xml 328 BLAKE2B daae7e3df86ad08016fd775c15491ac7d74f23b068d738ffc3ac73afe1be68567d488a007b49a2fe7c5c93b0fc06138838b3deede3b999728e9a597c3e7b0f9f SHA512 25b1bd4544967e35a6a9fe5f09992dd422f9f13203a81feca04db959bbc26bd1f1bb5b6be4642b97ae043c1998107fc54ab721778b2969c4652a90193eee4828
diff --git a/net-libs/libndp/libndp-1.7.ebuild b/net-libs/libndp/libndp-1.7.ebuild
index 066a56c254e8..d36cabf97b5e 100644
--- a/net-libs/libndp/libndp-1.7.ebuild
+++ b/net-libs/libndp/libndp-1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnome2 multilib-minimal
 
 DESCRIPTION="Library for Neighbor Discovery Protocol"
@@ -10,13 +10,9 @@ SRC_URI="http://libndp.org/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
-DEPEND=""
-RDEPEND=""
-
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 	gnome2_src_configure \
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 1d60d4abfcbe..91fa581b2614 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,15 +1,8 @@
-AUX libnftnl-1.1.5-fix-nft-flowtable-test.patch 1537 BLAKE2B 40a0d66fa2f391f4cf19de8d163ebee399338ba650cacf3d1ae35bd2942b1e14c9bf49d81184a0730cbd10fc5f08f0eb587da73aaf7734daf8904adfe6ea85e0 SHA512 6b3aabc393906c9c54d5c8ea2a6308793065494bd7d88fd1157070dc8a4b2d9232efc0a6bfdc957fc758a350d27327895dedb759e07457a8603d3d36aa69be7b
-DIST libnftnl-1.1.3.tar.bz2 366521 BLAKE2B 9a46a46b68fd6d3e0ffc3d28713ee9a70017dd4d05763a49a655f172ae77928d9b54554e7609851f3a18e9465c53f53c1828311162013bc067493e4e02ff3fb8 SHA512 3fb96ea1a8bc9eb00fa2cf79f64cc9613250e8b97de6e90e440c7c44e92789e7c7fd603b7347bb02d9d74af725cf8fde5d2e435c5ffdcb784316c67b83ddf0fe
-DIST libnftnl-1.1.4.tar.bz2 368262 BLAKE2B e5f396b582221b9f9a7d3303d65548e3597474b1cedf931728f3105b04a851eeeeff98fd2a49772f29849a9094c2e0cfef7d500050e8f205565e8dfd1ec7a49d SHA512 6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6
-DIST libnftnl-1.1.5.tar.bz2 373930 BLAKE2B cfd06084fb7de5dd6120a22faa43ac578f170e5209564579ff26bdf49e2b70b5b3944275861e32fcc7f6f2bb1d9f43bf51157665d0d5faea259e14cf930030c0 SHA512 a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7
-DIST libnftnl-1.1.6.tar.bz2 376340 BLAKE2B b5ca243af71462f7c91cae3f368bca7ba19151f5e14bdc459efc136cbf1d6f0234a097337dcee2a2e733a173c72c71496f34222dbd217e79b2a5b614315e6b30 SHA512 3de13cb667060f0942c8dd9e139ee8c7aff1854c544793774a827c01d06e432a4ce05d54846e1062aa620b5e54533da09daa9588467866c82c9119ef4cfbb57d
 DIST libnftnl-1.1.7.tar.bz2 387829 BLAKE2B e21ca38edbc7c651a061fcd6db80278ba99b4fe0c92c1912039fd0a1cd4b7636c87e17f538eaad8c6b963748c7c77800eaa83ddb80d344865504329984ac9c96 SHA512 80fd09147b1e2c1533cc2c8347d35137ff94f14118d5ba7bf3c1fbd0a226f6443560d5eca03273129e091b3442f820cd24455e72e917a8b7fedc8f3c9b6dc407
 DIST libnftnl-1.1.8.tar.bz2 389632 BLAKE2B 5668bc3839abb99b44d2eecfa4fe391d1669b31d5f653f859ef2ae80ed355252bff20bc74773ec68024e0bf9e93c8993765b84e8d562fc2b2b1f7e3f5d3fed91 SHA512 173d8a7b95eb964a9fbe7ffcb46541a6bae976b4d4f2a28fbf9b03bf3e50a29b1ea12faa49926d2d33bc088580a833fc6e15ff59a30bcfe67c91c524f00c778e
-EBUILD libnftnl-1.1.3.ebuild 1193 BLAKE2B de38ffd4dd0740b905ae7736201550806cac8671acca11f8999e1daef009799efdb673d234f9ace51409dd243bd50d4cbe7dac8869538a02441bfded17811916 SHA512 47a7b1b84dde93caf3fa1b2bc098ad62063584b185d96465140a8f661db5021e25e4a2109b91331faa186747991188ffd419768fd8b2139179a1656d229f2e27
-EBUILD libnftnl-1.1.4.ebuild 1200 BLAKE2B 10bc5492908945a9ef24ca430e528a18bd485c4a584414b5d001865ad3cb37d705be9c3772a451593a362a1fe8ea2915ce2e96153cd6031cb1b29589dabf85ed SHA512 0bdbdc05baa72d840d135c8bb628f576cc747b1140111e4568a97c0cad4fa79686fc6700d418b4091e3d0df289d73b3332b403066e8e8eb770f2187f5c37677a
-EBUILD libnftnl-1.1.5.ebuild 1256 BLAKE2B dccd0085e1c108b4a377a5e14f252dad6429bc8907ab5415fdc70959d38569355f2e02110b36e4f67c641768c5520298b15dfe37b9699899ee4e48738189a000 SHA512 d7287b303119dcee21127ca3e253976bd986975f9e6ef5944ca50a2cdfd70f830f90ad49cc5524cb1fe040ac231e66717aa60e39a1b25e130928416e24b36e62
-EBUILD libnftnl-1.1.6.ebuild 1200 BLAKE2B af974af8061f7789020a3efc449416e43af663ff1b8b098f820e5aff395bb25f9d99228bf363b5da8b5a32b8d38275564374f59088c24d0f11ac213d98e32590 SHA512 c6ee6faec8cab4159745be8665ad7363addc99f07d7a70b1c2e23337041ab2e5ff2b3262d9f13f946abda41c092482632249968c91fd6a31a4dd4005c551518c
+DIST libnftnl-1.1.9.tar.bz2 389639 BLAKE2B 230a78cc350910735c622f4996a217490ee2384a0f6809784aa3ba0de484f540ea83d8cb72933c05961103ba20339b3eae3e866135a222b6f96df0ef01ac8066 SHA512 8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25
 EBUILD libnftnl-1.1.7.ebuild 1193 BLAKE2B 00516c30541f17a36a56687be25edc8a559d91f5d553073a5062fb2b19d8f91925dbb4c769f4000ac7b47bf735620123a7ecf49e5190469cee3a57c442e4a422 SHA512 d16a9cab86c9f84a7ed9463b2eae753e1f44de4e1f0bbafaa2b0a003d48a9b4cceef75e15958844232406c230a8e23a394a82efd11b233442b71a0f970f368bd
 EBUILD libnftnl-1.1.8.ebuild 1200 BLAKE2B 6d0bb8f977e3a2910288ab3a5a3e7576b18f523c2c94172fdab12dfc5e4ce7604374da769ed66077dddef9cbe616695163ddb24f5e0f403d0e7a070a019b7377 SHA512 416d4570ac5dcb1d147e9ad0d7fd2c75dfe38ad7a2841cd99199723cdbf896abc68c4e5f551f8dd1f6745a999ff68724c15570b96d1bdea2cab41463c7be2ec9
+EBUILD libnftnl-1.1.9.ebuild 1200 BLAKE2B 424e6d8fa3e9d60dc519e71b5304f3ce1230d7afae8c03a9d867ce399996e44f3803c0119605ea070c24b64b5977823e46ec2ad94c6c7f7ddf443135347333b2 SHA512 f9ab83d57c21eedefb3c6999fb6a4cf0e52b547522563b89bb2ed1b1a5db5691eeceb2b17729122b3e619fb31070fee70b0dbbcb8386bbc0f5323c053af05be3
 EBUILD libnftnl-9999.ebuild 1379 BLAKE2B fb6bcbbefa618ef5175256ca380a636085c561f188d366597c7d9b3d4ae89102d2b56703732deb7cb5398dba880e0f48eea23b38f8d972e4249e5c93d74ffba2 SHA512 63d0e7972a2a3e3bb92fec82afbf2b72de4b68d622b5ae71f2dd948f2897f077ba76e9b96e45698120127b6da935c6a505a1b7fb32440a3f4fb3b41c19061ee5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch b/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch
deleted file mode 100644
index 312ff16eecbf..000000000000
--- a/net-libs/libnftnl/files/libnftnl-1.1.5-fix-nft-flowtable-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
-From: Phil Sutter <phil@nwl.cc>
-Date: Mon, 2 Dec 2019 18:29:56 +0100
-Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
-
-Marshalling code around that attribute has been dropped by commit
-d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
-lost during the test.
-
-Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
-later point, leave the test code in place but just comment it out.
-
-Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
-Signed-off-by: Phil Sutter <phil@nwl.cc>
-Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- tests/nft-flowtable-test.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-(limited to 'tests/nft-flowtable-test.c')
-
-diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
-index 3edb00d..8ab8d4c 100644
---- a/tests/nft-flowtable-test.c
-+++ b/tests/nft-flowtable-test.c
-@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
- 		print_err("Flowtable use mismatches");
-+#if 0
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
- 		print_err("Flowtable size mismatches");
-+#endif
- 	if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
- 	    nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
- 		print_err("Flowtable flags mismatches");
--- 
-cgit v1.2.1
-
diff --git a/net-libs/libnftnl/libnftnl-1.1.3.ebuild b/net-libs/libnftnl/libnftnl-1.1.3.ebuild
deleted file mode 100644
index aa66c6d45c69..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${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 "${ED}" -type f -name '*.la' -delete || die
-
-	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.4.ebuild b/net-libs/libnftnl/libnftnl-1.1.4.ebuild
deleted file mode 100644
index ce7a01b0ab8a..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${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 "${ED}" -type f -name '*.la' -delete || die
-
-	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.5.ebuild b/net-libs/libnftnl/libnftnl-1.1.5.ebuild
deleted file mode 100644
index f3d8044e0da7..000000000000
--- a/net-libs/libnftnl/libnftnl-1.1.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.3"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-nft-flowtable-test.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_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	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.6.ebuild b/net-libs/libnftnl/libnftnl-1.1.9.ebuild
index 06a2c10c99b0..bad28dad954a 100644
--- a/net-libs/libnftnl/libnftnl-1.1.6.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="examples static-libs test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=net-libs/libmnl-1.0.3"
+RDEPEND=">=net-libs/libmnl-1.0.4"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${RDEPEND}"
 
diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 99b80795069c..c9ecae4d5f7a 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -2,5 +2,7 @@ AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df0
 AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139
 AUX libquotient-0.6.3-use-after-free.patch 3310 BLAKE2B b76cedab7211b24c152fe33fe326e6b9ca487f33a4a15ea51aea73a6e1753967a107a6a23fca85bb3c1f450221d5241d7dd76b3b5fb0ca3daaee9d52dca77feb SHA512 91df36b149e3595e68a4743e88a921bc6fcb4fdd7a0506bae6fdf3d48e1c21a8fddf815999f9f650372a9782c91ec9ec41bb7e83cb5f18b8555684b0e53d5c23
 DIST libquotient-0.6.3.tar.gz 559142 BLAKE2B 77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024 SHA512 a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6
+DIST libquotient-0.6.4.tar.gz 559830 BLAKE2B 23a2d5bed5a5bcd30ffa00465291f5670d187d44991fe424bce5a2ce1ffc9d4fc09b0cc1e44e7b2b2470f82f6a3bcf4be2d6d9185d2952761a9a94d6f4fae2ce SHA512 6f505a697b6bd123004faaaae4ea6788ed985dafd965c5768cc838be98d6b27f65d5fb04c02d41c6a9ca2ce622acbd49264a9a14a99a087126d2852a926184ce
 EBUILD libquotient-0.6.3.ebuild 907 BLAKE2B 0dda7e3e5ddec21ce6c3e445f020208e293cbbdd180ad18d49116e962da27adabefdcd7a02811a47f851b115f0deb37b9b03df0ed5ad12090cecbc7cbf7c0c90 SHA512 2f97f71e4769fada4336381ca3a568b1119152d8575fea8fea6fb854cf27c1d669757a3c0a835769219249d16d1375bba846ccc3f8469de483d261c19f5a2b9c
+EBUILD libquotient-0.6.4.ebuild 865 BLAKE2B 2431de16f13e607f793b629182c954b0488c8dd107123398b7d5e9d13c88c3c70d7e92c2d3f519552a8dc12c581dc323f67b41b09624338cd254a539e5d5dd68 SHA512 7befebbee995aa9b4211c05149d119556ed30e50656ba0a534ba08acd60ac4a495006a9324b2201b7273df5673af22d2cf77c597e7d8a7467894986f368c0e8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libquotient/libquotient-0.6.4.ebuild b/net-libs/libquotient/libquotient-0.6.4.ebuild
new file mode 100644
index 000000000000..0474fff2b604
--- /dev/null
+++ b/net-libs/libquotient/libquotient-0.6.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Qt5-based SDK to develop applications for Matrix"
+HOMEPAGE="https://github.com/quotient-im/libQuotient"
+SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/libQuotient-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}"/${PN}-0.6.3-no-android.patch
+	"${FILESDIR}"/${PN}-0.6.3-no-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQuotient_INSTALL_TESTS=OFF
+		-DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks.
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
index edfa1325c766..10425139c858 100644
--- a/net-libs/librouteros/Manifest
+++ b/net-libs/librouteros/Manifest
@@ -1,4 +1,4 @@
 AUX librouteros-1.1.2-remove-Werror.patch 229 BLAKE2B c1a10b121c1bd835fc97aa864af5fae7350c8c4af77ca475f7ad4a8bdf1368410fcfc7cdcdacb65ebd1e51cd6f60bdde1b0ddb054f12927e4809edede74e0091 SHA512 e46dfec5344978595de438ed210a238c9380db4b74c26d31f55bbaac75d694ddece70a60196071ebc821fa6363ec52356d39892408cf5675c29aa3a239fcc58f
 DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3
 EBUILD librouteros-1.1.2.ebuild 648 BLAKE2B e1a786e84787c9a6088b329705db0e3f5cac8f6c6df4655212b8a3ad52cbeeab743e9e45de3135473ff5dc47435b52e94902178675fcf589ee4f73c02c403539 SHA512 0fd3017e5510aa77db1b710c1e3e54c75e135e2bbbd9d4d7f5f536151d39dd29e1b6f07d589acb88f6e0dd476dbb4aea628b67ebd70a98451bfc601d918f32a6
-MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml
index c5adddd4b3e6..6f49eba8f496 100644
--- a/net-libs/librouteros/metadata.xml
+++ b/net-libs/librouteros/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 6fe9fcbe3606..2933840a7190 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,9 @@
 DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
+DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62
 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
 EBUILD libtorrent-rasterbar-1.2.10.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
+EBUILD libtorrent-rasterbar-1.2.11.ebuild 2716 BLAKE2B 81bb67605a20de81313274cc39bf9873f1161636e644acc4b10ff923aa9df1559dd1187e9b0bf10cfaedfc834b338e134fc8c62ffb448f9bc8fbd48e6393a341 SHA512 66dee9ebdac66d65fe31c125046c816f8bb73eef68cec621f99b8355b3a77a651cd90fd72a4a3c30192c8d461e9643d583e46849ce9e26043961fe39f38d2377
 EBUILD libtorrent-rasterbar-1.2.6.ebuild 2499 BLAKE2B 6d231b994347cfec324e0d7ccd754af3855903d2cba91d131ec748ae600fed32208d0f2d0836e38232e85ea1bdad9c34e0d07e42236d9c5fc525f1ce3a88adf0 SHA512 7e324f71303f21b936fde171c3cbfbd1ec56dd4f53dd11eaffdd133e1fa2c0e07469a4d55cd1389e326caca358718a7d7b215a847a180d265c38eac66d0269ba
 EBUILD libtorrent-rasterbar-1.2.9.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild
new file mode 100644
index 000000000000..ae8f66e78a11
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools flag-o-matic distutils-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/libtorrent-${PV}"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	mkdir -p "${S}"/build-aux || die
+	touch "${S}"/build-aux/config.rpath || die
+	append-cxxflags -std=c++14
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-boost
+		--with-libiconv
+		--enable-logging
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+				# git rid of c++11
+				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
+				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 982d6a9c4738..40f9b5b0352c 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,7 +1,5 @@
 AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
-DIST libwebsockets-4.1.4.tar.gz 12698800 BLAKE2B 78cb9587af7a5cc368c3c4ce7b8c8cba7d25961595ae8853f52d374b73404e5fbd99ff9b552dc9d6370fd425d6bd28fc69b71be37f2f045817f2cb8f5354dcbc SHA512 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854
 DIST libwebsockets-4.1.6.tar.gz 12912895 BLAKE2B d6b8c96b8da4c177e7c730acb13bbba63996b1817bc0e0df36923c7ad3aabb6823f852c84bef865e85ed7eac1855273527ff6e92e413bbed8576388ce2ec7e3f SHA512 b83059b5405fe5c8bbfb6ef4cdfb66ce8b3fa2a660c013e64fa579f3ae09c70a6e3807d37ad4cff1d37b0c797959ba4e9c527be7e31520b3853161cfd6224a54
-EBUILD libwebsockets-4.1.4.ebuild 2363 BLAKE2B 10670a87356ce46c0702a8d3979d95b17846ba4e00c02215ca8b8464f4b261826fe130f1702c3b06a52b48f869f47d48b7aab1e1e0439efc00a5d80fbdf0b36c SHA512 3d5dce9a505f19224a0feffa6bf41789c5a1421d86db95ab2502131ffe671a4a4d3aabc983ee248b8288cc00cdb61bf9c407527f1be49c78808d49baa37b8614
-EBUILD libwebsockets-4.1.6.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344
+EBUILD libwebsockets-4.1.6.ebuild 2363 BLAKE2B a01a70dc472b95a632a81fbe781d560ecedcb413d65bedeb052de880f27ae02077ef7c813ff3151b8d00e8b3feea158aea05053e233c93b900dbf5d91381fa50 SHA512 698908e32c2fefc7d637420e53b228942cc8a4b46405cc27a0f31f65263d1296402f84735d23dc5b3eb8bc9b1c53def2a7248f68d97f62c623256e84b27de928
 MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
deleted file mode 100644
index 67609f666097..000000000000
--- a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A flexible pure-C library for implementing network protocols"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="amd64 arm arm64 ppc x86"
-IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
-	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
-	sqlite3 ssl static-libs threads zip"
-
-REQUIRED_USE="
-	access-log? ( http2 )
-	generic-sessions? ( smtp sqlite3 )
-	http-proxy? ( client )
-	smtp? ( libuv )
-	socks5? ( client http-proxy )
-	ssl? ( ?? ( libressl mbedtls ) )
-	mbedtls? ( ssl )
-	?? ( libev libevent )
-"
-
-RDEPEND="
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	http-proxy? ( net-libs/libhubbub )
-	libev? ( dev-libs/libev )
-	libevent? ( dev-libs/libevent:= )
-	libuv? ( dev-libs/libuv:= )
-	sqlite3? ( dev-db/sqlite:= )
-	ssl? (
-		!libressl? (
-			!mbedtls? ( dev-libs/openssl:0= )
-			mbedtls? ( >net-libs/mbedtls-2.0.0 )
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-		-DDISABLE_WERROR=ON
-		-DLWS_HAVE_LIBCAP=$(usex caps)
-		-DLWS_IPV6=$(usex ipv6)
-		-DLWS_ROLE_DBUS=$(usex dbus)
-		-DLWS_WITHOUT_CLIENT=$(usex !client)
-		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client)
-		-DLWS_WITH_ACCESS_LOG=$(usex access-log)
-		-DLWS_WITH_CGI=$(usex cgi)
-		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions)
-		-DLWS_WITH_HTTP2=$(usex http2)
-		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy)
-		-DLWS_WITH_HUBBUB=$(usex http-proxy)
-		-DLWS_WITH_LEJP=$(usex lejp)
-		-DLWS_WITH_LIBEV=$(usex libev)
-		-DLWS_WITH_LIBEVENT=$(usex libevent)
-		-DLWS_WITH_LIBUV=$(usex libuv)
-		-DLWS_WITH_MBEDTLS=$(usex mbedtls)
-		-DLWS_WITH_PEER_LIMITS=$(usex peer-limits)
-		-DLWS_WITH_SERVER_STATUS=$(usex server-status)
-		-DLWS_WITH_SMTP=$(usex smtp)
-		-DLWS_WITH_SOCKS5=$(usex socks5)
-		-DLWS_WITH_SQLITE3=$(usex sqlite3)
-		-DLWS_WITH_SSL=$(usex ssl)
-		-DLWS_WITH_STATIC=$(usex static-libs)
-		-DLWS_WITH_STRUCT_JSON=$(usex lejp)
-		-DLWS_WITH_THREADPOOL=$(usex threads)
-		-DLWS_WITH_ZIP_FOPS=$(usex zip)
-		-DLWS_WITHOUT_TESTAPPS=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
index 30dbd55c5f2f..06b29473d9b9 100644
--- a/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/17" # libwebsockets.so.17
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl static-libs threads zip"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 839bf03a6fff..05d508da779e 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -5,5 +5,5 @@ DIST mbedtls-2.25.0.tar.gz 3994272 BLAKE2B 27a326ba08c341ed47ce280401a4b73606138
 EBUILD mbedtls-2.16.8.ebuild 2498 BLAKE2B 3bc8c2d29f0b7c6c1e053d9a9580c2f20328308a70cc9e2f3028937de615c3d08f617597133296a006707093829d19c28a613d1e8d57f18d91ef5e4e8d068542 SHA512 36107a890ef9ebb8dde5596bd3d8fd0a660149adca8f8fcea8a0eb733e0422305ad38bdb35afd2e4ae6ec489a1885a37c3e2bf5b11e2de879c50a337d0a6338f
 EBUILD mbedtls-2.16.9.ebuild 2504 BLAKE2B ff6d66f0ab34e7a3b0b1ebff01a54c331ab83d75ed52b53b73be1fe0963c1d396746a47a71490d968733b47926537ba0aa3ec86bee3baf3a02dddfa3626c2242 SHA512 7ba7912b12300c3774b6b467169d042e40977ca4eb1bbba99913298e111d467bb7496f7af825215beb8b3565ddac501778360233a5c269b88510103e68838e30
 EBUILD mbedtls-2.24.0.ebuild 2558 BLAKE2B 3c800e117bdf590f4b2b36ed8cfe1100bdd3e5a7f30f1c0b75d8a87df0564b9d48ac54a4004a9aa106ddac89e1d0d38889d1a12f15cdfe8dd73044431bfbeb80 SHA512 efd6824356a5fc621fcf8b6f7c0937721fe8c044a5c49bbf965ee09f339aa0cbe8b38efa2cf65e87ba7d6f8f89188a45a6df95a8a08abfe024a55ce879b87ad7
-EBUILD mbedtls-2.25.0.ebuild 2564 BLAKE2B ceba3ed755c845206d9c167207b6f18206450c40f90a385ee9e0f61feba88418d6ac244b4d19bde43449ce8389b8c5cbb825013bc9baf3af8ce6a76aab7326f1 SHA512 f44df9b8e6ff0599a6701b60005d245cb3b37e50f267e6a78036b558dcff2a57f7d6a489b5e688dc2db46736e7993fb4eb1f6666a4c4abe56bdd2d3e38018462
+EBUILD mbedtls-2.25.0.ebuild 2561 BLAKE2B a7cd587fc56389dd5c8a3240346a0d8d71a9f7f9a3e0c4d94f32e12b68e7c294dbf1905807776bafa8f85a53ddfcdcc49c62eebb26a928f68841086f11ada921 SHA512 08539d45c38071ee93a9ec9d735b8c59509d55ae6855718bc7545121aa71297af54f995b6b9e8794fb72ce12e3dd69e686d2b568247f63b23354ffff359d27fd
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.25.0.ebuild b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
index c1bb84ede013..3a3fe113f9f9 100644
--- a/net-libs/mbedtls/mbedtls-2.25.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.25.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 692c4e84e2eb..7964e01919d9 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -5,5 +5,5 @@ DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c64994
 EBUILD neon-0.30.2.ebuild 3354 BLAKE2B cc9d94b47c23ff1612104fde3d051a0abb132fa64f2cd852597fcdfbb025020048aeabed8d0571614e0b3cb814d60cb85164bcc0bd2caa41041352f04d459b93 SHA512 e17afc025985d23c8e65252f6ba35702b4dfa4ee8adbaf7192a90e87ba15e07d845876f0e0634f7af74824480684a678f807ce63ca04ad6841c2c9a42fd984e7
 EBUILD neon-0.31.0.ebuild 3362 BLAKE2B c1d88e0046239bdec90bccb959c5240107eb61fd1d2c04875e1e4e23cd6926eb4c41bf8312af8a89595e93419a8c3e408743541b2e5eab3d311e0c529e1460de SHA512 3aa4ba6cb571497b5a88b1d624a93debcd422a6c3c4c8767e176d624c013889123f94981af6b54461177af986798eaf4a15daf20eb2c5ed0b4ae1514888ac581
 EBUILD neon-0.31.1.ebuild 3369 BLAKE2B f1dcee1fed98319650d35b30a2e4cfe7c72cfaaffebcf2b6a277603f46b9575e72d125535f04fcb17becdb3e88e0ef7c9649ba1080094cdd3d6e2f0cc89f4ece SHA512 a62d04500dc88899125b4320613e9608614fb8afb75fe95f98f1a06a4a7b869a0965daa1c959a2779f8b7a5acc0ddacfc551d5e7093462eca9b5b8474bcd9d4e
-EBUILD neon-0.31.2.ebuild 3369 BLAKE2B f1dcee1fed98319650d35b30a2e4cfe7c72cfaaffebcf2b6a277603f46b9575e72d125535f04fcb17becdb3e88e0ef7c9649ba1080094cdd3d6e2f0cc89f4ece SHA512 a62d04500dc88899125b4320613e9608614fb8afb75fe95f98f1a06a4a7b869a0965daa1c959a2779f8b7a5acc0ddacfc551d5e7093462eca9b5b8474bcd9d4e
+EBUILD neon-0.31.2.ebuild 3363 BLAKE2B 7d898b351560f9a7e31caef14ba09bb25391d24dbd9ba8cd56925f0961765220313fa6463d25dc6b80e56eade3978bb3c1a3974dfbe3bba0a8220b1f2d764676 SHA512 0193c0ef69400eccf44f25dddfcde3e81440a1a1f52a1efb50f89271e15f12b4b19cee45e9955fd0263f1f07bf02114f7fcc818e3688905e171ccf2c13b9d5e7
 MISC metadata.xml 1417 BLAKE2B 5feada9aceaed7ca6c5db29a993c24f049469f2d7d1ed57db5ddce3277e575a850ccc45700bd620ee503f3cb1abe7a9b333066b7be50bb7fd5f40f558dcfb0d1 SHA512 cef52cfe791a0b561a2c4472fb3d7ff5e878f8bc7fecf4095568b215724ce16edd866a6033d4be730d22b1297615119ae17bdeb09dfcc8555496a610270cfb97
diff --git a/net-libs/neon/neon-0.31.2.ebuild b/net-libs/neon/neon-0.31.2.ebuild
index 06d89576f8d4..f4bdd2f905db 100644
--- a/net-libs/neon/neon-0.31.2.ebuild
+++ b/net-libs/neon/neon-0.31.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy libressl nls pkcs11 ssl static-libs zlib"
 RESTRICT="test"
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c2023f724048..7f293bd74f24 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,20 +1,17 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
+AUX nodejs-12.20.1-fix_ppc64_crashes.patch 1788 BLAKE2B 48a5c5343b654fe57f021644c063b98db32bc634dc1ac5ef4ef9fbc3a1988ae3c7ae51ca989715154f5167ce985b742806de667bf6126bcf535f0ebae448b5ce SHA512 804347c985e59c9e3852af4c3d807ebaff95f1afe88a6ec5785baef51ba6ab9b3257d202fdddc5daa982fd06324a8f828f7d8dca8f99e071c52decea6cb00b83
 AUX nodejs-13.2.0-paxmarking.patch 2710 BLAKE2B 9e63761ce7160434f7f9e5ef76ffd4d0fd61deb24cacd9ac4736bcc74145090d730c6b1d0a60cf9c815a08f22c7925e0719dae835a0ede0b65bb8af53418e016 SHA512 e5aae8fd9758fc1dbfc77f9dbfb62b90941a4b2e9e06a6d70f47aa6462d120e61a1774ba8526b2033161195040326d1b5ad643a816552154ff69a8e2548b3d70
 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
-DIST node-v12.19.1.tar.xz 23829692 BLAKE2B 244ca8ef29e315ce027638d9d5c66469ac8cd69abec47d5bf6370b990da0d9d2a7af812963530e5187d273d3f20638be0d23ccb1c0409fbbd678677740939f4f SHA512 7c628ca214d3b17b34658aae32e335ce863d90853c92f1cd4119e9a82b7097ddf47d0d4cc7c9bbdbfdd4b403811aa6ee08e844078a947f31a3adc78f569b931a
 DIST node-v12.20.1.tar.xz 23641412 BLAKE2B 1c1d828a46c7d3ba3a8995d65902f20ff4d3e3c992a90e4cd0d0e985d5537a8251a1b789cac106caccca9050e5e74ca2e15b27100f715ef453d194fa07271a7a SHA512 a8948cfa64cc5222a975294a6403c1fb0c2443552ad739a049f7e50beed542c22e0004a456f1a225af847cfd06fcb4101d8f70e3f932750e74be86b14402af4d
-DIST node-v14.15.0.tar.xz 33440584 BLAKE2B dda9fb44f163b2268db126dfcda34e80064eba24921e4f8e6c14c212deb9170c79f31f7b2be272c8fa7ca992d14540df490c6cad078833514bd348825934ad95 SHA512 2a0cd1b9d95e0ac228a90aca82cb04b9f4fc4d08ab86f0286eed7a519ca6e756081b37375ad5d14d7f0e09affdd27bad658c3e364237eb3c212fe5b5e27af96e
-DIST node-v14.15.1.tar.xz 33437304 BLAKE2B f08251d2a76e4030433001fd7f062c71193de190036d1147ade0ea36350df0d65df9e1b749fbac77837dd090cbeda6c133ff88099691c932bc29e75b7bfa2acc SHA512 cbab757e370a09b73c29a9bcb310b4122e4424d6baeaeaf1b10919ed6b348bc6ddbfc0e0eaff99d8ebb4d3d74f0206f575e2656245151eda564dd2cd33ff823a
 DIST node-v14.15.4.tar.xz 33296076 BLAKE2B a707dc15bdb670cdb239560d9b7a10541b793cad2339d02dafac2974df38dbe57d141b60d934f8b91cd65961f3a2df4ce92bcccf8b4359c7041f5f5531f1b704 SHA512 0d497a5d51de52412d09dd0fbcb936dbf0cba810f84d598be8f02c876d55f614e00c1ea0b25a00838e7b9f9c73a7882e3de0e9507d1c6ee45270a62d3438ab41
 DIST node-v15.5.1.tar.xz 33380504 BLAKE2B 508ba56370fd2ebd32f917da1dfc5fc5f46929397ce92826d73d1c4e7bd76a14ca712ebfe55f7e2c60d44a1abc15a05dae01de3f574b3e181e0a1e107049c9d4 SHA512 ca27dcc541287bc4d2f661d793ead02390b844cc70bfce7f3affe79618426201eff40d430e3b68a2194b6269c32d150b15b617169bd063576308fab9714cb7a2
-EBUILD nodejs-12.19.1.ebuild 6297 BLAKE2B 253ee1f6fc802aeaf3b7963a743f6d5fd3655770794926bdb4d10ae088a6c0a13d61040516d2db3e3d53bcc3bb86c700a9af5790a15d0d1f9fc350be14022880 SHA512 eff8bcf765348fdd3b6a820c1a07f839a248e75e78c691caf969b42d1b92ca231ded21c41a22a56455b384c74e49c15494b8fe7c5e5d3f57258133ad147d6477
-EBUILD nodejs-12.20.1.ebuild 6297 BLAKE2B adacd0d838f9c3104b2a49d38dcb0c4396353551e09b9e477314c778b0508df29046077c53b2d13b0dd97b5dca536f053695396a4d1b54cc289dd595535f569b SHA512 25632a69565b4ef51d359d23951bf0d9908448f8aea6a971f5eb18f0681968f1c8bd6c9d48518d56b8ab14d201e6e80d823eedaa5aad125bf9ef9b8df2118068
-EBUILD nodejs-14.15.0.ebuild 5810 BLAKE2B 6690886bb45d826a0cd2c5a972fffd2d068aa6be081a46d3071835079cc9f48d9bc6d2c3d79a63d054debca9923c373aed99fe2cf1bdf95415db4602b44f5f75 SHA512 e7a34cae3c0058164d12853b95b912972f890ad24507164237ab54731cac04c3579240b1307716a70e0cbbda667b23342b58466152d577e99bae6d803899a12b
-EBUILD nodejs-14.15.1.ebuild 6047 BLAKE2B 29004ae6fb9ed1a35084812e8b0b0470b6aa9a8bf77e2d64f55634b657c935530eca2439386d9b31db1e5771df1cba12edf71ba82a6b4f5ef74f77438da8ff9c SHA512 699a8ce157eaefdbcc7080416cee5d699b1cfd619ee6c45582335eaa1f180c89fd9e881dfc1cbcb816e5f08f54b7522b1c674d90117742f88a3fea0186ffb37b
-EBUILD nodejs-14.15.4.ebuild 6047 BLAKE2B d793f876cd1afd61d5757c6928209598b5165007b48680b5f88a3588765b2c25fe7e2a9d4fc443832aed0ea68343f2472fc2f0314ac8cda6870ab84285962a59 SHA512 58ac3246f664b9f98c13227662c07eb34e10cdfa231b2dec70441e3c2c77d43a70118d31f07b199a98da406b782eecc6e2bb41aa113c8ed4748ea8926af4400c
+DIST node-v15.6.0.tar.xz 33419420 BLAKE2B 10385dc89fef6a7399ce76c54e5237f39b367dda1fdbbc546020580abda9def22649faf76a04a260846c97f142b87d08f49f02c06e198421799d406420282a95 SHA512 911ff2cdaece8b57c2537bd3bc42988756ec616b6f187ad9e4b37355d3d741b78a87b7d0069faadc837a66f5fd5a729b4e52034b213fd8a63bd71572b5a9e2ec
+EBUILD nodejs-12.20.1.ebuild 6349 BLAKE2B 02a7102b8d49eb40f3ff525a3cc2daa201d188297d092558babc4fefe675301fba18afb7cd657e0a6df4bfd704793018743ef8b451c9fb63cb5432fcc4b00751 SHA512 8d43755551704c09f252f202d7014ad3dee89121369e1687b6217a21242630e3ca06c9a6eac6ca9a98623a2eff70c3c0cc36ced0deb114e7053f5c6b3af03668
+EBUILD nodejs-14.15.4.ebuild 6046 BLAKE2B 33b0f4ceee6472129bebeb1db5d9f2f73028e5695eec5f92a877f63b1a33e41f80c8d119774dd0f002032e3a28debdc2a2040109165b9c39bd2a716925a38d4a SHA512 1c598f9699aaa8750455aa38717f005e3ff2284a8cc801a56e4a789c96f298503d7db9ff258c526dfcb0b4986c9f60a900671e25e35b999bd4a71325bed70e4e
 EBUILD nodejs-15.5.1.ebuild 5676 BLAKE2B ee5597bff165760d91ed4abaf1ac46b2e4fa736fda747488f7f5cbd40761a1a78a78f07071451f4e749928ef09cc9e958e677c20b9c7b7b7108615b0d7002866 SHA512 4e3fb131d552e8e3fe67999d819b89a2f594534da85cd006bc832f0ab5ba7a5cb05a8b4c0ddeba757aff894f3842d4048be5044a550d982427c711881e4d8419
+EBUILD nodejs-15.6.0.ebuild 5676 BLAKE2B aee7588049a09db4823eca4588623562e7b0f812f41f03681be5372579ed8eab9bdc38ce2c353e40de9c7fa6da05068be289d6319c1757b1cbfbb361b71c8d02 SHA512 9bbab3ef03347a9530079d12c221ce785770349f155e056a8ea39eba42c48f9cce2ab1315fd8ca9532f0cee354c2192c5072cc29cfb43bd77229f80a205d74f7
 EBUILD nodejs-99999999.ebuild 5811 BLAKE2B fa5f65bf9b29b39fab93459a01774b5237e185af99af95f0e0c51e6b282d158ee01701e216eafecd74849f991ebc4858cf527405d1e39fea1da69f19e68ac2ba SHA512 0d7f317b4fa2ecc450dd2c12ccad524be2a20ca255953b64eb012e46333b940baa3dc652353825fc7444834d8be17a33681c7d63f1d1f008fa0ab5d99f95c501
 MISC metadata.xml 940 BLAKE2B c1a7dbc678f50529afe12abaa96e87bd065d1bdb88e6ca4d7d58373b282a5d6c6920e43623ce71bc83affb54cc323e6d24df8841dce8001e1cb598dd96b0d4a4 SHA512 87c823b94b22026cbf333671f6d28928de66c5aee29fbe0d9773c4c35415ffc3f7e31559530cfda4f4f2a0a9dcb4964e0c3304c002182c4c17de785e842c0fee
diff --git a/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch b/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch
new file mode 100644
index 000000000000..0982d3c81c2a
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.20.1-fix_ppc64_crashes.patch
@@ -0,0 +1,44 @@
+Backport of https://github.com/nodejs/node/pull/33866 to nodejs-12
+
+--- a/deps/v8/src/compiler/backend/instruction-selector.cc
++++ b/deps/v8/src/compiler/backend/instruction-selector.cc
+@@ -2788,7 +2788,7 @@
+   switch (call_descriptor->kind()) {
+     case CallDescriptor::kCallAddress: {
+       int misc_field = static_cast<int>(call_descriptor->ParameterCount());
+-#if defined(_AIX)
++#if ABI_USES_FUNCTION_DESCRIPTORS
+       // Highest misc_field bit is used on AIX to indicate if a CFunction call
+       // has function descriptor or not.
+       misc_field |= call_descriptor->HasFunctionDescriptor()
+--- a/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
++++ b/deps/v8/src/compiler/backend/ppc/code-generator-ppc.cc
+@@ -1026,7 +1026,7 @@
+       Label start_call;
+       bool isWasmCapiFunction =
+           linkage()->GetIncomingDescriptor()->IsWasmCapiFunction();
+-#if defined(_AIX)
++#if ABI_USES_FUNCTION_DESCRIPTORS
+       // AIX/PPC64BE Linux uses a function descriptor
+       int kNumParametersMask = kHasFunctionDescriptorBitMask - 1;
+       num_parameters = kNumParametersMask & misc_field;
+--- a/deps/v8/src/execution/simulator.h
++++ b/deps/v8/src/execution/simulator.h
+@@ -122,7 +122,7 @@
+ 
+   DISABLE_CFI_ICALL Return Call(Args... args) {
+     // When running without a simulator we call the entry directly.
+-#if V8_OS_AIX
++#if ABI_USES_FUNCTION_DESCRIPTORS
+     // AIX ABI requires function descriptors (FD).  Artificially create a pseudo
+     // FD to ensure correct dispatch to generated code.  The 'volatile'
+     // declaration is required to avoid the compiler from not observing the
+@@ -134,7 +134,7 @@
+     return fn(args...);
+ #else
+     return fn_ptr_(args...);
+-#endif  // V8_OS_AIX
++#endif  // ABI_USES_FUNCTION_DESCRIPTORS
+   }
+ #endif  // USE_SIMULATOR
+ 
diff --git a/net-libs/nodejs/nodejs-12.19.1.ebuild b/net-libs/nodejs/nodejs-12.19.1.ebuild
deleted file mode 100644
index bb763d423aa6..000000000000
--- a/net-libs/nodejs/nodejs-12.19.1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-apps/coreutils
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.20.1.ebuild b/net-libs/nodejs/nodejs-12.20.1.ebuild
index 87b53e063d27..c5c29760dd45 100644
--- a/net-libs/nodejs/nodejs-12.20.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.20.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
@@ -45,6 +45,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )
 RESTRICT="test"
diff --git a/net-libs/nodejs/nodejs-14.15.0.ebuild b/net-libs/nodejs/nodejs-14.15.0.ebuild
deleted file mode 100644
index 560cce9ed9a2..000000000000
--- a/net-libs/nodejs/nodejs-14.15.0.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm +snapshot +ssl system-icu +system-ssl systemtap test"
-REQUIRED_USE="inspector? ( icu ssl )
-	npm? ( ssl )
-	system-icu? ( icu )
-	system-ssl? ( ssl )"
-
-# FIXME: test-fs-mkdir fails with "no such file or directory". Investigate.
-RESTRICT="test"
-
-RDEPEND=">=app-arch/brotli-1.0.9
-	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.16.1
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	system-icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )"
-BDEPEND="${PYTHON_DEPS}
-	sys-apps/coreutils
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
-)
-
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-brotli
-		--shared-cares
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	if use system-icu; then
-		myconf+=( --with-intl=system-icu )
-	elif use icu; then
-		myconf+=( --with-intl=full-icu )
-	else
-		myconf+=( --with-intl=none )
-	fi
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.15.4.ebuild b/net-libs/nodejs/nodejs-14.15.4.ebuild
index 526772a08fda..b80ad78525a0 100644
--- a/net-libs/nodejs/nodejs-14.15.4.ebuild
+++ b/net-libs/nodejs/nodejs-14.15.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x64-macos"
 
 IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.15.1.ebuild b/net-libs/nodejs/nodejs-15.6.0.ebuild
index 0f1006e67884..4228e1c6eee2 100644
--- a/net-libs/nodejs/nodejs-14.15.1.ebuild
+++ b/net-libs/nodejs/nodejs-15.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 
 IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl system-icu +system-ssl systemtap test"
 REQUIRED_USE="inspector? ( icu ssl )
@@ -27,7 +27,7 @@ RESTRICT="test"
 
 RDEPEND=">=app-arch/brotli-1.0.9
 	>=dev-libs/libuv-1.40.0:=
-	>=net-dns/c-ares-1.16.1
+	>=net-dns/c-ares-1.17.0
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
 	system-icu? ( >=dev-libs/icu-67:= )
@@ -40,8 +40,7 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 )
 
 S="${WORKDIR}/node-v${PV}"
@@ -163,17 +162,12 @@ src_install() {
 	fi
 
 	if use npm; then
-		dodir /etc/npm
+		keepdir /etc/npm
 
 		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
 		local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)"
 		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
 		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
 
 		# Move man pages
 		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
index e0acb1fe668d..41179cb25780 100644
--- a/net-libs/srt/Manifest
+++ b/net-libs/srt/Manifest
@@ -2,6 +2,6 @@ AUX srt-always-GNUInstallDirs.patch 875 BLAKE2B 22aac6b20131ff48c4f9809de288d3be
 DIST srt-1.4.1.tar.gz 1316195 BLAKE2B 1831494c9817d03b7f69e46344b41ace13c22e1817aced2fdeef715ecc7da9e3cf421c399951177ce052328e5baa56445b66769b7a9e4762efee3394c43568a4 SHA512 ff30b7e413c4b9f0b5076d9ebf5f0942b5d802773a27ed1f7b886a12eb01eec0148d1c305e933d4f54ee1b451a445a48cba582111eb2057326c0f61fab097f94
 DIST srt-1.4.2.tar.gz 1538231 BLAKE2B 1b3f625bb5a6436d6c35f957796217ed8c7f9d2412e96cbb2b83b8372f0738b5c9219b218b644e74f6f16457d1b8606fedc238310e800cce84fe127f86b33be1 SHA512 4c978e3898737e566f47222a0095df1b49591d79927850cc94c838b7eaccf401faf1c5d038fa45b6fd30c85f980e7c212a79c07ed6f9008430e8a5a594a31ffe
 EBUILD srt-1.4.1-r1.ebuild 1129 BLAKE2B 2d88cd71cafed4700385d5e005fd5a208e5650e055d74dbf7674ffb756f574083d8b4b3fb6b89bd69669191cd197f3d81e2707779c6a8778a7e85d28ac4e1fac SHA512 7ad947fe6b1731d15846b2125f4db4e3e5cb7476ff495bad14ef7dace90bc38dd85be9dec2bfaed8464e6fbc883d8aa8651e42e10800a29dc5f49f425bf6498d
-EBUILD srt-1.4.2.ebuild 1135 BLAKE2B 311b0e7fd95f89bb1107fe733551e2bf326286858b0dd1706a15e32f45e0c671cb2d58bed02a058278e76feeba20589062b1de3ac1e055959b4fff60f178ae2c SHA512 f043c6d916bd414239979bb1154a3d6f86fb25bc9e016fa325670c92daa62ac4bb066e9dc3de63a9a7d5720528307aea434fc0ccf78a72b3119f064ece3447ca
+EBUILD srt-1.4.2.ebuild 1134 BLAKE2B 20dae6938bb6fa332388c7f416f81e950387f3310317d3c6296853c1643a19f3c308c49a0f8ee2cc6a3a415e180c7deebe4ea40b2155e73d5836d9e418a61e0b SHA512 8961236cb192cdd3affd6ea18f5d758950b83cae9f39eac8d6977ac1a0ddce47559ad5ca9897676bb430ee951831a42c65e7048ef81153574b237edf33239046
 EBUILD srt-9999.ebuild 1222 BLAKE2B 2ab0060f8730f8b606e88b08e8723cc0c57467fc298aa466ebcff819ebe98f58dbdec9f3beede0434f632813d38a2b2c0e8a9a045127eeb8426f603144e819a1 SHA512 6b466ea8df60c562881147faf664ef3d8e021029f3db85051a139702df51d8c829814d52c47645d69731ffdde0a3e9413df9b68c4076f559555837342ce3c5c0
 MISC metadata.xml 429 BLAKE2B d4e74c1d35b8fe63e3c0380392f846d303d57992f17345ae5adfd859c6079d5e493e231fa33bd564df9c5832e180365c2fdcf4603689aabcfa8d3bef18d45e29 SHA512 146f7efe7d26123367b77a484f372e4e146f821b3b359d06056c319440b02389b337e98e7f4ee921f2420c8f852cc46b2cef55abc7ea1f91f336d81a14278bd0
diff --git a/net-libs/srt/srt-1.4.2.ebuild b/net-libs/srt/srt-1.4.2.ebuild
index cad2371d541f..0fa8b5336b23 100644
--- a/net-libs/srt/srt-1.4.2.ebuild
+++ b/net-libs/srt/srt-1.4.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 ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index e1503e09e412..cc6e49cc1b94 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,3 +1,5 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
-EBUILD zeromq-4.3.3.ebuild 1426 BLAKE2B 4bd64f4a1d701eb2f295ef341a6b8564da76446dab131ccd8714372c2337ab21709ffc58296f33911e837500e494a68859510d0289b93fb44dfb0775f8161190 SHA512 ff8d984a8a8f7e15fb3e94fdc4d6f3d72cf992e0f3ee0abacf9768eb2107fd2ff7607e1c448a095d55df372b8d9088bb4e44ac40ba7599ffd89c1923e2a39692
+DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
+EBUILD zeromq-4.3.3.ebuild 1423 BLAKE2B a47babf7ee873b3d5365d3ab45b6f6e6f13192dfb58f839deee0733559b17600dba002629156f19516b4fe3802a45292f0ecc7fa15eda45cf2563e406be1685e SHA512 13586b401955d4dd783f7a7f67d168e2522b7d01c9dd16d577c042e61b3390f66489ee514e0151d0176456c33926165c61d24116e131a7e3b289b053b5d1294e
+EBUILD zeromq-4.3.4.ebuild 1430 BLAKE2B 07c4e86fddb2c04b52f2699dd1df0a32c6a3360ea7197fc3dd1721028e8d2fca1f4a210bd7166c51cadf26208ed89bf39335b8d3f08d8afb18f6cf1189d60339 SHA512 90fccb7313cefa3aa99d1149260a421cc3476dec4b08f3b61d9695116f29e435d6b057a6fcd45a9e49c429b29522b8e9975353b802abdbee48f5ef3c791d2889
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.3.ebuild b/net-libs/zeromq/zeromq-4.3.3.ebuild
index 14c63573ce37..54387064008c 100644
--- a/net-libs/zeromq/zeromq-4.3.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit autotools
 
 DESCRIPTION="A brokerless kernel"
-HOMEPAGE="http://www.zeromq.org/"
+HOMEPAGE="https://zeromq.org/"
 SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
diff --git a/net-libs/zeromq/zeromq-4.3.4.ebuild b/net-libs/zeromq/zeromq-4.3.4.ebuild
new file mode 100644
index 000000000000..21302e285a65
--- /dev/null
+++ b/net-libs/zeromq/zeromq-4.3.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+DESCRIPTION="A brokerless kernel"
+HOMEPAGE="https://zeromq.org/"
+SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
+	sodium? ( dev-libs/libsodium:= )
+	pgm? ( ~net-libs/openpgm-5.2.122 )"
+DEPEND="${RDEPEND}
+	!elibc_Darwin? ( sys-apps/util-linux )
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	pgm? ( virtual/pkgconfig )"
+
+src_prepare() {
+	sed \
+		-e '/libzmq_werror=/s:yes:no:g' \
+		-i configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable drafts)
+		$(use_enable static-libs static)
+		$(use_enable unwind libunwind)
+		$(use_with sodium libsodium)
+		$(use_with pgm)
+		$(use_with doc docs)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Restricting to one job because multiple tests are using the same port.
+	# Upstream knows the problem and says it doesn't support parallel test
+	# execution, see ${S}/INSTALL.
+	emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-libs
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)