gentoo resync : 13.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
commit: e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree: 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /net-misc
parent: fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
73 files changed, 1851 insertions, 405 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5e93a47cd59b..003287db09db 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index d72722453423..a542939fbdde 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -8,24 +8,30 @@ AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d11
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
-AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486dc8499e7ff4eb2fab8d1afda59d880057bd4862f12a497d4cba5b025d73f5f510987d349dd46d269a4d1869 SHA512 65e35490966095a7be6f4acb9e338fe94021976860319fd1c13b8d1b19376854f45348e182ce3a6c02d459c6dfeae62236148b7c992ddfaeb0ed55d0d8682e1b
+AUX asterisk.tmpfiles-13.38.3-r2.conf 39 BLAKE2B 5b38f28ce1a22fc388ba5a68a71a3bff2ff02d37c24cc5f13e37bae603eeec82def2f5f62c2d1dbe012ef24c4e1c9724e684f860d32393d777b5f38aab9a08d7 SHA512 a8f467f19f57268aa860b4a1c1e9655e883c277dc4d6c1d109a02f4702b07c16c5fca1e6802fcc5d3fed31177cdac42407f4771bf83b95653fbd185fcb843ffd
+AUX asterisk.tmpfiles-16.22.0-18.8.0.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d4626d3791e3cb664b03ff51260892167a22c3cfca2caa02d162e7476070ec1374a92ef24ec799dc SHA512 680a4478d3a501c26fa19e29fad18389e7e02f04c8b9a676ae0f192fa6afbed95a826b74696c6c5459aba5aba6a16c57df8a9c5ff486e9dc8f1cbd01185e9320
 AUX asterisk.tmpfiles3.conf 88 BLAKE2B 826beba7712e4d096c5506fed353a1a21c89b4acbc6b6ae99f60fbc7e338a331056ec145bd885dd23b7058f4bdf3109d68fddff715ae32e9ec0fc88ce68bef56 SHA512 992902fd01dfd03a2d77bf8a6c7b3adbdcd769478cf0bfa019632515107222aa59b12be10f5dfd26b4e18651e51b81939f1321ae29531dda0f3a623306e6a983
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
 AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287
-AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
+AUX initd-13.38.3-r2 9933 BLAKE2B fffa5c97efc3691570500960cb01e86e0003950b93c67042a78342d2931a36198218f67de2d38a9f5ee5f2145c2712aa448b38710d9548cc3869ba9540c52565 SHA512 2bddbf10fcc39bbaaaadbbccdce9219cfef63807db553fa4923e558589985edbf83495fc94564b4a10d20c405140c6e8d6310e12a88eb350056ce52caf7dff88
 AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
+AUX initd-16.22.0-18.8.0 9974 BLAKE2B 29c3d51fb9935267061f33d5a5763dc07fdade2301f9f6c0b2b40cf866dd3673714e52e59b442c688e5c02f883718ed86ca227f6ba2fbe23e3919d23558905ed SHA512 9182c1385f404c3a4b7d3b72d3f03d4e34d3bed38378639a18f624f6a5cb95c451e7712588ee163ce8852b5eae1df01ff258bdb77cfecbe8130752f267079d96
 DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895
 DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9
 DIST asterisk-16.20.0.tar.gz 27888074 BLAKE2B 74f7812db787e5dcb041850fc7e80229e05ef0849cf373be29f9a3ac2eb0f2244fc6f2bd2a3f411c4d37d968184dfbc140e55ad62de53e6beb0b2340179b831c SHA512 0e270c2d00eda1aea3135eba427a77ac2abe66a31c868cf700d5cc26bde65fded6f2191d5e4af361b2e055ae04f2943611ca1fa19815a4a690076a83fb899148
 DIST asterisk-16.21.1.tar.gz 27912610 BLAKE2B 75b93fbde52d72906bb613b1d42b7fe592fac9a6af76aabb11dab1bb15b2ad8134f8cfe0a9a58f5f72928e046b0b6111d8e899909d6baca3fd820b583c6acd35 SHA512 399875d3e70e2ebae8b27edc9d97b485d7acfe7a99c1f6e2a6212ccac9cd77fd4e720ccb1cf4d16a441fb8f894d8b9a64785c48bc606a0cfd105d2b7ab16d766
+DIST asterisk-16.22.0.tar.gz 27925083 BLAKE2B ce700f8924fb2c7c8fc521879c0768595eb7462bb3aa78dd8b64c8a268b357e522ece17c6c4a02a4e17c16bad5141d5c2c15b602d335567be5a3df49f67300ca SHA512 7032da647f4063320fb2ea9c3cd7b0079fbb907e5c8f9d5cdc4197c82d07c99c75bfdcace5c74a593573cd0d9a1b9eb73b2030dc0b13604abb481a311a742173
 DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
 DIST asterisk-18.6.0.tar.gz 27970531 BLAKE2B a2eaecc962b236e6e455b8d305c05f33fab8e4d6c63eae1506b8354710d6e3e0e3c6da59600555d880520bb58a13950f830057ac03bc82628ab27b2627de52c9 SHA512 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590
 DIST asterisk-18.7.1.tar.gz 27995503 BLAKE2B edc13b33243507114fbf2a514fb67d462ca2f8095e4eba95dccd194b4495c3be256ddff280b7400182fed7ffc4d0a462c687f5a23e2162933e0603464e851d54 SHA512 5e08ed7e95d00538fd24ed46644818d690fe8c5b8f8d6b9a7d01120c7de28138372f8e166950730b65bd0ffc3e1028af89377bde598bee549ca86d369f9427df
-EBUILD asterisk-13.38.3-r1.ebuild 10844 BLAKE2B 6b9c6791acac5777bc063b9bc228ae1af6e5af641f257772cf2087281c3bc1459e5b2334cc0cabae45191a0de78d91b9fc67ccdd5498c4b14aba35496b8f7bd7 SHA512 c47dcade8239df4075842249aaf0fd3b3e3089b9fc0b3a3ecbce30c6a12b82e02bd7a3eeb51eeab346f520432907a95c79ca303af08d253d767af81fca1e26cd
+DIST asterisk-18.8.0.tar.gz 28007752 BLAKE2B d5feb2a03003869ee304cd38bc3abcd77a13614c4f1f0a871d517c972f661c17de3da7f452345aaa11e23526a612c1805325ac5a3e902fea1070f63c993ef3fa SHA512 aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337
+EBUILD asterisk-13.38.3-r2.ebuild 10884 BLAKE2B a5d6ad2195ad4375d43cc95ef76fdfd5e1ebb075c1907cb320ad98de9221f32e2ef6754cef38fa0f9633995ce58b506a4293e84ef085d87803f6eeb93f7ecdef SHA512 2abb7f02954fb6039c4cb4b71db6ed09ac6008273c084db47162db880a13a504cc4f1d293c97770b7f363852c159db9e4f62f54a91c23cb40f7f4244399b056c
 EBUILD asterisk-16.19.1-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e
-EBUILD asterisk-16.20.0-r1.ebuild 11252 BLAKE2B 0ec58a25537e2be301ab08745848dc82c195c429dd9b942ad02893fd3845345d3281087d56335ac9aaf4b0e72176c86b06e7bc51f0de86eb15dce98141a19714 SHA512 56fcb729fe283d66d0ee8442b8261b568654a7a841daf9fb7308091718f1176672c876f5f4bf9560d720cd7b03b7acf993dbdba72dbb2062285dc7ce60e342c4
+EBUILD asterisk-16.20.0-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e
 EBUILD asterisk-16.21.1.ebuild 11252 BLAKE2B 0ec58a25537e2be301ab08745848dc82c195c429dd9b942ad02893fd3845345d3281087d56335ac9aaf4b0e72176c86b06e7bc51f0de86eb15dce98141a19714 SHA512 56fcb729fe283d66d0ee8442b8261b568654a7a841daf9fb7308091718f1176672c876f5f4bf9560d720cd7b03b7acf993dbdba72dbb2062285dc7ce60e342c4
+EBUILD asterisk-16.22.0.ebuild 11300 BLAKE2B a29cd3eac10268e130d109abf65330057b3bab2a145eaa0f90e43c099374cc6f4e8f3e91af996bc358d020d04aeb75ee28eeb5c580a9e3e29b5e8c1062e0f6ba SHA512 07e6914a1a086e2f12e3cc315657781752d59308ecab43d50947a6fe010953da51fa12dc3a932c131a34b804577ccd61f0c881b4baf40a9fd99af5164283506a
 EBUILD asterisk-18.5.1-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
-EBUILD asterisk-18.6.0-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
+EBUILD asterisk-18.6.0-r1.ebuild 11223 BLAKE2B 99eca23e3eaa2caf971038282d32de5a944f5b62f229b23891a19cdada87a905ae88a9b2440625e7380779cc5a6224407c5e1a28ba1650f051c3151a8c00729b SHA512 a78276a1977eedcaf244f70cf4fc3499d0ba8b3fe07fc0ae1c1e3530ad9de2d24ea752a02829bae81e69fef139263b48767bc029f7db0eec818e334b4287b9e4
 EBUILD asterisk-18.7.1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
+EBUILD asterisk-18.8.0.ebuild 11273 BLAKE2B 7846bc1f453f77ca7bcee275508008a8d9b93f542998bdccbff97ad67b961b62fc122a0613afc3d0f0799170750bd681f78634652b122d1211138a069c431a23 SHA512 1e5d88bbb7555cb75518631f8190fb133d6c638a55338f7b06faad3f786de127502b5e8952a1c2951059b45e9821c8bad651900faba0769c0b08e2534782ab4e
 MISC metadata.xml 1483 BLAKE2B 00aa83418aa9cf46f9ac04f2281157abd02f6e0d77b18e10ec0e516a116d92c87b6bb70a4c595dd5e2553f522f8ebd4ef6b102f30cd02fe8ce261f3fa049ddd0 SHA512 65f32411b7a6ed223a9e12d9f43fc975de7fa00c42e93b6302dbcf50a44c4805d1a116ddea0749d17e28dfc0fe6897ecccd0873a76e6dbf4f9580e2ff6df2149
