gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-misc
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
118 files changed, 1804 insertions, 1534 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d12d8cf91b95..0a8038b6b0b5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 6a7c32d5b326..28f0a8884473 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -24,5 +24,5 @@ EBUILD asterisk-13.38.2-r2.ebuild 10791 BLAKE2B 378bdbcd0cc936a195a72d61ad3bd8e0
 EBUILD asterisk-13.38.2-r3.ebuild 10793 BLAKE2B 9882ff88ad7d5afa2dc9372d4dec8975b5def601ad3b590df91cdeeb3c189f6672ed93781e73ccaef76fe1decd15421a8434aad92ace456dfc92e4dfe0c8007a SHA512 9ce8934d879c44e4218701390e35475eea4f7e5a336a113cc5067720d6ab1b5bc0f01a5b49083b55ad8b1ac2af936ff0330a2b618981a54fb52e6ccbe900eebd
 EBUILD asterisk-13.38.2.ebuild 9664 BLAKE2B 7b5018e14e5fd93fe92b96a2ba20c39e061dee93a7c3491601ac1a051498fefa6914b5c259576537e1d9c96be1ef45e85d7b742bdc62d40390d824f08cb617cb SHA512 5c82cef460eebf4fb1cf1bbc1824b050855dfb2e8d8a8b0e42cfbff85a761e97843a1ff4bfc38dcb235475db7f2ea36536e031978dd861a9de4d84cddba829f3
 EBUILD asterisk-16.18.0-r1.ebuild 9855 BLAKE2B d17ca05051bfb2a28c4bac764226bcc285dfbc01d60e409ed1cc4ec00e430a0ba68768352dc66924bc8627f2f797be074f150b74da6176a319b069761d8081f4 SHA512 4db4384d0adf42c5201529fc032e7ce7570900cf83c16708841f64341b5673cf5adc7a4ee1f1306b6542049fd24f2bdc0669789ac0ab57a66c38952d40f9dd5d
-EBUILD asterisk-18.4.0-r1.ebuild 11217 BLAKE2B bb978a4fda8ef5f398d6b28c0bd6a9c0c3c021ff96396fedb94f4af831dcb4210393d44b312540ad14774007a083b006747ce4a26238d220fd57efe8aa96e05a SHA512 cb84fab3ce287ac75aa3f4fa391b5efff5606e2c9c5708ff3e0929e44ac0ef7b54d347db424e856a257a40839e1a9ccaeed8e615f56d8e21e216f4804a2bd767
+EBUILD asterisk-18.4.0-r1.ebuild 11216 BLAKE2B 1267a0d61d27b7bb7793367115cb9e365b017f062d4d3879ec14d80d6b74bccf2d4daa69bbaffc2570bba129ac0b8fd6b3f7d97039737f95ec59b05cd5c3778b SHA512 08a6c80558aa9d45ecc3f10aab7aea1956f95c020b99e6010c92f3965636af6545b8e2fba9f9ab6485776cd40dd04a2f1ee348cd3eaf849bed27aa0e788a3907
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-18.4.0-r1.ebuild b/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
index ad920ebb0ab2..5bd2a374d9aa 100644
--- a/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
@@ -18,7 +18,7 @@ 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="${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} )
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index f21f4b3a1ab5..54b05f1ba74b 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,3 @@
-DIST batctl-2021.0.tar.gz 108424 BLAKE2B e6823c730348483582ad3724a3ef5a67ba0c429ccea114a650ea23cae22d6fae256f95992777a9a7634ad29315085a3f7f91c6ea45d46568ce9b422fe58d8290 SHA512 87a773667377826d2d7fcdc16d2b34f61e3d02ed8303617bf33f5ef9d5a9c46cfe6bfe560ff8899c45290ce3e8581ddf798991590f48ba3e70b2e0e07f7a8e69
-EBUILD batctl-2021.0.ebuild 768 BLAKE2B c1fb8cbc6b2a57a9374288b095d4a8a7dfe4d4777075d33fa5dbe5a4ee6fd301c1b9b16bda759d17ce7b1aa71e60edc15d1ee58ea19f2b6cde65b063c31a278a SHA512 6ec88c6d9839c39ce95722a31fefa722c14a24324001d43c0bc18fd26375ea6ad1623d38a42bdde19bc9e35545668680591930e1a77fa63c5b57c52f91462868
+DIST batctl-2021.1.tar.gz 115688 BLAKE2B 44d77e82b8ee770212d5c1774b14b09dcc6c06741ecb2ad649addb8e837fe833905ab9ae3862bc1d816ea40c9e6d0dd3a6c6a298787e6dc7b475e0e767bc3358 SHA512 542343db3fb7d8f773656d9049285816359b0c94d7b26f26d5993209cae561b4b62442eef919b65bc46e0d8d23b10afd2f3d8c4beb2841641fffc643f65d8de6
+EBUILD batctl-2021.1.ebuild 768 BLAKE2B c1fb8cbc6b2a57a9374288b095d4a8a7dfe4d4777075d33fa5dbe5a4ee6fd301c1b9b16bda759d17ce7b1aa71e60edc15d1ee58ea19f2b6cde65b063c31a278a SHA512 6ec88c6d9839c39ce95722a31fefa722c14a24324001d43c0bc18fd26375ea6ad1623d38a42bdde19bc9e35545668680591930e1a77fa63c5b57c52f91462868
 MISC metadata.xml 405 BLAKE2B 719af4f8dfc3545f1a93dfc42ef385658bf2de2aad67deb3abc16f2f898dca06af6b85047cb98d83eab2dfb988f65141742f3d19119a743d5540413e3a2b2168 SHA512 6e428a8de5643d3d151ce8375e8077a7519fd9c9bb11a82a6c83d6365c4e40f7632cc06e19d0b1ce1d39da8bf79b4b4dbd8a3921af0ca19cf6e556341467f6b6
diff --git a/net-misc/batctl/batctl-2021.0.ebuild b/net-misc/batctl/batctl-2021.1.ebuild
index 6ac8ab8cc2d2..6ac8ab8cc2d2 100644
--- a/net-misc/batctl/batctl-2021.0.ebuild
+++ b/net-misc/batctl/batctl-2021.1.ebuild
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 108679cd0932..921df057bf14 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,6 +1,6 @@
-AUX chrome-remote-desktop-44.0.2403.44-always-sudo.patch 820 BLAKE2B f1e2c9d3a7bf2d53407b9ee4e4f34bf915d59502799bc4d38c9886d6c216dafb8ad957229a454da2ff750b00bc967e668cb022b06d4ad382e7427d61907970a1 SHA512 aa35c9e81b056fded2ff95b6fc7ab9cf3bb89282513b7bf1a04a9d25567d0e59da9c8c9877500e7290e40d712f4be06ae8b482d3f830d818ea5897e6ffde248b
+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_88.0.4324.33_amd64.deb 33645072 BLAKE2B 5fc565c3a27307e46ff307ad2e68a9a390b5fb86be9d3d8bb5f82f3d22013f70af18002c888d5df82956b6f33b3397cf2cb8b9a7e4c07db480ead81abbb5743c SHA512 0cf6ebe8ce916874be79255faf870b20df892ce4825902996685416cedd8d8ef52215e7f278301fd6ff11e2cbc3b2e82078d7b0ee23ab35669760b1102d5827e
-EBUILD chrome-remote-desktop-88.0.4324.33.ebuild 4752 BLAKE2B c9cf603c748e8a6bf1a6a9a58c95db17f89485d4e8ac1a2e0937e0c04c18e5ef22de03ae2e9c4091bb648459fbca785578215282410d0af315159bc872046e6c SHA512 d172655f950e089f9baf169e55cad9ad2f0162a1c7d8d5917694f22bb96c234fe260f6c73ed4ebc9690a92308d8b8c2391f5187ac24925c4c5786f20ad4dd2a9
+DIST chrome-remote-desktop_91.0.4472.10_amd64.deb 38240812 BLAKE2B 34a91fba76c70abe3ae3aa4704f977f2f4788c412962a77c9c3f4c54aec0452cffb9705f650ee0688a63482ad20ccce8dcd2348cb606db6c2dd143592e68e222 SHA512 882138361926cf0975739ff9cee4105a3b95336021a1c63461a42e1eb76f8ae94fef4a36589da5ccda0c16bf8e9655be2517035e925f1bad08609f8d1f404553
+EBUILD chrome-remote-desktop-91.0.4472.10.ebuild 4787 BLAKE2B ab4a02650efabcfe489d91ace5251a6d69bccd9a484986b1589d3a22d2d57f72e6606643785e2ec31c3750bca12a271b0a687e7d6c7d97a9e40de3151989367a SHA512 286d12360e725a9bc70d01aed9e88e27f84ce7999ef0fd48bf85c5b9bf6e8d906cc347d1f5055aa30d4c3b638cc0b091e29d040cb84d87f8c7a90ec649350222
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
index 32d84d049579..f2057d508820 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
@@ -77,7 +77,7 @@ S=${WORKDIR}
 QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	"${FILESDIR}"/${PN}-91.0.4472.10-always-sudo.patch #541708
 )
 
 src_prepare() {
@@ -89,7 +89,8 @@ src_prepare() {
 	python_fix_shebang chrome-remote-desktop
 
 	cd remoting_locales
-	rm fake-bidi* || die
+	# These isn't always included.
+	rm -f fake-bidi* || die
 	PLOCALES=${PLOCALES//_/-} l10n_find_plocales_changes "${PWD}" '' '.pak'
 }
 
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
deleted file mode 100644
index d303e5e753f9..000000000000
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/541708
-
-just use `sudo` for everything
-
---- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
-+++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
-@@ -1092,12 +1092,7 @@
-       logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME)
- 
-     command = [SCRIPT_PATH, '--add-user-as-root', user]
--    if os.getenv("DISPLAY"):
--      # TODO(rickyz): Add a Polkit policy that includes a more friendly message
--      # about what this command does.
--      command = ["/usr/bin/pkexec"] + command
--    else:
--      command = ["/usr/bin/sudo", "-k", "--"] + command
-+    command = ["/usr/bin/sudo", "-k", "--"] + command
- 
-     # Run with an empty environment out of paranoia, though if an attacker
-     # controls the environment this script is run under, we're already screwed
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-91.0.4472.10-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-91.0.4472.10-always-sudo.patch
new file mode 100644
index 000000000000..9e9ebd80c73b
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-91.0.4472.10-always-sudo.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/541708
+
+just use `sudo` for everything
+
+--- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
++++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
+@@ -1092,12 +1092,7 @@
+ 
+ 
+ def run_command_as_root(command):
+-  if os.getenv("DISPLAY"):
+-    # TODO(rickyz): Add a Polkit policy that includes a more friendly
+-    # message about what this command does.
+-    command = ["/usr/bin/pkexec"] + command
+-  else:
+-    command = ["/usr/bin/sudo", "-k", "--"] + command
++  command = ["/usr/bin/sudo", "-k", "--"] + command
+ 
+   return subprocess.call(command)
+ 
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 51fee4375736..5394636ae07f 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -10,6 +10,6 @@ DIST chrony-4.0.tar.gz.asc 195 BLAKE2B 1947a73f35eb5c58f91775d76473210a7b5edff5b
 DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
 DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
 EBUILD chrony-4.0-r2.ebuild 5478 BLAKE2B 4dde74187b43f93d8056a1c70a0a9671ea3e5ef4f9975f0ed9458ec901565849fc0f7a8dced8398d82f1e6836cfdfe55d4c2630043795153b3592639c3828715 SHA512 d6249e70f95dc0bbe3355cea997b362bdce5b91d3aec27a885eefc7c10cac4ab9718054b172c37c60c4363e7eebb62bf1f4a6e77bef330d4c34c8975bfd71202
-EBUILD chrony-4.1-r1.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
+EBUILD chrony-4.1-r1.ebuild 6624 BLAKE2B 7c26d02175f8c91190b04f0d9d79b09a8d5ca51d3a558116336dcaf3cb4fc4e5c801a36f2db6203d91cadc3912cf863e566a0c7a9205be57772decebef8dab58 SHA512 0896ac623d575faaa7f92c9e8f348c57e0fb9beb8b60c29f34603b6875cde0cbfab00c106c3e755b2285f76faf4155dd02c3d6fb38aa737fdc6157a15ca3fefc
 EBUILD chrony-9999.ebuild 6631 BLAKE2B 93c4b6a53a2c44bcf2508125fe33291c60a37321f32eaaa2c6fb4616bb97378cc50463ec977cd0204e1215c4651d84d79c39adca45285c9ae44e126007cea5a7 SHA512 69c90fa53b76c2a996d466098133a962764f19a54686bbd03c1694eff80b6e4a846bf6c33b1d139bcc0e0076eb51f49a78d45a550f816786785bad00b3fc6075
 MISC metadata.xml 2299 BLAKE2B f5e8667a5fdeb86395d773eaf6e7d80c2133fe945565d7d6005f156a0a4763f1434ba887627fba63dd0f0a15663d7fa194d91699f6961ad21b9afa40576cd1fd SHA512 370e06edf9df22a327ff8b528f8a810c731af4615d740331ac737af8cbc5af265f7592ec22bf844301c5089185bc4f7de102f87378f85cf276d4f550933e519a
diff --git a/net-misc/chrony/chrony-4.1-r1.ebuild b/net-misc/chrony/chrony-4.1-r1.ebuild
index d3e68c8d0126..41b2733275f5 100644
--- a/net-misc/chrony/chrony-4.1-r1.ebuild
+++ b/net-misc/chrony/chrony-4.1-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 	fi
 fi
 
diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
index 157cf654516b..083eafbf522a 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -2,5 +2,5 @@ AUX clockspeed-0.62-gentoo.patch 6605 BLAKE2B e8394fe60510c0505cd343fb38ac080ccd
 AUX ntpclockset 1100 BLAKE2B a84e6d6ec78e8d0e9be34640db9f18cb6a15dfe35c583b3f1af654ec6ba39ede15bab5d92ed333c3c9758db532c29503f031157b5e18ee6eb3abcd3104b7410e SHA512 4301f84956df473aea2e13f304fc320897e680619a6933f5fe3b6fa229fc4e34dd6874bb6fa417c462f6eae2513ad7cccc843108331ee0a45fb19c7f0563dc6c
 DIST clockspeed-0.62.tar.gz 25797 BLAKE2B 3e409b09dd426dbe33a1aa27e08313bafb5f682ce4fb42740b88841bad2a88b6095e3b0d178c3d2b0f338a99a8ede03e00e79ce09559dc136addfd1d1e1ceca3 SHA512 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978
 DIST leapsecs.dat.20081114 192 BLAKE2B 71113068e1fce9a11b9acba1527d90f6977302b6d8042fe83522fc2fea260a15b18226bc34cd84637b00d0e58a24c24d6f9ea537f1064b82655647ad4c58e0b6 SHA512 c85634ce30f40a03ae45983ee29483fe5859f291a0a69835dad1f50459327b212b8187a0c2c18c9a27fd74f2d69ed0d9a556349c8b2833b9a30107ed259aacc7
-EBUILD clockspeed-0.62-r7.ebuild 1186 BLAKE2B c6aaf3ded3466e7f6c7d00b00fbd6c64c607e87315924eb8c757c2f52c944ea4b66bee791f35d4452e4764ad398ae52c759c89024cb48c5f09b79a7de762d9da SHA512 d7683aa72eb856927fc555f396ad24245ab835f33683b78503be41b80ba6efb479dda0b96b1fa88da282bcdc7df25d3bbf23d6bf1b765c8489270605509fd4f1
+EBUILD clockspeed-0.62-r7.ebuild 1216 BLAKE2B aae83b33c384e37521c82e664b0b001a91add9784ab8a1fd12541060a32c20679f77c02822e11e4f41ca8f2dc7ad970ba8e9d8c77579f94c628277daab4841d5 SHA512 ae439b24557ed1a864744f5e722438dacc97f1a9d59a984536d8a5d901dafc24255d9510dc24b1f5446c3baeace258cef801b1c419758f3b32b8f9219ffb1f58
 MISC metadata.xml 416 BLAKE2B b11bd8ea02066ba97613146ac7984f394b5fa4e1b34b2781f0e3fb747affebc6f5db19bde801ca0e0465699520561c24293e6855f40df0c93d9e21fd7463f094 SHA512 966f4ad088720ae3da99158933a8344b9f17b7f251ae37562b99ee8cdc9e1fdbb0d530e42703208ed1373932037918e4657bd0663a42f3a3348505ccdcd39d69
diff --git a/net-misc/clockspeed/clockspeed-0.62-r7.ebuild b/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
index b70ac60b3bac..fc40dd6960bf 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,8 @@ LEAPSECONDS_DATE="20081114"
 SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
 
-LICENSE="all-rights-reserved"
+# http://cr.yp.to/distributors.html
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~mips x86"
 IUSE="static selinux"
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index b4705d8c1b0b..da3391d6fdba 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,6 +1,8 @@
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764
-EBUILD connman-1.39-r1.ebuild 2745 BLAKE2B 78a55fff293c38a70f061c9b4af3dfc268a7c88e02cfd07d606ea4761716754f7b7aeb222e447bba125309c2ee11d6c340b69d4aef502d6a1b03a4c8be3d801b SHA512 f20d2d9062f30a56005815604a8435240a4d6202b7468121ac79750db0d554a42244f9a7793908e79419c0bef09910013fe6f318e4588c520910ad24d274179a
-EBUILD connman-9999.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50
+DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f
+EBUILD connman-1.39-r1.ebuild 2782 BLAKE2B 255776bae74077773674f5707a1febb7aff81792cf47c54c5cb173801cdba6017550c0dc19866016357a950062c7d5a520365817aa91424fe459dcf99b04afe9 SHA512 04efe423622186f7e2ae043f38320c0b30ce485f9ce544bcc5ace99155bb152d4f92b94d1ecb9c4f59922c007c75d85ef8deb5958cff78d10b527ddf8f8adc42
+EBUILD connman-1.40.ebuild 2788 BLAKE2B 78e75bd78bb645b80931465d72ab2d51de070cf7538f289078d0bfb08c7f5421be5194dccd3b4482e641611a133d41092a9caf5086dc74bfeedf6e46329ce2d6 SHA512 612a4fdeb5cef9e435b8e59c53f869e052d530ee2e66917184d0bcd227eba1d22839b38b2bad182bb1ad2d98763cf3fdf43ed10426098685f9dd5e86fd85544a
+EBUILD connman-9999.ebuild 2788 BLAKE2B 78e75bd78bb645b80931465d72ab2d51de070cf7538f289078d0bfb08c7f5421be5194dccd3b4482e641611a133d41092a9caf5086dc74bfeedf6e46329ce2d6 SHA512 612a4fdeb5cef9e435b8e59c53f869e052d530ee2e66917184d0bcd227eba1d22839b38b2bad182bb1ad2d98763cf3fdf43ed10426098685f9dd5e86fd85544a
 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/connman-1.39-r1.ebuild b/net-misc/connman/connman-1.39-r1.ebuild
index a25edfcf355b..86e7435576ad 100644
--- a/net-misc/connman/connman-1.39-r1.ebuild
+++ b/net-misc/connman/connman-1.39-r1.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/connman/connman-1.40.ebuild b/net-misc/connman/connman-1.40.ebuild
new file mode 100644
index 000000000000..acb42aed5422
--- /dev/null
+++ b/net-misc/connman/connman-1.40.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--runstatedir=/run \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable iwd) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+}
diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild
index 9f5662b9ab43..acb42aed5422 100644
--- a/net-misc/connman/connman-9999.ebuild
+++ b/net-misc/connman/connman-9999.ebuild
@@ -13,7 +13,7 @@ else
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index a1b61cded489..d25fe8cecb33 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,6 +1,6 @@
 AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772