diff --git a/net-misc/asterisk/asterisk-13.38.3-r1.ebuild b/net-misc/asterisk/asterisk-13.38.3-r2.ebuild
index 9c92d3c20425..12bf7e259cb9 100644
--- a/net-misc/asterisk/asterisk-13.38.3-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.3-r2.ebuild
@@ -109,6 +109,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 _make_args=(
 	"NOISY_BUILD=yes"
 	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
 	"OPTIMIZE="
 	"DEBUG="
 	"DESTDIR=${D}"
@@ -292,11 +293,11 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newinitd "${FILESDIR}"/initd-13.38.3-r2 asterisk
 	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
 
 	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-13.38.3-r2.conf asterisk.conf
 	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
 
 	# Reset diropts else dodoc uses it for doc installations.
diff --git a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild b/net-misc/asterisk/asterisk-16.20.0-r1.ebuild
index 236daff8745d..a1a9536e12ed 100644
--- a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-16.20.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-16.22.0.ebuild b/net-misc/asterisk/asterisk-16.22.0.ebuild
new file mode 100644
index 000000000000..735b5ef050f6
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.22.0.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild b/net-misc/asterisk/asterisk-18.6.0-r1.ebuild
index 456bc7d82990..22c24bf0800f 100644
--- a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.6.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
diff --git a/net-misc/asterisk/asterisk-18.8.0.ebuild b/net-misc/asterisk/asterisk-18.8.0.ebuild
new file mode 100644
index 000000000000..11d956599705
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.8.0.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11:=
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libcrypt:=
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d <&3; do
+		keepdir "${d#${ED}}"
+	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
+}
+
+pkg_postinst() {
+	tmpfiles_process asterisk.conf
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf b/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf
new file mode 100644
index 000000000000..dc999ee65fc9
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles-13.38.3-r2.conf
@@ -0,0 +1 @@
+d /run/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles-16.22.0-18.8.0.conf b/net-misc/asterisk/files/asterisk.tmpfiles-16.22.0-18.8.0.conf
new file mode 100644
index 000000000000..224d060a3c92
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles-16.22.0-18.8.0.conf
@@ -0,0 +1,2 @@
+d /run/asterisk 0750 asterisk asterisk
+d /var/cache/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles2.conf b/net-misc/asterisk/files/asterisk.tmpfiles2.conf
deleted file mode 100644
index ce85c7f5461a..000000000000
--- a/net-misc/asterisk/files/asterisk.tmpfiles2.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/initd-13.32.0-r1 b/net-misc/asterisk/files/initd-13.38.3-r2
index 2a7387dc2eb0..8a4555be7ecd 100644
--- a/net-misc/asterisk/files/initd-13.32.0-r1
+++ b/net-misc/asterisk/files/initd-13.38.3-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="forcestop reload"
@@ -30,7 +30,7 @@ setup_svc_variables()
 	local t
 
 	ast_instancename=asterisk
-	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_rundir=/run/${RC_SVCNAME}
 	ast_logdir=/var/log/${RC_SVCNAME}
 	ast_spooldir=/var/spool/${RC_SVCNAME}
 	ast_confdir=/etc/${RC_SVCNAME/.//}
@@ -291,7 +291,7 @@ wrapperstop() {
 	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
 	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
 		ebegin "Killing ${ast_instancename} wrapper script"
-		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		kill "$(cat /run/asterisk/wrapper_loop.pid)"
 		eend $?
 	fi
 
@@ -313,7 +313,7 @@ forcestop() {
 	wrapperstop
 
 	ebegin "Stopping ${ast_instancename} PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid
 	eend $?
 }
 
diff --git a/net-misc/asterisk/files/initd-16.22.0-18.8.0 b/net-misc/asterisk/files/initd-16.22.0-18.8.0
new file mode 100644
index 000000000000..ed6fa8bca742
--- /dev/null
+++ b/net-misc/asterisk/files/initd-16.22.0-18.8.0
@@ -0,0 +1,363 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+	ast_cachedir=/var/cache/asterisk
+	ast_stop_timeout=120
+	ast_stop_method="gracefully"
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
+	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
+	case "${ASTERISK_STOP_METHOD}" in
+		gracefully|when\ convenient|now)
+			ast_stop_method="${ASTERISK_STOP_METHOD}"
+		;;
+	esac
+	ast_group=
+	if [ -n "${ASTERISK_USER}" ]; then
+		ast_user="${ASTERISK_USER%%:*}"
+		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
+			ast_group="${ASTERISK_USER#*:}"
+			ast_group="${ast_group%%:*}"
+		fi
+	fi
+
+	[ -z "${ast_user}" ] && ast_user=asterisk
+
+	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
+			result=$?
+		fi
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-"
+				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
+				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS PID
+	local tmp x
+
+	local OPTS ARGS
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# ensure that ASTERISK_RESTART_DELAY is integer.
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in "${ASTERISK_TTY}" \
+			 "/dev/tty${ASTERISK_TTY}" \
+			 "/dev/vc/${ASTERISK_TTY}"
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : Yes"
+		OPTS="${OPTS} -c"
+	fi
+
+	if ! getent passwd "${ast_user}" &>/dev/null; then
+		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
+		return 1
+	fi
+	OPTS="${OPTS} -U ${ast_user}"
+
+	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
+		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
+		return 1
+	fi
+	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
+
+	if [ "${ast_user}" = root ]; then
+		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	elif [ "${ast_group}" = root ]; then
+		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	fi
+
+	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
+	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
+
+	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
+		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
+			# asterisk can crash during startup ...
+			ebegin "Waiting for ctl file to appear"
+			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
+				sleep 1
+			done
+			is_running
+			result=$?
+			eend $result
+		fi
+		if [ $result -eq 0 ]; then
+			ebegin "Waiting for ${ast_instancename} to fully boot"
+			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+			eend $?
+		fi
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing ${ast_instancename} wrapper script"
+		kill "$(cat /run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping ${ast_instancename} PBX"
+	start-stop-daemon --stop --pidfile /run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "${ast_instancename} is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for ${ast_instancename} to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 2)"
+			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
+				echo
+				eend 1 "Failed waiting for ${ast_instancename} to stop."
+				return 1
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing ${ast_instancename} to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "${ast_instancename} is not running!"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 126be7ed8c04..a8a71366f5f0 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,6 +1,6 @@
 AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a4869437d2d392274c0f0586153406480eb1614297420e161285d981eedf03a4e090a309dfe55163e13387bf4c649586847ccee64dd2e88f9c7263b6b66 SHA512 f4aa5a2473c1872d06fea2611594f63c888717cd93618587b020dcb6aaeb7889443358dbc74da5c7763fb6ef08a6ecf9345d94874c582c799abbf8db8957c790
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
-DIST chrome-remote-desktop_94.0.4606.27_amd64.deb 56546400 BLAKE2B 20d2920b5090f44ffd2b5843e2e08e8073eaec32e30da03f904a73ebaf9ba80b6b08c3e23af4963bbc8d42611b264b65874c61f2ded386de524431cea01c95a7 SHA512 5a322a83fa4ebefa5597e87ff99b46c630f1386563f43ebdd1e891e880be06bf2974bbbe09b62bdb84778c5e5b71e4d0c31e76eab1985aba58404a43fbecd8f7
-EBUILD chrome-remote-desktop-94.0.4606.27.ebuild 4807 BLAKE2B 7fa6f8a5bd362b817b1dc018dcc9ac9d05ad3548815cd17141c8b234eb1042e1e0880d9cb3d761b0a15fab7f9e9ba91002320a5c664e87e423883cda3c8e652d SHA512 dc4a8ccee7866e920d90c3ba6082487ed2a3b7bd79e1cf8440ef28f9e839f12eeed9b0726bf153f2bda818d3b3a6ad5a8c4ee2a2f8396fd59d53d16847e41b92
+DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B b7ac12e2f1c16781225b9c74e558e51d817aad5de2d953d94a06d5d3fa0d937dd317f7157c770e01a91c249f0192542da67911899014360c6fadd252bf0908ae SHA512 86d4ac9b15da2b29f7245866dbc78a131c6aad8efb8ac4f150935afdd5ad95e8f2bc4a59cda52849c96aadaa869b05f9eb7a5cdfda711358e5055e08cf9fbd79
+EBUILD chrome-remote-desktop-96.0.4664.9.ebuild 4808 BLAKE2B 26d9e5c83ac126f414f3dab199f50972965fe777c2bf55db298c2ed82f8fd5cb14cfacb12c249544c2fc7cc24ceb181759e3be0b10dd8df1e943b6f8a51cad39 SHA512 db708de2928e175d476f127a60c5c878cce3db19c6a0298a4a04447c1fb4671ee383a0307b5267c743e4b32630069c4ce49bc5dea56b07e77e9e37efb9867368
 MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-94.0.4606.27.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
index 51e526f00dff..65b1951d7a70 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-94.0.4606.27.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
@@ -15,7 +15,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW"
 
 inherit unpacker python-single-r1 optfeature plocale
diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest
index 175b40ea9b8c..4690f3d3e5de 100644
--- a/net-misc/clusterssh/Manifest
+++ b/net-misc/clusterssh/Manifest
@@ -1,6 +1,6 @@
 DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee3005a64550a90cafe59101fd3f4b66307990e254334fb270398c9e36a9d27657a27e7348b1223a7ccef04181f8c88809b SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8
-DIST App-ClusterSSH-4.03_06.tar.gz 81476 BLAKE2B 6b513cb86fd4827eb510dd26ded9aa2d45ac1fe484dc10b8cb841c8b1fb50c7f279cbc6a63e817acbbf66e4aea5faa4f32cc612c387d018bf09abb18919fd7d6 SHA512 87dff4c0445436c10929bcf30a9295deb6ddacca16939091fdab0cf67765c77706745ce8e738145ea6c67ec06093567b7668e4387a72b48018f8e173da5709b4
+DIST App-ClusterSSH-4.16.tar.gz 96151 BLAKE2B c0b4ee36f42cb26853c264686fa6084133e0a75f9dba6e7233e341a2dedbb3c41642dd255bf6fa01b7285c9c3edd43485d3014b6d41957d6476382dcd00866a2 SHA512 3d4fc2aa681ea815020375bb3bb0f9a070e1638c5a4e38b1b279c58f9644a568bb687e0e611919afa48a32b44ff4e25cd5661c7d1330978f851bc506282f020e
 EBUILD clusterssh-4.03.03.ebuild 1070 BLAKE2B 71b09ec83e69facd4308df30c15ab9cce9cf1009a007a70de5503d44b6c94be228f0ff94845a581b740ccb243286bbb9da21d8b47c803a6db6f9cef317627b2e SHA512 277e9a1cca280261584c40ed1af97d09270b54c9a89b931dcbbcae911fae58b1c5da0d52815e17c37ff1fc2c135a6d08be38b3115e4477a8ccca02846d298843
-EBUILD clusterssh-4.30.600.ebuild 980 BLAKE2B 503f0717e4630bb4752bab6cc0d1ad300e35a6a164be52e1f0482bc1f4837613f5304815bc362da191002cd4e155f3a3767e81528980af2a14338923ec3d1eba SHA512 fde939b6f4b910dfaa8559926f0e3164895e3c7508e7152b005325a5c468c65d58c6cf95d615129967f0d9e0637300781663f9fafb1163b340bff46a0ae0a289
-EBUILD clusterssh-9999.ebuild 871 BLAKE2B 6d559b7a1a350b462004fde3fe56a697efd60c06b8f786405b3c96f331a51e4ed1e5f171429060b02727d16b8aeed7d5406bb05df755bd866a8fa7ba86d6b973 SHA512 ed797c1eb3ef11aa8732d81508d58d393d4f8ae09c863f4661d49d14974b23ed67abab564772b92600211dd7e58de62c3bc6074885270afba900cbe60542868c
-MISC metadata.xml 709 BLAKE2B 8c4b0b7851db7334aa5a111efcb8e50638e3ae0000d3b42ab5589234555495f7c6281c3abf8c27e9975e19c0d8207bb4608c22cfe4657c2e5433bd7071e75252 SHA512 1f7508d748076b11f6606962d154a13e6ea7668859fa62fa57563520b87548380161a5ca287e1483055fa073976dadc3651b156dd80140652c854cdca44cdac2
+EBUILD clusterssh-4.16.ebuild 1231 BLAKE2B 32d8c9645d2e51879e2aea40fc8931966671fca1bc8608d01147990e85d8b876b3fc468e1626e30184556089f6165ffb1117ddede6f9cbec1e9879538713181e SHA512 577e581cd93e9e666b958f49269c819af4668f6afbd613ad3a5e93e5d2221dac2347a1b41278336aff733dc52865a1a2dea474b60f15972955a7391b64b13244
+EBUILD clusterssh-9999.ebuild 1231 BLAKE2B 32d8c9645d2e51879e2aea40fc8931966671fca1bc8608d01147990e85d8b876b3fc468e1626e30184556089f6165ffb1117ddede6f9cbec1e9879538713181e SHA512 577e581cd93e9e666b958f49269c819af4668f6afbd613ad3a5e93e5d2221dac2347a1b41278336aff733dc52865a1a2dea474b60f15972955a7391b64b13244
+MISC metadata.xml 969 BLAKE2B 7c844e13199afe65bf147d91606c7e733345c68d08b1a8538c45f1ccbdcda892c6a9330a6633d2b5efe007a9b2356d07e7189a0765a8321363aecf5228e3d877 SHA512 e0bbbf566f6360c79303d4c36dc5e894f60524e6aaa3fcfb8950e89c06371c6b627322591d76ef9aaf6c657884b6831e2bd15f684c396f30ba05e20d9a40be5b
diff --git a/net-misc/clusterssh/clusterssh-4.30.600.ebuild b/net-misc/clusterssh/clusterssh-4.16.ebuild
index e2aa81d7cfa3..7d85bec61967 100644
--- a/net-misc/clusterssh/clusterssh-4.30.600.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.16.ebuild
@@ -1,42 +1,49 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-MY_PN="App-ClusterSSH"
-MODULE_AUTHOR="DUNCS"
-###################
-# /!\ IMPORTANT /!\
-###################
-# CHANGE ME AT EVERY VERSION BUMP
-MODULE_VERSION="4.03_06"
-
-inherit perl-module
+EAPI=8
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
 HOMEPAGE="https://github.com/duncs/clusterssh"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/duncs/clusterssh"
+	inherit git-r3
+else
+	DIST_AUTHOR="DUNCS"
+	DIST_NAME="App-ClusterSSH"
+	# Use dev-perl/Gentoo-PerlMod-Version to update this on bumps!
+	# DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION})
+	#DIST_VERSION="$(ver_cut 1-2)"
+	#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
+
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit perl-module
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Config-Simple
 	dev-perl/Exception-Class
-	dev-perl/Tk
 	dev-perl/Readonly
+	dev-perl/Sort-Naturally
 	dev-perl/Test-DistManifest
 	dev-perl/Test-Pod
 	dev-perl/Test-Pod-Coverage
 	dev-perl/Test-Trap
+	dev-perl/Tk
 	dev-perl/Try-Tiny
 	dev-perl/X11-Protocol
+	dev-perl/X11-Protocol-Other
 	dev-perl/XML-Simple
 	x11-apps/xlsfonts
-	x11-terms/xterm"
-DEPEND="
+	x11-terms/xterm
+	"
+BDEPEND="
 	${RDEPEND}
 	dev-perl/CPAN-Changes
 	dev-perl/File-Slurp
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 19eec2cb92c4..7d85bec61967 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -1,45 +1,55 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit git-r3 perl-module
-
-EGIT_REPO_URI="git://git.code.sf.net/p/clusterssh/code"
+EAPI=8
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
 HOMEPAGE="https://github.com/duncs/clusterssh"
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/duncs/clusterssh"
+	inherit git-r3
+else
+	DIST_AUTHOR="DUNCS"
+	DIST_NAME="App-ClusterSSH"
+	# Use dev-perl/Gentoo-PerlMod-Version to update this on bumps!
+	# DIST_VERSION=$(gentoo-perlmod-version.pl ${UPSTREAM_VERSION})
+	#DIST_VERSION="$(ver_cut 1-2)"
+	#die "|$(ver_cut 1-2)_$(ver_cut 3)|"
+
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit perl-module
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	dev-perl/Config-Simple
 	dev-perl/Exception-Class
 	dev-perl/Readonly
+	dev-perl/Sort-Naturally
+	dev-perl/Test-DistManifest
 	dev-perl/Test-Pod
 	dev-perl/Test-Pod-Coverage
 	dev-perl/Test-Trap
-	dev-perl/Test-DistManifest
-	dev-perl/Try-Tiny
 	dev-perl/Tk
-	dev-perl/Config-Simple
+	dev-perl/Try-Tiny
 	dev-perl/X11-Protocol
+	dev-perl/X11-Protocol-Other
 	dev-perl/XML-Simple
 	x11-apps/xlsfonts
-	x11-terms/xterm"
-DEPEND="
+	x11-terms/xterm
+	"
+BDEPEND="
 	${RDEPEND}
+	dev-perl/CPAN-Changes
+	dev-perl/File-Slurp
 	dev-perl/File-Which
 	dev-perl/Module-Build
-	dev-perl/Test-Pod
-	test? ( dev-perl/Test-Differences )"
+	dev-perl/Test-Differences
+	dev-perl/Test-Pod"
 
 SRC_TEST="do parallel"
-
-src_unpack() {
-	git-r3_src_unpack
-	perl-module_src_unpack
-}
diff --git a/net-misc/clusterssh/metadata.xml b/net-misc/clusterssh/metadata.xml
index 2772a30ce58d..8cd8ade0d8c9 100644
--- a/net-misc/clusterssh/metadata.xml
+++ b/net-misc/clusterssh/metadata.xml
@@ -5,6 +5,14 @@
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>jaco@uls.co.za</email>
+    <name>Jaco Kroon</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   ClusterSSH is a tool for making the same change on multiple servers 
   at the same time. The 'cssh' command opens an administration console 
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 2e75ec01daf8..bc147565a4e6 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,4 +1,5 @@
 AUX csync-0.50.0-gcc_5_and_8.patch 1346 BLAKE2B 55c78622122e429b5a72790c5db3b0e2e063f419ab85dac460541aac121bf8d957a2be443837023e745c71debfe908a8fd5f75d041b16f7c22610da9e049532b SHA512 fb739031b2eca4f69f1384262214b13d5ccfd0abc64d889bb1b69f3a04473a43129ed26990aebcfd51e5b98b70649d9fac36a7eb116d162631f074d60ea82a41
+AUX csync-0.50.0-libssh-version.patch 2107 BLAKE2B 1525fe1c9d9ac6d19c2b5dd6c7119795bddf2820e986b151b24f6dfc8afd61f39384da833be5936793bb312145a6db5eb81f4965e4f00fd221ea28e7a49b9404 SHA512 709456c8b162d994afb972b4712d30e6107eebdd356a99689335f1edffd1b07bd76de95186ffe5f9538899f9b6095da158973711e67ffffe4a601a7b2b422d5c
 DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
-EBUILD csync-0.50.0-r1.ebuild 1157 BLAKE2B f33db5654367764c3ea7b38ea00f80551daaf36df59288fd1dfde135fe8dca52ecb836c3171bb85fca5d478b1f73f2a7f2ca7188632f251d81b304498cfabce0 SHA512 86a5f1eef0f446f6def4c2fcbbe38ff74d73ea15c5a4de65e88b33c919475a90b5dc26206de030dd3a108f64f01fc89ddace5514579915ca86f8ee4db5635939
+EBUILD csync-0.50.0-r2.ebuild 1170 BLAKE2B 6821df4617e8bc37106225e51ec1fe2faffcb62e609b8f77d42d5809e6071b3e25a713a069dba8996fac838494fbb1f08d6aefb821020b4736352d97a6c8a73f SHA512 3d3cf9573351a815c5bb548f04967b1ab8f9cfa98e3772cfabe5c348c97f2c0b7e03249ced17e67fd695a841d3a6dff9d797377adba0474beb40b4c8d4c891e0
 MISC metadata.xml 355 BLAKE2B 8340e48d7539b41e478209aebef5f25d42aa08936e109a848dacb7c3ca1ca208e4f23b113b0a6398065c90167bfc60cf6c53dad794d426d78c0cb3ecf2761453 SHA512 f9c45dd11f297f2851bf85aa2b694ba866936841e7b1f783e8920dfeb8cb5ef7587891bc490065788012bb506500f35371e38ca012afc79d5f9c01c5eeddec97
diff --git a/net-misc/csync/csync-0.50.0-r1.ebuild b/net-misc/csync/csync-0.50.0-r2.ebuild
index 4439f480f684..d749dab20f3e 100644
--- a/net-misc/csync/csync-0.50.0-r1.ebuild
+++ b/net-misc/csync/csync-0.50.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="lightweight file synchronizer utility"
 HOMEPAGE="https://www.csync.org/"
@@ -19,16 +19,17 @@ RDEPEND=">=dev-db/sqlite-3.4:3
 	net-libs/neon[ssl]
 	iconv? ( virtual/libiconv )
 	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
+	sftp? ( >=net-libs/libssh-0.5[sftp] )
 	!net-misc/ocsync"
 DEPEND="${RDEPEND}
 	app-text/asciidoc
 	doc? ( app-doc/doxygen )
 	test? ( dev-util/cmocka )"
 
-PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch )
+PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch
+	  "${FILESDIR}"/${P}-libssh-version.patch )
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# proper docdir
 	sed -e "s:/doc/${PN}:/doc/${PF}:" \
@@ -40,9 +41,9 @@ src_configure() {
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DWITH_ICONV="$(usex iconv)"
 		-DUNIT_TESTING="$(usex test)"
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package samba SMBClient)
-		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package samba SMBClient)
+		$(cmake_use_find_package sftp LibSSH)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-misc/csync/files/csync-0.50.0-libssh-version.patch b/net-misc/csync/files/csync-0.50.0-libssh-version.patch
new file mode 100644
index 000000000000..77ce1cdafa14
--- /dev/null
+++ b/net-misc/csync/files/csync-0.50.0-libssh-version.patch
@@ -0,0 +1,41 @@
+Index: csync-0.50.0/cmake/Modules/FindLibSSH.cmake
+===================================================================
+--- csync-0.50.0.orig/cmake/Modules/FindLibSSH.cmake
++++ csync-0.50.0/cmake/Modules/FindLibSSH.cmake
+@@ -20,7 +20,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+ 
+   find_path(LIBSSH_INCLUDE_DIR
+     NAMES
+-      libssh/libssh.h
++      libssh/libssh_version.h
+     PATHS
+       /usr/include
+       /usr/local/include
+@@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+     )
+ 
+     if (LibSSH_FIND_VERSION)
+-      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
++      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR
+         REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+       # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
+       if (LIBSSH_VERSION_MAJOR)
+         string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
+-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
++	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR
+           REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
+ 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
+-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
++	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH
+           REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
+ 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
+ 
+@@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+ 	include(FindPackageVersionCheck)
+ 	find_package_version_check(LibSSH DEFAULT_MSG)
+       else (LIBSSH_VERSION_MAJOR)
+-        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
++        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old")
+         set(LIBSSH_FOUND FALSE)
+       endif (LIBSSH_VERSION_MAJOR)
+     endif (LibSSH_FIND_VERSION)
+\ No newline at end of file
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 2ce80a27e6c7..248a2646489e 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -2,5 +2,7 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
+DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 EBUILD frr-8.0.1.ebuild 3538 BLAKE2B f4c2a6bc1901bc776f0266ece3a0daf04ab716b63a55c32e634f387e2482d18b3c1446785294fab12be08c1d97eb07f56dbcaad22bc20d354befa7c08489fee1 SHA512 4ebdd4c6bbf0770f7c478a1c85a47e8d78237d709240bdeaa7f4bace13ef0b59bc5bf715c899977ba8c712c63a1cf14685fd7e5056cddd2af254fe0e8de8a9d7
+EBUILD frr-8.1-r1.ebuild 3445 BLAKE2B fe86b9e6e3ff80ed9efdb6633c45fdf2103764e9087323f9f755237c3fc2da67827592d74a5a4d3da385043e250dfac09313dfdcc5966583fa11e10bbd7d2c53 SHA512 6fbde4096367c00896662d6226708e397ffd2625a8c215b2ebc5f56b3862fe67ceb9eba44329280fe73a36fd85e3081241d58b9bcc6bf679a392568c7782dac6
 MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
new file mode 100644
index 000000000000..1fcbac9b2687
--- /dev/null
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	>=net-libs/libyang-2.0.0
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	~dev-util/clippy-${PV}
+	sys-devel/flex
+	virtual/yacc
+	doc? ( dev-python/sphinx )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
+	!net-misc/quagga
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--with-clippy="${BROOT}"/usr/bin/clippy
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 rtadv)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	keepdir /etc/frr
+	fowners frr:frr /etc/frr
+	fperms 775 /etc/frr
+
+	# Create logs directory with the correct permissions
+	keepdir /var/log/frr
+	fowners frr:frr /var/log/frr
+	fperms 775 /var/log/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/vtysh.conf
+	doins tools/etc/frr/frr.conf
+	doins tools/etc/frr/daemons
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/vtysh.conf
+	fowners frr:frr /etc/frr/frr.conf
+	fowners frr:frr /etc/frr/daemons
+	fperms 640 /etc/frr/vtysh.conf
+	fperms 640 /etc/frr/frr.conf
+	fperms 640 /etc/frr/daemons
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v1 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}
diff --git a/net-misc/gvrpcd/Manifest b/net-misc/gvrpcd/Manifest
index a0a44401e1dd..9d8c1d6d9884 100644
--- a/net-misc/gvrpcd/Manifest
+++ b/net-misc/gvrpcd/Manifest
@@ -2,5 +2,5 @@ AUX conf.gvrpcd 132 BLAKE2B c1101658ffc59f5e45cb388b5595b3f48f89d037517e1d890c02
 AUX gvrpcd-respect-ldflags.patch 465 BLAKE2B 1dc62e0caf54d120bdeaa3ad621f624ef00e8c16512b92ab4079881e9892e416d58c78023cb57c5de9c380c54b426aa590d174c131138b6b2103fc214adf1e6f SHA512 c0d0230ed35ca4fb421e4b65333bdef6cb4e5dde954d95b1f56d9bea0b33f6353969294bb30e4c231580d946c65632c49f06eda98fa41064fef6ff12349f2507
 AUX init.gvrpcd 1055 BLAKE2B 6de4641a5c383769a8da604dc37a915a165a3164d4430a4ab70d8cd2a001e77dfb06ff60f22c830efec84a71e4155e7896c9de5c858e5279ebdb5a330d95212c SHA512 57fcd87fa6e209907352bd85984120ce2cdcd73cf008f41dab34d0b739d014229d10976416d0c6d4b154b81e36c6ac2e9cc961b79cf3e507a4b9d70d039ecaa7
 DIST gvrpcd-1.3.tar.gz 12066 BLAKE2B dbe28e45b9efdeca7f4d21fdd3e4cf0470b3cbe90866ee024ad0b681b6a6825ca9844cb06e58eaae95fe38561caece1607c0c0473dbc85affcc72b6be966eb86 SHA512 53f2ad4c9ce5ee2bbf72c691ca0ea1d3d2e22dba98c18cdcbecc09c9082427f8ebc83277b4ffc40fd693652c932a4c093512f99157e82d5a3b97bb6f3d8ff444
-EBUILD gvrpcd-1.3.ebuild 701 BLAKE2B 6d897d71543968b4d91a899465ef7609024eb95c245da2fb608862a676085503f3799214267750eb488ffae1d85780b9a8fc8f21684ccbdf7544f9a0f4b59561 SHA512 8d616d3a51c070a1b0476f28af2f4aae78520e20c96e3c079e7b72d94f8d028ecd125dde74788d5d4529092011a4572065d93fe583fc9f5621e5a012964f0fa1
+EBUILD gvrpcd-1.3-r1.ebuild 682 BLAKE2B 708fa3ece73fdfdec017690017c2b7a16372da952d1d7283e2a6bad794e2b03ced5cabc1d0053bb69fbddfade815d3dbcc9016e434dad142fd06f49423d16644 SHA512 a8300c6264031d0a6f6057c3969ec5d586af277c05e4b2beee4c909ca45b8df502e72b1941cf1bd0998b08dbbebf7559e060910184696845998e466a6af3a13e
 MISC metadata.xml 514 BLAKE2B 7de5ef4412f36dfcc1d96163f60360ce87ed0b45b71137fdce91e090313308958a2bcbbbf77c405fbc0d7c52d3139e2c1800980d915fe7cdb2c85384210e7606 SHA512 20a8a4b61ae713c5429d7f01f3dadf8ac38ba721fda0803e55a9e8c6d7974180f83286fb8f41c144c8ec5043c2c993352b1b657cc2783714f3b46bce6f138662
diff --git a/net-misc/gvrpcd/gvrpcd-1.3.ebuild b/net-misc/gvrpcd/gvrpcd-1.3-r1.ebuild
index ddadebc283c0..83edfc7bc102 100644
--- a/net-misc/gvrpcd/gvrpcd-1.3.ebuild
+++ b/net-misc/gvrpcd/gvrpcd-1.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit linux-info toolchain-funcs
 
 DESCRIPTION="A program for announcing VLANs using GVRP"
-HOMEPAGE="http://sokrates.mimuw.edu.pl/~sebek/gvrpcd/"
-SRC_URI="http://sokrates.mimuw.edu.pl/~sebek/${PN}/${P}.tar.gz"
+HOMEPAGE="http://zagrodzki.net/~sebek/gvrpcd/"
+SRC_URI="http://zagrodzki.net/~sebek/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +27,8 @@ src_compile() {
 }
 
 src_install() {
-	dosbin gvrpcd
+	dosbin ${PN}
 	dodoc README
-	newinitd "${FILESDIR}"/init.gvrpcd gvrpcd
-	newconfd "${FILESDIR}"/conf.gvrpcd gvrpcd
+	newinitd "${FILESDIR}/init.gvrpcd" ${PN}
+	newconfd "${FILESDIR}/conf.gvrpcd" ${PN}
 }
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 959ab94aa727..a8b59e583f88 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -6,6 +6,6 @@ DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
 EBUILD iputils-20210722-r1.ebuild 4581 BLAKE2B 44e8c6bd74ce932caa428c85413d9f85bda0b7047f55d96de55f6de1526210ddb0a78e75f2fea8a084a4abe3aad96ba1818e5066e42b24920830b0b7111761c5 SHA512 27c4db1d21ca0d47aaf9c3791574306a978a2fa8be7a6cf74c4794a9fb766e1cb16d6a5c6510cbf1a28d6acc06f30da92564fe36cf5cf8216f2aacadee70afb1