-DIST croc-9.1.3.tar.gz 2784231 BLAKE2B 844e3b3db6e65ab88fed9162ecfa5ba7e0018f95e466f73314423127557dffb10a3dce46b307c45f7e1b635b7f90edc18af8a42f95b36c17b8f80c24a52e1a5f SHA512 f81230be44f5462a7e92fccdeb63570c9ccca2f02405f4e06019822c6a8c2d5b48c7622dc779bacb5d4120a36c92acff1e7689aed182e7b8db467a3cf4d9ad06
 DIST croc-9.1.4.tar.gz 2785285 BLAKE2B 401f4c033831490e50fefe9c6a49e9296a6dd47d6ab675e2426115a600b019196f1455e71fe8747557bc469ff5b14a7b9a05466872143c916f1c4b152bbad6bd SHA512 667cb636a8fea54997a734f46f2002b179361f54cc5b16f67dcc469645f85a46bfb4b587d720c599654358ea1e6a2ec4a46829f4a6e5c74fc9a574a24d316ce1
+DIST croc-9.1.5.tar.gz 2790786 BLAKE2B b4b0450584f1291fb6366379c9dea59b6c2f902f4edbe10abdade8081c59ee649fcf9a6dee011d644f6609d2b2ddd8ed6f5b5a57df01de92f57d8024a1cc4b72 SHA512 fa50ab5500c01ad8547754af95433a1b13e63f0f10a51ac62e4b29c38174b9c7896804402466becb5b1b51420d03a78a88d74a0b429590ff1e43b5819ebf108f
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -27,6 +27,8 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.12.zip 20977 BLAKE2B e9a9da9c1383fd4011c9d934467ce94b00b04cdfb58faa0a531fa4b71d956b45cc1e6b9afc9011a2dad60fadd3a0c1fce7eda5de1e6eeabd53cc9f541ed48029 SHA512 05a554dc62146f8251376ec07e521594941e6f7c0173fb0c0ca48e6d9e512a92a29e059acdce83a5a0af503c0391fee4bbab57d2e256efb44b1ac137bfae59c2
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod 84 BLAKE2B d78cb89b5321a10aed4ad5abd88952a190c5051dedea0c9f43f06881be807892152edb9be4ecc9eddfc3cd7b75a441ab85559e25c60feeaf560baf829af373ff SHA512 b96cca212a7024f0039ddd3a744fe818ab2e028b8ac2fd4472ce76ee9b496de3abb0960718c1106a98cf7e6df652dcf2884fe5ed95979bd9016399ea4abd324d
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip 20978 BLAKE2B 1114ba9e7289e1a1423e81c4e0ff52860d9232f7e55a626e32282dfbf7a45ef53c21b843f4b6870be92e710db9c619d96f9c197eda0d8c28dac3764160e92105 SHA512 e86a3b69601be1a0a15d7bfd5d93fce8d8c06b52c55c941a9ed62b44f05d3062e436d817661af14bb42838efc45875a63eb6042b196e1684db36e0fe6ed42a7f
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip 5985 BLAKE2B db4ca25a009754faf835ed02201c87cc04f82c3d3e9d4698d030984e2ba6eb557dd629d4b48005a44a87d6f333c573cc4b9465cd10456ba5af958a37dbeddc70 SHA512 9ad6acec3cd1b12d46279f0f7fd12d2216f53658eea4181d0331a9c2de4d8e5c7ae5f095c4eb7c1c97a1d14b0f231f23c36ee52d92708eb3dcdfdd4cfefe17c8
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -47,8 +49,12 @@ DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod 200 BLAKE2B ac3886b13c5b
 DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip 11584 BLAKE2B 436025438469ea00bca4fd958a604a29d688bf0c9c205e651d814458a35728d065c7c1af9f5bf3d39b61bf629581656578b9453fb788cbd9c71af83c7f9416be SHA512 c16986d2d0ecda2c9b119abfb4565eab79c829d8eaf0c2be00079f21b4f4988fb13bcd3e61add4a5781511aecbd1411d6a9da3aea12401db89ad41a67c409522
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.5.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.5.zip 9383 BLAKE2B a703122effe26cb19f7e591c32fb75797b09c9bd9b089f1db4b4d273e7ee6a23927c6db5d9cb0ca9b1e27ac038ce5c0bebb6ca58eb3e4f1672251470e948bd35 SHA512 971532b3a65a0294a96bef3e92f4e3426791c27635cbe359f5e55916ce73bcabfae038864b2e399b6d0d287035bb836935d9cc5424c9569fa834e8c468041f12
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.mod 216 BLAKE2B e378f4d4364d5f51bac5b116951e65725ee56e03fa8833fbcb91d148b9b58f3948fe97004fddf81912a84814d15225d23796098bef4bb9f881460b441d670a00 SHA512 30bdd048cc41acc7f7ff4ef9d6e69143174eaf9f8deb43e8bd5cd1097a3934b3f04d17753b59eab892a8575129bca0fe1187b098ce9ad4beae465469a24e75ed
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.6.zip 9435 BLAKE2B 1e91624d47801581cc1e8f13ad64be4178c6f23d4cc2a78691933cd0602e14265116bcb9fb8399dc868bfa1f0f91240624ba630e86f6ac1e6879c8e9b4d2f900 SHA512 45cb7b90f6328a46824d701a33a11960e4e26fe513a05b95d6f487e1e9471ca8ac8cd522fcb45ae84f9766dc983bc9bafa10b5df89915389827a0b5474839f4e
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.0.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.0.zip 606683 BLAKE2B 52a01c6532d69a877a53cdac3faee136edc3b4c913aa97c03de2ae2bf149f6d2edbeef3e1623fe9453a56c5143b9f669c5bf131708aadb3c562214b3d1a64cbc SHA512 eee7b75e41ce80c290b1cb1bd9199687a5b0c02d98eafcc74a42be21c0565834cec0809f6d03ffe232793566c5e2fc5b99d2f5573fa58fde89b185eef8692841
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.1.mod 595 BLAKE2B 1c9bf9f7ce9034de611701eacc329015700546201a8d4d95b91fc3eedf411845c129ace3fd449a08a8c00f6aa0b25c093abd0003eaef49a3cf6c347429196bc5 SHA512 7d59879aa35cb7b48cbdadceb770e50bdbcce71d9cb48ea33a7b98a90ae4019d97e6951baafcb92383556d0bc9cfe078e72204c0f3671c02bb15164c6d68b3f7
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.1.zip 606668 BLAKE2B 6a88ebeed8cc4b48d32477f61ce0012d6038f7179e37eedabf0955d6a2913400e97afe4bc9e56a64179c30fde8c6b54943356cc3774f56dc487f409930bea34c SHA512 b08d7a96fc95a02717072346575334666ef5c7d1c62ae85ff6b73927244708f4953c016400daf407b8e86011c6767a5671a1f2d12b6a0aff1a51d95e4af628d8
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -65,11 +71,15 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.zip 1874428 BLAKE2B bc63491e97e9a528a252723dd16ac8e79d7dda0a022be2f0b94ae68017f14759127bbc398b721efbca6f270ccf4ea7146cd267be68898369a81bb2368cc367e6 SHA512 203fa97ecc318bc5a6de3a79380d52863b7280eeb7e1509f092d04bc6c1d6f89e32b5c836622adbee2031f2482d4d63e0e2e2523fe1c610ce6eb08f338fcb523
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.zip 1874670 BLAKE2B 15ddedd5ae7c1f4f279502fc220fed70155caf23a21b9a79c2bae6eafded5ef966b07b2c4e2748735017fa1e312062052c291ac2862adf5e1b7f9b110f9b6508 SHA512 6494794aff8498860f5af522d4a4921278c6aed6e7ce6bef3c8cfeabfb78810e932b66d47746a2bd416c538d5a277ccb82cab45a479b37fd0484dbe44cc78825
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210510120150-4163338589ed.zip 1565631 BLAKE2B 80fee98ed18592b39375d95aa4ca99752d13c55ef618414c8983dba3faf1faa8baf8c47b1e1f7350dcc4d2b90093990f2738f3c4638d5cba2a7ec11c7685d3cb SHA512 8b376daeb6c9dbe8ede34b94dd4efd02419151d9a50d92891a8d199393c304b0cba5921e6d990a8f141ed58ec1f1395f0281d3b0ac1fee0c42f84ce2458ac801
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210610132358-84b48f89b13b.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210610132358-84b48f89b13b.zip 1566855 BLAKE2B fd52fe25284121bed79d1ebd005a9ca4b2311414a34abb51b91873a6538fc30a64491e82a0b383a81010dcf64490d1cf3dc34461ebd8fa55e36d43b71d2e7cc0 SHA512 0029833e5edcbcd923efb82021f51c0074085e9a20ffd7678f3dfb6661144df1ca29393df45a2fabdc079f599e2a49de70eaf697a1c83b4858cfa8db9147d20e
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -79,6 +89,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210511113859-b0526f3d8744.zip 1634357 BLAKE2B a30240d51cb13049e8705df0160afff8fdc3707d2287e32261b5d909e60e02af13e292be839c3731ec3ed75dc3215d809d21ac53d46d5118ce928ad3ec6a2488 SHA512 79105ca14bd2eadd6351300b7adb954129597309246e1a2e8dcd8ca512113e576c3198c28441069bfa6f4ffc4fb4072e86ff679ae4b168dd52a6c36af8698612
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210608053332-aa57babbf139.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210608053332-aa57babbf139.zip 1643893 BLAKE2B a7d16d86b3596b6c3eef28888b6d50995fcd74a7f1c8e4798cf83989e33b0db6e241b96d37c220ff795e4f5f8eaab767b9eba8b3917095fd304ac78595cfeeb3 SHA512 7dcb1eddb6501bb0c93fcfcea7c70c9a9a4d922a35a9ef35b1216698aa8fcd6a812a440399da6a15ed9b2de4d55af1fd6f92f981109089c1c53cf6848650d7c2
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -97,6 +109,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-EBUILD croc-9.1.3.ebuild 5863 BLAKE2B ee8592fdd71c35bf9d9a0e86602740569b5d0a65bc3cab953dcadf7e4181ab666929411ae176a16ea27fe277c7e2fe0368a183dc94ad89d0b26f54f6821791a8 SHA512 ec4da117814e2223ced88a6c6243eca8426896c82e506f2e6878be5fd89b73f9d85d2e9dba7e1275d77b49d1b7579eced4e09737c41565e3525403d10ffab672
 EBUILD croc-9.1.4.ebuild 5863 BLAKE2B ee8592fdd71c35bf9d9a0e86602740569b5d0a65bc3cab953dcadf7e4181ab666929411ae176a16ea27fe277c7e2fe0368a183dc94ad89d0b26f54f6821791a8 SHA512 ec4da117814e2223ced88a6c6243eca8426896c82e506f2e6878be5fd89b73f9d85d2e9dba7e1275d77b49d1b7579eced4e09737c41565e3525403d10ffab672