-EBUILD iputils-20210722.ebuild 4513 BLAKE2B 5d94157b66c766964d395df24eef93068f17ee892592e28412fa0f28596e30f07ce8c10654fd641fc8954a7faa9f97c677d09e20d6700ee3788e0ab56f2e6919 SHA512 32be9ad976dd770b14fa267a97171e21f44723afa4c413c1ba49819a6504e75b271c4f17c541f9d92d5791234960ecb7e75977a889cf0338ae95ede75ccc7b39
+EBUILD iputils-20210722.ebuild 4512 BLAKE2B 1db6a9919ec592900f53fe4676a31b21059a6f011418616eef131f2d57d869b5af8ee3a0d4b527adc85a65c564a9137d23f631c03376920890d4140d8ceb0435 SHA512 fad6f0ac622ed92df810b9a34c9450853af63ad7ace9707dd1855058ff47188dffa2b134bf50862ab1c52e26c8c2207ac7183115d9c7452e0e116bf1c536538c
 EBUILD iputils-99999999.ebuild 4440 BLAKE2B e752bc9085ee4a631a7c93b6f5a533bc2ea88009020aa336add86167cb68296a418e436af05469e06e8d11f6c49bf7bff9534e8258258d8eda5674e7011481bf SHA512 2b30c9bd6a5470381d016ab68338de9da471ebb0f351a19585543a33b77ab4f586a13590f592fc7b5c92a976d04ee9988c6da3d7d83ff15a55f295535021ac52
 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9
diff --git a/net-misc/iputils/iputils-20210722.ebuild b/net-misc/iputils/iputils-20210722.ebuild
index a080ea8712cf..a4f130b6e606 100644
--- a/net-misc/iputils/iputils-20210722.ebuild
+++ b/net-misc/iputils/iputils-20210722.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 93fdc732c46e..24756ed7e8bd 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,5 +8,6 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74bbac038db329d84f2b9229e6db8204c2c0b55075ef238a5c3fa3751de5a0fb843a2ee0e71a648a194aed832d6dd36 SHA512 46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835
 DIST memcached-1.6.12.tar.gz 618614 BLAKE2B 45de1c9610781ed6ab27261642db62b65a846651df64d9db2658ce8bc1cd96a798add6099340281c9dadc470e81b86976b855f4bece29189cfcfdb9b4e3a8991 SHA512 6cf41f14679ffac096195c29cf79741f28069e92d8ceddd5039061f1b8d3d4018f2983a6e43a27306ff299f9198e56f9ebd8ee8b62aa4882b38a0aa712ab1779
 EBUILD memcached-1.6.10.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff
+EBUILD memcached-1.6.12-r1.ebuild 2968 BLAKE2B d1683d929f3a1165f0c92645fa33ae16cee48f64bae0427e75228edf2611acb7432012f04d754693fe36bef88ae689a13c1f6fe6af7177bfde399af8201c8a2d SHA512 edde0dcf4d1d46972b7503b4b4ce0ea8ff0ad6ee0086beb12a63148b1e2ea96036842f3e2c47f5c61d2e12dd99c5f9d3286f9e29f1686d7a2cb6fb6f4a811c75
 EBUILD memcached-1.6.12.ebuild 2868 BLAKE2B 637e796bac6f590459dbccd3c6068b1d7bdef9bf92595f6b3def557a4803d8f32e8a391c582a3b824110a136d557247227190ada8d78184c76e05e57b70d4d94 SHA512 d9c61fedbe070116105346ac78e9a310fa4f0a0da7d070387a6477cb0340205f795f5bc4cee283a5bb6faf012c8b4aadb56138df57bb4c9ed6a1ffb0a5b7a61c
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.12-r1.ebuild b/net-misc/memcached/memcached-1.6.12-r1.ebuild
new file mode 100644
index 000000000000..691bb53ad5c0
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.12-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 746a737a7ef0..0a2bf4c3c59b 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -3,6 +3,9 @@ AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191
 DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
 DIST minissdpd-1.5.20200928.tar.gz 37860 BLAKE2B fc80660ed84198d08d5879e276a0b5ab49c66344c8841f223990f704b6ebf70c8411da1d84ec51a9f69285a6b5a804ebe6b197555f5684d55cd0bf3abe250704 SHA512 e44142dcec4d0d4029a9d93748a8b3edec5482e2313d290956d3829b04e3637f6ba81292f27effad8829b29bb59f7fc43666338a8423d683ca6daa5807ea6362
 DIST minissdpd-1.5.20200928.tar.gz.sig 543 BLAKE2B 5fdedfe4b042924667c329aa964e006cc9a5aad1e2d4f11d46c6689e7d88b4614c383bfb666ca9a7c90b37256a4e38dcc85e479687688578dd198893fcf5d3cf SHA512 15477061b009991a05323a66582bd7ba9c9aa3a1a7c84eca93b27adf1b11ede81063d9de4695fcf3567f3c367a730afe4cee0fa95cccdecd316d08021956cf6b
+DIST minissdpd-1.5.20211105.tar.gz 38870 BLAKE2B a2c7c2b377f426eaffd77a15dd48945bd923344ed606c5060c209b57d7cb1ed92eaf93d8ffda6154b16d293ef78a20bec45aaae287c3f17b6affe3ab0bbc32f8 SHA512 ef393a051352c4abcc11d9f3bf1c822585750c1f8284875345f5cdb947b601c0bcd896d519a826f580612abbd7eacaedbd42e3fa60d654c906a35936faa92886
+DIST minissdpd-1.5.20211105.tar.gz.sig 543 BLAKE2B 09ac05a8e3836b10cdda4fbe00c09c0adccc0fcd119ac2711943c351eedc07b4a915c05a7026f853d26f41d687d5e8b1f69b229033291af302c4e56bc0f93333 SHA512 cfa41832f229609fc41f60a8b35d7dfbb9285933a17baecde2e2e0d855d841941d9e532d8c33a8f025f076cb052a3526d5daee2cdc5e0065f253258f4ee005f1
 EBUILD minissdpd-1.5.20190824.ebuild 677 BLAKE2B eecbab57e067679e992529c0aa64d246be5a1ee7a2dc56ccc6dc4f2e2ad512b869d6adca9dbf0f228297aeb557a27dbc8aaa177b1f74310a6fab1914793cb37d SHA512 d98bf9956693c41a56fbd5401f648359678d40c3ab6b936732004747567ce65686d3baec04b6a6e704450b7cff121a1e0789218550bff79bdd51594ff8b81cb8
 EBUILD minissdpd-1.5.20200928.ebuild 970 BLAKE2B 19e025bb874e1ef5554a2f18a5794cf0f9f5194d6a3d7d111e4321d0f7d347c4acbaad0cee3fe5c8e410ab8ad8464cbc206038ae339796feb4ee768b42ce07b4 SHA512 9f70df6c063235fb790dcd39cfc33eff8226d2a531afe733921713a16e0f6861b9612bd21106b6bb87c528cc6ef57637b95c5d53cb289af39c3493583cf96f46
+EBUILD minissdpd-1.5.20211105.ebuild 969 BLAKE2B 1647d974e2f660cd35015ef470985864a1caacc1fd608a48354a78a548447dce0c4f034937b20a4c270b3a571a9b06cc452ead63d67e496ed91cef42fa485bda SHA512 098d56a212515d5870a377d427b2c7541a485131c336f0996429b987a155795d2a0eb09f376a8320f0875fcdde83d5f07bcd3acd6a91a6ac8931e26e7bd1205b
 MISC metadata.xml 361 BLAKE2B f4494f703999092a10082b23b3326f798df53decf2c9724f906ce70a7da884103edc2932b64954966d3d9f636bf8d3796375e10e688ec53b40b0201411fb49f5 SHA512 6f0a117ab68ff21e355354536c109985e7a42ade339c6ffa36231529731b14a0308eb8ef4b4df9a95cdef4e02ba410fd521c164fdabbaaf4c74117a4cf8b6f3b