+EBUILD croc-9.1.5.ebuild 5424 BLAKE2B f80d4a82120a7d23cdc8dc25ef83a6623aa34bf928299feeaccc85e12d34feeabdf9380a0a1c92efbb56895182141b8d1606d66041a1f497febdb1aafcb83f51 SHA512 0ad9ad775d13c23803f2f7f91b4d310bfd9aa555fb0b38d49df8f7601a692c1bf44aef5923237b48e14b711330d87783a8f3f75a5b7b8cc2bf4e3030cf881715
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-9.1.3.ebuild b/net-misc/croc/croc-9.1.5.ebuild
index 6b7526df7016..230877837b8e 100644
--- a/net-misc/croc/croc-9.1.3.ebuild
+++ b/net-misc/croc/croc-9.1.5.ebuild
@@ -32,9 +32,9 @@ EGO_SUM=(
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
 	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.10/go.mod"
-	"github.com/mattn/go-runewidth v0.0.12"
 	"github.com/mattn/go-runewidth v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.13"
+	"github.com/mattn/go-runewidth v0.0.13/go.mod"
 	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
 	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
@@ -53,10 +53,10 @@ EGO_SUM=(
 	"github.com/schollz/mnemonicode v1.0.1/go.mod"
 	"github.com/schollz/pake/v3 v3.0.2"
 	"github.com/schollz/pake/v3 v3.0.2/go.mod"
-	"github.com/schollz/peerdiscovery v1.6.5"
-	"github.com/schollz/peerdiscovery v1.6.5/go.mod"
-	"github.com/schollz/progressbar/v3 v3.8.0"
-	"github.com/schollz/progressbar/v3 v3.8.0/go.mod"
+	"github.com/schollz/peerdiscovery v1.6.6"
+	"github.com/schollz/peerdiscovery v1.6.6/go.mod"
+	"github.com/schollz/progressbar/v3 v3.8.1"
+	"github.com/schollz/progressbar/v3 v3.8.1/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
 	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
 	"github.com/spaolacci/murmur3 v1.1.0"
@@ -69,27 +69,20 @@ EGO_SUM=(
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
 	"github.com/twmb/murmur3 v1.1.5"
 	"github.com/twmb/murmur3 v1.1.5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
-	"golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf"
 	"golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a"
+	"golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod"
 	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210510120150-4163338589ed"
 	"golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/net v0.0.0-20210610132358-84b48f89b13b"
+	"golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod"
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
 	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-	"golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744"
 	"golang.org/x/sys v0.0.0-20210511113859-b0526f3d8744/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/sys v0.0.0-20210608053332-aa57babbf139"
+	"golang.org/x/sys v0.0.0-20210608053332-aa57babbf139/go.mod"
 	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
-	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
 	"golang.org/x/term v0.0.0-20210503060354-a79de5458b56"
 	"golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 5c855567f2ee..fd3eaa0c0701 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,8 +1,5 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
-AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.76.1.tar.xz 2427636 BLAKE2B 56452871fbd998f0c9a5af86b3853ed1dfc956c39380e5da472b4f382db45926ac3aa9e395ae7d2812aac0f0f29bee28343218810a169beb592c5224e0a4f018 SHA512 5fe85d2e776789aa8117c57fe7648e375b7fa92d5ead5d69855f19ca9a2624d77a1f9ab91766ecb72bbc17e82862248cd07e48917884d6fd856b93fb00d83e28
 DIST curl-7.77.0.tar.xz 2439336 BLAKE2B 433b3179dcf2c3363514b72bf9c54286873d8e5559b33e543ba8f3e7df25a619c5be13a8aacb9361c4464b646af4d1fb214d4de57a17f3de7e8f379777214d13 SHA512 aef92a0e3f8ce8491b258a9a1c4dcea3c07c29b139a1f68f08619caa0295cfde76335d2dfb9cdf434525daea7dd05d8acd22f203f5ccc7735bd317964ec1da76
-EBUILD curl-7.76.1.ebuild 8187 BLAKE2B d5744b39a6a51c6ec2646df5c699c5311ff5391ec026a61c387f2d1cafb478e2db6757edb050722b932640fac49521c9c57b92cf5b330680b9aa88f6da7fdeac SHA512 6fce3a508e11c8c628b4b5b29e2e777353557b26dca5e2211997ddce1a745650d7d9e15e73521cb71db6b2f865666e4bde130f8ced68b0bf0aaf883f0599c9e5
-EBUILD curl-7.77.0.ebuild 8188 BLAKE2B 3e72837643cda35ef27136e0329205bfc986e0a6eea616d1ef54bd5cd678b61e9d1ff4d55c5e0f0cd1fd4bdefc548c19a670e4474d2758a798acfc7668f11275 SHA512 deeea4b9784d937fc16a65fc5c7a8b19664ba10f2ec72fa78125fb95bad9a57bdaf849c011f9e8a5b8cb2164ab501ae5867e05776cd726dce2f991ac641cbe77
+EBUILD curl-7.77.0.ebuild 8187 BLAKE2B d5744b39a6a51c6ec2646df5c699c5311ff5391ec026a61c387f2d1cafb478e2db6757edb050722b932640fac49521c9c57b92cf5b330680b9aa88f6da7fdeac SHA512 6fce3a508e11c8c628b4b5b29e2e777353557b26dca5e2211997ddce1a745650d7d9e15e73521cb71db6b2f865666e4bde130f8ced68b0bf0aaf883f0599c9e5
 MISC metadata.xml 2104 BLAKE2B cd965737bacd5cde978fdcb652559c3c29eee0083bdee82e00cf78055e681571e77a2deaf4ab6ef5a9aba0c33689356fc2299c346c4c1e6b4afda9c675b9f3b1 SHA512 a2e9ba5358d115b18fa089bd222f026a7553505a154e1d865af0cde1004a0a427f58ed38d802815d96453d5d58628aa91d8cd5d082fe059cb1afd4dc9d312052
diff --git a/net-misc/curl/curl-7.76.1.ebuild b/net-misc/curl/curl-7.76.1.ebuild
deleted file mode 100644
index ccca9041f594..000000000000
--- a/net-misc/curl/curl-7.76.1.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="curl"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-# c-ares must be disabled for threads
-# only one default ssl provider can be enabled
-REQUIRED_USE="
-	winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-# lead to lots of false negatives, bug #285669
-RESTRICT="!test? ( test )"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		openssl? (
-			dev-libs/openssl:0=[sslv3=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	#myconf+=( --without-default-ssl-backend )
-	if use ssl ; then
-		if use gnutls || use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		fi
-		if use mbedtls || use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		fi
-		if use nss || use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		fi
-		if use openssl || use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		fi
-		if use winssl || use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
-
-		if use curl_ssl_gnutls; then
-			einfo "Default SSL provided by gnutls"
-			myconf+=( --with-default-ssl-backend=gnutls )
-		elif use curl_ssl_mbedtls; then
-			einfo "Default SSL provided by mbedtls"
-			myconf+=( --with-default-ssl-backend=mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		elif use curl_ssl_openssl; then
-			einfo "Default SSL provided by openssl"
-			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_winssl; then
-			einfo "Default SSL provided by Windows"
-			myconf+=( --with-default-ssl-backend=winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	myconf+=(
-		$(use_enable alt-svc)
-		--enable-crypto-auth
-		--enable-dict
-		--disable-ech
-		--enable-file
-		$(use_enable ftp)
-		$(use_enable gopher)
-		$(use_enable hsts)
-		--enable-http
-		$(use_enable imap)
-		$(use_enable ldap)
-		$(use_enable ldap ldaps)
-		--disable-ntlm-wb
-		$(use_enable pop3)
-		--enable-rt
-		--enable-rtsp
-		$(use_enable samba smb)
-		$(use_with ssh libssh2)
-		$(use_enable smtp)
-		$(use_enable telnet)
-		$(use_enable tftp)
-		--enable-tls-srp
-		$(use_enable adns ares)
-		--enable-cookies
-		--enable-dateparse
-		--enable-dnsshuffle
-		--enable-doh
-		--enable-hidden-symbols
-		--enable-http-auth
-		$(use_enable ipv6)
-		--enable-largefile
-		--enable-manual
-		--enable-mime
-		--enable-netrc
-		$(use_enable progress-meter)
-		--enable-proxy
-		--disable-sspi
-		$(use_enable static-libs static)
-		$(use_enable threads threaded-resolver)
-		$(use_enable threads pthreads)
-		--disable-versioned-symbols
-		--without-amissl
-		--without-bearssl
-		$(use_with brotli)
-		--without-cyassl
-		--without-darwinssl
-		--without-fish-functions-dir
-		$(use_with http2 nghttp2)
-		--without-hyper
-		$(use_with idn libidn2)
-		$(use_with kerberos gssapi "${EPREFIX}"/usr)
-		$(use_with metalink libmetalink)
-		--without-libgsasl
-		--without-libpsl
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		$(use_with quiche)
-		$(use_with rtmp librtmp)
-		--without-rustls
-		--without-schannel
-		--without-secure-transport
-		--without-spnego
-		--without-winidn
-		--without-wolfssl
-		--with-zlib
-		$(use_with zstd)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default_src_test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm -rf "${ED}"/etc/ || die
-}
diff --git a/net-misc/curl/curl-7.77.0.ebuild b/net-misc/curl/curl-7.77.0.ebuild
index e15247a6d58e..ccca9041f594 100644
--- a/net-misc/curl/curl-7.77.0.ebuild
+++ b/net-misc/curl/curl-7.77.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="curl"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/curl/files/curl-fix-gnutls-nettle.patch b/net-misc/curl/files/curl-fix-gnutls-nettle.patch
deleted file mode 100644
index fbacb7748bdc..000000000000
--- a/net-misc/curl/files/curl-fix-gnutls-nettle.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
---- curl-7.25.0.orig//configure.ac	2012-04-04 17:24:48.000000000 -0400
-+++ curl-7.25.0/configure.ac	2012-04-04 17:23:07.000000000 -0400
-@@ -1823,20 +1823,9 @@
- 
- if test "$GNUTLS_ENABLED" = "1"; then
-   USE_GNUTLS_NETTLE=
--  # First check if we can detect either crypto library via transitive linking
--  AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
--  if test "$USE_GNUTLS_NETTLE" = ""; then
--    AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
--  fi
--  # If not, try linking directly to both of them to see if they are available
--  if test "$USE_GNUTLS_NETTLE" = ""; then
--    AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
--  fi
--  if test "$USE_GNUTLS_NETTLE" = ""; then
--    AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
--  fi
--  if test "$USE_GNUTLS_NETTLE" = ""; then
--    AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
-+  AC_ARG_WITH(nettle)
-+  if test "x$withval" = "xyes"; then
-+    USE_GNUTLS_NETTLE=1
-   fi
-   if test "$USE_GNUTLS_NETTLE" = "1"; then
-     AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 6e0363332e2b..a33269593d96 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -24,7 +24,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040
-DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
-EBUILD dhcp-4.4.2-r3.ebuild 8222 BLAKE2B a1d8cc6bae3fa9b0cbbf6c2acbf640478434c3ee9b21bb79bbf988a11b84712adf5322a805c93797f7a34220d36d0c43f190d9e06ccea4e19f9540b657decf2e SHA512 63866cde12580db53cdf6a59553714b9082d5f553936731640a616b22d0e9b2372ab902faa4db74c3629385ee73005230120b4ab8034797b46c641e672214a90
-EBUILD dhcp-4.4.2_p1.ebuild 8229 BLAKE2B 6f4db80f9b79d638a5fc2593789049596edf83077db28e26b6e3368513770b5000efdbb086f10019f150099cfa1a913835f0bca3ece4f2b8a49edd0ecb25748f SHA512 71949a58ffa6b14defded787efea2f66a9a186b43aef8b9028acae3d4521e4b7b9ecbe696457e1f38e1124e1b33b52d0e4b92c6126840d21eccfbc84f2d89ba1
+EBUILD dhcp-4.4.2_p1.ebuild 8222 BLAKE2B a1d8cc6bae3fa9b0cbbf6c2acbf640478434c3ee9b21bb79bbf988a11b84712adf5322a805c93797f7a34220d36d0c43f190d9e06ccea4e19f9540b657decf2e SHA512 63866cde12580db53cdf6a59553714b9082d5f553936731640a616b22d0e9b2372ab902faa4db74c3629385ee73005230120b4ab8034797b46c641e672214a90
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
deleted file mode 100644
index 0cb341b0cecd..000000000000
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs flag-o-matic tmpfiles
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="https://www.isc.org/dhcp"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="
-	acct-group/dhcp
-	acct-user/dhcp
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap
-		ssl? ( dev-libs/openssl:0= )
-	)"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-dhcp )
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-PATCHES=(
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
-	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
-	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-
-	# Possible upstream candidates
-	"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
-	"${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
-)
-
-src_prepare() {
-	default
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client || die
-			cp doc/ja_JP.eucJP/dhcp* common || die
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -r doc/ja_JP.eucJP || die
-
-	# make the bind build work - do NOT make "binddir" local!
-	binddir="${S}/bind"
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	# https://bugs.gentoo.org/720806
-	if use ppc || use arm || use hppa; then
-		append-libs -latomic
-	fi
-
-	local myeconfargs=(
-		--enable-paranoia
-		--enable-early-chroot
-		--sysconfdir=${e}
-		--with-randomdev=/dev/random
-		$(use_enable ipv6 dhcpv6)
-		$(use_with ldap)
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-		LIBS="${LIBS}"
-	)
-	econf "${myeconfargs[@]}"
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	local el
-	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
-		--with-randomdev=/dev/random \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	docinto html
-	dodoc doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
-		systemd_dounit "${FILESDIR}"/dhcpd4.service
-		systemd_dounit "${FILESDIR}"/dhcpd6.service
-		systemd_dounit "${FILESDIR}"/dhcrelay4.service
-		systemd_dounit "${FILESDIR}"/dhcrelay6.service
-		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
-		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-
-	diropts -m0750 -o dhcp -g dhcp
-	keepdir /var/lib/dhcp
-}
-
-pkg_preinst() {
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
index 1a0e0a3d7f5f..0cb341b0cecd 100644
--- a/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 4ad2c25c8443..2c8ab98c475c 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,3 +1,5 @@
+DIST dleyna-server-0.7.0-r1-patchset.tar.xz 1680 BLAKE2B fd6494dc04bb0fc20e677c69b360df30c89b35b6a990a2ce78e87101291307c485a5cb133152eabbd117691eff4d738fa2e33303128c4305a0c1e5137c67781d SHA512 7f37ba456f84bd9e45b732d40467e08ba5ce775c0f1d30011157e10a6f3010b904fc52a4d699a211dd66b66c54ff6e98b109aa5ba9c04112f81de1529d55c425
 DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
+EBUILD dleyna-server-0.7.0-r1.ebuild 786 BLAKE2B 271e0cd33a23386a110cd5d91198a3dd16daa084f7f694895dbfddb6381be27faf618e2b4da042bfc6b84ac360c7a87c77bf447fb81b5744c4b451c63614cecd SHA512 3cf7e358c1226c172b97afd85236391ac26b6a5ebfeb02089ba5942d0d2aa4c62b468fb33b7228263076a85515d5867086e8be8dff08ad54d0bb5feac21e457e
 EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..0c97205a63ef
--- /dev/null
+++ b/net-misc/dleyna-server/dleyna-server-0.7.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
+HOMEPAGE="https://github.com/phako/dleyna-server"
+SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=net-libs/gssdp-1.2:0=
+	>=net-libs/gupnp-1.2:0=
+	>=net-libs/gupnp-av-0.11.5
+	>=media-libs/gupnp-dlna-0.9.4:2.0
+	>=net-libs/libsoup-2.28.2:2.4
+	>=net-libs/dleyna-core-0.6.0:1.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/patches
+)
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index dbc5a51d9b4f..12a97650beac 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,14 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-122.4.4867.tar.gz 98758165 BLAKE2B bb9fac6670cb384e5417ad6f73d0894ba35cc8471ccaec3dbb37d99fb0ec36810051856bc674b5291e654c4c4626f82963335ad92190318f3765bfc33b47703e SHA512 7606f21b56df4e894611b30566538007715e9598f0ac45377e8bbda4a649f4ab6df6b9b0f4da467c9a9aa632d38f78a632c3c879cb21bbd13bcc46faca450689
 DIST dropbox-lnx.x86-123.4.4832.tar.gz 98431455 BLAKE2B 6838420baeb330b6d0a611564e28f13d65b5b9ed1f616afb440af57b31ffab2275b615e5346856d485aeacb691603999430fa8eb6d6299231f02951f2d017b69 SHA512 bba088d2123a8b3a3263d4c1c2ddd24b21e573d938920a07c15bf18cd89be02fe3cde76f68939a18ca5a80bc3a0d729adcaec095e7cba9ed234081d75d0275b7
+DIST dropbox-lnx.x86-124.4.4910.tar.gz 98766012 BLAKE2B d682dfc402a7b1133702331130d76c0dfbb2e70642aeed318eb77425593671dbbaaf10f889fb44c018bfe345336952363b72d27f8a093bdc717559ef67c98dd2 SHA512 e643b3f4d017d4388c3746faa4168d4cf5fe1b9944b4b65ea4191aa37b8786cb37d15faadab94271064b0f59ecd9503b81dfcdadbed5907b8a81afdace5627d4
+DIST dropbox-lnx.x86-124.4.4912.tar.gz 98764776 BLAKE2B cade38bf4f65331bd232fb87c3fb31aedc0df59a1f8ad4521cbbbc73a1383b2e719c7e942f23f7f7ab02cbec176a01e56027b367ce63c1262354526da4978757 SHA512 6fdd503735e3c71e3dfe7c6174884b4c27fa3051f596c8b7f29acf5bc3a505d6b3e627cc510e97747aece27ff52bc874d6378313b0d89eea086e1bb4613c6d1e
 DIST dropbox-lnx.x86_64-122.4.4867.tar.gz 102022157 BLAKE2B ce68823f184d9ff9a7378f6c7248ba73bd76f120cf095386bd6f43a701849f380c849ae3e7e6e035594d480e59bb9c98b0d23774c6083e97122af657c2860e46 SHA512 5b2252a07b63a0805445bda486039a07c267e280cead8519de88a35b8d877cc4276e3ce91421b3bd4a64cbcab125edc519d067974c64de012d59a74d06324d39
 DIST dropbox-lnx.x86_64-123.4.4832.tar.gz 101557451 BLAKE2B f30778a81fcbee0989c7ec4b5ff5337179138a50cea56a7b4d38e940e263ac849ac1a2db58978634a1bbd75c1eac6f87b04be6a7c3c5dfdc531ae48ec558bb55 SHA512 42411274863c0262a0623ff1cb3ae2d776bf342121f6f47351d61645b0b5096bdade08084208e7f73f5fd08be6152c0971b9208dd2a083a5229f5bd0519ab089
+DIST dropbox-lnx.x86_64-124.4.4910.tar.gz 101929245 BLAKE2B 414efc58bf155545bf3a708de602bcb227e2c5ab87f206c78a125c7ec2bd4e99d5342592cfe9f4ec4e19928020bbf127277fa7d9c38c66c19b39377bd55c3f01 SHA512 383d11e9d879c6c8d970ffbb23d9d2f9f7523e5c5e92d4dc568eba62567ac37904a3a3e4b85cf6d463a52b55608eb28a7bd2f3798d63546239ad4a82693118b9
+DIST dropbox-lnx.x86_64-124.4.4912.tar.gz 101928148 BLAKE2B 535127b4a4d160e60f1f3e97a0e4689f38728a6e0324de64dd08e37ab566be79ec103e1a8ca69f28ba9b9fc8d7b8e522dfc889b076693e263f1beba5dba58bcf SHA512 1bfcdfc656cef947be940c6d392c96ee39f1e611b1ccd1b5490fb9406eb32972a7339ba213135aab4e9bbbe818fcd82322258ec129e324f89ec9ac9e73d5ffea
 EBUILD dropbox-122.4.4867.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
 EBUILD dropbox-123.4.4832.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+EBUILD dropbox-124.4.4910.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+EBUILD dropbox-124.4.4912.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-124.4.4910.ebuild b/net-misc/dropbox/dropbox-124.4.4910.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-124.4.4910.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/dropbox/dropbox-124.4.4912.ebuild b/net-misc/dropbox/dropbox-124.4.4912.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-124.4.4912.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 03b4a8401607..cefb065075af 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r2.ebuild 860 BLAKE2B d639b8be7ea94639c23caf7069f71df9ba45ea43781a6bd01a10438141291a6f655bc178184009481d180bd7ae9c6e1dbefb488ff6249f54a6bdd68949a5dffd SHA512 1b8b7f1ba5fc97ee63c486f377d2961eecb9f71e99944629db66e60bc440eff8dc8dbfac527bc27eee917d34c70c311eb89532bbde82ead9093a1ebe2b36729c
+EBUILD econnman-1.1-r2.ebuild 861 BLAKE2B b12d76caae9b8188441a4cc36e0c1b0a13a3ca1c32e1b22df59ab0614ed8b130952422f90795468ea7c3bda839c39822ea3a88a5d8e43eb4b1569615957e5bd9 SHA512 50a97526f3aa8efa57b74d6e2f51ef38a15684a21d4a6dfd6025e439b1ddef34b68995b967d692ce0df0064a56a8b40fa5ff1886dd59f2abd789c14544419aec
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r2.ebuild b/net-misc/econnman/econnman-1.1-r2.ebuild
index 7ccef1ed1883..8ea76419802b 100644
--- a/net-misc/econnman/econnman-1.1-r2.ebuild
+++ b/net-misc/econnman/econnman-1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-single-r1
 
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index ed9a1636b918..bbcb977f6c10 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -1,8 +1,6 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 530 BLAKE2B fbf901cfc9133ed45afc1a7859c02926fbb8ad52db9429c10b29a4a5dd75d9e4b1387077ea21f075d6cf176e7b167127a9f344b24b126bde5d9445257ffe5780 SHA512 981f57845811ff3d528fe4ab69d75f547dc0189ebb842260d448407645e19fb16be6ceeb6d4a76e3d491fc98a8773588fbddf9b96b270365da48ed2eb82f8e36
-DIST electrum-ltc-3.3.4.1.tar.gz 3897254 BLAKE2B 113e4175adad0d404f9677913bd24cbda569f20183de75d341d60b954f0423ff13042e0b05f66f7953729368412fc181d2c8da7caee15899f6810cb77c4be241 SHA512 cab85edbe9189fffd2a4b8d57dd89dc55f68cf3f02cd4a7427c53de852ab2001b82b1484126699c8eee36d765a8ca58936eba82e3c153f654bf5629b9cd50745
 DIST electrum-ltc-4.0.9.1.tar.gz 4464915 BLAKE2B 2c328f9fc433f39b11aa2bfc4e397b75aadd07adc66576ae985c5b41b32d663df80bb67dafbbce210f3581f6fb43e666070d090bf189eb4907efd07d306fc945 SHA512 926ad16246d0609a787614b84cadfa893ed792ab2a54a3c0b9d707019e29874b1ae1c42dba098f34b61f915d85578809ff87dc9026c85563264a2d2b583c8823
-EBUILD electrum-ltc-3.3.4.1-r2.ebuild 3768 BLAKE2B fb66c7d244268308f0542a7a7adf751e4c6a935171543061844b7bdb680fc34ddf94c86411df838fc68856f09693b31926e9e78300d63f87ad460ea415891421 SHA512 3e4a96eccc774d679f8453d5ad733ac7a0a67c74d886b59ed6f3975548441e8a589a5216b90cadfae7ab2ae854a107c69d8356da88ac16ba32c0baa894e394ad
 EBUILD electrum-ltc-4.0.9.1.ebuild 3866 BLAKE2B 781548f9512eaaa0fff4eb1762b6fe9da24842aaa550625154dabf90487dbdad08c8c402c1b20d1cfadb351f38c0e2af347d6343f38f87f0dec67789083ad9f5 SHA512 8b9547a5a3a981e10ec407d2f426cde154bc3ff37b1e3c998c4efc4c26290dd069d578a27b06cbc04c221f58ce7dfa1cae5d47451e3d13442c1008fe8fdc128f
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild
deleted file mode 100644
index 35a21c5d0046..000000000000
--- a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-EGIT_COMMIT="${PV}"
-DESCRIPTION="Litecoin thin client"
-HOMEPAGE="https://electrum-ltc.org/"
-SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
-	l10n_es l10n_ja l10n_pt-BR l10n_pt-PT l10n_zh-CN"
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	dev-python/aiorpcX[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	if ! use qt5; then
-		sed "/'electrum_ltc.gui.qt',/d" -i setup.py || die
-	fi
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN/-/_}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN/-/_}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN/-/_}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN/-/_}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 33882f4735b7..6a8fa54f924c 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,11 +1,5 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887
-DIST electrum-4.1.0.gh.tar.gz 4539032 BLAKE2B 72ef52a000799e496e6ccca152dc8bec827aef23d4e3290fd2e86ace0f96e9267f68b56c390b873658dc8f6e6998080bd0283494ee74603c360dfe250b64c282 SHA512 7dd94bfc23f78e915f42f1043f6b7e9d0d6d5de7303418da8d2f3bd53ece794c74c3cd0dd9d77b370a6c6f049261273b170ddcb67f6c3dc7189869b200e8d437
-DIST electrum-4.1.1.gh.tar.gz 4539619 BLAKE2B abcb0713b8b82fb7b13b432146ee63746690cf3a80d3951de41a13435eba7217010c92653d5263ea155072e5bb911e38f6c3d6a83f72bda9fb07a26f705e2621 SHA512 f3066171bc8cef1402356f01254acdce3e4f4d6fb99a1feb52d76f3a7c21f5b082148b7b598b19ae8a4817b221b8d80f27f9ab67d3d09e465856d51f8b28f0e4
 DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a
-EBUILD electrum-4.0.9-r2.ebuild 2360 BLAKE2B 9c94a59d7a4359f2f92a4d7d807c43b6c1802f3755f9909355ee288bce08c5dc76a40e47ffc3df3186d7321cc62653ac79d7e69d4ff1b71841365574b70d5ace SHA512 7eb3066ea7bae08650f3e124b57df9b2e355fd621369cd54a29e028bfb20df99fc6c5fa921c8c42f08cdb115efd3858cf0fcf7c02ae38f59c30b4776b5483b7d
-EBUILD electrum-4.1.0.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84
-EBUILD electrum-4.1.1.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84
-EBUILD electrum-4.1.2-r1.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
+EBUILD electrum-4.1.2-r1.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
 MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/electrum-4.0.9-r2.ebuild b/net-misc/electrum/electrum-4.0.9-r2.ebuild
deleted file mode 100644
index c0432d8aaefd..000000000000
--- a/net-misc/electrum/electrum-4.0.9-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcX/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.0.ebuild b/net-misc/electrum/electrum-4.1.0.ebuild
deleted file mode 100644
index 434ffec4d5b6..000000000000
--- a/net-misc/electrum/electrum-4.1.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcX/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.1.ebuild b/net-misc/electrum/electrum-4.1.1.ebuild
deleted file mode 100644
index 434ffec4d5b6..000000000000
--- a/net-misc/electrum/electrum-4.1.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcX/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.1.2-r1.ebuild b/net-misc/electrum/electrum-4.1.2-r1.ebuild
index a8c551d5f9bb..1efda47c7185 100644
--- a/net-misc/electrum/electrum-4.1.2-r1.ebuild
+++ b/net-misc/electrum/electrum-4.1.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 7a7eab0f069e..03b6860090bc 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,7 +1,7 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
-DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745
-EBUILD gerbera-1.8.0.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
+DIST gerbera-1.8.2.tar.gz 3589779 BLAKE2B 120654d5a9d1ac7dd29da401f2ca040e3331a27dd22a52fdc9c9a958a1a8e918ae6ca76926e636184f3b91475797432728462106eb4fbdc146737e88da07d8e7 SHA512 3831030b4960613e487bdba92323a4b8d7ed63352c1c9eb1ca5eacd3c91d4864d48ef1d1bec19a98b6abed0a827d18ba7940a814fe174b44c2808ad7b85a8756
+EBUILD gerbera-1.8.2.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
 EBUILD gerbera-9999.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.8.0.ebuild b/net-misc/gerbera/gerbera-1.8.2.ebuild
index d68414c66ed6..d68414c66ed6 100644
--- a/net-misc/gerbera/gerbera-1.8.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.8.2.ebuild
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index d30ec5ee9f73..8a77b8c7b305 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464
-EBUILD gnome-online-miners-3.34.0-r1.ebuild 898 BLAKE2B 912862579bd2cfe953cd35f8702a3768e433651a8a93c647c970e66fac2cc07c378214d380bb43d12e8864a00ca6f92f9273007185780b65986c29138b3c4351 SHA512 3ec1ba0cb89bdd4f0e59e89482212d9bf30a429c092980b117d195d87a865fe078fc9aaaf5facaa7de61e18b27893b92fbc0f7787d9734bc83d7d1c0058810e5
+EBUILD gnome-online-miners-3.34.0-r1.ebuild 905 BLAKE2B 281d226cb596077c5e20981a3bde383fef4dfacb9dc7fdbdb4b31f471febe877efadbb7e717420eadb1fe0e5b8eaf4919cbab0562928a2392420c4e035bb534b SHA512 9d1e05d9a4bf8f064a26d01ed822664bac8775f32148ee56732bb412626d6e3f4afdd846fe7917984a02c57ce4b68335c9a8a1bd80b7696f517e6e2cf533ee66
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
index 2b595426beb3..0330845cb380 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 1e9b54a6d4a7..7b6842008b4d 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8 SHA512 a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
 DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B 58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05 SHA512 a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
-EBUILD gns3-gui-2.2.17.ebuild 1128 BLAKE2B 69dd59c79cbde82c113cbd0f9f96978040680a0bd17b4d3374c06e265692c4809e46157be448ce7f3761d49e13f8151de5018ca2a366f9e5bbf0804c014219f9 SHA512 c7f75554ded5a8af7abf70288239686f25f561a013f6c86bdd0ce327548a1655c0e4f8a545355fe52783c4653bb069494caeac63fb91e584836cdebb1c29b419
+DIST gns3-gui-2.2.21.tar.gz 5162935 BLAKE2B ebe60ecd2c2228a783ae8c0aa65213534a81495c7d0afbd5fee7023dcf87e2d25c6575f8b966299f2953e16749ef92d17b07a1cbcac211effb28baca6851aaa8 SHA512 64ec5b49e6dc2ae6af2618b5ad0f06d306c43989802db1f0e30e5fe1ca92bdbb53d011820ed622690f3d97987be94daf3bf9a9b6e6fd4fd04fa6e8bffa846423
 EBUILD gns3-gui-2.2.19.ebuild 1099 BLAKE2B bb40c8d8b4fa70391019d3cdb7c09081db92ea33303185a6d4d5a9811ff48bb0fedf9239ae82da2f60f73907cc6e4bc35cd5bfd7cf230c6b8d632cb8df66323f SHA512 aef0c60f7051d94577c2affc687c924095970e810bdab540ed0fbd690722ab20bd61bc4f844d0b2ab795c91a45f4fede9e86ba87f0696af979c3ece6b9a806aa
+EBUILD gns3-gui-2.2.21.ebuild 1099 BLAKE2B 4a3c36f87a3fa83d4414161b661c7dfff3c11d7439b408b60644c928826c0d6e9a24c6262d75d287e06d51e6677c3f12bd7a5a79d8ab14fd816165d3c692faa2 SHA512 892e9d0c5292d90b3ff34b300c67134a503e31ca9b5978015df670efa81bd663a080a090029c5532e27d60d6a63902456238d4e92e0709a5af314b2214ad5878
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild
index 222f29a2923d..f702b56de93a 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
@@ -31,7 +31,7 @@ src_prepare() {
 	default
 
 	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements failed"
+	sed -i -e 's/[<>=].*//' requirements.txt || die
 }
 
 python_install_all() {
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index f63e3a346839..fd9eb7d840c6 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944 SHA512 233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57
 DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
-EBUILD gns3-server-2.2.17.ebuild 1948 BLAKE2B 0db413789015cb528b82884639bd02abe1fa8e5fed63e1c8c5a0f534ed512613491ccac2ed1764aa5bc69e61b9c6000575541a9f20ceec51b08fd83d76542e22 SHA512 74004f45d53a3bcc1cf00b7abd171ab539c3320d34f22c0273aa6bf37e19b7457515f46f47b7dc1e0b25d4a305869d58dfdf8961699fbd9e3650b8b49f499ce2
+DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
 EBUILD gns3-server-2.2.19.ebuild 1920 BLAKE2B 97df3dc66e92ef74325c411945666fdd2be613ff9f43bc3cad09e7fb891c8a914612c398968b8158848775eeb7fbea32c4dc9499b15ad1a1386acc44404ba561 SHA512 a3ea580135874ec73009f732b72fda4b9b3b785937c9347b13434ed613cfa223607e2d0813c11d895f46195d84170b2569ec085399a6328aa1a307fa75a28c2a
+EBUILD gns3-server-2.2.21.ebuild 2113 BLAKE2B 843ae1b77b7bae4847d7b2fcd176d550b34fcc26fa4b530ed0d82aaf4667a39480f24903cf5549f3162e136f6dca0d6b8782a6557320868846410b162d9feaf3 SHA512 e10ab97da6dc98892bb04802dfd0d9b56aabf39c9624bcb929c9634c5456f8942fbd793259fd5efe6f6b938cfc3481680f148af28f9aab5d3f641e4fbc0d6c0d
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/gns3-server-2.2.17.ebuild b/net-misc/gns3-server/gns3-server-2.2.21.ebuild
index 36b02014f945..07b724ce6475 100644
--- a/net-misc/gns3-server/gns3-server-2.2.17.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 systemd optfeature
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
@@ -35,7 +35,7 @@ src_prepare() {
 	default
 
 	# newer python packages are fine
-	sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements failed"
+	sed -i -e 's/[<>=].*//' requirements.txt || die
 
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
@@ -54,11 +54,14 @@ python_install() {
 }
 
 pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
+	elog "The following is a list of packages that can be added:"
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
 	optfeature "Docker Support" "app-emulation/docker"
 	optfeature "Wireshark Support" "net-analyzer/wireshark"
-	elog
+	elog ""
 	elog "The following packages are currently unsupported:"
 	elog "iouyap and vpcs"
 }
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index f17348910d1c..91b50a19f9cc 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -4,11 +4,11 @@ AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.10.tar.gz 636646 BLAKE2B a8a7e01aa02a0dfb320311812a5e0d95213c5c67990fd30e9747d0372e125e4318bb211dc97a614015b75418a70d6a62f1dfd08d7499fd78765dcff9d99a4ca0 SHA512 f9ccc0dc0dc74f708d75a6992318b615259e8fa716175ee916462ebf75a370dc06a0ab5ac2aa314bf9c6f6f56dd2a00648bba34c65da848cbde1ea196c5a6f4e
+DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b4e7baba23b4bec2808b42582bf76cc4250c529a1eb4a58c7214120f0e3a393a7c2602b838b22d97eb53842b3 SHA512 d1139aed0c7a99e8cfc23c41d606854d48a57db24d45ea31412d81222b09faeee6edccdf4030a00eeb6acbfd540d4b985b4a89f81a4d5b84592339ad5e2e9e41
 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
 EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
-EBUILD iperf-3.10.ebuild 886 BLAKE2B 6c5610d40243962c52db5eb2f90b774bf5efb75a1dd66a2811cb47be3b34789aa0cdc0e83991c812e31a9e893a92981be997c42eaea57988f1e7f81c1150f89e SHA512 7563f89b69490920026a769618d1445a2f5d44f6d9c3d9075045a4c0071863d1aa305e76d971f6c50173a6130a32627ffb26a4fc24a73428d22cbd7965dc7a8d
+EBUILD iperf-3.10.1.ebuild 886 BLAKE2B 6c5610d40243962c52db5eb2f90b774bf5efb75a1dd66a2811cb47be3b34789aa0cdc0e83991c812e31a9e893a92981be997c42eaea57988f1e7f81c1150f89e SHA512 7563f89b69490920026a769618d1445a2f5d44f6d9c3d9075045a4c0071863d1aa305e76d971f6c50173a6130a32627ffb26a4fc24a73428d22cbd7965dc7a8d
 EBUILD iperf-3.9-r1.ebuild 909 BLAKE2B ba3fb40ccd81fe6a241d51ff65ea925417fa8f9410dae883b5eaa13fd9da10202eecd7b575ec76425b91aa52eea19d678c34daf4484d7c2d6d5651ae505affbb SHA512 660f46d0f3167f667e2136b89a561eb616898791fd3c31b6409d70d0cc5df4f941a3f84fe0ea9e5b747bbc3641160359a2f960737ad555f7718e718a7db18d01
 EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/iperf-3.10.ebuild b/net-misc/iperf/iperf-3.10.1.ebuild
index 9e9f34b2843b..9e9f34b2843b 100644
--- a/net-misc/iperf/iperf-3.10.ebuild
+++ b/net-misc/iperf/iperf-3.10.1.ebuild
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index ee07f632c9cd..8914381aa082 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,5 +1,5 @@
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
-EBUILD iputils-20210202.ebuild 4187 BLAKE2B dc16aa0c366ba0d73e8b9aa52b6d5811af3c863bf237c17fb1883ce9aa73419f46a0580d6cabce5037cf732c3d27ca354e1694b5b0811466361f0271eb5e1485 SHA512 27713da5471b70f1460df74344137018827ab7e6b6c00749020e6b0497f2744b2a58564c064a56f4b46ff97d011286e69b2299daa7b8f7cc984cb3f917e8137b
-EBUILD iputils-99999999.ebuild 4195 BLAKE2B b9adbcf552e07ac65cb786882cb48babcfb37a31903a1a65ac2c4fb8aae8e75fd5c50960a7d465173388c1d1ec6785dd0178aee904329973cf1725b83990a7cb SHA512 8b1042db8c47a2f1c2f7125e70f0bbd62a046e683ba93ac15e747c456f45d965505dbc44c63d69fb37368a57f7117bbeeaa792ebc370af73930d1f25c846c262
+EBUILD iputils-20210202.ebuild 4204 BLAKE2B b996ed5f8320d4dc5683ead7cac68d52a5fcc0343085c12861b6fe2cacb3bf569c2dbfb03a44926d727a6fe529f1bb2e51b7aa8c8092ca4a25931fbe3dfcb239 SHA512 234295b2a40af2d53df0cacb7bf0d1f4ca4f22482baf63e940378d5f3d43c25047fba8c6cb1b28543408a93c1af05f15fa3a3c3c1cdbe8e3bb26d2cb222cfc54
+EBUILD iputils-99999999.ebuild 4212 BLAKE2B a45d944f0e136bc15848dba417c8022739443ceff29d611579e4f2c61bc70ed7227322cc4a7edd1d992065446271aaafa57e1fbcee4c2d772885f13c920f6af1 SHA512 180e520783f660d714761edd9ef6bdf9e8f75a30289d4c5148248362459e192f18fa3833ae500fe61006d8bdbecfbadddda90296843b2925b7d160378caa3779
 MISC metadata.xml 1509 BLAKE2B 800c6f657d331ad2f73fbd3e6a199732549f89ba31188e8caf5612008b89f60c6a7fb925f2740fcca07d3772f12ea9c5590de834e77201730b848a877061a97a SHA512 5b358f53068f6a49f00141c47f75fde84fe609fd6652e3e717b97b9d36abbfb80ea52c1ef8c2e3a850ab3724f1d4a87093b2bfc1ee5497d082ce1937dc3aa83d
diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild
index c60375ef537e..2e35ddc1ea7a 100644
--- a/net-misc/iputils/iputils-20210202.ebuild
+++ b/net-misc/iputils/iputils-20210202.ebuild
@@ -30,12 +30,15 @@ LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	nls? ( sys-devel/gettext[static-libs(+)] )
+	nls? ( virtual/libintl[static-libs(+)] )
 "
 
 RDEPEND="
@@ -59,8 +62,6 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 fi
 
-PATCHES=()
-
 src_prepare() {
 	default
 
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 82b60db38922..c77ade4aac5e 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -30,12 +30,15 @@ LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	nls? ( sys-devel/gettext[static-libs(+)] )
+	nls? ( virtual/libintl[static-libs(+)] )
 "
 
 RDEPEND="
@@ -59,8 +62,6 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 fi
 
-PATCHES=()
-
 src_prepare() {
 	default
 
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index d996bdeabef4..7a0442aad67e 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -3,8 +3,10 @@ DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
 DIST ipv6calc-2.1.1.tar.gz 1453854 BLAKE2B c95f66c2f99cb4953a0c9a8416e294a08d4907e0c5df53616fd0d26c31070ca4727fcb6ebe3d9d84b147d8f24bc69a5c789564ef8e0f5e2fedb1af31a664ed85 SHA512 99dfc87c33c48722d75c98d7a4417b68b23da3d691629ebec65a18992d82a09fd01e55f829f4db4440e0becb746907669cb0bcab4a9ecb477bdcf8ecab675dac
 DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2f745213059ed2b0f36d7a9049a7a659d0419e6f684661247c7714d3e9886fe0a6782f5dd35895c46f2583310dcd SHA512 6e9acde56e245ffae0903305659881eb763524336da285d5048b655728c7d7b031ae7b4190f01f663e3d7134defbb8987c8f47ddd75bf8c8368ec1b918ee42e3
+DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
 EBUILD ipv6calc-1.0.0.ebuild 1487 BLAKE2B 2bea35e2df217cee666c20940c365e91976eb70cf752653148138649e1c80c35514d13b2eb3571a401c3413fb9b29c24fa3e297c0d6837bd57bb4618b340b1e3 SHA512 93bb58646c27e30c067f003bd8b79c8d9562e63c2db39c80e207913760c1bcc46ec3e14cb343466d0a5a2f8a4d9cf037abdabcac520cd06a950f364c705f189f
 EBUILD ipv6calc-2.1.0.ebuild 1525 BLAKE2B 2fb920cc7f827d4b6d272f8a50418a6382ea82ac64ed7ed79c2cd2faa76240b0656ba02b1184207c9de2161b13b176ea283db9713bb6ebd5ad9d3a1ddbc0c00a SHA512 2e3653a9c4a8b48d2f61a8ff3d46f2218cf9a407ed48c2add7d8a04f686984c046491ec6f0f2235daa20c935bb50e754ff63f85778efe21a7dd8e174f408a86c
 EBUILD ipv6calc-2.1.1.ebuild 1528 BLAKE2B fd6b294ac662f84c8f4812e1049ca3c546ddb66fd126a49154b076833745aa217660f89ce4049207a8177c306e1ec2e724dd7120175ff49fcce86bc012861ba1 SHA512 297f6571f673e48b0edab519cfdea211f62bd07a8ba0570acb6a68592f468661b9e9bb12ae66710c36893eaf76d36a46fc66cb540cf9680036dc6a33471cfc07
 EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
+EBUILD ipv6calc-3.1.1.ebuild 1535 BLAKE2B 38a64d668af4ef06e5106513cf29fdfac4407d59e3c8d84dff049fb0227f5084cdc364a3c50b84a38b203e00db4f86f8ee7967848c766dfad0bacad141e07542 SHA512 4f2a5b818e076092d5ecf9a2666887c7ecfd6a7a4a743c41af4f07a93a168cadff86936496070c57ab6f7d44534383e147fa812c057b6bb2a013c5ed9072e2f7
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
new file mode 100644
index 000000000000..80ba906c239b
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-dbip2 \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	emake distclean
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index b8d702bceada..a98ac49ee2b9 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -1,5 +1,7 @@
 AUX lksctp-tools-1.0.18-autoconf-2.70.patch 2049 BLAKE2B 083525c312ec0ab05fb0bafc7c857ce4478e19aeb6ed2954ebdbf0bb28540fb5a71d20d651c7b3bed3135ec695f10e61070cd6449fb6a7eed777f5d5432587b9 SHA512 07342f740afaa09e61c8d756c318731e84402a3a92a6e5fc5011320a4f3b80bbcb4ff4ddeffe42bc2cf5f6b37ad741ede8fb7a6833c3f4de55ea2bc99f267673
 AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e0814bcc6e7748fb4b1ffa97e8832e9fdac8dd62fd4ea5d60b2e385d5b8be0eaaa6e60b32f6ebc2f3962b43f6d6a39b14bc14eae7e08 SHA512 042611f2c2e7605e96552dc5bee79e014b9ba2db4e08fa7a5c5c821a86d22d970bfba40a477249aa6e9149a997aab1d48b133b97ec353d4ab22ed9e2de6f9096
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
+DIST lksctp-tools-1.0.19.tar.gz 561962 BLAKE2B ae6a5b7c30413dadac736bd17dd1ac3f97bd34f74323959f4e9cb60186db735b4e79b101ad550bdb2975350951fd6ae8bb27b165c6dc86fc7c822fce30f49d05 SHA512 e56a4b00206acfb88cab1b8fc7424a1a4996f67ef925c29a97395c44c57f2cbcb3fc36ec2648f5e5a5ce29d8d61ee1f7a5e7869e6bbd68bff85590b6ec521883
 EBUILD lksctp-tools-1.0.18-r1.ebuild 1384 BLAKE2B 4c4e222b853362a307b42edfaef2459481e2c34e8c31bd1818d9266855cd5e82ffcf5b89d0eb0f9c750636a8165398827b2066c56e6ef6f1f7519c8701f810da SHA512 552150b3a766311bcf3faa89e6e6aa859da7515b01c256de0db7d46ebf3a7be8758df9739ed1f90c6080384e91849ac1148b4264b87028a5194ef67e433e4263
+EBUILD lksctp-tools-1.0.19.ebuild 1299 BLAKE2B 11d9c320c249e356115aaaf503b0cfd313329d66531ec1606a42c669a05cc8acbf68dca57ab97726520a85eaade04a48fd27f28c5eaeda95a2fd50fe8c93c7e1 SHA512 ab638ede377b36b71bc4614364b5b94880795937ac25ebeca53602cb472415e20983d131e151c9c562963cd333a6fda06259ce8008e00a8f03cedf2da1a05cb3
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.19.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.19.ebuild
new file mode 100644
index 000000000000..6ff9fd80eaae
--- /dev/null
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.19.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic autotools linux-info multilib-minimal
+
+DESCRIPTION="Tools for Linux Kernel Stream Control Transmission Protocol implementation"
+HOMEPAGE="http://lksctp.sourceforge.net/"
+SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="kernel_linux static-libs"
+
+# This is only supposed to work with Linux to begin with.
+DEPEND=">=sys-kernel/linux-headers-2.6"
+RDEPEND=""
+
+REQUIRED_USE="kernel_linux"
+
+CONFIG_CHECK="~IP_SCTP"
+WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	dodoc doc/*txt
+	newdoc src/withsctp/README README.withsctp
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/net-misc/lyricwikia/Manifest b/net-misc/lyricwikia/Manifest
index 5afd9a52bba6..41de9bd7cc7d 100644
--- a/net-misc/lyricwikia/Manifest
+++ b/net-misc/lyricwikia/Manifest
@@ -1,4 +1,4 @@
 AUX lyricwikia-0.1.11-skip-online-test.patch 506 BLAKE2B 92bf9826dd35d483fdabae057884e36847e2be273e668adae281962ec26ec05338b5fe53debb01655136af6a1325a20d043f023e756ee674c876c40d08095915 SHA512 6bb6d2960c39bee05e1d5b3a01656d78bce4fe07038758029274cf7e4d8495a29ffd2b79a7f3e02902a5e73fce03b505d1fed48a75e3681ab004a95cd6466416
 DIST lyricwikia-0.1.11.tar.gz 5571 BLAKE2B 1e2fb5400b4c0ed07d419e577e3c12c6b8eca749ce1a5b7dea51d6d055979722b82d003eac20402da873d3011d1b444c0783935adbc01ec99dd6079b234e6bc7 SHA512 53ff9a2837ccc10be62c2a92240e9849a9c88b7979f8058deff87ce6eda6e98e39fb86c78052de9a885db679cd87a6c5749af2f9502d3316fbbf2c0796718805
-EBUILD lyricwikia-0.1.11-r1.ebuild 1318 BLAKE2B 95c706a85be8d56a02f1a20681d5ef0cacd5475c1f3ac04021c3c97f477b29616b8d11b7103b56a8c6f24bd947ae3308689087d49f3f68394abbf96b88f0ef73 SHA512 b5a1bca6ff1f0fee0a321a2dd6bc445cf3f1e8517ef5e1a28210a6762eb9fb025fe057475d323c87b12659e3c2ccd5486e3ab09580b1e9356ca6235c56938ccb
+EBUILD lyricwikia-0.1.11-r1.ebuild 1319 BLAKE2B 9be4a92758e7a1528bd02c716d6e03f13634af82acb13dd15c82ae0bd7badc212a4da0bb47d75f95303cd6d522ca640743da3b3247f203ed1db152b13645c4a3 SHA512 f790ae9b2aa79e1a61128552f655031c9513af1b2825a1a4dde8d129f22a07f0f8f5ba0cb332748747fce503e2ed3fc22f7078168bc4918e6acd5273b4540362
 MISC metadata.xml 283 BLAKE2B ef3dfe1a27e46c933f7ae0bbdece78cab262e4c6a5713caceabd3cc11e5150ff4ad87da258f9a9aee61eb0b4f84dd8aa4b5537bdee54c0eee3d219666c436a46 SHA512 1401089263deca8f8539e7242fd5a68f32c51f8eeb44c05639cc5bee57781948443fd8fe3912c77dc7bbd61181c0b1d7ded90c7c7c3ae161d681d050ec990bda
diff --git a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
index feabf0bad1a1..f66bf007d07e 100644
--- a/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
+++ b/net-misc/lyricwikia/lyricwikia-0.1.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index b3b620b764a0..5bf167c2cec9 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,5 +1,7 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
 DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506
+DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
 EBUILD modemmanager-1.16.4.ebuild 3567 BLAKE2B 9e5825b5df612ecc0da6ef056a58fe12e62700be0a215fd67f5f31c9de377930ac15317ed689cda7d0a88f6d027c1757ecc52c5583cd3db8083dbe39d75f1dcd SHA512 f4456cd7b40dc0ba85ba6fa2f3ec8ed3ef9b370cb9b7ee64dfb66034caf9afb33997ea8215a661439533035f62590e98601830256b2fc7780fb775d717349aab
+EBUILD modemmanager-1.16.6.ebuild 3573 BLAKE2B d6c8acb639b624983310dc152115a4e2d3399a811b140e34a5ac8e82644908462346dbe19ab3de40b1e80b0cd866eebfc926d523a775279ce187f6b9d059578f SHA512 62a47e4013a9a45f3a4f2d511d1180e59e6787d2ae1015ea05f6121140c72f30f4383708004dc3d3c894bb25318e5215d9452f76cbbfe25503b36b6d05a940e4
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.16.6.ebuild b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
new file mode 100644
index 000000000000..d831eb774edc
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.16.6.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+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 ~sparc ~x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.48.0:2
+	udev? ( >=dev-libs/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.24.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
+	qmi? ( >=net-libs/libqmi-1.28.6:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+RDEPEND="${DEPEND}
+	policykit? ( acct-group/plugdev )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use systemd || use elogind; then
+		myconf+=(--with-systemd-suspend-resume)
+	else
+		myconf+=(--without-systemd-suspend-resume)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest
index 640e4acd98a3..8e1af40bb1a3 100644
--- a/net-misc/netkit-fingerd/Manifest
+++ b/net-misc/netkit-fingerd/Manifest
@@ -2,5 +2,5 @@ AUX fingerd.xinetd 250 BLAKE2B 0b9a1e2af0bcf4223ae8919245c1b9696693c07adc9c6aed2
 AUX netkit-fingerd-0.17-name-check.patch 681 BLAKE2B 89b120b47f3d3ad0599b28586e455a8c5a25f93d9afe81ab55e69e12474c9706e63845d86c6405e4e3a31b2b5205b132b7c7d371c5e7d9c5e7b68dfc15ce2446 SHA512 832afddbf7c5d9985fd5ffd87f3354be1c2aba4a82146e2ebfca81045c80b91238b31f94ef72409042e8fd8c250108d2d29feb3a1ce1acd77769d3df8a09c23a
 AUX netkit-fingerd-0.17-r2-gentoo.diff 603 BLAKE2B c17544baf5fb2cdec8172a4f9d833d575858b606e1dced6793ae4d7d6593d6ec416b7c35324c0dd39dad38a322d8cdbaa0135f79ee8bc2114a2bcaf30b7b4dc0 SHA512 1948a9c350a31497fa681aa6061ac859a5a3b18b9efb4b87a323a45a1472c6ddc31e50da33b891701f2e7196ea6fa07a40c31575ba261f9c2f3a6e28b35dbbb1
 DIST bsd-finger_0.17.orig.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0
-EBUILD netkit-fingerd-0.17-r3.ebuild 1140 BLAKE2B 801b9e7dc0c3f28ed6d546671becb020a1e91af7c835dcfb9b90c34e9e713d179876a0515d71dd230d847a8b0011f9f4e2943f790bf65a90899920ebfae3db50 SHA512 fb48da9042f392e03f530d19231d22bbd5c8c79c01e3141b6b71ba36694aa006acfc9e5d98afa5bf2de68d5914f718d5110a2f4d60f825c66f469bbe1093a8af
+EBUILD netkit-fingerd-0.17-r3.ebuild 1113 BLAKE2B ccfdf9ebdb9b45a843fa872152db459832310c1af8a7fbd0636dd0a5699683dcb025f4f8b1dc6083153b9945173180e44e66ee914478a1f7cd2ed749f8e5cf13 SHA512 8891b0e928c21b3d68ef254d12c02b4142c0b4176c0362d94e8a0ed9aee2827683b99251d4667acfe28a506be0ca244b14f0ddeffe94276b7b9dd261df871a0a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
index a6733741c15f..4b7aca59d55b 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="${PN/netkit/bsd}"
 MY_PN="${MY_PN/rd/r}"
@@ -18,10 +18,10 @@ IUSE=""
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-r2-gentoo.diff
-	epatch "${FILESDIR}"/${P}-name-check.patch #80286
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-r2-gentoo.diff
+	"${FILESDIR}"/${P}-name-check.patch #80286
+)
 
 src_configure() {
 	# We'll skip this stage as the configure script is crappy and not really
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index b4a03bc43ee3..8bb5d0505e24 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,7 @@
 DIST netopeer2-1.1.70.tar.gz 170883 BLAKE2B 59dbb1f82b355d807769466fc95dcac0ef0b74711f299b29cc6653183b5ffbb832d69b4247e04f38bdb9218adfabe1fff20c6f76e198ca0860808ec3910d20bd SHA512 d60c7ac861a05f8ee325013786e25e7f987f28265d66df5568ffd92ee31016a2d07f6b8256572110b9a6a5d00cb68644d1c3c3cd638f609b0f4f806e9e6cf602
+DIST netopeer2-1.1.76.tar.gz 171127 BLAKE2B 77b97cc60185b8843c216f69d6e7c6366b66dd2de86ab6a08489131738a27e28e730e0d773a5115406ad83df7aa22ee80638b6661faf6394fccb986b3996e038 SHA512 c37e7e4cba1d78fa20cff48fe6cd73fc5c0f0c43989b061915e7f7928c147ed5380f79d74341220df32aeebccf5db7d1560b261570e789807ad53591bedb0232
 DIST netopeer2-2.0.0.tar.gz 255138 BLAKE2B a33fa6a952a060a8fb4bd4ad2f2f4e0ab163faef44cd999eb5d3a28706110908bf6350859da1032e873cf24ff8bd9327d0d694edeb35ecb8e0650634dc5d8966 SHA512 789a6fb36f9a3cf9df4ff996b90a5e8f07a24b14027ec455133e184ae96c72a1e8f9adef6d36800139d47d667c54189a2c14616f4947ce0fe72467cb178dbec5
-EBUILD netopeer2-1.1.70-r1.ebuild 1015 BLAKE2B b75b3dec3703a2cef4514743fd13153663d497b9384411345b39b4b0db6d2c3422a17b1b489971133e2c6c1c3c2c9141ad6ec5bafe8b1142bce66c54d872872c SHA512 92446cbfb98218c888e23f1f8bc56ed4b8dc02515234b1e4cb4ce1bc9126042bc062ab8f4817a7047a09c2ad823b34e1f3431783f9fdd9386b25fe4f74bd0b86
+EBUILD netopeer2-1.1.70-r1.ebuild 1014 BLAKE2B ed146b0a8bc26b6da5200e2766987cbee3672a4fa07fc7a210a071ac82230a17d57c331bb224929c4107aea2209704fe230573c9e53c1347e104528d59c3798f SHA512 49c34f131200aa54aa72f429f04021433ddda84ddf4448eabe58d1aa8055876b11dea74bc5a1ead59d1eb44bf95393a3b2e0d0671e9c3d51df1dc5ffed5e0626
+EBUILD netopeer2-1.1.76.ebuild 1016 BLAKE2B 29a306b4114bb72c5ad83dff2148269618751f7ad4bc4c3664329443c2102a85e43b4ff79aff8a2ff804a4070bd4cf9f62fe88fd81e607b22b8e77078b134eb0 SHA512 292f43496f1e61b1b70588a6bf684f7cfb580d630adcbafffdc94ed11de9e64a09c9bc2e896d7939eed475d8ca9ac330f48e65149dfc653996c73cde75326751
 EBUILD netopeer2-2.0.0.ebuild 925 BLAKE2B 1b527e1f11dd8c24f3e594d030877293c5ca6eee48515afeaea03efdc3891f05d5d810c52ac811393f65524192f7e30d04179e9a4635f3e9bb4e460b16b99d20 SHA512 5de23f009617944ba31c3472731cb79dfb3fb811ea65cc303c185ef1d3b0ce55a2728d4124b79d2523a377c17a19b80617858ce3aa662a6101799aca9c5fba24
 MISC metadata.xml 449 BLAKE2B e77e9d18382c642d6165e32716e8ae0c8e5964acb49249687269fcec0f678b194fa905f50458ad640c25ce7d47138b7062232d92e0649a4b5fb54487a47c4cc1 SHA512 51596d9786cae042106f29190c459161c3eadccd64b51f79e255a8a2ee470bacd1c990420d195e7b2e15e913f8ba418cf2140aa87eacfe2e8252de1e5f95a6ff
diff --git a/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild b/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
index 5d8fc5b128b1..395e51ac135f 100644
--- a/net-misc/netopeer2/netopeer2-1.1.70-r1.ebuild
+++ b/net-misc/netopeer2/netopeer2-1.1.70-r1.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-1.1.76.ebuild b/net-misc/netopeer2/netopeer2-1.1.76.ebuild
new file mode 100644
index 000000000000..a18b90eb1807
--- /dev/null
+++ b/net-misc/netopeer2/netopeer2-1.1.76.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Server for implementing NETCONF configuration management"
+HOMEPAGE="https://github.com/CESNET/netopeer2"
+SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-misc/curl:=
+	>=net-misc/sysrepo-1.4.140:=
+	<net-misc/sysrepo-2.0.0:=
+	>=net-libs/libnetconf2-1.1.46:=
+	<net-libs/libnetconf2-2.0.0:=
+	net-libs/libssh:=
+	>=net-libs/libyang-1.0.240:=
+	<net-libs/libyang-2.0.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_HOSTKEY=OFF
+		-DINSTALL_MODULES=OFF
+		-DMERGE_LISTEN_CONFIG=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/netopeer2
+	doins -r scripts/.
+}
+
+pkg_postinst() {
+	elog "In order to do initial server setup please"
+	elog "run setup scripts located in /etc/netopeer2"
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 6e028dba60db..d0751f1b2a62 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -5,10 +5,11 @@ AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf
 AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e
 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
 AUX ntpsec-1.2.0-move-newfstatat.patch 544 BLAKE2B 877bb058fc2d06c315c086b5501181bac1a63d3e08bfd900bd3cd651b8dafaac0531357c4b9f30c51eccf17f0debd219daba2d3f115843ad77bb4b9bcdfb47fb SHA512 fe2fac5c6b6cd5c905209685c57ef3a2f2fb14f633b5cd0e73aaace0f7774f76b1cb1b07b6c94558a6bff3017c8498574d12b703495ef314eaf5f1298a9c078f
+AUX ntpsec-1.2.0-seccomp.patch 736 BLAKE2B 9cd75079773786aea7b2c87518d9d8d4c0e49298d4a83fb57354faac5b9169fdec2fd1bd36b7bf58b2938ffa954da06e33d07d77ac518885cb876a78b17ec45e SHA512 4949332917b34ef2895da646b0415bb15aea4db07026bbaba1932312e003688718db7a506f6468cae1e1e9e5a5379acb5d244b3bc570548d30e67f2294863d2d
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
-DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
 DIST ntpsec-1.2.0.tar.gz 2625968 BLAKE2B 23ceae5a1f241fcf5a17801fec2f15f9b9d9d64a108bebe29bdc75196303091eaf0efee7df67ce10acefb7c8dba90ce1144a0c0c5432797d7659714d162f26bb SHA512 9e18b3ca2f786a1ea323ba2384b51cff3d862115cea1ae576fc98172c476ac5e7d0d0fc873e47be0b19b050204ea9ed49669d94e66eb94525068dd1b08a8ae71
-EBUILD ntpsec-1.1.9.ebuild 4204 BLAKE2B 7048ffe57ab11bb95b10a136fca7c84178be03b81ae075d390c4cf90ec7c4efffb250a59d957c7c758efbef8e6ede0b38208775d19e33075f12ce61e17c9df2f SHA512 9bdcfb046201f517b8e1f249146c704e55a73b4649382402ad10bfca1bd7708daaad212fe708ef807ef0bccb8196cc7bcb41e5e2684f14c89fb94605535288ae
-EBUILD ntpsec-1.2.0-r1.ebuild 4443 BLAKE2B b22f287060e4d61410c4bdcec9c2800e648a1e67b72bb154c5452494caddd88fef92d258490a0c9c18f670dafe792f0cb1b90fb29dd6b5e7bcdebf268a5d8f0e SHA512 ed762dea1c5b8f1f7f49d809a4ec3f4fa25f268ce368188797b3cbba2fdab4cbf95ba6eabaf5a89ffb22375cb1b63d3d0334f7a1c216631a5b2f98732ee200f0
-EBUILD ntpsec-9999.ebuild 4063 BLAKE2B a4bd61f498368159597b30b658ee186c14817fba8e0e27c64f2b779457a7b9df1f51c9ac1cf8b3dbb77bfac97bda5678ae0d4c60bb4ee4dd6ae91898e4aa83a5 SHA512 797245b867ba2e9fa33386fb631dff6b4c724862adf5d92e85b8ea4ae47bc9a9fc104bd99f85d7f1bb64e51fbf5d11bf16dee382ff435650463d19484103d0b7
+DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
+EBUILD ntpsec-1.2.0-r3.ebuild 4484 BLAKE2B 1f32519192c92760de2eecf1b8b4d72f1514da7ca196840d41ad6dc237a903eecce9a33a232c22ae0203be0a41c58e1d298a2177cac909713aaff073b39f77c6 SHA512 5d29ff40f10a9afe490c5f3c2d317eecb8615aff89bf733776a8f702fdc25cf5cf1b7b7510ce3fa149a903d904f1be97e2acd350f43afcc1da6a6c1de7582b9a
+EBUILD ntpsec-1.2.1.ebuild 4488 BLAKE2B 7a231efd59c854f2f1f3216131e25dc9008161b81567b6121e5d1d633594db8fd5c50336f27b28733fb9697e5e0ce73f49bb130836c6b871d512d898ff57483e SHA512 ea87adba6261a83eeb1da3ff9b1bf7be1f7a39b1fdf6cc640ec72ad49f60721efc618846d32f4e25a47cf266b044ef01c6d989324cc1477315cf138245598350
+EBUILD ntpsec-9999.ebuild 4063 BLAKE2B 46d4c35ff1b73d2af63182f38ea3d3c4b3ab28b53b31764f9e8615922239857df7cbe7397d32202402b91507547e0d6d9834184f13c249bd95e32e39ed4c1cd2 SHA512 55278b3d172de7de1eff6a9269049bbb40270ce16cd6063c550ae0c9a642300899ba22d3953b24e4abe7fb7391cd453a035892915d15d44d0cf7e7f89cc1606b
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch b/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch
new file mode 100644
index 000000000000..6e61a06e12d1
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.2.0-seccomp.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/705128
+https://bugs.gentoo.org/786228
+--- a/ntpd/ntp_sandbox.c
++++ b/ntpd/ntp_sandbox.c
+@@ -463,6 +463,15 @@ int scmp_sc[] = {
+        SCMP_SYS(send),
+        SCMP_SYS(stat64),
+ #endif
++#if defined(__arm__)
++       SCMP_SYS(statx),
++#endif
++#if defined(__riscv32__)
++       SCMP_SYS(faccessat),
++#endif
++#if defined(__aarch64__)
++       SCMP_SYS(syscall),
++#endif
+ };
+        {
+                for (unsigned int i = 0; i < COUNTOF(scmp_sc); i++) {
+--- a/ntpd/ntp_sandbox.c
++++ b/ntpd/ntp_sandbox.c
+@@ -355,6 +355,7 @@ int scmp_sc[] = {
+ 	SCMP_SYS(openat),	/* SUSE */
+ #endif
+ 	SCMP_SYS(poll),
++	SCMP_SYS(pread64),
+ 	SCMP_SYS(pselect6),
+ 	SCMP_SYS(read),
+ 	SCMP_SYS(recvfrom),    /* Comment this out for testing.
diff --git a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild
index 1032524529cf..9d2d01df34ea 100644
--- a/net-misc/ntpsec/ntpsec-1.2.0-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.0-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	KEYWORDS="amd64 arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -61,12 +61,14 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
 	"${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch"
+	"${FILESDIR}/${PN}-1.2.0-seccomp.patch"
 )
 
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
 	default
+
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript || die
 	if ! use libbsd ; then
diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.2.1.ebuild
index f92de0e4f1d9..593fe355639b 100644
--- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
 
-inherit flag-o-matic python-r1 waf-utils systemd
+inherit distutils-r1 flag-o-matic waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	KEYWORDS="amd64 arm arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -58,18 +59,24 @@ DEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
-	"${FILESDIR}/${P}-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.2.0-move-newfstatat.patch"
+	"${FILESDIR}/${PN}-1.2.0-seccomp.patch"
 )
 
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
 	default
+
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript || die
 	if ! use libbsd ; then
 		eapply "${FILESDIR}/${PN}-no-bsd.patch"
 	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
 	python_copy_sources
 }
 
@@ -90,8 +97,9 @@ src_configure() {
 	local myconf=(
 		--nopyc
 		--nopyo
+		--enable-pylib ext
 		--refclock="${CLOCKSTRING}"
-		--build-epoch="$(date +%s)"
+		#--build-epoch="$(date +%s)"
 		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
@@ -119,6 +127,7 @@ src_compile() {
 src_install() {
 	python_install() {
 		waf-utils_src_install
+		python_fix_shebang "${ED}"
 	}
 	python_foreach_impl run_in_build_dir python_install
 	python_foreach_impl python_optimize
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 7833fafd9711..4d520e72c5a9 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 616c9367cd82..a8ada3cef3fd 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,3 +1,3 @@
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.1.0-r1.ebuild 666 BLAKE2B 1478efb222535df133f1c83d28c8304a082f8c5ecfc0973c2009f717cf503f3e7b41e0ccd4022036da3251b92fb1b50d0f555a394d3d1106b52096551517a59b SHA512 4af7ff4ae64e8f2cf6d6f54396339432be006702b7abd49b7df362e1091ac835948b6e47f79c3906249a57dd1a0519d11212885438349a002a9e4e2b7fd89a72
+EBUILD nyx-2.1.0-r2.ebuild 670 BLAKE2B 6ba8d21aa1047ad533510c09d2e07dd1099a48c91fce2f8319fbc0909eaa17795543106c7d6e1a352b08e974f47609ce2c304bdcf9f7e74207b6727878277ee7 SHA512 433e8d5d24b9955a28f4ffdb557dbfacedd52e54bf6b12a76db64617974339392e1f9fc3cc6ec011e943448b5de8352adda3084c474b36bea09408a6520e4872
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.1.0-r1.ebuild b/net-misc/nyx/nyx-2.1.0-r2.ebuild
index cfc8c7e5f17d..e3daaf75fa08 100644
--- a/net-misc/nyx/nyx-2.1.0-r1.ebuild
+++ b/net-misc/nyx/nyx-2.1.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7,8} pypy3)
-PYTHON_REQ_USE='sqlite(-)'
+PYTHON_COMPAT=(python3_{7,8,9} pypy3)
+PYTHON_REQ_USE='ncurses,sqlite(-)'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -21,9 +21,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	net-libs/stem[${PYTHON_USEDEP}]
 	net-vpn/tor"
+
+distutils_enable_tests unittest
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 15bc0487b530..282bc5bf0d99 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -11,5 +11,7 @@ AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
+DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
 EBUILD openvswitch-2.14.1.ebuild 4412 BLAKE2B 349b7cae8d88f157b608189086b111d5ad0af227cc15a7dce04cfb94874e19551851fd09f12c414f2884294f86a6371bf956b37d9161072c5f612ebad7a557bc SHA512 35f1ddd7393bf0a57132ef1a7f3d2c872a057eb95f33dd7bc1703147c73675a4797b9b87d6fd0314e1f75cae29282e1305b91cb0a58d4862ccea2dc1ae5db349
+EBUILD openvswitch-2.15.0.ebuild 4370 BLAKE2B 7587be9823c2db3e0f7c815de8a226904b6c67fc2fe7edd1b7071e97906a10c89dc163f0a53771f88c51f6fd081a4e7203027a9434e9f0042eaafbc20d850394 SHA512 973d59ef1d51d4550bb671f607eda6b4737ba881dae26228c708f1e5769f443b44890acca2ea997014e80ad9dd67dbe8f293c401d64ab8880d9bbfb4e3c51c62
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
new file mode 100644
index 000000000000..7f44d4ded567
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+
+inherit autotools linux-info linux-mod python-r1 systemd tmpfiles
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.13.3[${PYTHON_USEDEP}]
+	dev-python/twisted[conch,${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux[caps]"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES="
+	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+		kernel_is le 5 8 999 || die "Linux >= 3.10.0 and <= 5.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug 607280
+	export ovs_cv_flake8="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	newtmpfiles "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	# only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 9b6b7e57d598..fa94992856e5 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST ownCloud-2.7.4.2934.tar.xz 14151708 BLAKE2B ad6f3d827a2fdcead6fdc2514696e8fbdb75b2d365c9a09602b95b24c669695e3693167f5da305e27e6fb2266f106b50c578def1d1518730926a10f640defbd9 SHA512 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6
-DIST ownCloud-2.7.5.3180.tar.xz 14154036 BLAKE2B ebee57568b917c1c7dec8f41f172caf53d0bfe4eae5e24ec5c9adbf656bf667769b0ed341a13a899ff6a04cd779d92b145736dce5a4e72055d306b2f08e0a902 SHA512 9e788341c45753eb2d2c62d252cf453259474689fd7d498147e0f4548a9038bd44bdca1539f9617d383853f8f9ca2f24c575667fb96e2a1a4ceec30195d257c2
 DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
-EBUILD owncloud-client-2.7.4.2934.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
-EBUILD owncloud-client-2.7.5.3180.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
+DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178
 EBUILD owncloud-client-2.7.6.3261.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
+EBUILD owncloud-client-2.8.2.4246.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
 MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49
diff --git a/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild b/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild
deleted file mode 100644
index 4afe35f947d5..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.7.5.3180.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-MY_PN="ownCloud"
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	kde-frameworks/extra-cmake-modules
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	xdg_pkg_postinst
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild b/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
index 4afe35f947d5..4afe35f947d5 100644
--- a/net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index ae1b12c3904f..23a4e7cdee83 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,6 +1,8 @@
 DIST proxytunnel-1.10.20200907.tar.gz 54711 BLAKE2B 79b5fc459ece793997b4407679498af29c53aa495802259f95ec600665fca815f9e43cafcbf1d0407c4f7184c21e7dae3f899413dbeeaf0924034e1bbd26cddb SHA512 f04570e87a0fda024661135b6598f87f1d7407c368fe3453300a655fefedb66ade96a742223de08b500ba9fc1fdc2e6519005ea38529ceaa3c1815f5012fca84
 DIST proxytunnel-1.10.20210128.tar.gz 54702 BLAKE2B e873f20c37b5c0dc66a2a6767cfb8d9f73e7cfceaf99e03750eb5fd72acd33bd42281c2eec7e1a72ccecdd7fcd62c8592926c55c206aad220ed5b0b9bc3d357e SHA512 188ab239362cc7c9fd05ddaeaa85aee45c9040ac8f39f10cd0a97c2b92f49a9f5b854690b945109474492955c46b1f5c87e3251bfe68b22d3f1b3a21cf17eda0
+DIST proxytunnel-1.10.20210604.tar.gz 54872 BLAKE2B f8e70bd81a541bd3ecf0ed09fedc57396531aeec460eaff125046700d1a9c69f110590a5b81f650fdaba0c5938dd401a2937ee7347a4e33a3b89ac36bb915a7c SHA512 8cf88cda45646575b1eebbca3e8fe0de0edb6bcbecfb5b06cc50fdb863717f7c72b0a52c6d0f70f99284c1b2914f455f0965366b16e331c12e1bb98296b9b7ae
 EBUILD proxytunnel-1.10.20200907.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
 EBUILD proxytunnel-1.10.20210128.ebuild 1099 BLAKE2B 232f1d29172e64b49632f180cf16646cb41204aeb043796fe831c73d06d3ebd3accb2a92c6aaad3126470f6954163636b67e98d6004245b7dd79f4126335b126 SHA512 2b28ade2060edee28e6e991d18728eeb0482fb445c7fafb3a28b85c94cf34a59f4e717b1da5ba3e1d9cd3bad43fe34ed75273aa6201e8d3b70d708afa682ae64
+EBUILD proxytunnel-1.10.20210604.ebuild 1099 BLAKE2B 232f1d29172e64b49632f180cf16646cb41204aeb043796fe831c73d06d3ebd3accb2a92c6aaad3126470f6954163636b67e98d6004245b7dd79f4126335b126 SHA512 2b28ade2060edee28e6e991d18728eeb0482fb445c7fafb3a28b85c94cf34a59f4e717b1da5ba3e1d9cd3bad43fe34ed75273aa6201e8d3b70d708afa682ae64
 EBUILD proxytunnel-9999.ebuild 1099 BLAKE2B f0583623d03bd83e41af0154343767de36dcc426789cff6272422c19d703f045ca38608dd4123454517d4253f56c3116940f3a3fd52bcf254d3f28dfab6a2f5a SHA512 44d288b26633cde054f04560c0123e158acc23a76957e1b208e3333b828c15cf801f3a9108f29919c6250aab8a90968d2a23a1b1e5d0b5987d5906d4cceb4acd
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild
new file mode 100644
index 000000000000..e15bad2afce3
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-1.10.20210604.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS INSTALL.md KNOWN_ISSUES LICENSE.txt README.md RELNOTES TODO )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+src_prepare() {
+	default
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
+	einstalldocs
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 14eb214306a2..874a3ec7e0a7 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -2,6 +2,6 @@ DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5
 DIST putty-0.75.tar.gz 2731167 BLAKE2B 529b2c65853b8f915afd0563c1a055244d919794a71cff43573910fa2d4a81efca060c12320a0d07ddf3b03064b7e27d00ae396d6a2c1e46dc1a06403cae5c17 SHA512 3dbc15485008a98daf60236061253e66b94a6e5da123fc84c5f0ac006c84e17c70fe748987677775e3b54a12297eb826cccf70a4fc039b633bc2d512938b3028
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.74.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
-EBUILD putty-0.75.ebuild 1705 BLAKE2B facfdddc435961582f8f437113f49efac9f65d027a6263aa38f2d31768c3737602756069ec201309c8275c50a0575b01d95124f701e7818f29ebdadd5a285b80 SHA512 096f01563f6af4253eeba726724f17caa681bc658f767254da6326310fa040a0784e952a6d65e0e2da47332b52df3c28379de1dde6603f04c02bba9b689c0b07
+EBUILD putty-0.75.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
 EBUILD putty-9999.ebuild 1746 BLAKE2B 112f9ce331c974edf1a5e7e9dd778bed19e5072be100302fe601a92cc9456be965dc0f2cf015a4630385b8c766b12bc497ef4504ee2bbcafea9e8dfe7e812f4d SHA512 87cae42323cbc63e4a739b7eed25925ed91467a5b06fbc68721f6f7afaa7af3e23e94428d1a497a7509fb44673d101b7b6b58e7f5140fa1bd008f1f95212ffab
 MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/putty-0.75.ebuild b/net-misc/putty/putty-0.75.ebuild
index de62fdf29a9f..62ac436ba4c6 100644
--- a/net-misc/putty/putty-0.75.ebuild
+++ b/net-misc/putty/putty-0.75.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 SRC_URI="
 	https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
 	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 5c22cbbf3455..479d604817e9 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -2,5 +2,5 @@ AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e5856
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
 DIST rabbitmq-server-3.8.14.tar.xz 3187648 BLAKE2B 53dc32a4b798e79d4c523f13e3d6edeaeabae251221875c464d4ae53fb5d80883807d615591cf8b7a9aae862b182637a2a0bbe1966025791560b3e8f6dab73f5 SHA512 19326fb7ce42241c22541dadd73a147d0b1e6c01d3c7748486fb1d666d76e2ba7835d2a39c200294808ef1a7af5f885fbbe8c7c2a81e561922bd6f8574e5fb91
-EBUILD rabbitmq-server-3.8.14.ebuild 2121 BLAKE2B 6c2d0b1206638c5fea4e931b62017080989256a87bf60dbe58ab35c33a0270159b3d6f2a4ec56e00e934904c6647be4001537a7baa4328f67dd908df68797a52 SHA512 577ec6aaa235863414f26736f454771a80c544bf83150c24f0f446ea37c316439966e518de125faf2278283fbaa8cd229fe9a3244fe25c430ea231027de9f184
+EBUILD rabbitmq-server-3.8.14.ebuild 2123 BLAKE2B 517cf859914216b94b892632ffa73671323044a4b8a726faa8916f156f024295075503356cdad523c5f353efb4838bec810fb7a989c65cd690ed5b58bff6e956 SHA512 7865ffd3400a7c7302536323ac9b70a71fd181c0af91321c42b2aaead3080cf9d6c6aaa90d80802c1f95a9cbb3cad9655e1f829aef1305878c9f057d693d2213
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
index 346526d274c4..44349a5e36a0 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-any-r1 systemd user
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index a53bc97bbdcd..2ed590651da3 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,13 +1,9 @@
-AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0ebd8a82f4bfa030594e919d920f9ac081dc82acb75a2e4a76f520516efbfeca24c14ef15fe853c13a62f7db7776e05a700a11cd SHA512 78012c0ad279b870e3a550cd13afd5dc02f8e3af7708090aa6bd3c9892c9a6914f343e51787d9546f1416b45a17c57d2f643dd04a5dda479e22889d55a800a96
 AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
-AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
-AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3
+AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f9bf867d1890a16a027015390c8402f9da98513ec5fa5fdc2fee754d4e6c436cfd20d61cf830e3f9a8d7111bac37cbeed06 SHA512 85308d3230fa71a2381f35c20c02e3316a8b1b98bbe3f507d9f14fc8f7e703ffd7a6a45907e0799d3f7a243da52571e3c07b7adb1f68a4123133d8ea3eb31451
 AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485
-DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
-EBUILD rdesktop-1.8.6-r1.ebuild 1719 BLAKE2B 423890da3163c6ceebb26bf0dfdff5fa5fe04723fcb32329b5270cbf0afd7cdac6632b79e95ed48bcafaa8e38c8e59e2732e56cb01ee2566d4fd5d64bd5927ae SHA512 5ed08665faf130deb7a6b8a2060eaec82166ab3a1ab799239c3e4c497a18175e57d1708fa7a53c9747d9b25b5f8de2afa39111023073fba62ae052462a3f99b3
-EBUILD rdesktop-1.8.6.ebuild 1675 BLAKE2B 2d3b80868b1ac41c121780d4a17e89074e20525f1fe12cbe7a97f4d721c3bbd10012dfc56adf765d83d53a803529203fe17cf58189c397839283bf473e303323 SHA512 ae47270d110ba76b8b2c54eb6f9fb3b23f3b0767a9d651ed31d47fb30cf6e32da8d9856207a9eee5edf760d2b00b79652868029cf4e9c33b5db1c134f763600e
 EBUILD rdesktop-1.9.0-r1.ebuild 1749 BLAKE2B 23e0faddcc839ce9ef8bbade80f66a642d2804cbdc12eca2b70cd41700ce6248b5e5d6490b1616e92b0fd1d0a2d895117b8136abc5f3bf8fbe7c7fc73db6bf1e SHA512 39fb5a3187dfa26161da186b26821c2c6d33fb9b242056a706cfa920b41a01307f799043d14478e6e723f6ecae350201e7adf2ab2bee088de6dea89b576c1b01
+EBUILD rdesktop-1.9.0-r2.ebuild 1788 BLAKE2B ec12da46b590b92ba54db4c475e8b7c0e46d9d714aea353636de859ec6f868cee495d9875b493b2eabeec7f4e34802d82701a4925e490e3e58572f66ecdd3fcb SHA512 87d3b47cdc4378b7dda51a17d9c750c89cb6699570c3d5c503c3c0722f3f06e2d400fbfcbbc2423d985e58a0aed89dd4e96c5aeb60d67e87b034ec8d0ded5e8d
 EBUILD rdesktop-1.9.0.ebuild 1694 BLAKE2B 643d0eb4f1aa7d86ebed2fea56d07c7d17f6610c4b6adaa2b3c502c0bc1821e2bb95b4b07f27f09e2b4592beadd29f6ffcf9d788a5a64b4deaec0888748dbe29 SHA512 7922b7ffc4cf08ba3c96faa43dfba382e573abfec39ab61d0bccbd63fed6b130fd536eec0bbe18996c519cf6a13935c8ced073632d62275c1829444aa4b2a84c
 MISC metadata.xml 883 BLAKE2B 9ad73132150a724eb69cf65c62aea7cb0530e45fb4ca0395bb916cc95f48452b2dbd34edc7116ef9b8184527ea2dee16213b419185eac7b5aba8346dc7978cbc SHA512 5a68b2d8f23e4039efd76a52ea19400b2d17dfb01d0cb16504914bd0e2fb6f0523a135e7e98a19d7a0f371c1b149cb9426fc308303a0fa09a0bd0ebd118c1ea2
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
deleted file mode 100644
index b2f492b10716..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rdesktop.orig/configure.ac	2009-06-30 10:35:14.000000000 +0200
-+++ rdesktop/configure.ac		2009-06-30 11:35:10.000000000 +0200
-@@ -228,7 +228,11 @@
- if test -n "$PKG_CONFIG"; then
-     PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
-     PKG_CHECK_MODULES(ALSA, alsa, [HAVE_ALSA=1], [HAVE_ALSA=0])
--    PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+    AC_ARG_WITH(libsamplerate,
-+        [  --without-libsamplerate disable libsamplerate support])
-+    if test "x$with_libsamplerate" != "xno"; then
-+        PKG_CHECK_MODULES(LIBSAMPLERATE, samplerate, [HAVE_LIBSAMPLERATE=1], [HAVE_LIBSAMPLERATE=0])
-+    fi
-     if test x"$HAVE_LIBSAMPLERATE" = "x1"; then
-         AC_DEFINE(HAVE_LIBSAMPLERATE)
-         if test x"$static_libsamplerate" = "xyes"; then
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
deleted file mode 100644
index a5e14c3aff0c..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.5-use_standard_gssapi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur rdesktop-1.8.5.orig/configure.ac rdesktop-1.8.5/configure.ac
---- rdesktop-1.8.5.orig/configure.ac	2019-05-08 11:24:50.000000000 +0200
-+++ rdesktop-1.8.5/configure.ac	2019-05-14 18:33:49.479354354 +0200
-@@ -122,27 +122,20 @@
- 
- dnl CredSSP feature
- AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
--AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), 
--	      [static_gssglue=yes], [static_gssglue=no])
- AS_IF([test "x$enable_credssp" != "xno"], [
- 	  if test -n "$PKG_CONFIG"; then
--	    PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
-+	    PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
- 	  fi
- 
- 	  if test x"$WITH_CREDSSP" = "x1"; then
- 	      CREDSSPOBJ="cssp.o"
--	      CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
--
--	      AS_IF([test "x$static_gssglue" != "xno"], [
--	          LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
--	      ], [
--	          LIBS="$LIBS -lgssglue"
--	      ])
-+	      CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
-+	      LIBS="$LIBS $GSSAPI_LIBS"
- 
- 	      AC_DEFINE(WITH_CREDSSP)
- 	  else
- 		echo
--		echo "CredSSP support requires libgssglue, install the dependency"
-+		echo "CredSSP support requires GSSAPI, install the dependency"
- 		echo "or disable the feature using --disable-credssp."
- 		echo
- 		exit 1
-diff -Naur rdesktop-1.8.5.orig/cssp.c rdesktop-1.8.5/cssp.c
---- rdesktop-1.8.5.orig/cssp.c	2019-05-08 11:22:39.000000000 +0200
-+++ rdesktop-1.8.5/cssp.c	2019-05-14 18:34:49.559368755 +0200
-@@ -140,7 +140,7 @@
- }
- 
- static STREAM
--cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in)
-+cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in)
- {
- 	int conf_state;
- 	OM_uint32 major_status;
-@@ -181,7 +181,7 @@
- }
- 
- static STREAM
--cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in)
-+cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in)
- {
- 	OM_uint32 major_status;
- 	OM_uint32 minor_status;
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch b/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
deleted file mode 100644
index dbb0d0e9baf7..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.6-sec_decrypt.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7841030279c5300d5073b2348b58f3f41e136f82 Mon Sep 17 00:00:00 2001
-From: Markus Beth <markus.beth@web.de>
-Date: Tue, 11 Jun 2019 22:57:31 +0200
-Subject: [PATCH] sec_decrypt() the correct amount of data
-
-Save the correct amount of data to sec_decrypt() because after
-inout_uint8p() the macro s_remaining(s) will find nothing left.
----
- secure.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/secure.c b/secure.c
-index 8f65b3aa..9b301e1f 100644
---- a/secure.c
-+++ b/secure.c
-@@ -813,6 +813,7 @@ sec_recv(uint8 * rdpver)
- 	STREAM s;
- 	struct stream packet;
- 	size_t data_offset;
-+	size_t remaining;
- 	unsigned char *data;
- 
- 	while ((s = mcs_recv(&channel, rdpver)) != NULL)
-@@ -832,8 +833,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 
- 					s_seek(s, data_offset);
- 				}
-@@ -860,8 +862,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 				}
- 
- 				if (sec_flags & SEC_LICENCE_NEG)
-@@ -883,8 +886,9 @@ sec_recv(uint8 * rdpver)
- 
- 					data_offset = s_tell(s);
- 
--					inout_uint8p(s, data, s_remaining(s));
--					sec_decrypt(data, s_remaining(s));
-+					remaining = s_remaining(s);
-+					inout_uint8p(s, data, remaining);
-+					sec_decrypt(data, remaining);
- 
- 					/* Check for a redirect packet, starts with 00 04 */
- 					if (data[0] == 0 && data[1] == 4)
diff --git a/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
new file mode 100644
index 000000000000..71ada7703996
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.9.0-gssapi-check.patch
@@ -0,0 +1,12 @@
+--- rdesktop-1.9.0/configure.ac.orig	2021-05-22 14:38:14.854099405 +0300
++++ rdesktop-1.9.0/configure.ac	2021-05-22 14:43:41.476323564 +0300
+@@ -84,6 +84,9 @@
+ 				fi
+ 				;;
+ 			*)
++				if test -n "$PKG_CONFIG"; then
++					PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++				fi
+ 				;;
+ 			esac
+ 		else
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
deleted file mode 100644
index b81e1b576142..000000000000
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://www.rdesktop.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="
-	dev-libs/openssl:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	kerberos? ( virtual/krb5 )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
-	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
-)
-
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_with xrandr) \
-		$(use_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
index aa98e0277708..1f5e5559a2bc 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
@@ -13,35 +13,46 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libsamplerate oss pcsc-lite xrandr"
+IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
 RDEPEND="
-	dev-libs/openssl:0=
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.2.0:0=
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/libXext
 	x11-libs/libXau
 	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsamplerate
+	)
+	ao? (
+		>=media-libs/libao-0.8.6
+		media-libs/libsamplerate
+	)
 	kerberos? ( virtual/krb5 )
-	libsamplerate? ( media-libs/libsamplerate )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	oss? ( media-libs/libsamplerate )
+	pulseaudio? (
+		media-libs/libsamplerate
+		media-sound/pulseaudio
+	)
 	xrandr? ( x11-libs/libXrandr )"
 DEPEND="${RDEPEND}
 	x11-libs/libXt"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
 	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
-	"${FILESDIR}"/${P}-sec_decrypt.patch
+	"${FILESDIR}"/${P}-rdssl_rkey_get_exp_mod.patch
+	"${FILESDIR}"/${P}-gssapi-check.patch
 )
 
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )
 
 src_prepare() {
 	default
@@ -49,20 +60,18 @@ src_prepare() {
 }
 
 src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
+	if use pulseaudio; then
+		sound_conf="--with-sound=pulse"
+	elif use ao; then
+		sound_conf="--with-sound=libao"
+	elif use alsa; then
+		sound_conf="--with-sound=alsa"
+	else
+		sound_conf=$(use_with oss sound oss)
 	fi
 
 	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
 		$(use_with ipv6) \
-		$(use_with libsamplerate) \
 		$(use_with xrandr) \
 		$(use_enable kerberos credssp) \
 		$(use_enable pcsc-lite smartcard) \
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index e008a17475ef..825c55097bb9 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,9 @@
 DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc
 DIST Remmina-v1.4.16.tar.gz 2615347 BLAKE2B 5cff71d94bf66dd0116be739646c33a601a83deb8fef1cfcddf9c197eb34458ea97f6e45e96e7e0bab7fbfb6d95c6150e5c72c6d5aae5f23bfedc8f080e00ade SHA512 a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78
 DIST Remmina-v1.4.17.tar.gz 2618015 BLAKE2B 2b4fbc6cd80dba7d73d8ce7cb5627b6fb67c0cc0c76f124da629f2ebee2c5d0542c3e6b626cdc19630f49f1227fada7e5344ff2f49eeabbc8709c50f5d1f58eb SHA512 e833a4c602ce68354b6d65ea0d7e32c19a242bb72d5fcfd558106b6f53d9397b278472070bc53579185ebbc8fb2ea88718e05f05fdb743df5b46051eb3423d78
+DIST Remmina-v1.4.18.tar.gz 2578470 BLAKE2B 341352b6661a640cf99c5ca6a79f3f1a77cbd0a6027e4bd4a6360f2ed17e1a5abb58ca8a8638988842efb7218072e5cb4a3e56e0f35b7c06f9094c0e00d72689 SHA512 98f14caf39afd8531ce1af2e5f9addc1c68fa12eb66845f0436eec623e8bdbdd75ec14c59544e6e6414b2e4c522ac2b8213fd30561a902768d805ceb1d768f69
 EBUILD remmina-1.4.13.ebuild 2491 BLAKE2B 70f498068e3529e7e8a3d46d937f4a76faee8b5eae69d12f07a5c8785f5c2c496f4331d5770cb6e4cf6b408fae859c14a40573892484a1a75dcc97b83163d108 SHA512 d142b8d3bbf6b4520a77564d6be9e01cc02e9df66e82ac38ef70f2e1cfce9378418f107d4859416606bf5aadc108792bc1039b4f63161ea97cb2d7ca0546d470
 EBUILD remmina-1.4.16.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
 EBUILD remmina-1.4.17.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
+EBUILD remmina-1.4.18.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
 MISC metadata.xml 1179 BLAKE2B cd5ed669c77987fc48b69e50632cbdcff804a9eea251b1f2591e47ee22f9e7d0e7922fc23b7b8f8846e15d8d201b9bf177fcba75d3bca75118f912f63ee58f88 SHA512 88b7748273b1cb9e625352a30820fdeb56e78207e5d06049c20406b371859713fcf5a7053578c9df41369ba12d35b3031e1e95919a34529f5f95246727a33c9c
diff --git a/net-misc/remmina/remmina-1.4.18.ebuild b/net-misc/remmina/remmina-1.4.18.ebuild
new file mode 100644
index 000000000000..e7bceef93c0f
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.18.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	dev-libs/wayland
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex appindicator)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index f2d5290f1c47..9644cb2cc266 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -2,5 +2,7 @@ AUX stunnel-r2 1652 BLAKE2B 7a1ee4d81b51583fcc2138b09999bd8ee66f03305f477ea6929e
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.58.tar.gz 988551 BLAKE2B 45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d SHA512 6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
+DIST stunnel-5.59.tar.gz 995508 BLAKE2B 12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ddddab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17 SHA512 c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
 EBUILD stunnel-5.58.ebuild 2919 BLAKE2B 035703b6f9da38617d26983d620087ef1fbf6393580f844dce372d90becf5535ca9297ec29c163f660d4e12ddbd9e56b1223150606f4f1eaca0b7101c5739987 SHA512 c53676354bf7cb298ddba2c5a6daae87d32682be026cba197fe1899b1903c7b7635760ea9290192c9e632359b6dfb4b6614abf6401532f84b95b586fd0b93c6a
-MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
+EBUILD stunnel-5.59.ebuild 2972 BLAKE2B c42d8fa88aa06f58f1470d921cc441c66945dfbe94bb8225af22e34b300aa23033f2e75e73c9bb75a057e50dbce3e70a879f8929ced54154f4b9c851c37a8bb6 SHA512 738ef4daa80792f2b78f790ec617e111a608049b16846254429caf3e3f293cc97149a8b0a2bf4ac885982ba8cd965edb8a2af6c3006f4d7e59b8ae05ffa657b1
+MISC metadata.xml 796 BLAKE2B baa4e805a9a0c26ada2f53ad6e8572a6d01e48ba4ea78e390aa908317d7018b853fc23c298b8d1c728beed8dd7f22a9130e2b35b7045c7b1344f9cb15d7b7935 SHA512 207c1c3882f2889921daaeea4e563ec827492e921187fcdd09d2cb7b4362a7ad8b01e062bc2017e5de459b1cb282c6c8d362620a04bfdfd99d931d88439e464e
diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml
index 7b9debfb547e..4f231a81f727 100644
--- a/net-misc/stunnel/metadata.xml
+++ b/net-misc/stunnel/metadata.xml
@@ -15,4 +15,7 @@
 		protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the
 		encryption, requiring no changes to the daemon's code.
 	</longdescription>
+	<upstream>
+		<changelog>https://www.stunnel.org/NEWS.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/stunnel/stunnel-5.59.ebuild b/net-misc/stunnel/stunnel-5.59.ebuild
new file mode 100644
index 000000000000..40631323d410
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+	dev-libs/openssl:0=
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_enable ipv6)
+		$(use_enable tcpd libwrap)
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 424d4921ce04..c355dc79ba02 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,6 +1,8 @@
 AUX sysrepo-2.0.1-cmake.patch 749 BLAKE2B 40419e1ac3cd9459587f5af1a54a89cbce3b770e81e2c891a6a5dd8f12da9499cdea470951b65233ac43095282892069a976b2f13753332a3981d9779a635ec2 SHA512 9b2d89bf5f6fea6b088d672c51c6b7691375ca2d824c350b9d21cb72df6f290d31681b51426dfd8d2fa5d027e49177e4d6f7392fb758de5718ecd59a9a674597
 DIST sysrepo-1.4.122.tar.gz 679974 BLAKE2B 3161eb8635c3ea7a0168b1a0eb3250da7e8c134030e5c5443d492cb708f095f9af12f08257a7d0b86a084b121754a8f19fa408de5afc32ce82d92bb4c6c7a535 SHA512 ccd603913b0f31f26f990dba8430ad6c1033546cd764396c43cc6667919b486924fc2d2fade77eee9ef7a3329aae2ceaf4acc578613a0c7c1d2a53d3cbf2944c