diff --git a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild
new file mode 100644
index 000000000000..b07a95967646
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="MiniSSDP Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libnfnetlink"
+RDEPEND="${DEPEND}
+	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+BDEPEND="
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_configure() {
+	sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	# note: we overwrite upstream's init.d
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	dodoc Changelog.txt README
+	doman minissdpd.1
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index c39db964b9a3..1c3d5687bb64 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,5 @@
 DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
 DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0ed2a36c374210e57cdd6a1346772c7f1c06a273e753606f70fe5d911eb6b11c6779382e2fc8a7bfa99ce216522807c6be60ed1719d05b7b452b SHA512 d3166484792aa0d97d7a094ecac309062fa1bf07c50c5b9bcc827e45c0a4d005a1131a589af1ec9920f373346d9ccb27bea6c019bad39c633998c00df92a5356
 EBUILD mobile-broadband-provider-info-20201225.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
-EBUILD mobile-broadband-provider-info-20210805.ebuild 485 BLAKE2B 2b669fabda9def3851ef5e80f367902748032c72958af49bbbbaa7844ac14955813327d19ecf6450848f06a492f91c79968dd0daa4e8c5c7ef4ea3bf16099dbd SHA512 8e7e8741a57dc06c3c02cfb6b45e8dc824d946a2ccf9ae4efa85af8667d6d12408bebdd8ecb02e889b6c0549ede53b39dad05e74a518949f2e477ac51aabb31a
+EBUILD mobile-broadband-provider-info-20210805.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
index 17ea28c46031..0da3e23ad4bb 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 200d587587d4..fd9bee5b0cc0 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -5,5 +5,5 @@ DIST ModemManager-1.16.8.tar.xz 2344748 BLAKE2B 70ed052a7cd5561518577948419b0363
 DIST ModemManager-1.18.0.tar.xz 2493576 BLAKE2B 36034a589fb38447c83a232b6d24ca2fceed15ebc89a41af969bdcebeb482d4baf2657d063b1011c0df252b4ba7f703284cbf111b90d565d66157006331d6e69 SHA512 6e99e5529a74e6fdf814b4fcb9c9f5cd6a0398cd75303feee62c3564f9d62f54bb5a435a9847ed085fe2031af5a8d821d43f9cabed7d3be019ae0f5c8b0e11d2
 EBUILD modemmanager-1.16.6.ebuild 3567 BLAKE2B 65802d8c7595ae478afea4d0232ca4da9b3a34f6a98bd4dc7443b76899c576b0c31c6c14d0c70378241fda1a5bbc7e5816c5cff12eabce6e4b8ef7a2b5d99bba SHA512 75c7aa58d2cb1097cab704b5a301b3a2a752f9ad043d853e7292d0f8963fc4f1cc0b8775b9df7a880136f5beb980679ed58349b041551787afd627f14b8bee34
 EBUILD modemmanager-1.16.8.ebuild 3574 BLAKE2B a5b0d70185d35e3008abbf4616ff7f8f344527b792a826388e5ed0ea3c85bc6adc23be3fbf3f3fd86dce64f8a1e60d38092da5d619ebb1600eb326ce8935d5e4 SHA512 06d2668d1b3a5215b80cc8a5839c4078662526f1c1fa8fb4a73a932c6e3ffe4c517c9b4ab426927201f6215b17c114d49e931f989d69b4ec3f863efda69f2b1c
-EBUILD modemmanager-1.18.0.ebuild 3623 BLAKE2B a9acfa1cf90c4bd780798cead31c0dba94d3170de9d23d6926a55208b136ed79e3526390e542e26fec17d31d99c39490a789040c9934914fa108f2502c5ce5c7 SHA512 8be0d517239a858bda43af8d6e7d96c27133cd1698587301dee36a537dee972e690bf2f9210f8f75b3189bc857383606c3e1a40d75d3b2a787ec7bbc53879023
+EBUILD modemmanager-1.18.0.ebuild 3619 BLAKE2B d4209522fe447e7fe37d3fe191a8fc4d67d8455941b085bb988d5ad52da904663b8b80310a43cd032e68b2b6233b94dfad8a75c14ba13bd94d72e9d4410c1517 SHA512 df28ce31928da7728faa522f50500455d26d9309c7e1c9770d241107920318e135256554ed46d388f0116af142531d59116669c5704c3e9299508a6b1f87de6a
 MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee
diff --git a/net-misc/modemmanager/modemmanager-1.18.0.ebuild b/net-misc/modemmanager/modemmanager-1.18.0.ebuild
index e3784f614694..5797f597414a 100644
--- a/net-misc/modemmanager/modemmanager-1.18.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 9923f64753c9..b3909d6b8444 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,5 +1,6 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
+AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.3.2-r1.ebuild 1439 BLAKE2B 9e6211c88c24d6de22370c92512259c1b94fd45cf369f79723a29c1c4627c7ba165188e3be5bad334094e0b2a8c58c50535065862bd2e0dacc3a60c8d3e9e0cd SHA512 0bdc871a9f79f1c0ac55382249473d723cef3598ca93bb4710cab7e47794e666100ed30b3e11d4252fe6b5dcc06a8de99472405364dc6f7941284de495a3240e
+EBUILD mosh-1.3.2-r2.ebuild 1483 BLAKE2B 810b03aaf006c531dddd4cca178251a81730b08729b8b27113b64818b59d773bb2e3094a789d5e2754511cee337481f4575a552a329354e29be61ed736613e47 SHA512 070d5841d827c3efbf2312ded70e0343eb316acbf05dd41544e8d6da6e628eb51bace622721ec8dc9c779528a559719a2a26b3662bdd7b838d4d571aa693707c
 EBUILD mosh-1.3.2.ebuild 1432 BLAKE2B 762f107430bdfdff1b200fce097fb298f7fe5ecd1799cb5e4f890552ffaa1a91e84c2fbdc0de18b3472c2aaa8ed8c4b9d6d732279d9e341f6ef4f1f63faaf664 SHA512 93ab6bfd1a7dac29ee7da5a3a8021b18f34acda6d1c8f3df624ee6da05ecdc0757406dfa68644d1cdd588b490b2df7ad73a8691e5c48303fe429878bb6edecdc
 MISC metadata.xml 1047 BLAKE2B 86b2beea09ccbdca70646b00a5af74f253ecd18fed70f364287b122520f4e15f507416c3ef9b40fe28b267e3dad9e8e16f0139dd0966c55d1597a5cae1c411b5 SHA512 3940264e614abb7b646d24e6786503793b3a651af7f802f5ef5bf1d395e89f38542eae2df5b2d737bf2474963215529771c1ba2eabc785a5649ecaa1da4713db
diff --git a/net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch b/net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch
new file mode 100644
index 000000000000..0203cfff6b23
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch
@@ -0,0 +1,11 @@
+--- a/src/network/network.cc
++++ b/src/network/network.cc
+@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high )
+       }
+     }
+ 
+-    if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
++    if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
+       set_MTU( local_addr.sa.sa_family );
+       return true;
+     } else if ( i == search_high ) { /* last port to search */
diff --git a/net-misc/mosh/mosh-1.3.2-r1.ebuild b/net-misc/mosh/mosh-1.3.2-r2.ebuild
index 469c7b1f214b..710a8c1fe272 100644
--- a/net-misc/mosh/mosh-1.3.2-r1.ebuild
+++ b/net-misc/mosh/mosh-1.3.2-r2.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 # [0] - avoid sandbox-violation calling git describe in Makefile.
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+	"${FILESDIR}"/${P}-bind-misinterpret.patch
 )
 
 src_prepare() {
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 1e2cb8bc6910..32c5fb6f2281 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,6 +1,8 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
 DIST mrouted-4.3.tar.gz 327278 BLAKE2B 3f9182f90170868c0c770cb07ac8d6cfb5a8dce305a9b5e3bb9881e238cbdb246389225fb1524a0765a4c2725402546e07945a406edd78c5c6dd3272a16f263d SHA512 c471e95f5ce6ff017d269ab3005741ecbf1c41931da07f584bf9e28799c3cbbeeb57d8c517dd2fa342b63a460fb4df8f7f7db53312480059509a9d64b5e765b6
+DIST mrouted-4.4.tar.gz 316949 BLAKE2B c768f78588ef5a321b33a6444627db0eae36dfd1798f58672392729e0ce45392fbcaad074e55eccef43dcda5d29cfee24f30aa85eded130ad8d1a6a006e62411 SHA512 cadd4cb15674c04bd976daad36ac38ec93eb9d6d0e2888cb7b4b73d2802f58beb11c122de34c1c5214a58f74dc832f35bff0820265370f4636036813ff283c09
 EBUILD mrouted-4.2.ebuild 739 BLAKE2B 0600285e2c195f010ce90cff56552869a018ee311c238aacd22f4e13ae50dd80c794fa1925922aca99e087b4163b1328115ad85bbd4b4e9b33b54031a1f2453a SHA512 ce61708bdaadeec297a442fd5d9059af362786b47f6e7539f2ced24a86200633f5d206da7e031ffa1e3263bfcc7471d4efe2d971c7b7ed7d1d1f46a7be1b72ca
 EBUILD mrouted-4.3.ebuild 716 BLAKE2B d7c391767251635f300684bf18165314999f7dbf844ca2f5e64af13e6725c17eb28e2466816c9d95d204c126611e94805fb4fd7da011fedcfa1b03c55feac0cc SHA512 04549e79911d8bef24297a87aae547128c780c4a713b47b6e9c503f785e929b490e97c133f336c95d16b21a06a7f54ca6a337fb40f0842f0da4ad4e5a7d76fc6
+EBUILD mrouted-4.4.ebuild 794 BLAKE2B f9f5f03b28afa0905153f61a52ef995afe5ac45ad009cb8eb0170f091ba802972eeddc4235d6b3a9e5926f696592c3cb7a9396bb61275cb745dc17360912177d SHA512 8044de2bd2c044b4b2e9c0cf662038f0e32bd932f9d13c0ef5ea73d81e51b7fb76fc354ccec2af2395fa99bbaa2b87a3783cc4507d3d4c6a4a91ffe3f5d3b340
 MISC metadata.xml 351 BLAKE2B 2cc58048ba632fa6ae2147b949a5ac8441b4e10c5cab17527369a1100a5d95cca3746d82c43a7d99b564f07ed68cd95114aa5a13bfd73b07befd1203a423cb3b SHA512 1ccf9c0699efed649eff70b1b2eaf588b9bad3838c1530609e8bb912ace18bd21f35571f7d731727e886cbd7027aae5b234cf3e4959da5d81991724679a815d0
diff --git a/net-misc/mrouted/mrouted-4.4.ebuild b/net-misc/mrouted/mrouted-4.4.ebuild
new file mode 100644
index 000000000000..97fd56dd2d0c
--- /dev/null
+++ b/net-misc/mrouted/mrouted-4.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs systemd
+
+DESCRIPTION="IP multicast routing daemon"
+HOMEPAGE="https://troglobit.com/projects/mrouted/"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Stanford GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="rsrr test"
+
+# Needs unshare
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="virtual/pkgconfig
+	virtual/yacc"
+
+src_configure() {
+	tc-export CC CXX
+
+	econf \
+		$(usev rsrr --enable-rsrr) \
+		$(use_enable test)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mrouted.conf
+
+	newinitd "${FILESDIR}"/mrouted.rc mrouted
+	systemd_dounit mrouted.service
+}
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index 904503c0afb8..fcb6c60c7118 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,5 @@
-DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
 DIST netopeer2-2.0.30.tar.gz 382529 BLAKE2B e17bc4eceb07b91347aac4e5167d7a92bfd7bfde77a79f27b6531f4ad0c77fc42e9281ed156b017969171dbb9f25e2570e9b2db1a85af9da896d5f39bd902555 SHA512 f0ec1b1e469b5a39ec4ae9533bc0cea6391068502defba3e3f25b154a573d37c030283b4483e27a11e8e372f580110af7df7279c6e1be3a2fec249a6b79c3d95
-EBUILD netopeer2-2.0.0.ebuild 923 BLAKE2B ec65dfc84bbeb329af7a3da12a4520ce41addb79f2a04deadb19ddd54f46262d25b7715223731cb6739f1fa701e39c13c5d75d178f4f91a811d9694cbd9ca50f SHA512 b85af038622f580bb0fc3005cecf0ee3200b525b2e2440b5a9a3f4b11ca5bcc3a43524b1725759ff12e2a2644143fa3286e073ad25b6320f2cb3fb1524feb509
-EBUILD netopeer2-2.0.30.ebuild 979 BLAKE2B eb8d463864df3254cf2c6359bd237fc912bbe03236007dbc93ffab13b96e200abe47bd2393608a7e9cd4d0d8116c89869c62859c2aa1cd8ad51fe173b7c69bfc SHA512 951660817153d8e0928e188ab2c933a67a53ba225a4fcdf4465a8d5665d5bd2653b28b210a500797186bcec59f42acfa089274b826b0fe3416f777179a33b2ec
+DIST netopeer2-2.0.35.tar.gz 381321 BLAKE2B c776561b59bf05d093496e242fdb37766bf6292175186f92b85b86162d5fd6bba7118c41cef0ccfc835b09f34da1978f4e3aefb9961893b3d15b57117c3dbdb6 SHA512 f6b956c4b9d0f799f622eba62c2b20beb5f7db4899c6284bbb53303ff15f8787644687eeb99f1c68b455784166f2e858959ee16a345c0aabc444952bde70427d
+EBUILD netopeer2-2.0.30.ebuild 977 BLAKE2B 6315256db0e18386ed77668700ef2660439ad4d6112ef022799f98b6a5530645421e6156fc47a0db6d78bfe69623494ad058cfbddcff1c91473749550c3db045 SHA512 c821d498f878d4c590831c192d7a1ed14d9523128b5a7da488a918bf0539f6291056efd68ad05a1d1c42c27640387afe8fa7a32c7a4fbf389d002803b62e3d46
+EBUILD netopeer2-2.0.35.ebuild 980 BLAKE2B ac544c4217587fd87d8702b528a629841ccc02fe19ccb64720f2175a6c17172e5cef9e042866a825ddfb085c62a2ded85ae959fe80c7b4b1474c66d3930537dc SHA512 84c0edd43fa9fb09d7323ef750845012f9509294eb35a2dd8c08ab56e37cfec7e4064879d348b37f4dea6ecc8e03415f2043f28aa716e59436d1f583d8591021
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.0.30.ebuild b/net-misc/netopeer2/netopeer2-2.0.30.ebuild
index 07d22987d05d..e47eeecc25b5 100644
--- a/net-misc/netopeer2/netopeer2-2.0.30.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/net-misc/netopeer2/netopeer2-2.0.0.ebuild b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
index 807ead2dd447..04f0cbece36f 100644
--- a/net-misc/netopeer2/netopeer2-2.0.0.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,15 +11,15 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-libs/openssl:=
 	net-misc/curl:=
-	>=net-misc/sysrepo-2.0.0:=
-	>=net-libs/libnetconf2-2.0.0:=
+	>=net-misc/sysrepo-2.0.53:=
+	>=net-libs/libnetconf2-2.0.24:=
 	net-libs/libssh:=
-	>=net-libs/libyang-2.0.0:="
+	>=net-libs/libyang-2.0.112:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -28,6 +28,8 @@ src_configure() {
 		-DGENERATE_HOSTKEY=OFF
 		-DINSTALL_MODULES=OFF
 		-DMERGE_LISTEN_CONFIG=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_VALGRIND_TESTS=OFF
 	)
 
 	cmake_src_configure
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index de28410b4393..515a9794b89b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,7 +6,7 @@ DIST NetworkManager-1.32.10.tar.xz 5353296 BLAKE2B af176abd4dd8f725741cc8fde1024
 DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
 DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
-EBUILD networkmanager-1.32.10-r1.ebuild 11700 BLAKE2B b4c9637d6b137a997dbc04f67b83d1e8fa9558a50b59792aa3ec855f546c8ba908fd6e92addad7801b8be1d45c42654faf99bd0061d2a15940ee2bb2d4586cfd SHA512 029d913e260792f39e674a33ffe7cb36765e5fc95f9229f0139bf846cb1c9a1de1ecb9c1838adc36bf4006907c8425104dd578e4517bbe971d78af14db3bff63
+EBUILD networkmanager-1.32.10-r1.ebuild 11696 BLAKE2B 8cf1b21ce091f0d60b303b176ab801dfb292c3ff5da76e0988e7440c718d2a02786bd8b82828f8b9f70c21b4bfd4acecb87f9c32b56a6ba251f60512a855087f SHA512 4ba056421e940bf557f037a4357a31af2d3d577d1ba013350009ec1849146c6d0cb412180a60bc2ac7c9f712e0fd6c093f7e2cda45ce08823e0acc2bab0e0177
 EBUILD networkmanager-1.32.12-r1.ebuild 12243 BLAKE2B 13773159c5df4f8c1bd2b91fd261b42ce1bef6aa3e54ce7568727b6fdc83e612925908540ebf10765f379a2b708b892ea1e843db49f02eb83fbed0ae091b158f SHA512 8ab56159d2b8d9b4914abfc0784a4d2139ff7850593c260fa1c841a2446c94ebab453f111b7edbb692b1d9609ea67a4b707c1c091018af8d60a75e665e5497d2
 EBUILD networkmanager-1.32.12.ebuild 11973 BLAKE2B cb84cd0969914f4373c8162a8d51580fd3555b4ab8028de641ee6f8749a4ad5cc39ad1af3385663654ac67e1f26de7bc1c837f9e94b7549a777014bd8b75bded SHA512 60de1b88e8b0e464e0bbbdb858640af6e73dd77d8a698f649b4e5151e39f54617f2827cd617375a7fff34e5d0ac0612df3688d75a8cbf9b6c0cb18939d46b2f8
 EBUILD networkmanager-1.32.4-r1.ebuild 11371 BLAKE2B 5ad40b864ffd1ded48fd148267362ffaca2b1139332a1fd7e632909ef617b9549b4cf913be4dd43bdd8c862b6eb77a284aa75863c10bba4e0859bd3ee9dc8808 SHA512 e44332cfac5c3e9cd2931e5f5a40c3b219c0f55684c0bced16432ba40ebacf2dffe368a741f521014cbac4a16eb04d88c985fdbfd6c1f4c9da8f31ddfe919a9e
diff --git a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
index 11f47fe9f7e1..bb8fdd3a3208 100644
--- a/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.32.10-r1.ebuild
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index e707ba2ce24f..29d0369ce0c5 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -5,8 +5,10 @@ DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d42
 DIST nextcloud-client-3.2.3.tar.gz 15381488 BLAKE2B 14ee239321d7c530dada9d4727fa7cc9801637827fc8dd065ea9b68c54f3559cdb56b0d0e0e37fc7aa5c668be51e3839bc33b20ea9ab73e4a1df4ba260b0ab9e SHA512 bbb247ce4945503a5b1af55ee200edaef000bb21220a9408657e057c98bd3f7bd646dedbedc57048e9f593f3a1d408ac37b4b01c390ecf85dca82868792e922d
 DIST nextcloud-client-3.3.4.tar.gz 14032214 BLAKE2B 2d5a4cb8ed2aff6166e13c5e7ea5450d9b9ba1f385eb3cb99588584d1ccaf114ecdd4ed2fa0bdfcba6e5582df8e4bcdee371ef0de8c023fde131f23828d30fbf SHA512 c4fe2d032161fea556610396c5b51d6745f41de76d17e21fdd93ed0163f2079d1abba997a3184842403041cc25a303c5844fbd2213717b27d11ff9612f364151
 DIST nextcloud-client-3.3.5.tar.gz 14060100 BLAKE2B c5e712dbd8055590963f7be3286a33492c512b440ca7636cf69ea246212b4882c5bb1e66290e35b3cf6efc96a91eea6542495036160923251a475931de57ceee SHA512 42502f12366b99e457b0f22ed28b587105eaef0d16404062e04544629f4074747925f168ecce4c035d75bf28ac2bae03464e5c127a826571b82648ec8f0834b2
+DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
 EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3
 EBUILD nextcloud-client-3.2.3-r1.ebuild 2175 BLAKE2B 9f3c68d6afd38a786b1808860b77b2f05c53361b7dbfae0a52bb0f46114c56f2f6c510b3d339179549af132b34478ae84e361313e47362ca53677dc0025b62ff SHA512 93364128839e839fb76752cb753301652dec39a6ff936dac43e90ca636180703889b1e48c79a0f9e814a9c094534e96d474583d2aee3222eabd3b3b4410a8797
 EBUILD nextcloud-client-3.3.4.ebuild 2166 BLAKE2B 81877061305f13dd5fb75bb56c39aaedc49b63624b35a536fd1ce711468c2608da0c1d4e64d26af729ccac65b44f8f2bd087bdd1b61403f938986940242c1c93 SHA512 9cc5ee0c40d68b797aa83cedd7c2347bf446d187eb3435d91ece998e22684b7dd25467d83656e3cc8e1d7a6f0c3661c30b5cde105b53bdba7574e4dc8decd937
 EBUILD nextcloud-client-3.3.5.ebuild 2173 BLAKE2B 281b3c90c66e0251e8dfbab1f5806ccdb9744e7109f9d1f10939acc4c60b038ec8702ee8ddf092925f3e4c60491c6ba845ded9e42cc16beb51448f76f971868e SHA512 9eadc5f0cfa15fc264e348955b378d7bbb39352ae3b40602dc2f177d09a96448dbe84ca236516f44866a6bf470b43077ea422e052c3204f69436cc784edee99f
+EBUILD nextcloud-client-3.3.6.ebuild 2173 BLAKE2B 281b3c90c66e0251e8dfbab1f5806ccdb9744e7109f9d1f10939acc4c60b038ec8702ee8ddf092925f3e4c60491c6ba845ded9e42cc16beb51448f76f971868e SHA512 9eadc5f0cfa15fc264e348955b378d7bbb39352ae3b40602dc2f177d09a96448dbe84ca236516f44866a6bf470b43077ea422e052c3204f69436cc784edee99f
 MISC metadata.xml 605 BLAKE2B c24c20e11e5ddf2ce188c7c80aecacc9af7145aa325b150e9d9b753b11525683938409aa911d65d4e62a2f6177df369005aaba7c10768beba4bb66955126b547 SHA512 5fc64dfed80ed91c89402e22910dc72e8d3649be1bcd27b0a48ecd6a86f129b06d9d37fa7d4f7d54c083b3b04935a28ae982871e7c1cf28a88cbd9dbf9aebc17
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
new file mode 100644
index 000000000000..35dda8ac61e3
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	gnome-base/librsvg
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch )
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 44a089417fbb..89bc1b321840 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,10 +1,9 @@
-AUX oidc-agent-4.0.2_install-perms.patch 1931 BLAKE2B 9061a41dc805f98c4813f967f2e0280ed519c143551c9232bd1a3786f6e4569407744d3821845b5245751fb6bd91462d45fa6f12dcae92fcac1abd6fb5bf2f51 SHA512 f924f3e3bbcb0e427036fb2c13e9272641b340d829d19389c072faef5da6381f1470858033c78bc356bbba75b622bc0283cc4e1fba3255f80788b2d09fab5106
 AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb
-AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a9b6210d2180bb851c11a31ce90c8c1af5f05b0d86cd7cdce572c564c4117ec23f286c72a4d701b52ec815f6f30e68c58353fe5394bd210e6 SHA512 22c561c057be1de9ba1747a0234225954ec953f2bdecb0cc05149891e6fc43fede14808dbf59e9e27e5e5e8041d22b16ba4d46e366bd5b96a2b567b2d26a0f8d
 AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d
 AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cfbf66f99f8a3fb71966c78c2af2922219efe6684c2fc572fafd8c5d9e93c70cc05aabeed3a53d97a592f3e22d9a0aa6931ce436946fc194c7 SHA512 e96d88784bc55095308fc40da8c969da1068ec6c2ca62ed34fa455785c28f1e4373c49a8023f2ca77fa64cacdb27481972eae014e66315b30c9de2a76651749f
-DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
+AUX oidc-agent-4.2.2_makefile-toolchain-vars.patch 1194 BLAKE2B dd0e28e3dbbd2aced6742afbfa1c7bfaa79111a0be4cfaf822184761173a6c6d209c1f6f9fdd4bb3fcf41a94df09b24dbee1bf0e949443ab0e7938d3002cf0ec SHA512 b7555d04afa850aa1579def5825f7e22a024358d8ce5850632f379d2e94a13a2de1c2eb79619c3d6e80b57292d95037103ead3e54c8825b6a349734c5e4e37c2
 DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
-EBUILD oidc-agent-4.0.2-r1.ebuild 2134 BLAKE2B 3a654a6b6e3c8bafa04001580abef231ed3b71f4e15b7a918f771f8f93442e99b0f0a77fb6332da74b63def9db04d9c4d0ea8df91b56c1f22aa6499639710189 SHA512 b65d825c1d5fe74a7693d62a8d51c725f11b75f1c873ae9deac3d43802eb234c009ab985ea561a3bfeff01b4bcd4186a445a52895232e5823f721d65e739cdb3
-EBUILD oidc-agent-4.1.1-r1.ebuild 2137 BLAKE2B 749784644c7ab3a5665dcc2265bd98f5bfdbe32909b4ad66745cfaab154832697e29bea3538d4878130bb36865af100569f81288f42be41a1354e08b80ce118a SHA512 3298f8ab25b46039650d9ecc71ee3a5b0d8e0f17a41c6e156b9e484e8c03539754cd60c21c419c867f1116251169217e06f1d5d167ab817dc6951d2cda5ac007
+DIST oidc-agent-4.2.2.tar.gz 823169 BLAKE2B 5ce071c1ac6e65ab7de869e9963884e60142dc1c93e8eb3eb00c144527754199867238eb45ca2cba814dedf7e55b2aedf66f45e613697ebc3262598fca0312e5 SHA512 852eb5c6c071aafa58366e5e867f95908cac2fa0c3b6924e021cc81825b0bba0549e74742eff0ef5a9bbb16173e21c94ba7b618150a42b585968b4cd4663409e
+EBUILD oidc-agent-4.1.1-r1.ebuild 2052 BLAKE2B 1b40576b3e8869a7a6904192ab397786a3dfb3be1c14910fb8efacc0f7931dea599378602f4f776947d81c38cb188c792c74db741685d292eb4533dafd7907aa SHA512 e498dd833ef994e96f4f9fe41d42edb5334f3dae38d85a3929c5d2b6ef7d28bca15253be4029922a45849e51771b92f411f81f3fb2850e3f86bbed50be694d13
+EBUILD oidc-agent-4.2.2.ebuild 2073 BLAKE2B c6d1c5992bdb7aa47af2b5c7795f83a9976d5e335e7cad3a93d765bafa034660d23021f3f4c0071aba2dbbde22ebdb6a0ab07a5342bdfcbb6515ec887266062e SHA512 7b21b359b66da7d9badcc551b7a12bf507825d46f85a4e3a11343f510456192a3ccc4a69c48b0fcd9f0fe1eb75b98f0a43058ce5448608ced006f761ebb8d2a9
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
deleted file mode 100644
index 6184f42d9335..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_install-perms.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -411,19 +411,19 @@
- 
- ## Man pages
- $(MAN_PATH)/man1/$(AGENT).1: $(MANDIR)/$(AGENT).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(AGENTSERVER_MAN_PATH)/man1/$(AGENTSERVER).1: $(MANDIR)/$(AGENTSERVER).1 $(AGENTSERVER_MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(GEN).1: $(MANDIR)/$(GEN).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(ADD).1: $(MANDIR)/$(ADD).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(CLIENT).1: $(MANDIR)/$(CLIENT).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(MAN_PATH)/man1/$(KEYCHAIN).1: $(MANDIR)/$(KEYCHAIN).1 $(MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- $(PROMPT_MAN_PATH)/man1/$(PROMPT).1: $(MANDIR)/$(PROMPT).1 $(PROMPT_MAN_PATH)/man1
--	@install $< $@
-+	@install -m 644 $< $@
- 
- 
- ## Lib
-@@ -437,24 +437,24 @@
- 	@ln -sf $(SHARED_LIB_NAME_SO) $@
- 
- $(INCLUDE_PATH)/oidc-agent/api.h: $(SRCDIR)/$(CLIENT)/api.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/ipc_values.h: $(SRCDIR)/defines/ipc_values.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
--	@install $< $@
-+	@install -m 644 $< $@
- 
- $(INCLUDE_PATH)/oidc-agent/export_symbols.h: $(SRCDIR)/$(CLIENT)/export_symbols.h $(INCLUDE_PATH)/oidc-agent
--	@install $< $@
-+	@install -m 644 $< $@
- 
- 
- ## scheme handler
- $(DESKTOP_APPLICATION_PATH)/oidc-gen.desktop: $(CONFDIR)/scheme_handler/oidc-gen.desktop
--	@install -D $< $@
-+	@install -m 644 -D $< $@
- 	@echo "Exec=x-terminal-emulator -e bash -c \"$(BIN_AFTER_INST_PATH)/bin/$(GEN) --codeExchange=%u; exec bash\"" >> $@
- 
- ## Xsession
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
index 533af1f2a6d4..2df3afce8e68 100644
--- a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-toolchain-vars.patch
+++ b/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -74,9 +74,9 @@
+@@ -92,9 +92,9 @@
  endif
  
  # Compiler options
@@ -12,32 +12,32 @@
  ifndef MAC_OS
  ifndef NODPKG
  	CFLAGS   +=$(shell dpkg-buildflags --get CPPFLAGS)
-@@ -87,11 +87,11 @@
+@@ -106,11 +106,11 @@
  TEST_CFLAGS = $(CFLAGS) -I.
  
  # Linker options
 -LINKER   = gcc
 +LINKER   := $(CC)
  ifdef MAC_OS
- LFLAGS   = -lsodium -largp
+ LFLAGS   = $(LSODIUM) $(LARGP)
  else
--LFLAGS   = -lsodium -lseccomp -fno-common
-+LFLAGS   := $(LDFLAGS) -lsodium -lseccomp -fno-common
+-LFLAGS   = $(LSODIUM) $(LSECCOMP) -fno-common
++LFLAGS   := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common
  ifndef NODPKG
  LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS)
  endif
-@@ -112,12 +112,12 @@
+@@ -130,12 +130,12 @@
  ifdef MAC_OS
- CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION) -lsodium
+ CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM)
  else
--CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
-+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lsodium -lseccomp
+-CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP)
++CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP)
  ifndef NODPKG
  	CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
  endif
  endif
--LIB_LFLAGS = -lc -lsodium
-+LIB_LFLAGS := $(LDFLAGS) -lc -lsodium
+-LIB_LFLAGS = -lc $(LSODIUM)
++LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM)
  ifndef MAC_OS
  ifndef NODPKG
- 	LIB_FLAGS += $(shell dpkg-buildflags --get LDFLAGS)
+ 	LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
diff --git a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
index efb002fd48f8..a4b1287eadfa 100644
--- a/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.1.1-r1.ebuild
@@ -34,11 +34,6 @@ src_prepare() {
 	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
 }
 