+DIST sysrepo-1.4.140.tar.gz 683340 BLAKE2B bc9d51fc18450809e0428b32901a20516a82b29a58f0c8bb962c2cfada1bdac94116e8d436eb294d3c50efb3a829f6262666e5715212a1bd83282667cc5ab744 SHA512 9d10f61825438462442a2757293f73a143222dc7f0adafcfdd21a2439eea63fe8789c05765f58c5b3798b0321bc79c4e649f88b0bf0b5443bfac30d1c168325b
 DIST sysrepo-2.0.1.tar.gz 642522 BLAKE2B dc2ce960f1ce4156b89ed8f0ab2c567ca50f8d7fc3bc1151cf52d2302ba8114c8e01b7e295c249176acab6c501fbf45850a6d89fde427be444bcb12ccd243dcc SHA512 c231174980985d7cc7380f2708cd5395f621735cee62923fcb224d09d500978917b4caa7860e4dca8520e27a4f002e7377b987b6738472d6424d09a0894a3953
-EBUILD sysrepo-1.4.122-r1.ebuild 773 BLAKE2B 080c24c14b11ed46417c5a86204e888b8db85c927045a924d55824ee587823c72e135595443b2a0520addfaab84c0c76d2f97a6bff995baa423c422488394fcb SHA512 dc3de4b6afc417add8fc24c9ba17109111229b019ea81162017678c08d3189db80b37131051f32e10e5bd5cc3747bd88de265361aed3024b15b512fd7643e4f6
+EBUILD sysrepo-1.4.122-r1.ebuild 772 BLAKE2B 7425a6e27b426b7b6b62f47ced029fec376dac49a7bd1ca4192c0af7281b540d89695db22eff2d4c8648bb2a7d71be34c127592dfcbec4c443096c5e10ba7087 SHA512 e481e28e1532e179ee42fce9095bfc4d975642c66c4cd33af9b5508db69470689999aa859577c2eb9a7eb2667d2e091d1f457ef65a560273a0c23d3abc881060
+EBUILD sysrepo-1.4.140.ebuild 774 BLAKE2B 6f7998ed5a0bbc506477c05feced5915dcbdd45e06bc13c334188df54fc9a67cfafff230ae7e34123b45a4e5a005e2774ea04a8f2c4971793031e965467a8c06 SHA512 0a5ade7ed2d9751659a9324d2528a023319490ab8fef9059e055a2eaffeb6f953c20f062cb22a2a9d2a36c3149b11806c68f4b0a06f55442622c63d962fa393f
 EBUILD sysrepo-2.0.1.ebuild 786 BLAKE2B 676f6c564fb8fadd063a9bf4b0e380bf6441bcc6e959c802c48a3a8add0472838adb6fb074092333bf919171fca4406850fab59933ca88357003644f5f6e65ff SHA512 750d39de3bb4fdce534491a8d95eaaf528b4cdb4084125e7fcbaa0d4f457c6918956b820227ebe8842a8864fcc73be29e302f53c2146e5404e826143511d9f21
 MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba
diff --git a/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild b/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
index abea148c94a3..184ab5dc58ec 100644
--- a/net-misc/sysrepo/sysrepo-1.4.122-r1.ebuild
+++ b/net-misc/sysrepo/sysrepo-1.4.122-r1.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-1.4.140.ebuild b/net-misc/sysrepo/sysrepo-1.4.140.ebuild
new file mode 100644
index 000000000000..9958375e77dc
--- /dev/null
+++ b/net-misc/sysrepo/sysrepo-1.4.140.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="YANG-based configuration and operational state data store"
+HOMEPAGE="https://www.sysrepo.org"
+SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=net-libs/libyang-1.0.240:=
+	<net-libs/libyang-2.0.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 0eb98dc00719..c4586c9d0532 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -3,6 +3,9 @@ DIST teamviewer_15.15.5_amd64.tar.xz 13264432 BLAKE2B 8f23c036b79c7ee7cbef118182
 DIST teamviewer_15.15.5_i386.tar.xz 13751236 BLAKE2B 32d8f6494c72b51feef54e2d5dd1096aee83c283a1d07680f428bd4321ede9975d1ee4e7cd55718f9250d54304d17887b98ae6e62617e7022ec78384fdde5a16 SHA512 315e6fcaa6d40aab17c47ac4eee6d894be3731ae7d0242e2b11bae279627de04540f8d46908826d53b6a6d275769c19a420c6f30e9869a734e87cb7d6832bfba
 DIST teamviewer_15.17.6_amd64.tar.xz 13763464 BLAKE2B 5dde0947470611bd67bd8913355c965c0e206d2bd5243e27a4fa742e4fc2d3e0849132a6b2527d453c1f8aa2026cb65897bc2a3c83b493914aa8bd69b1d408d7 SHA512 1775e1fb1c35eceb9df1ec12fb5d7a6e7e9df739a211b99561f67665834bbea2bb80af4547841b73be386cae184861d0f40423936d38f9a2055ee30edd4095c0
 DIST teamviewer_15.17.6_i386.tar.xz 14394028 BLAKE2B 4a5f7f72887c4ba391ae444eaba2c7c474b40fc0bfbe0c7745b4c925fbf7626862de162f49f115e41ccc0858cf7d6d813eadf0940d64217a6964b4d83526b0ad SHA512 f7b7a999069cb036b2b528651fb0737ca0dbcbe3b8283ca8281dd9c08f33b1aa44b7689c63816686538213cd10939dcc69510512ab61829ba7d4d7c6789709ba
+DIST teamviewer_15.18.5_amd64.tar.xz 14049816 BLAKE2B f3f32685f32c7cf10e6dacb9b11333fc5fd69a6039bfae4e872aaba2f71451873f5a6648056fb07a69fc44f83bb3067b6c72a5239eb0ce51f33b34ee595fd323 SHA512 5c60737a69c2777d555bc3ce76f43d38171fa4e8e0adf99c4ddece0b8852778c1ea630fe7d938cc6271aded4a6b0bbafec6cd3ccb79db304d0f7b9263bd93c5e
+DIST teamviewer_15.18.5_i386.tar.xz 14697088 BLAKE2B 85992ccfd946fdad245397b8ff9e9340bc608106bc2a8a5290f9e85c5aa012600f6b9c2fa42908d7c7228c089c6f941c25bf48f1424ff17cc87a97eadbb0073c SHA512 bf43108b919acc003384fa7ea342805ce7e6cd1016cf982f066e8e80756dc031d7ae9449ec18cd63e40c928a12dfd9a7138dc7d18943e68e93e72927dd651ab0
 EBUILD teamviewer-15.15.5.ebuild 4027 BLAKE2B 8c597b6b34f440ce5fed8e6fab07d57fd6e70d9a78392e435a0133e7d6f6f4bc51e99fc80598f632eab8d0713fe153a4d4984b51cecbabff04744ac952d7f7a3 SHA512 87a8087b5e4de9fe6b618abc1effdc6abcff605214ff90d804324353f0a9c6e9fdb29fae1a02315fd5a0ba3843b2e004285ab0350ef1b361295c1794714da239
 EBUILD teamviewer-15.17.6-r1.ebuild 4042 BLAKE2B 43fc88ba97e92ee98398d072d926e7b344dc904996f424270fb558d2edbac287724df3c082461ce8eee8411f0c54a676ff1f069e784a100f7f912363b187fc21 SHA512 949265ca6c08ad52e503563b7be381a42e800474a3def791fe49411770b4a788941b4b2a22413ed407f21d0f521511dddda75baecd490d89494d95ce7843f52b