-#src_compile() {
-	# As of 4.0.2 parallel building still doesn't work
-#	emake -j1
-#}
-
 src_install() {
 	emake \
 		PREFIX="${ED}" \
diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
index 9e463b228212..53f713528866 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg-utils
 
@@ -11,11 +11,12 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
 	dev-libs/libsodium:=
+	media-gfx/qrencode
 	net-libs/libmicrohttpd:=
 	sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
@@ -24,9 +25,9 @@ BDEPEND="test? ( dev-libs/check )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.2_install-perms.patch
 	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
-	"${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch
+	"${FILESDIR}"/${PN}-4.1.0_install-perms.patch
+	"${FILESDIR}"/${PN}-4.2.2_makefile-toolchain-vars.patch
 )
 
 src_prepare() {
@@ -34,11 +35,6 @@ src_prepare() {
 	sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
 }
 
-src_compile() {
-	# As of 4.0.2 parallel building still doesn't work
-	emake -j1
-}
-
 src_install() {
 	emake \
 		PREFIX="${ED}" \
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 2a9a4716506b..54a3600832a4 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -6,5 +6,5 @@ DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9
 DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e
 EBUILD olsrd-0.9.6.1.ebuild 2243 BLAKE2B c8c1227e9cb3c445c59c37bc88f567fe0d6f931fa02c3972c9eb0288eec57eb797877d411706c01ac7782ceee55f7b8143186af0d1fff028712e668b18b39e05 SHA512 f28e2701e44d7e6b6e9a5ab1044d337a1c9a456d6c35e85986e7fec9a2df9143d2a18b27c7f3a275d42cbcb78ad6a0894c212f42415bf3b041009e2f0792ec48
 EBUILD olsrd-0.9.8.ebuild 2411 BLAKE2B 0cda86cfb22e55060a58fc5e73e73997c4db95525eb12bcc12df80587f8c5d61b74bd32c51f2869a8aaa28f9b60e96441775bf40c5b2e13343df92bd74b9af59 SHA512 3d4cfb163509c3d2c71f51c5cf6bb2a9d11af4663856e6e5193233708747c35928d82aa03b89cfdaf299b7cc1b3858994b555bf6f1a85002bc119ac2583fb04e
-EBUILD olsrd-0.9.8_p20210612.ebuild 2608 BLAKE2B c17459c56b43e2707e67bc371b294fa42d3f9ed108fb96917f43f8ac4105b94c3ea732ad51de29877a23af06b847002072ee8d20873de0a50ebf99b596bc0882 SHA512 f28fdaf972b2a94a48d7dbc3e6f8b46f90f7d18641e49ce96880889c36bf1c4c6164931d101201332e51402e6fe39ca13f39ea24ef18bdf273102b49b57b2b92
+EBUILD olsrd-0.9.8_p20210612.ebuild 2606 BLAKE2B fb88c2cbfa48ab7ab660d7969f49a09777018a64a839408ecf70dd99e1c088b15da84229a02a3099271c43c9ed58f7e5c388189dfe8688769ce979df8cd951b4 SHA512 ec118f0bcefebc636a6983e2fe4f6b7eb1d1d2934a7981476b1808e0f9b1bb736f283e940cdd01fcba6f11e41838e026368645768c54a984efd4ed3f8d412d0a
 MISC metadata.xml 244 BLAKE2B c96f92863f59c5672e9fd06a833d19ac4884039c1a6b4550b167f4e228b663963c2f98534e9865cd039561345d1097edb52b4c5614417b46accc48c2acbab668 SHA512 c044670830d2077e8075125980c7502a96fc956fcdb24ac01d390afebe4780cf6b7f79b4a8749e57ae436fc5e8f7af976c02765ab5f6575de01a5f0881008c4c
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
index f106d0346a35..3feebde88006 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20210612.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk pud"
 
 DEPEND="
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index 3c856bee0967..4b1c0f3b007b 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,7 +1,4 @@
-AUX proxychains-4.12-makefile.patch 1269 BLAKE2B e52a59dd39e19c063cf37455aef06551bfb93f12b12c39c432237d80552c2833bc40a7aa033548770f3ae921c0a929ddefe8a495b84448bffad13548f307417a SHA512 c25bae5b6d72c496cc4d92b0f8db22a113bd5e138cfccd0c5cebe45788f2dc88a4e2b194a86e635619e5ba575747bbf460b246efb35993544dab06b12009ea04
 AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703bf257a9d7c5a4bf91cbf4574f117dd7d6dc800a1def5d772d6ab74194db92d053e759d2ae2955d5d1d11fb4598b0f0d6e SHA512 79dde568a605a085208a2cefa23780448a71b44a273ebe8f19f2ba478b33eeb29b38a478a5c2aa88dcf2352f52aefded8ac8985ccf52839e8b332bf885381203
-DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a
 DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95
-EBUILD proxychains-4.12-r1.ebuild 1041 BLAKE2B bf9952a9010b02fee0c3175a3063b9b872811f663d2fa8af948aecfed71aee71f4910f49e719a73548276a31a87702b4d54bc4b3d203998b818444d304fb6070 SHA512 4952e915dc831c24e7cff9075c23409464c2023debea45c452cd711abde6575736184acc30dab88a538fa7f6ada91cf80d051ed6ecb8ae5473dc7816b0a9f71f
 EBUILD proxychains-4.14.ebuild 1026 BLAKE2B 5261e86fcc27ee36446426fbf70da311b20fac51930fe56614caddad3d8976a1070f989d5f9d2fe2b770737c79217c62ef4b192a92cea813552c8f33c00b7091 SHA512 f928f796cfdfcf25b06836b8b4df83bdf706ec52a6d233c4227412dfd441a8cb8ee67ecc040d114625ce0f919610055d29337a7b076146f049096fa914b98ba3
 MISC metadata.xml 623 BLAKE2B f9683b5ae1fd82fb1e9fed4353a6da4e353fe84ae430180f743e493307b7b45596f8730531626b0500f5c34b1b2f2cf51e1f378f957b004cafefad3ee14a2d14 SHA512 4d9ed631a7afd1592857a27cae9ba0127651cf670b020a5294cd9238d5285b92f7718c4ac834998840f52381d9a58745f941da523b4b4968839d9f332dd81c35
diff --git a/net-misc/proxychains/files/proxychains-4.12-makefile.patch b/net-misc/proxychains/files/proxychains-4.12-makefile.patch
deleted file mode 100644
index 98fdaacba6c0..000000000000
--- a/net-misc/proxychains/files/proxychains-4.12-makefile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- proxychains-ng-4.12/Makefile
-+++ proxychains-ng-4.12/Makefile
-@@ -22,10 +22,8 @@
- 
- GENH = src/version.h
- 
--CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
--NO_AS_NEEDED = -Wl,--no-as-needed
--LIBDL   = -ldl
--LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
-+CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
-+LIBS    = -ldl -lpthread
- INC     = 
- PIC     = -fPIC
- AR      = $(CROSS_COMPILE)ar
-@@ -35,11 +33,11 @@
- LD_SET_SONAME = -Wl,-soname=
- INSTALL = ./tools/install.sh
- 
--LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
-+LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
- 
- SHARED_LIBS = $(LDSO_PATHNAME)
- ALL_LIBS = $(SHARED_LIBS)
--PXCHAINS = proxychains4
-+PXCHAINS = proxychains
- ALL_TOOLS = $(PXCHAINS)
- ALL_CONFIGS = src/proxychains.conf
- 
-@@ -81,11 +79,10 @@
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
- 
- $(LDSO_PATHNAME): $(LOBJS)
--	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
--		-shared -o $@ $(LOBJS)
-+	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -shared $(PIC) -o $@ $(LOBJS) $(LIBS)
- 
- $(ALL_TOOLS): $(OBJS)
--	$(CC) src/main.o src/common.o $(USER_LDFLAGS) -o $(PXCHAINS)
-+	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
- 
- 
- .PHONY: all clean install install-config install-libs install-tools
diff --git a/net-misc/proxychains/proxychains-4.12-r1.ebuild b/net-misc/proxychains/proxychains-4.12-r1.ebuild
deleted file mode 100644
index 65dd3aabd8c7..000000000000
--- a/net-misc/proxychains/proxychains-4.12-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_PN=${PN}-ng
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
-HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
-SRC_URI="https://github.com/rofl0r/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
-	tc-export CC
-}
-
-src_configure() {
-	# not autotools
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		|| die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc AUTHORS README TODO
-
-	dolib.so lib${PN}.so.${PV}
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	insinto /etc
-	doins src/${PN}.conf
-}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 26cf5b69db5a..a43b302d69a0 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,6 @@
 DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f
 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750
-EBUILD r8168-8.049.02-r1.ebuild 1061 BLAKE2B 6b0904a0908a4e557354426b44908ad4901dc5f600ca1217883bafafdd849563432c7d172e3156199972da300b4fd3bdf07fc61e144ac9a343d223be1952a98e SHA512 0e739eb173a87807f1c3e6620c72c14dab52f8427fd4a1eb29ac840b2e5744e9b7300c4933679aba6b52cae3502bddaf107620e86571eba8322561ae0b42aff6
+EBUILD r8168-8.049.02-r1.ebuild 1059 BLAKE2B 316c5dd6ec2a37d058acbd9d0e10ed1e9e08d8db789537b82c405ca099c5c0ac69b02c00e0b64e62525d757a6e99f7bbc09c0efa43b8b9987b40641babffea4a SHA512 a072ecfb47b5758e0a04f960d517c6cdc589bd001994803ca0eeb39e8e4f5955935100a5c20b462584c24bca72e50cbed8b7138e9588a898ae1d424e7237d1a8
 EBUILD r8168-8.049.02.ebuild 924 BLAKE2B f4ff3e0f5177124d6628f6c3205f62512e6c3343e0a8de91d87073c7af0f57fcab421e2834434da7a9d309e02a604e6a006294016c78621e7864f276cb8e9a88 SHA512 b82a87e40ed975c981eacc6e03410dca1b824319cf0ae7aa75bad04d30c986af62fb14f164e587a7d585b50eba216225bb8f316c089b18ba6d46b8702b27a053
 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
diff --git a/net-misc/r8168/r8168-8.049.02-r1.ebuild b/net-misc/r8168/r8168-8.049.02-r1.ebuild
index 47810f27e05d..2f271eb31f74 100644
--- a/net-misc/r8168/r8168-8.049.02-r1.ebuild
+++ b/net-misc/r8168/r8168-8.049.02-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index bdf4c81037a3..d4eae6d30e3c 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,4 +1,4 @@
-AUX rsync-3.2.3-cross.patch 4091 BLAKE2B 1c42917ccd9edc4ae53da9bececbd1065e633f52e0dd97bee5d09300d86d0128670b641bc253c1f89ff037d4d64bf01b47014bb95b39a11d3713dbc7fd9fe803 SHA512 a70a742b1967c0d5f17837d045cf52598c546745f9a49d39f22af540f00fe1daa8a51982a4654c30ac9c59edd8e09c73e490704cc72b358d378f2cfb66e0a1d4
+AUX rsync-3.2.3-cross.patch 4964 BLAKE2B 0f782eb6bf88e848d9ada93ac66dd4ca13c85ee9007e4e0509bca79f054e28915bed0dd78afeb3c3642ab284dbb54b3431abadc809328d0dfb0e78565c570812 SHA512 0d1c119b89be482e2348e265516452b29adde4eec40596af3e55bb309ce12702bfe7887cb3d8c86f59cfa6a24f71e113a9dd75d74353590c98ece11365636e0e
 AUX rsync-3.2.3-glibc-lchmod.patch 1836 BLAKE2B 14b2e4246c6c2d4623500e346bea3ad430defbb81de65ecb29672b390024e34e5116c660a87013f8d489a32d1841d535d03fa442cdc9e962d530355f389ad008 SHA512 76864a9002ef3e8c42a840906915de2bb8cfb1dea2597cbe657ee418b5d00b6d409a88cd441658f7a1ce3cab148a9889193ddd75d19b6ef2069379c728434231
 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch
index 1f23627853b9..c61090b7c40b 100644
--- a/net-misc/rsync/files/rsync-3.2.3-cross.patch
+++ b/net-misc/rsync/files/rsync-3.2.3-cross.patch
@@ -105,3 +105,25 @@ index 3fd7e5d5..e469981b 100644
  	AC_LANG(C)
  	if test x"$CXX_OK" = x"yes"; then
  	    # AC_MSG_RESULT() is called below.
+From 7d830ff52ff7b01f528f39aa27b1ab36ea8c1356 Mon Sep 17 00:00:00 2001
+From: Andrew Aladjev <aladjev.andrew@gmail.com>
+Date: Sun, 7 Nov 2021 22:45:49 +0300
+Subject: [PATCH] improved cross compilation detection (#252)
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fbdd17d8..9e7338cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -264,7 +264,7 @@ if test x"$enable_simd" != x"no"; then
+     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
+     if test x"$host_cpu" = x"x86_64" || test x"$host_cpu" = x"amd64"; then
+ 	AC_LANG(C++)
+-	if test x"$host_cpu" = x"$build_cpu"; then
++	if test x"$host" = x"$build"; then
+ 	    AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],
+ 		[CXX_OK=yes],[CXX_OK=no])
+ 	else
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 9a3b299a2abc..0899ea7c5ffe 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-3.1.0.tar.xz 3177236 BLAKE2B 17d1fb32acbadd3af2447aab1c1e49c40c1a1b25204f31e366831e380e2a16f4b637f242afd5dfa41cc991e76570bdc0f8a804b1374290c44c417ed07f33f4ba SHA512 b12d054ccd4d8fdf3d975503c07b4c17321201651f68be03be6384e9c2ff127384737d0d5bdcb8d845c6edc21e20d7fd6a06cfe60af31ea6bc0373159771b5d1
 DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf
-EBUILD smb4k-3.1.0.ebuild 2033 BLAKE2B 78645a0f69655b4023cb6e8e2d7372c0521c55ba3a2f65ba11f3ae66d6b7a81311dd6bd3df775d21ec522a8d216968b063f8d9877dbb67027a69818625b8b1e4 SHA512 f00862ed637a232ccfdd78fd24d4af9e0a768d3269bf9fa7268b6375f7bb1e1bff54f2f9553f4e9893f4e39b3c431076ef84dda18a2fe50b40f04f417f3264e4
-EBUILD smb4k-3.1.1.ebuild 2035 BLAKE2B f9112ff51d71e7a2dca73bc2d8c6d0a4e707aac93e113309db70d7a6019967bb7bc44d7552b66e229cdeab0ac589590debbe8d0a1ebf0ad33690d4500b28b048 SHA512 2b19c87ed98e230638efca06ca8d6e0de8188b33dd02f43c505c3a53718947b536044e90b31b7be30bcf26e2ceed056e3cda8cda7ea7b6e35841c038c55368a7
+EBUILD smb4k-3.1.1.ebuild 2033 BLAKE2B 72f415d729ea78b2601777c93302673414b7ceb7afd4c25cbaa20ed5f28873f375d58141ef0c9b82a69431421a7db2676923153c3567be20d426551d464ae020 SHA512 d2a52c2937f53361e212f9b49f78b30f2d0cc3a4036f35022cc56797aff302f05c44ee945cfafbc3196afad562f8a981ba88412e501593685df0589719ab2631
 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b