+EBUILD teamviewer-15.18.5.ebuild 4045 BLAKE2B 2039a40e0bb5181fe210ea82e33f532eeeb5211fd27ea801f4a497b0e5b7f54edbff44ea05cfd96aa9c09b3d2ed9e1f13cccd2b45875eb191e44cd01552450d6 SHA512 ca2f9b1907f6723d296f5a40e9b5e87b548b347a8aa323739e9abdd4947b51dbe58fe879127197026b3d625a69bfc81f99487c9b05796a3fcc7d8566af473f41
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/teamviewer/teamviewer-15.18.5.ebuild b/net-misc/teamviewer/teamviewer-15.18.5.ebuild
new file mode 100644
index 000000000000..63c023804a57
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.18.5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_MAJOR="$(ver_cut 1)"
+MY_P="${PN}${MY_MAJOR}"
+inherit desktop systemd xdg
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${MY_MAJOR}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_P}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -i \
+		-e "/^ExecStart/s/${PN}/${MY_P}/" \
+		tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_P}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	local exe
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	local size
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png teamviewer.png
+	done
+
+	dodoc -r doc
+
+	# Make docs available in expected location
+	dosym ../../usr/share/doc/${PF}/doc ${dst}/doc
+
+	# We need to keep docs uncompressed, bug #778617
+	docompress -x /usr/share/doc/${PF}/*
+
+	keepdir /etc/${MY_P}
+	dosym ../../etc/${MY_P} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_P}
+	dosym ../../var/log/${MY_P} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${MY_MAJOR}" teamviewer
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "Please note that parallel installation of multiple versions of"
+		elog "TeamViewer is currently not supported at runtime. Bug #621818"
+		elog ""
+		elog "Before using TeamViewer, you need to start its daemon:"
+		elog "OpenRC:"
+		elog "# /etc/init.d/teamviewerd start"
+		elog "# rc-update add teamviewerd default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start teamviewerd.service"
+		elog "# systemctl enable teamviewerd.service"
+		elog
+		elog "To display additional command line options simply run:"
+		elog "$ teamviewer help"
+		elog
+		elog "Most likely TeamViewer will work normally only on systems with systemd"
+		elog "or elogind. See this thread for additional info:"
+		elog "https://forums.gentoo.org/viewtopic-p-8332956.html#8332956"
+	fi
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index f085842185db..bbaea5439073 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -2,5 +2,5 @@ AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
 EBUILD wget-1.20.3-r3.ebuild 3290 BLAKE2B 46ba1c5d99cd2447e168c09affd97bcfb2f7f9842e9f9e70922e0579512e810400a7ee01bcfddf4c757440bb5ff6d39101251d75fb54e375cd4e4315d81cc5e7 SHA512 bfbbcbd088e1cb169d4bceea7dd831f5dcda35502545e55b095befe2dc9359daa2b909ce0e6916732af62bf323beb87db5f4640c247ff83de5695e63f901d9b7
-EBUILD wget-1.21.1.ebuild 3244 BLAKE2B 66fffe658f8c23fdf58b14af890d0007ccd3c8eeee3bd0f6ce849290eb2b7cf30f698bbf368445fe72b59cb7fe57ebae4ab0d088d002aef644f935c022b8b4fd SHA512 48ddfa4bc61e16977f1ccf181be9e1b93dc4667e264552765145ed03f99d6bedcb3a4ff3053fdfea108903d49a668132f98f583bc9f12621fa79ca4f20ff8baf
+EBUILD wget-1.21.1.ebuild 3236 BLAKE2B 9a2bd30ace63df6fef3aaa5dbc9382882b77dc53f997bd9790a3b52f44e82b1b2aa2eb249502bfbd6437751e079d55f858a13ec3550d5137ae1681d5183bcda8 SHA512 db7814e84d3a03094e44a5bb6fd62c690616bc44f3ab293bfe0fa68a9d3c500a4a3266db6eae3c5045e88e8029632016a68738c0c9261ed70c823d0d7ae961ab
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild
index 71aaf01dd5f9..b882f87b5e7c 100644
--- a/net-misc/wget/wget-1.21.1.ebuild
+++ b/net-misc/wget/wget-1.21.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index c80dfb25cfb2..4fdb69c00c56 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,7 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
+DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28
 DIST whois-5.5.9.tar.gz 102516 BLAKE2B f5f15568558e9f82ed19dbd35fd43f3067953d4766477f71bfb5d638cbf328fe95012633daa90ad14a6bdf836161967684562f6e028bc204f2a9ed539600c92d SHA512 ab70181220a6d41dd9add04bd81836c89a626de1b45f617e9ab044a666f0ab99a4dee910cff4b0a6a3e47b5e0a7320c2c20f3ff95c2dfc852123d4f672629e16
+EBUILD whois-5.5.10.ebuild 1913 BLAKE2B fba85f7bcc9bd4132a95dd3cbe7070bfd6fef092626ef54f704b3978a2198c0a1b5e60451bf3bfcc080a1001ea319b8733c40f4e8aa430158a8cd455e9efd00d SHA512 4028276f4513a5a03fddb0eae2af822d1727a90baa11dc4728d97e7902220863fb9b99f566ff5e65d0a2a5ae2f4d80fa39e3a10cc9960033c73c062411837d15
 EBUILD whois-5.5.9.ebuild 1906 BLAKE2B 134054616f8e108d3668d4dcba8cd2ccdb78834c7a83f9342942e4b43487f537500a4e16524276787f80a43b56d9d4120e73bda25b3a9d36beab7985c06afbe0 SHA512 b36292da9d56227da3b300f0b85d47fe321fe130a63005dac2787d4a05db935f8621491bb21e39894ef2fdd7e6bfa32a53d08b9930ecf022dd17ee371cdfd2be
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.5.10.ebuild b/net-misc/whois/whois-5.5.10.ebuild
new file mode 100644
index 000000000000..4420819a3d8a
--- /dev/null
+++ b/net-misc/whois/whois-5.5.10.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+RESTRICT="test" #59327
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
new file mode 100644
index 000000000000..ec96798e23bf
--- /dev/null
+++ b/net-misc/xmrig/Manifest
@@ -0,0 +1,6 @@
+AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
+AUX xmrig.service 835 BLAKE2B 96a6d52cae6730a08d06563cac47f054b86e8bd78972ab35355fee7f8c20c08943b8aa60e776296f9383f1436a589b84f93a25c8bc960458cb4e2c9a18e38cac SHA512 ec44d44526c67457af17b50dc021832da153bee812b2588b6f3cf0bbdb46449bb3e30e53c7118f1843b156c33695a097c6ee5f52d024a1191aa31c3375e0a003
+DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
+EBUILD xmrig-6.12.2.ebuild 1267 BLAKE2B b96fd1c1c10e556b8414da5ac5cc755bce61760e0a155df9289db4325ffe2cc0d632acd8a9c3418212558336df7081853743fd1f96230619e090f48612187339 SHA512 5e8134455cbf5bbbc85f9a748bdfd24f88ca993c8dde2411cb3056006e64db3473f6f85d8a0c8a55277bdbba1c9de7c4458fbd1cea7c3f15765e2d0501a49a0e
+EBUILD xmrig-9999.ebuild 1267 BLAKE2B b96fd1c1c10e556b8414da5ac5cc755bce61760e0a155df9289db4325ffe2cc0d632acd8a9c3418212558336df7081853743fd1f96230619e090f48612187339 SHA512 5e8134455cbf5bbbc85f9a748bdfd24f88ca993c8dde2411cb3056006e64db3473f6f85d8a0c8a55277bdbba1c9de7c4458fbd1cea7c3f15765e2d0501a49a0e
+MISC metadata.xml 968 BLAKE2B 414e9b01d85608c77582192dac5134dfd9a9d9812bc4798c89025eaddfa054bafe435d93c71e5b62e1628aec122be7f36f17cd53a9f00722f77edb2e8cbe6c29 SHA512 d1c33d7e09517c30aec87d01c0b840a4694cb4ad776422c2c746394e94236886a01d85db52c464def74a61eedd69707932b35dfb75002337c783c0dfe3f1d079
diff --git a/net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch b/net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch
new file mode 100644
index 000000000000..f58c7e2ce5be
--- /dev/null
+++ b/net-misc/xmrig/files/xmrig-6.12.2-nonotls.patch
@@ -0,0 +1,23 @@
+From ee98bfe01a94d021d81ed4c2bb11ec91c0bd81c8 Mon Sep 17 00:00:00 2001
+From: Matt Smith <matt@offtopica.uk>
+Date: Sun, 7 Jun 2020 13:20:04 +0100
+Subject: [PATCH] Don't suffix binary with -notls
+
+---
+ cmake/OpenSSL.cmake | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake
+index 89805301..c01c940a 100644
+--- a/cmake/OpenSSL.cmake
++++ b/cmake/OpenSSL.cmake
+@@ -54,6 +54,4 @@ else()
+             src/base/net/http/HttpServer.h
+             )
+     endif()
+-
+-    set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
+ endif()
+-- 
+2.27.0
+
diff --git a/net-misc/xmrig/files/xmrig.service b/net-misc/xmrig/files/xmrig.service
new file mode 100644
index 000000000000..8b59fc0c131f
--- /dev/null
+++ b/net-misc/xmrig/files/xmrig.service
@@ -0,0 +1,34 @@
+[Unit]
+Description=XMRig Monero Miner
+After=network-online.target
+AssertFileNotEmpty=/etc/xmrig/config.json
+
+[Service]
+ExecStartPre=+/usr/bin/randomx_boost.sh
+ExecStartPre=+/usr/bin/enable_1gb_pages.sh
+ExecStartPre=/usr/bin/xmrig --config=/etc/xmrig/config.json --dry-run
+ExecStart=/usr/bin/xmrig --config=/etc/xmrig/config.json
+StandardOutput=journal
+StandardError=journal
+DynamicUser=true
+CPUSchedulingPolicy=idle
+PrivateTmp=true
+ProtectHome=true
+ProtectSystem=strict
+NoNewPrivileges=true
+PrivateDevices=true
+CapabilityBoundingSet=
+ProtectClock=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+RestrictRealtime=true
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+RestrictNamespaces=true
+PrivateUsers=true
+ConfigurationDirectory=xmrig
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml
new file mode 100644
index 000000000000..6ee8fae27b4a
--- /dev/null
+++ b/net-misc/xmrig/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>matt@offtopica.uk</email>
+    <name>Matt Smith</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>telans@posteo.de</email>
+    <name>Theo Anderson</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <longdescription lang="en">
+    XMRig High performance, open source, cross platform RandomX,
+    CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner.
+  </longdescription>
+  <use>
+    <flag name="donate">
+      Set the default donation level to 1% instead of 0
+    </flag>
+    <flag name="hwloc">
+      Use <pkg>sys-apps/hwloc</pkg> for CPU affinity support
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">xmrig/xmrig</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
new file mode 100644
index 000000000000..e07b6f23ad58
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.12.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( sys-apps/hwloc:= )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/msr-tools
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=OFF
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
new file mode 100644
index 000000000000..e07b6f23ad58
--- /dev/null
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( sys-apps/hwloc:= )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/msr-tools
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=OFF
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 2133050bc220..8173cb44830d 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,5 +1,5 @@
-DIST you-get-0.4.1520.tar.gz 164979 BLAKE2B 063c3a3d14c5430de49fc5ba4e70302048287dad812aef8ba9d2bc67d2089b6f1bcfe4e0db3edf9e1dd0621549104594c8df56acfe8567bd87fb22b9d8ec617d SHA512 fc211753110ffcd39412da82ee11b9a32d98fb9f6caee5ac94732d75c615a8e8439bac247564036b1359bf61422704089e6fca206367f5c7e8fc1f7ec3aff454
 DIST you-get-0.4.1525.tar.gz 164972 BLAKE2B 4ac50572a2714d523f4f3a53c0f7329b07faf88a3c22b26bac5b440383bd6d540854d9966c0b10c25b0c207d4e29c6dd09a06c55c68dbed13ba673c29f5f4eaa SHA512 2d9bc2e66da39dbe0146ad4ff88dd1b45ce17a2208b82196c96a36ed1f4a0a86ade274b3c7b8cf683cf46d69f813caed1e24f58a3a7677a29f1999707da9a5ba
-EBUILD you-get-0.4.1520.ebuild 508 BLAKE2B 384915fd1cc4b27a5d407a1a60fab8e2b0c4f0a32bd172111138ed1b5e701ba5c5414c542e6ac45452666f5ee93861f4dd9de458d082231bf662c997ce15073d SHA512 2d375049c7612dd263a59aacee83623a5b13d17df211b5089e27904e4918a2a75ec73eddc0ad6d96a4854faf3b7f5ecfa7adad82d7dbede1c41048e373e396ba
-EBUILD you-get-0.4.1525.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
+DIST you-get-0.4.1527.tar.gz 164994 BLAKE2B 5bdabefefa92d9fc8a6d7a0f97a4aa7f1e15161f3f8add7e5392ad2994abb0dc082a68301de0d0979a9158515788695413e3d5b1c343b51209b8a3bf22343aab SHA512 9543d49e1b6aadfc6e9af57457a567aa8a804efc255c86fecfbc90c150b9ad1231d38730735ad9cf075312e4ba83f4f3bd71f088d14b8928f7e6951535029f8c
+EBUILD you-get-0.4.1525.ebuild 508 BLAKE2B 384915fd1cc4b27a5d407a1a60fab8e2b0c4f0a32bd172111138ed1b5e701ba5c5414c542e6ac45452666f5ee93861f4dd9de458d082231bf662c997ce15073d SHA512 2d375049c7612dd263a59aacee83623a5b13d17df211b5089e27904e4918a2a75ec73eddc0ad6d96a4854faf3b7f5ecfa7adad82d7dbede1c41048e373e396ba
+EBUILD you-get-0.4.1527.ebuild 510 BLAKE2B 6f52f1d579213889ef26ec16c662acdc07873031a72dfc802760ab960c0c86318861747601e36b6408d44d1e6a368c0d03bfd9e5c0825d20b1d18fb5029a6d7e SHA512 e0c410aed1373a46b8c52d5cd4b1a809df2c8cf8e818f4b1a1fa22c614f1edcb024546b84066eaccb0e24dbc0695d2d5df94bf9859cfc8acfb3ad1056832567c
 MISC metadata.xml 355 BLAKE2B 634db21b0e450020e42fa7576e04a3015f624b4d9ba3fe4d185897142d81497eecc14ffd35283e7903efb67a02368bbf1b27d507123675169abf0ab627c0b1bd SHA512 1dd99e270059527e7230eeffb8779664977af2f9000a1e4fc2025e377602ba4a1a3f6f8def34eb3854a9284638717eea469581cba61ab0ddf374272be62d7520
diff --git a/net-misc/you-get/you-get-0.4.1525.ebuild b/net-misc/you-get/you-get-0.4.1525.ebuild
index 93636c539412..a0cb7ef0a1e3 100644
--- a/net-misc/you-get/you-get-0.4.1525.ebuild
+++ b/net-misc/you-get/you-get-0.4.1525.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/net-misc/you-get/you-get-0.4.1520.ebuild b/net-misc/you-get/you-get-0.4.1527.ebuild
index a0cb7ef0a1e3..93636c539412 100644
--- a/net-misc/you-get/you-get-0.4.1520.ebuild
+++ b/net-misc/you-get/you-get-0.4.1527.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 9e63888ddea4..1dd9aa555f10 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2021.04.26.tar.gz 3333530 BLAKE2B cffa09f91a1bbfc5962177133711ec1fce4760ef4a073c01daede2cdc168a10cfd868ca536903127f5a3214aece1c111d1dae23739aac86e765d7ff21903c884 SHA512 d187b537fc71ca8e0c9422404f14bab20f66ee9ea10af40d94e9216a79d6b78c1c535600308d18905c34ede0934dbf4f642f58125e898130ce536bc053aa2a10
 DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
-EBUILD youtube-dl-2021.04.26.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
-EBUILD youtube-dl-2021.05.16.ebuild 2137 BLAKE2B fe26a208b04301c55e253adfa69189bcaa55624e1e7ac9103634383bb5c04537d1bd15552064d0ae07eb42ab19bd3be3497568d6b4dc74e8bf87748e211c08e1 SHA512 76d1a22b00c0d1625889b5bbd23bbae97a0408642d883127821a16896e3c48a0a809e40496777b65f45b34b6e20b38a7a168d087d781eb1b3e6575ab7fcc3ddc
-EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
+DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
+EBUILD youtube-dl-2021.05.16.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
+EBUILD youtube-dl-2021.06.06.ebuild 2104 BLAKE2B 569aa65da08a7dd77d3988ff9583a5af8f8c8f556d4d6b7742ddc7c7b11d8266a969cbd40a39f0fb22a245cb4d5a93ad5bdc771fb54b421f25f2cb2719bc387a SHA512 9d91adeafb7ad3f3caca35c5e65b7caaf86cdaa37b5b7c1a7312175dcd7665a4ac84bd5e72d2c7c3f81c6b33fabec9829ead0e94c3f7e3739019c045220ed47a
+EBUILD youtube-dl-9999.ebuild 2097 BLAKE2B 193cf2464a2d5f7fe0f6fcbbeefa919884d8bfff551446930a12a98afa0827ff178a9e8af7bc9df827d09ce539a824781b155286b57cd2e7f3e7e1629b08be1b SHA512 a51572c892c8774eccc3ebe098ba634a9c60d3b68e956e980e62313e0ddce524c5cf3e686b820f6a12ee60ef849512004d9677eeea6b54b0d3d1c2504a7ec801
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
index 6ca1748400e4..3d701ad41fa9 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index 3d701ad41fa9..8ec79bfd981f 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.04.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..10})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -15,7 +12,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 718c04ca9f29..50bd1337b3fd 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -30,7 +27,7 @@ src_prepare() {
 src_compile() {
 	distutils-r1_src_compile
 
-	emake ${PN}.{bash-completion,fish,zsh}
+	emake youtube-dl.{bash-completion,fish,zsh}
 }
 
 python_test() {
@@ -40,13 +37,13 @@ python_test() {
 python_install_all() {
 	# no manpage because it requires pandoc to generate
 
-	newbashcomp ${PN}.bash-completion ${PN}
+	newbashcomp youtube-dl.bash-completion youtube-dl
 
 	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
+	newins youtube-dl.zsh _youtube-dl
 
 	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
+	doins youtube-dl.fish
 
 	distutils-r1_python_install_all
 
@@ -55,13 +52,13 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
 	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "youtube-dl works fine on its own on most sites. However, if you want"
 	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
 	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
+	elog "a higher quality format without sound. youtube-dl will detect whether"
 	elog "ffmpeg is present and automatically pick the best option."
 	elog
 	elog "Videos or video formats streamed via RTMP protocol can only be"
@@ -70,6 +67,6 @@ pkg_postinst() {
 	elog "Downloading MMS and RTSP videos requires either mplayer"
 	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
 	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
 	elog "resulting MP4 files, consider installing media-video/atomicparsley"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-misc
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)