diff --git a/net-misc/smb4k/smb4k-3.1.0.ebuild b/net-misc/smb4k/smb4k-3.1.0.ebuild
deleted file mode 100644
index 8b9bf80d294e..000000000000
--- a/net-misc/smb4k/smb4k-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://apps.kde.org/smb4k/
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="+discovery plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-	discovery? (
-		net-libs/kdsoap
-		net-libs/kdsoap-ws-discovery-client
-	)
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSMB4K_WITH_WS_DISCOVERY=$(usex discovery)
-		-DSMB4K_INSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.1.1.ebuild b/net-misc/smb4k/smb4k-3.1.1.ebuild
index 3e9d26215437..e57006cd7cf7 100644
--- a/net-misc/smb4k/smb4k-3.1.1.ebuild
+++ b/net-misc/smb4k/smb4k-3.1.1.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 2dd7241a8296..f5dd6d91e247 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,6 +1,6 @@
 AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597
-DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
 DIST sysrepo-2.0.47.tar.gz 667259 BLAKE2B 9869fb936322f317156842daa71f1c07176914df4bcec73d2e8976dc28429555a1754eb5e2c5b0626f040bdf664d121dae711bc698974b727f27ecd544e6535b SHA512 ef9f7c2698180a820566f46d5155b0bf7b31c2c5b7675e17180bb7f28a9ebb10f4fefd7fe983d89b4e40a28f2b905f4a6541644ca3805975339ea7827a364d92
-EBUILD sysrepo-2.0.1.ebuild 784 BLAKE2B 62ef44c179e4b30451b6c9b3eac3cb8d2ce3b218a5295d1c52d7116dad8c13e71bf6c28db7dad1b34ae6fd0fc593e954a40820c942ef42607ab1ae8cb582178c SHA512 6a53a695e039e954e842e4019e46f84bfabb1a42d55c3cb296361d9ba5c702f23b478601a3c0d952f9549b66df44bfe41ab050ffd1c8f8ccfa2a301afc8586cd
-EBUILD sysrepo-2.0.47.ebuild 773 BLAKE2B f89babb01f7a5c2a2fa2bba1cdf9ce8f127050224d728fd133440a89563354668bec668875fcd78b290303f13e362807784388021d2ab94df4e4f019b0d9c500 SHA512 71e130fccd72643ce9bbd9129c07170f825fa5464e1c49b76ded15ee58ab0042f732a86f2c018b6bd401ababaadab30c0a6609796fb1d0ad40062d5f2918f074
+DIST sysrepo-2.0.53.tar.gz 669484 BLAKE2B f612080b316d6cf86ea70d88834f75b647dc16b29ad824829338d2144784bd7f425d3811055b9b956ef4e6820d467ecbe9a33a3d54a51a4024999b79e62b8255 SHA512 47949514df988a7a8a3b2a506f69baf6ea31bb32d5e80b85af968c827382cadf96e1ab237519308564a59ae67514d6ca3f5e300855259b9baf6ab49252a2eb12
+EBUILD sysrepo-2.0.47.ebuild 771 BLAKE2B 1e89bee7836779185e0eaa88846361c4ecaf681ce156b36f2c6b0bc8876cd5b774af186a066a0bb703a1fe52bafe3277cc064d28398ca7c1402dd03c07b101b8 SHA512 2df75af3a3434801908162348d62a9b62a365adcc14cc0f1cea1f3e1d2c11423a3d3232b3254baa67279253a36d2aa86cfa8a9ba934ee88808f4bfdbb466e793
+EBUILD sysrepo-2.0.53.ebuild 774 BLAKE2B 47179035d7a336c7862d6986d8ffed7b446495d0b313edf5ef43ee9b8127da11304fd21d019b1ff94d2ca8602936f9985b1ca2ba1989e31d7671417426c8518c SHA512 18453af092b26bbd0494f34f99eef81808508dba1bc1f85738e2b55b45e0f77fe02fc97de7d77e10a82a1c3e30df64c4594b79c3817e5f19228afc913f424ad8
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.0.47.ebuild b/net-misc/sysrepo/sysrepo-2.0.47.ebuild
index 8c0fe6c1dbeb..1cfc5beff760 100644
--- a/net-misc/sysrepo/sysrepo-2.0.47.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.0.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/sysrepo/sysrepo-2.0.1.ebuild b/net-misc/sysrepo/sysrepo-2.0.53.ebuild
index aba7132d49a5..622f5a98a45b 100644
--- a/net-misc/sysrepo/sysrepo-2.0.1.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.0.53.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,19 +11,18 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=net-libs/libyang-2.0.3:="
+RDEPEND=">=net-libs/libyang-2.0.112:="
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
 	)
 	cmake_src_configure
 }
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 6e2b412fb6d5..3c7a888ce399 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -5,6 +5,6 @@ AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e6
 DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f
 DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb
 EBUILD wget2-1.99.2.ebuild 2102 BLAKE2B da8f7c03ff6e86568f14e58f23e8d0cb6656bccaa3cff04ffe7c9b1073d5007c598052ee668f6c6e8eacdf80e47ae62a3e30df0453c8ce74b016be3d965669f3 SHA512 cf9b5acba95447cd0c30130052c2ddd9a5316744749fe873ed86b454ab8dec5d692abcbfd70a7c33d89624385ec01114aa629c6daa30629d4d6d18795d04816a
-EBUILD wget2-2.0.0.ebuild 2012 BLAKE2B a19b91f7e59fa9161e590b6df262f69f40489444e8f410d1d54c2dab2cddca7fba00b34b77ca378a76b108dbc5c13885e7b9f67c3b0d6ed4faff0a80e3e5be91 SHA512 2da735658416e1cc74df5c231f772c899cffbd9920b7cbd64b1885f0fe4e2adb562091306241dd6534d8ef6d0223d83953db03d4fa9dc39db3ea3e82cb2e65cb
-EBUILD wget2-9999.ebuild 2579 BLAKE2B 8428353d808b131ecfa1006f20fc8c8101eb9ad62b9a961583495df938d2bf5c0023db1deebe0e5e2e0c3a012e33ac5ff83a0ebba50ff33d5d3bb7f4b7c4de0c SHA512 ca1f07a9893d2fd42ed32e6c4104509fc2a66b8229966821693365ad07e1d2014fea053fca832dcadba4b9f1164f2647209d3530d0d77d571e987fea7e78d3ae
+EBUILD wget2-2.0.0.ebuild 1846 BLAKE2B cdfc5e05efe8eb44b4811b55ef0ccf1a9a5808e8ab7dd9b05923377429593456c826663f2031734b44151f66acb35efa4ca9a69ef32e8f1932090ba4ba6774f0 SHA512 743fde071d209c716d97b8e23d03556c8381f5c7344bf3e9a4edce6169b098474d2faedc89026aa594878c8efb3f3ea1d7665d3dfd2f6700207f6501f4bd3d02
+EBUILD wget2-9999.ebuild 2465 BLAKE2B 4f8e2a92d09749432c8384c18d7d086bd292f0b884bb368c15373eafda33475da726cdca86dfbcd378c2b68e9d2b8ca2fa3520e277d4c02ec126204f806a2b5d SHA512 2126f18a018c6dc407058e7eb81bdf2bac5a97f3d36801fba52d5a0d0470696926fc1b9c694b96145171c4405683d20fc26199e28929d4f9a20d1c9ac3e87adb
 MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40
diff --git a/net-misc/wget2/wget2-2.0.0.ebuild b/net-misc/wget2/wget2-2.0.0.ebuild
index 2926f4837238..facb07871d08 100644
--- a/net-misc/wget2/wget2-2.0.0.ebuild
+++ b/net-misc/wget2/wget2-2.0.0.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
 HOMEPAGE="https://gitlab.com/gnuwget/wget2"
 SRC_URI="mirror://gnu/wget/${P}.tar.gz"
@@ -48,17 +46,6 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	# Upstream attempts to be "smart" by calling ldconfig in
-	# install-exec-hook
-	"${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	local myeconfargs=(
 		--disable-static
@@ -79,6 +66,9 @@ src_configure() {
 		$(use_with pcre libpcre2)
 		$(use_with psl libpsl)
 		$(use_with zlib)
+
+		# Avoid calling ldconfig
+		LDCONFIG=:
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild
index b757baf13439..c35c06da76fa 100644
--- a/net-misc/wget2/wget2-9999.ebuild
+++ b/net-misc/wget2/wget2-9999.ebuild
@@ -3,12 +3,10 @@
 
 EAPI=7
 
-inherit autotools
-
 DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
 HOMEPAGE="https://gitlab.com/gnuwget/wget2"
 if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
 else
 	SRC_URI="mirror://gnu/wget/${P}.tar.gz"
@@ -51,12 +49,6 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	# Upstream attempts to be "smart" by calling ldconfig in
-	# install-exec-hook
-	"${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch
-)
-
 src_unpack() {
 	if [[ "${PV}" == *9999 ]] ; then
 		git-r3_src_unpack
@@ -71,6 +63,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
 	if [[ "${PV}" == *9999 ]] ; then
 		local bootstrap_opts=(
 			--gnulib-srcdir=../gnulib
@@ -82,9 +75,8 @@ src_prepare() {
 		AUTORECONF="/bin/true" \
 		LIBTOOLIZE="/bin/true" \
 		sh ./bootstrap "${bootstrap_opts[@]}" || die
+		eautoreconf
 	fi
-	default
-	eautoreconf
 }
 
 src_configure() {
@@ -106,6 +98,9 @@ src_configure() {
 		$(use_with pcre libpcre2)
 		$(use_with psl libpsl)
 		$(use_with zlib)
+
+		# Avoid calling ldconfig
+		LDCONFIG=:
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 1bfdc4ad93b9..f654e52eeb6b 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,4 +1,6 @@
 DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8
-EBUILD yt-dlp-2021.10.22-r2.ebuild 1478 BLAKE2B 7c8c55fd7b8c1b523334bbef77182929dbb0f631191371772ed22df89dbee94553f9c97536bf04beb826cbfe69b533392d26c82be0806f20b317f13384693c92 SHA512 9fb7ead0738e5885cfca80673c08de140380a58d477f797d85f592d198aebab2ac936d5b03d2522401c89ec211053128f16742b675d67418224c1a7f7a2d0b39
+DIST yt-dlp-2021.11.10.1.tar.gz 2042241 BLAKE2B c4542edce26931a8753002a5cf0fda46549dd9b79709fc595c0c807837b07242d5d7a7fa19cc4f64cf7b7fc5803c4937185d68f4593250f9fa21155d5a24ee92 SHA512 54a371d70b7b82349a184b26201fca12fabbc9a107dc199347c412062776d63879d22955d76726df61bc40ec594a7179a997e4679c683673c8c0dd41f62b16f6
+EBUILD yt-dlp-2021.10.22-r3.ebuild 1610 BLAKE2B 2713e981200c642a3a3fbe582d73a48a69425724c878e504b4494ea2b95eb28449220622504420d45badc3fa80025e7e569a7d4fecaa6fed72065d105906a2e3 SHA512 a3a342f9426f11250a7b57045480db6243f27457e1427dd45843cef024cf61be89e1129aaf0ed27e4db14309ce7f3f27def2f24ace7a8263dcb51173fb69cfe9
 EBUILD yt-dlp-2021.10.22.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
+EBUILD yt-dlp-2021.11.10.1.ebuild 1610 BLAKE2B 2713e981200c642a3a3fbe582d73a48a69425724c878e504b4494ea2b95eb28449220622504420d45badc3fa80025e7e569a7d4fecaa6fed72065d105906a2e3 SHA512 a3a342f9426f11250a7b57045480db6243f27457e1427dd45843cef024cf61be89e1129aaf0ed27e4db14309ce7f3f27def2f24ace7a8263dcb51173fb69cfe9
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22-r3.ebuild
index 9a121884d749..1aa701367fef 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.10.22-r2.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.22-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1
+inherit bash-completion-r1 distutils-r1 optfeature
 
 DESCRIPTION="youtube-dl fork with additional features and fixes"
 HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
@@ -12,14 +12,10 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
 
 RDEPEND="
-	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/websockets[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-video/ffmpeg
 	!net-misc/youtube-dl"
 
 distutils_enable_tests pytest
@@ -49,6 +45,10 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
 	if [[ ! ${REPLACING_VERSIONS} ]] ||
 		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then
 		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
diff --git a/net-misc/yt-dlp/yt-dlp-2021.11.10.1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.11.10.1.ebuild
new file mode 100644
index 000000000000..1aa701367fef
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2021.11.10.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1 optfeature
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	!net-misc/youtube-dl"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	newbin - youtube-dl <<-EOF
+		#!/usr/bin/env sh
+		exec yt-dlp --compat-options youtube-dl "\${@}"
+	EOF
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+
+	if [[ ! ${REPLACING_VERSIONS} ]] ||
+		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
commit	e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree	1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /net-misc
parent	fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)