gentoo resync : 27.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-27 06:06:27 +0000
commit: 8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree: 4d26462d027b14926335894749d2e01d982234d0 /net-misc
parent: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
53 files changed, 339 insertions, 618 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3501868e7690..94d856826e25 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a791fbadfa28..54593fd6fd66 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -20,7 +20,7 @@ DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648b
 DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546
 EBUILD asterisk-13.38.1-r2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6
 EBUILD asterisk-13.38.2-r1.ebuild 10793 BLAKE2B 9e0ba0d5db3f56b8726a557e8f80ac5833aceb1a023f5d107f5736a275eb3866f98eec6cc9234af73c8ecbdc44302207a0b595e89e7f2a4c578b8553037e8ea5 SHA512 d324345df46ae82b113b06746a9ee4020700de68619f1f82f7c2d41da46f8056c9479b4f9e2cea96bc964c89b72e7fc300d9d5f91162eb0e0a922170916f9b61
-EBUILD asterisk-13.38.2.ebuild 9727 BLAKE2B 23045501df1313e8eaffff84854c636b451c62d866e08faad95c5e9437c3a4663bb8da102fe41e9ca353b1f281572aafead82a6cb949db173aebf6b5f9909654 SHA512 ff7df049d824e33618e7759930df761bdb0ab5e6dca852409daff2bd94bdb84fb99ae3139e877d14655b2cd7a12ec423a87fb2a9fe8aa13c7e9cb2a29867044b
+EBUILD asterisk-13.38.2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6
 EBUILD asterisk-16.16.2-r1.ebuild 11358 BLAKE2B 11dfe65926cad46998ccc2942e00d2a43343dee69c6a0ce2b32c070d1927a58cefba753463467d55e0c3133bb3b01941c5879ebd8881c227cbc94089947b2722 SHA512 ab299440f47d5dc2aa16af46f6859ab4317ec1d83aef853fadcc403a44d3cbc4043a9b6cfe7ce146e6b3bc5958123072e04705e80a3b964009177266a12570a5
 EBUILD asterisk-16.16.2.ebuild 9916 BLAKE2B a02bc1d09394459ca9737f43dea546b16fe3230319585bf7a86a8bbccc123342054f63578382b17bf1c02cee94749c1516860aaea383aaec173990267ba41f35 SHA512 c06ebbc5202ddbda233747120b17b2cda0cb8db4465ea5f445f0d064c8efdb49ef7cf957c5da759bc392dcb5e5805e30b47268062c94b241d2cb27e0ec33c152
 EBUILD asterisk-18.2.2.ebuild 11331 BLAKE2B 89f1eb498c7e25872918ec01a865bb00c393f4b86e6199622f49259b9ceff341c71992d99adce75d8ef808edbf4d139106c3bd41f2ee46e69e013da1b0af03bb SHA512 f4568a1caf38249e2e62ee6a0033aeb023bb0c731820b42429f02afd3f7faffa64fa66f95d708f7f19a0032bdd0ab7c830dfe5a4f985f7ff40b0f7108ccdfb58
diff --git a/net-misc/asterisk/asterisk-13.38.2.ebuild b/net-misc/asterisk/asterisk-13.38.2.ebuild
index 7a8d1d57cf86..4afefac8480b 100644
--- a/net-misc/asterisk/asterisk-13.38.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	+voicemail_storage_file
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 06069428d601..cb629865ee99 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -6,5 +6,5 @@ AUX bopm.conf.d-r1 221 BLAKE2B ca4f3eb206dfc18d5714d1e5530bc1d562d1e6262ce26cc93
 AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5e3dafe264fb043c0a15c0531042e0c0fcaf068f74ff15d5b93f85b07a5793c9e0dbaf191ab7e SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
-EBUILD bopm-3.1.3-r4.ebuild 1383 BLAKE2B b1c515d5b44b1c0e2199551f40a0cc53ddd6281bb6cf89beb144813b8f7c7993743c76cc2e8ced03cf1d80dfa6a6088524c091b6dc256038c63537184a12d969 SHA512 2ce8f45a7538aeeab3cfb7e0c9561002a6a217002a388531e79ac0443a7efca1cdd9dd9856f6ae2c5956abefc445f1f56952fdaa026026c75941e8d7bc0f3489
+EBUILD bopm-3.1.3-r4.ebuild 1401 BLAKE2B 635d6656a807d702aece550b9332f6a87beac0e0bf564a10b759695c036bfaa35fe9fb6281833c506e93717c0167e302a534ba0764d09ba0f151828647d8b096 SHA512 409e437e4d03693b4ed96f2367c8f0ad5e71e1b14125d5cfd6809066694cc7d83206aedc4292af456b2d4819c339bbe222587df44e2ea2401c22175e3e042a6d
 MISC metadata.xml 320 BLAKE2B 0df7bccca17096486031e49410ea661aa6e82e5b9da83c14e193805a2635438487c8d95107b8594a6917983f7976f89fc7a89af6f3cb6cf403e4318d40b09812 SHA512 7df57a22ef6611ea0872ba4b2fd29f6f48d88c18719f032a1f664a4e97945b89d707cec3bd95a1bb9714a4916cc70863a0f1d35e43f977dd829bcdd7ffa329b6
diff --git a/net-misc/bopm/bopm-3.1.3-r4.ebuild b/net-misc/bopm/bopm-3.1.3-r4.ebuild
index 5c2096926f29..d90d4d376cd0 100644
--- a/net-misc/bopm/bopm-3.1.3-r4.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools user
 
@@ -12,10 +12,6 @@ SRC_URI="http://static.blitzed.org/www.blitzed.org/${PN}/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-remove-njabl.patch
@@ -50,8 +46,9 @@ src_install() {
 	default
 
 	# Remove libopm related files, because bopm links statically to it
-	# If anybody wants libopm, please install net-libs/libopm
-	rm -r "${ED}"usr/$(get_libdir) "${ED}"usr/include || die
+	# TODO: Do we really want libopm? It's gone now.
+	# (was: "If anybody wants libopm, please install net-libs/libopm")
+	rm -r "${ED}"/usr/$(get_libdir) "${ED}"/usr/include || die
 
 	newinitd "${FILESDIR}"/bopm.init.d-r2 ${PN}
 	newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 8188530bd160..5780a3d81fca 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -7,6 +7,6 @@ AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7cce
 AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
-EBUILD dahdi-tools-3.1.0-r1.ebuild 2017 BLAKE2B af2c1c8dc9645139ad80ddf21d69b36d53b03c12ee80c6164906f3b5884922c1eac086e9de5340f3c073de72186277d1f6497ea6405280624a625473e5650bc4 SHA512 e2214f1d1d56ba9ca78446409e37ebd94c5fe1a83da2a25ab95f94574c568c56007b3b9dbdd43f8aaff0aaf5e1e5a081d4bec58b66cd12a5a7de6dd70ac4c83a
+EBUILD dahdi-tools-3.1.0-r1.ebuild 2105 BLAKE2B 841b07107b0bd090a5c13df8d71aaa832e77d28832115203363841c00d27174c2736098316c2b967769e6c27d8ddd12a61ecd3dc56233de085b88f4bcdc229f5 SHA512 12fe5c95dda32abbe5d244a1d754df232289da30b1e150a1b02d01878f0618e1ac9c941718010784f1357c1e669641cdf73513aa3ed4b4f3495ccac7c8172580
 EBUILD dahdi-tools-3.1.0.ebuild 1692 BLAKE2B 7ed3148872c5975ad46517a4e687509610ebe57755be7e6ffbf5b1d8617f6a4ae12b7610d30eac5192199190e160d7ea6ee791e62f66deada89c40a39c15005e SHA512 e20f7a9fb034725b1b96a23630a5bfc37d2b90bf702343577328a1c1a078094ed93085e64f5be8a627570168916ab56efdbbe697f4fded5a5f774195b7f4d5f0
 MISC metadata.xml 473 BLAKE2B a1dc5e28f6ed28a92131b23462f4f5948643347786c3526c3496fb93f9f3d4d7b15afbcab367e9be32f8c99248e72abba5c9ce130ed1014a522be5aae3f1d241 SHA512 be7ceb43b06eedba076244b078ded1288e3509cfcc7df4513d2c4d9bb8b5feb356e2890e51ed7ff825a8b568e61273499e0d12f080c96f2014ba0a48af77289b
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
index 7df08c9eb371..557e1849f862 100644
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="ppp"
 PATCHES=(
 	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
@@ -60,5 +60,7 @@ src_install() {
 	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
 		die "Error parsing dahdi bash completion file for commands")
 
-	rm "${ED}"/usr/$(get_libdir)/libtonezone.{la,a} || die "Unable to remove static libs from install."
+	rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install."
+	# Delete *if* the libtool file exists, bug #778380
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index b2dabc3d2758..dec2e32b9613 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -20,5 +20,5 @@ DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0
 DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101
-EBUILD dahdi-3.1.0-r3.ebuild 4806 BLAKE2B ae62f4327aa2a8cb09a5892230e2088c5533fb5e33c8480c119c6e58ea2695485ebecbd2bf4c0cdc73202e83891f1a5ae49a06ddda44a28b652e2c5049300666 SHA512 d1851513061f7b66728415f7c041bdcc16de673d571ecf5010a5e443be4db95d7d640addbb511ec39e2b850fbe4c34b369f43207a66306cc110cb1558f963f6a
+EBUILD dahdi-3.1.0-r3.ebuild 4805 BLAKE2B d6e722b3d9649293889ac3fd9374aa247a1b35b28a6d7fdc526568ed24ff42af392555b75550a82d9089af77d270abcb51edea4c6d7fdbab29e2ea92a80279a1 SHA512 3ccd4e65fead21091cb18bcf5bb9871160c55f7009afcdc3b5a1b2a7cc3cff03c79ee3f0895c8adc3a4312400151945490ecbf74d9acba726fd144f09e82f0b0
 MISC metadata.xml 569 BLAKE2B 29c44b59081d83f8d8fe32b9ae21809295dc07707d14947c1e1a4bbb3b5d183938053e521c743f0fdfa0131cb42a464bd688da35b7d600f30944af714901f8ca SHA512 a69687c4a087484a60a1dc10993706fe4ef9799d226884d93788d9f726196ae3ccdce2a0f458202b3974c55aa8e18e0debec10116c6b86386331c3ae955adbb6
diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
index bb776d1fafcf..5dc1b0089be5 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index c3675b9d1b04..ed6a4e436e68 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -6,5 +6,5 @@ DIST dropbox-lnx.x86-118.4.460.tar.gz 98620060 BLAKE2B 3b2aa51cd93d2ccfc78efe434
 DIST dropbox-lnx.x86_64-117.4.378.tar.gz 101675442 BLAKE2B 42dbb52a4cb1998b1e114e5486acc0a89191c1856f1391c3f19186937faeae12ceec39e5496744f3237e457656f50d4c6af6b4f9ad5b02541e946c96f325ba92 SHA512 876314d7d56692c34c714c7aa8d03d5e9250a5a5bb72c74a16eaee68cf1cf28d4585e4b3ac457dc42d0230d222d62eeeab66672765c182d999f7200a1335a4b7
 DIST dropbox-lnx.x86_64-118.4.460.tar.gz 102012647 BLAKE2B 87ee9e246e5e4c7cd4b5fe7aacbbe028ebec3f02abf650b1d8d8f867aea0900d05ae697ec02916b59b19ad3049606bfa1c63a286f7d21a335650a4322978c345 SHA512 206bb2bc4932d0784438df8de4dfecbbc6deda4ca71f8cd5dced17066293f41f8a722d7e05516e24fcc163cdb9e475733d75d19b369a7f63b3a7f1a966f0d5f4
 EBUILD dropbox-117.4.378.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
-EBUILD dropbox-118.4.460.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
+EBUILD dropbox-118.4.460.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-118.4.460.ebuild b/net-misc/dropbox/dropbox-118.4.460.ebuild
index a77b20f7a3b2..17ace6762e14 100644
--- a/net-misc/dropbox/dropbox-118.4.460.ebuild
+++ b/net-misc/dropbox/dropbox-118.4.460.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index 2ded2c1fb390..f085ced628b8 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -2,6 +2,6 @@ AUX endlessh-1.1-syslog-help.patch 898 BLAKE2B 97d075e3f0e86f560cc57a2227f15ed88
 AUX endlessh.confd 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad
 AUX endlessh.initd 767 BLAKE2B fdc7a57dbf9812880ee2b95f3d23350375ae960431929c5823647d052eb38fd6d3bfb87e9a3d33356018d117a73ba1a78a855972d7e4e11d35cf3a8910b2473f SHA512 2deb46cfcdf002408933f8e20287c1be3a0deddf41d97229ec30408e769b0c9a5c8575cb3e43939e385a3187def4451b7f20acf1641da403f335d435ebabf322
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
-EBUILD endlessh-1.1-r1.ebuild 1328 BLAKE2B b7b524612185219a5399517bb2c411bc477ca8593757de59a66efc91e7595248ffb4a54b61842c2d085aa770754cf8b7424bf9ff67896756df15936d54a0a996 SHA512 8f98368d49f23d11fc299c7048ebe108e65ceeb9591265911091008b108d15146638d2d54bad56898663b005f704e7d6331172dfbea7c51631288bdfebed98cf
-EBUILD endlessh-9999.ebuild 1274 BLAKE2B 86e33cf561e21d916f1b7d04b9437b3a18e23c609001ebd573b22a2b06936f714b544bec8aca2f0a83508ff134fed56e245c560a972499c4bb1f3abcd2bc20aa SHA512 d47aa21b448bfa5e82b097b0fefc7c3caffadbe88c3a29098ba7b70c001439ee9e83da34f60ee7ef0789b62a028cbc656a5ac7e0b5123f2e5e169bff5f4343af
+EBUILD endlessh-1.1-r1.ebuild 1287 BLAKE2B 884855d5b00546e6433f1a1c3d7859040e2730c057ffcf247537256e9006265082d4359cc470c20ca0547dbbf66caece4909f6fa1b4be403e18336b2e3ad5b69 SHA512 f4093f4dd5b565393760c591cc85cf18c3489caa604587ba794f8ca743365f37da0f0841c0311ff6dd50b1db11fff4d70268ce24dc13b658c32aa0d357ee9201
+EBUILD endlessh-9999.ebuild 1233 BLAKE2B 90a03afed39b1f335a1c0b5e0e78d8d88aa5bb6f1958ee8ce5c6ca59bb0b3e334720b2cab6ca1da540cc22712290680b3fc9ba6ca7a856c7cb598af8e2161042 SHA512 1f3067394094c6e71aaa352f66a9930664c4276f9591c69eccb3f3fa61f26dc46c2786daa8b64182ba3dbac6a363cb8b10cada049e0822bc79f86fe58a417024
 MISC metadata.xml 919 BLAKE2B ab8d02aa829751a4903ac5f0774ea59058604ff0bb3297a910eb8f705c5eb5a663a48bb96f4786aae0b477bf171d63478075f78b06eef5dedd4039100b2a62b4 SHA512 ac33dcf8f76eb84c1b78bebea62ea07e8dfd3c727e6ca37a1cd180841a6dbd4e969922e5fc3cb09883ece3255873e462d9e39980ad01291e06bf817af9644ac4
diff --git a/net-misc/endlessh/endlessh-1.1-r1.ebuild b/net-misc/endlessh/endlessh-1.1-r1.ebuild
index d1022eecb731..6b88d25a68ab 100644
--- a/net-misc/endlessh/endlessh-1.1-r1.ebuild
+++ b/net-misc/endlessh/endlessh-1.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit systemd toolchain-funcs
 DESCRIPTION="SSH tarpit that slowly sends and endless banner"
 HOMEPAGE="https://github.com/skeeto/endlessh"
 
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
@@ -18,11 +18,6 @@ fi
 
 LICENSE="Unlicense"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-syslog-help.patch
@@ -55,7 +50,7 @@ src_install() {
 
 	systemd_dounit util/endlessh.service
 
-	insinto /usr/share/"${PN}"
+	insinto /usr/share/${PN}
 	doins util/{pivot.py,schema.sql}
 }
 
diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild
index 8d77c61d5a7e..6a1cf2d9165f 100644
--- a/net-misc/endlessh/endlessh-9999.ebuild
+++ b/net-misc/endlessh/endlessh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit systemd toolchain-funcs
 DESCRIPTION="SSH tarpit that slowly sends and endless banner"
 HOMEPAGE="https://github.com/skeeto/endlessh"
 
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
@@ -18,11 +18,6 @@ fi
 
 LICENSE="Unlicense"
 SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
 
 src_prepare() {
 	default
@@ -51,7 +46,7 @@ src_install() {
 
 	systemd_dounit util/endlessh.service
 
-	insinto /usr/share/"${PN}"
+	insinto /usr/share/${PN}
 	doins util/{pivot.py,schema.sql}
 }
 
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 9bd543432ae4..b1ce793ea894 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,6 +1,8 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
 AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
+DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
 DIST frr-7.5.tar.gz 6730659 BLAKE2B 12c915e7564b8f0157b20b0714b1efd8c2ad0c51dbaeb1eb3ef2d5ea50406c297d7f4bd854d9246b515d42f3fa326b2b3c7a30d83f35b64c374947b26709f6fe SHA512 d0d3c0bc0d30e2ebb93e20906768a996d21db23b23118c8e3c50d238e7bfdee7a789b4a90c9d7dbdc842d857f60bd44f0922b01b0c2c8b289ac860f008a430a9
+EBUILD frr-7.5.1-r1.ebuild 3463 BLAKE2B 9d673b775da6f15b9557a771a05f118d2756bf8cd885d3d4865a702310fab07a0f1d784e2b7004c79b3788c3c5c031361357b475bc39b0f26502eb6e116714e5 SHA512 6aff90a4fa99f636d4cd9e1d6d8651a69f0e30070a076f1d2626ee72002594efdf48ae5aad856cfab633ad02eabb9330adfceed24f8b2efc5c11764249273ecc
 EBUILD frr-7.5.ebuild 3371 BLAKE2B 4540d279f5b9816cd9abfe404928d335e6792df572e154a10302d53fb661892ea068c04ab160c841d7d6b8a3faa2de3bf39e6acfac50816c9d787a1f7dddd83c SHA512 fbe577b9cacd4e29ced2c035c3d26d627c2cd969c110717577cec59371fcd3f4de84879a49b45f84b422c28c7bf150fd1cfb1ded85580f1f8cc6ce7195128dde
 MISC metadata.xml 701 BLAKE2B 69812cc3ccd29487acd06afe28dbc936c671ee20741790045e39546720c1745311cae6dbba2bf612311e7ae27a708039006f0f92f04f512b724d291ebb33398a SHA512 4979d8ec46e7a874f9cff76f5b06b98692db749764d649bcbd8a06a51265cacdd466004ca4b7c5f7cabc7a4969908eb4840da2b85fd1dde3ee19815819b4a66a
diff --git a/net-misc/frr/frr-7.5.1-r1.ebuild b/net-misc/frr/frr-7.5.1-r1.ebuild
new file mode 100644
index 000000000000..899edf8f2bda
--- /dev/null
+++ b/net-misc/frr/frr-7.5.1-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	>=net-libs/libyang-1.0.184
+	sys-libs/libcap
+	sys-libs/readline:0=
+	grpc? ( net-libs/grpc )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
+	snmp? ( net-analyzer/net-snmp )"
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	doc? ( dev-python/sphinx )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
+	!net-misc/quagga"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch )
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-pkg-extra-version="-gentoo" \
+		--enable-configfile-mask=0640 \
+		--enable-logfile-mask=0640 \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/lib/frr \
+		--sbindir="${EPREFIX}"/usr/lib/frr \
+		--libexecdir="${EPREFIX}"/usr/lib/frr \
+		--sysconfdir="${EPREFIX}"/etc/frr \
+		--localstatedir="${EPREFIX}"/run/frr \
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules \
+		--enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \
+		--enable-user=frr \
+		--enable-group=frr \
+		--enable-vty-group=frr \
+		--enable-multipath=64 \
+		$(use_enable doc) \
+		$(use_enable fpm) \
+		$(use_enable grpc) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 rtadv) \
+		$(use_enable kernel_linux realms) \
+		$(use_enable nhrp nhrpd) \
+		$(usex ospfapi '--enable-ospfclient' '' '' '') \
+		$(use_enable rpki) \
+		$(use_enable snmp) \
+		$(use_enable systemd)
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	keepdir /etc/frr
+	fowners frr:frr /etc/frr
+	fperms 775 /etc/frr
+
+	# Create logs directory with the correct permissions
+	keepdir /var/log/frr
+	fowners frr:frr /var/log/frr
+	fperms 775 /var/log/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/vtysh.conf
+	doins tools/etc/frr/frr.conf
+	doins tools/etc/frr/daemons
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/vtysh.conf
+	fowners frr:frr /etc/frr/frr.conf
+	fowners frr:frr /etc/frr/daemons
+	fperms 640 /etc/frr/vtysh.conf
+	fperms 640 /etc/frr/frr.conf
+	fperms 640 /etc/frr/daemons
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v1 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 2626559e7b4a..a76188d5dd34 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,6 @@
-DIST gallery-dl-1.16.0.tar.gz 327915 BLAKE2B 8d7805219f900ab66afc400a56b279a18ebb78c47a531b380af2d1578c338f84575f1fb5a006a5e1bb0684349d595550dc89177493890001e38077edd34e00b5 SHA512 84cd8ab4b3e4a63f912e36454e6f35adb9f9c395002d04391c4093d4efe62ff249999eda3755f0ce77b4d4b7ce11ccfb2acb972cd5144ea84b00d61e370f5de7
-DIST gallery-dl-1.16.3.tar.gz 333058 BLAKE2B df45afa7c745a6176e8490bdcef95b7e1eb63b8c8ea61abf5422928fc72b5bedb101336c2470fb8edde0d12ce48d8d5f0eb4ab44acf6dc032eed2412e55ca30f SHA512 abb3223c13d67297bfd8cd94ac0efa66d7f6315ff589bb8b5ab96a3487015b91e8ab27e9ee43f4ee1dbbc7b69676c73cf4d4833bcd868295332aca417008c0e1
 DIST gallery-dl-1.16.5.tar.gz 340821 BLAKE2B 06820e1755ccbc64382b084a54420368c9e9c7578c53f690d26ee552c6303580ccdd6ae8bec3a6462af9c204c1017cd2ff766bbbac317908b2951455793a10a9 SHA512 fe4535310adb900c4e6094928d8184d2981e2bb90c972a04c068badb0ec1dbad252053da466f7ad74e0662d1db1dc58703262fc627b823d8e90b18247bdca3ac
-EBUILD gallery-dl-1.16.0.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
-EBUILD gallery-dl-1.16.3.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
+DIST gallery-dl-1.17.1.tar.gz 344091 BLAKE2B e5a108d088083e3aa1881919e74f6631321312a225c0dd6d9c6cbee87ecc957d19a6c3812d3f0c80c5937089d1402ca2e0a779c23537f28ab78ad9654c06852d SHA512 015346cec09ab85fa408b3faa6b63d61fa1f2004b39b45d36741cb63e2809c62c48b544c57b0a02b797db6f36cc66172e9c120ff6cf1bf1a2c3d6f05f7ceb627
 EBUILD gallery-dl-1.16.5.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
-EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
+EBUILD gallery-dl-1.17.1.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
+EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
 MISC metadata.xml 793 BLAKE2B 0c014ab324d1fce9d2242f124aaea8273cb6de0553b5c0c6a65479d853ade3f1a9b8a7f482da9bd4ed6ff72ffd6138c35cde4cb373e92b5019e94405e29ba69f SHA512 2e7b177f458f13b084e28e0a59613ee58dce7ac0ad9483b04a2bb79df48583043924f13b5e3899d5f76a44b76ce2e4a04c63e71bea1916031c378831ea613fad
diff --git a/net-misc/gallery-dl/gallery-dl-1.16.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.16.0.ebuild
deleted file mode 100644
index 458d0edf5edc..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.16.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..9})
-PYTHON_REQ_USE="sqlite,ssl,xml"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-# tests require network access
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-src_compile() {
-	emake data/completion/gallery-dl
-	emake data/completion/_gallery-dl
-	emake man
-	distutils-r1_src_compile
-}
-
-pkg_postinst() {
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/youtube-dl
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild
index b1acc9d0aa4b..b1acc9d0aa4b 100644
--- a/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.17.1.ebuild
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index 458d0edf5edc..b1acc9d0aa4b 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index d02a479e2d4d..58191ccdd8bc 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -2,8 +2,8 @@ AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c155
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
 AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc844128f68f67d2817c6ffd2189b6cd5e40357ed15580f5bdd68a68148faf77c49198040e767af4c57f49163c5903f0 SHA512 53c20d01d60be0d560c5e15f26bbe206bba59ad97df486b8c24409e2a58b13093b09a4601f6d8add9ec4f5f01faf9e5c3ecee00e9818e5de84f7df7d39b5127a
 AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
-DIST gsutil_4.50.tar.gz 3618295 BLAKE2B bbd8ec13428a9822b1ebe3eea984f3e50abc010a0de4e57e7dc365642ab501f7994a235d778eaa73c8217ae1e69d1569e80ac8a59d94a84a6abb8272ad466a35 SHA512 aa7d68f369ac24c75cbd321d9a1a943fc361e9bf768797327852d0da39d364fa95ac3891367e90a39061b30b331405e2ea8358e0c91e3bdc5cb151d367e0857e
 DIST gsutil_4.59.tar.gz 4024669 BLAKE2B 4317cd3787adae2d7d066d7c8d5c62cfe77749d4efc8b5451e87ac6294de0e6f13c085795de30a891f2d7b58cd7e0724234cf14b4308542c8d050856a868c5cf SHA512 c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48
-EBUILD gsutil-4.50.ebuild 3204 BLAKE2B 1fa9f4720094eecff970a749d2fa33664ef8735d198d4a8f281101196ad500da3d04e9cdf35d3ecacefe1a64fb89d0a383eae5b95a04e8de7e18115944b80775 SHA512 69d23976eec1fe7d87644b336681044a3dcb5dde46fa1a762d7d69f00fc9501797283be68c87e628d5500b94c5abf7d89966d2850382b738a63975130a969771
+DIST gsutil_4.60.tar.gz 4012900 BLAKE2B d3d1b57d5b0d42b1b454944efe8d62855b665d3772817c636568ef49c79ae2c566ef08c4c6e1bd3c9829471561865b64b3beec8d3911d6766748337aa1b1fc3e SHA512 18ab701cbb60513d66e8b96ced28cfe65dc0f210435fb5ffbcbfab3541ec7ed051db726e52239796d9579d0928953f610064279a3ee1e5b5c06cec963493804c
 EBUILD gsutil-4.59.ebuild 3026 BLAKE2B 579c56d597e1aedb12a872763947c3d1e4eb29edd6768cefea0ba0e1bc435f79a1a2ef495682407ed545fce53cbd71ce4fa5fd166c926ab1c9d9370018d1351a SHA512 82e63ab4bbb1e2b965079fa3268b2c340d909822c9e9b6286239a36a6b10745a45c7dc7ac93706907adc8e2a3a1e1210f19932b6534aa6bd453a65bfba9dca08
+EBUILD gsutil-4.60.ebuild 3026 BLAKE2B 579c56d597e1aedb12a872763947c3d1e4eb29edd6768cefea0ba0e1bc435f79a1a2ef495682407ed545fce53cbd71ce4fa5fd166c926ab1c9d9370018d1351a SHA512 82e63ab4bbb1e2b965079fa3268b2c340d909822c9e9b6286239a36a6b10745a45c7dc7ac93706907adc8e2a3a1e1210f19932b6534aa6bd453a65bfba9dca08
 MISC metadata.xml 514 BLAKE2B b37a6acae57aa619dd2adc4722283fbf1f5076ed9b3fa18558fdbe0d9ea39eb9fd1e0a678ce2df59c2c37f444558f9e4d1e913be7c7fdf1b2a16f31e809b7588 SHA512 d97ecaa80d5996fb0bb424681861e552c4f3ee206ec0b5d7a4f703247ea495e0a201757ebe4a5288389cab58208ead2718288107cad173684f37ecb9357bf06e
diff --git a/net-misc/gsutil/gsutil-4.50.ebuild b/net-misc/gsutil/gsutil-4.60.ebuild
index e7658e4d66b2..48e12ee22074 100644
--- a/net-misc/gsutil/gsutil-4.50.ebuild
+++ b/net-misc/gsutil/gsutil-4.60.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
+EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -23,17 +23,15 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
 	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.5[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.7[${PYTHON_USEDEP}]
 	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
 	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
 	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
 	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -58,12 +56,10 @@ python_prepare_all() {
 	rm -r gslib/vendored/boto/boto || die
 
 	# failes to compile with py3
-	rm gslib/vendored/boto/tests/mturk//cleanup_tests.py || die
+	rm gslib/vendored/boto/tests/mturk/cleanup_tests.py || die
 
 	sed -i \
 		-e 's/mock==/mock>=/' \
-		-e 's/oauth2client==/oauth2client>=/' \
-		-e 's/SocksiPy-branch==/PySocks>=/' \
 		setup.py || die
 	# Sanity check we didn't miss any updates.
 	grep '==' setup.py && die "Need to update version requirements"
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 9ec9942c0ad5..f369dcde19bb 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -5,8 +5,8 @@ AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
-EBUILD iperf-2.0.14a.ebuild 860 BLAKE2B fbbabc49ddb3d4b65306ce6c900a62f6242651cf1368dac0dc1ede1acd2d07f108973eb05c55491436838502c74124af7dcc4ce06f054dd90bcb6c53042eeae5 SHA512 176d966c356dcef6a7ed792446b9814ced18bf745d7927f05bccbb10729302e430612ab594f24ac6b89e3a53226495c7ca866b2e5bb513a41bf7700896aab55f
-EBUILD iperf-2.99999.99999.ebuild 674 BLAKE2B ca210a0f4320ed023c91d6e764b836bd87dde603944626fa5a65ff59ef7e7a6c1a469c5135f4e75499256992ee54762132f7939bf617a8d5cd2e4312143f3741 SHA512 1b2259028c491938224af5ddcdecaccff0f8a72e603a46c068a7bf1e5b030c101e3f933ed71c62e2bc471c8d3278adc400a6968f9496bb034c54798ce0984252
-EBUILD iperf-3.9-r1.ebuild 972 BLAKE2B b5ef4d92222f61fed88b9579e109b4f429916065bac12e0704e06e04ae88c0289f7cdf8a24e2e98dda2db56fb0a6ce214aa929c2fe6179582f4932e442cfd663 SHA512 57ddd35949dfbb4878391b364331d89dab2dd3e6ce97c529b385822a322a4ae34094c558e4ee0e362ea8f183574372504536e8a359cd9121d66acbbcabdf4e9e
-EBUILD iperf-3.99999.99999.ebuild 797 BLAKE2B 7a617faeec980c5f3cd46e6416b0c28fe2d4eb5233937925072426621b8c064a6f666f40b73e168e29eea11c1ff4ce051f40ca7d6b358d20b5a7180dad7ac011 SHA512 93168f91782c5575be57075ea114cf3c7594f14ec8a405b62e654b949615966bdf3364366b7a769f7306197a22a073999de446f65729a5a963924fec29834465
+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.9-r1.ebuild 969 BLAKE2B 8b4bb89b4f2f825b54095121b389dc58feea066b6810ff91b6418cc2d9e8378c7e8f4d08d1be314f89d1f9742e13ab31f87d79998c00eb83fcc442bd45d77b14 SHA512 5d72aebb10a80b24f338fd05ec99793488c9f85b4360ced32763dffcb680ff8931592545c4cc4b5f5d9157b1c92f116a5ef9d417de8c9ee98f476d73ff12fd91
+EBUILD iperf-3.99999.99999.ebuild 792 BLAKE2B f4d5f0b93ab6a55d826969d2c5431ff4f02ee69eb38dc27a761fa7488cbe531ef50643ea401e81d3d08467c28d758ddbc5ff697f181cb09500cad5f7ed8425bf SHA512 d21e2c6fe80c4daf31f20985f70dff6b857ea7bd5b0ee5e74aad61e3262aab560201b1d419a06f445ec8a0ba044f4b04a9c1a2ce99686319bc629b0ea58134e7
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
index 8e383190aae1..1f6705f71ebd 100644
--- a/net-misc/iperf/iperf-2.0.14a.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -15,7 +15,7 @@ SLOT="2"
 KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 threads debug"
 
-DOCS=( "INSTALL" "README" )
+DOCS=( INSTALL README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
index a4087a924a8e..6c9197a333b9 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND"
 SLOT="2"
 IUSE="ipv6 threads debug"
 
-DOCS=( "INSTALL" "README" )
+DOCS=( INSTALL README )
 
 src_configure() {
 	econf \
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
index d53aca6f6b77..2c1fd2153029 100644
--- a/net-misc/iperf/iperf-3.9-r1.ebuild
+++ b/net-misc/iperf/iperf-3.9-r1.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit systemd
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
+HOMEPAGE="https://github.com/esnet/iperf"
 SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${P/_/}"
 
@@ -21,7 +22,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( "README.md" "RELNOTES.md" )
+DOCS=( README.md RELNOTES.md )
 
 src_configure() {
 	econf \
@@ -35,5 +36,6 @@ src_install() {
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
 	systemd_dounit contrib/iperf3.service
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index d209c9b4ed3d..caa68e8e7fe4 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit autotools git-r3
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
-EGIT_REPO_URI="https://github.com/esnet/iperf/"
+HOMEPAGE="https://github.com/esnet/iperf"
+EGIT_REPO_URI="https://github.com/esnet/iperf"
 S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
@@ -21,7 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( "README.md" "RELNOTES.md" )
+DOCS=( README.md RELNOTES.md )
 
 src_configure() {
 	econf \
@@ -34,5 +34,6 @@ src_install() {
 
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
+
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 1f11951b3bef..2e88ed0b05cb 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -12,7 +12,7 @@ DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a49918251
 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 EBUILD iputils-20190709-r1.ebuild 4988 BLAKE2B d4085aef19f926db7fe27a22d0bb4589648ee4450d53df43cd3aeab6571d15891ac9b4a363e3d4c4b7efa80f67fc54a0333a9485f386d5bb3e0ea88531df44a7 SHA512 717eb995035729ab0af20c9e48f9ccebba7ca51ce11d076aee708d381474f99311b00e6fed6eb63e1641e6ca4adce9d3178fb369a2516f32f0a260b7b09f7beb
-EBUILD iputils-20200821-r2.ebuild 4413 BLAKE2B 2300d389ad26bbfa745c666ec299fa142aa3364381422f94bc7cf38199f55872b279197e6e8f3d48fb4e508dca7b55959f9e03e47ece932067c95633063ab236 SHA512 56c789ee0a2458350dda5d31790ce28ddf02095130aee6ab5c7ee9723419fc800f720a2a402352c819f7f8ebe1b5e15cb69b296080a1aafc723e515290cd400e
+EBUILD iputils-20200821-r2.ebuild 4412 BLAKE2B 259d4026283a3c299deff58742e4fd6b58bf2069055d7d1c50bc8de471f972b60cfe7e3f35abee7e0215a0c8a5d38955cd945f85f0a8921424c5175e05df72ca SHA512 3a75a6d267522ca25d08a45621a8201f3db7e4db7a598d6a0cd53e29e85f53e1ce71f49939863214e25d309244a0ac0ca31966e2186d886666f27b22b38470ae
 EBUILD iputils-20210202.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da
 EBUILD iputils-99999999.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
index 75a7d14b642d..bf2570e11292 100644
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ b/net-misc/iputils/iputils-20200821-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
new file mode 100644
index 000000000000..cfcdd71b0e0b
--- /dev/null
+++ b/net-misc/netopeer2/Manifest
@@ -0,0 +1,3 @@
+DIST netopeer2-1.1.53.tar.gz 169329 BLAKE2B d65b579ca47d59963a181d78ec060c8a239639e7311f9e48ab88412cfa7f30e17dabde4ad086109193fec4129f836c46fb04acb0881248fc27e6f4e6877a70af SHA512 30da532a370c44d598b37199550ae1adb65486d5bc9205e9a0213beafe16174c87628395d564c48d095503b597b0008457e0b951451472f1c414fcc705897d21
+EBUILD netopeer2-1.1.53.ebuild 901 BLAKE2B d16ea4b1178f7ecd1e7c0f3a37f2b042b0b8cf40b8ae891907fc37a49b0eaa43284bf3e0385df28a5c44dfaa7cbe5e2c536db613fd71768f1ffdfaf45c28ccfd SHA512 d8c6e66fd8871c7362316bad639986fbed10fab21a2ecf9db62b7f909a27fc915a6ea31e3a8b2c13673cc0b2cb7f5ee5a9d9eccdd53bc9e499aa3a9c90b76dcb
+MISC metadata.xml 449 BLAKE2B e77e9d18382c642d6165e32716e8ae0c8e5964acb49249687269fcec0f678b194fa905f50458ad640c25ce7d47138b7062232d92e0649a4b5fb54487a47c4cc1 SHA512 51596d9786cae042106f29190c459161c3eadccd64b51f79e255a8a2ee470bacd1c990420d195e7b2e15e913f8ba418cf2140aa87eacfe2e8252de1e5f95a6ff
diff --git a/net-misc/netopeer2/metadata.xml b/net-misc/netopeer2/metadata.xml
new file mode 100644
index 000000000000..976b10aaa62d
--- /dev/null
+++ b/net-misc/netopeer2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">CESNET/netopeer2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/netopeer2/netopeer2-1.1.53.ebuild b/net-misc/netopeer2/netopeer2-1.1.53.ebuild
new file mode 100644
index 000000000000..13d86c998387
--- /dev/null
+++ b/net-misc/netopeer2/netopeer2-1.1.53.ebuild
@@ -0,0 +1,46 @@
+# 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:=
+	net-libs/libnetconf2:=
+	net-libs/libssh:=
+	net-libs/libyang:="
+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/olsrd/Manifest b/net-misc/olsrd/Manifest
index 9daa20652112..1abda5708623 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -2,10 +2,7 @@ AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
-DIST olsrd-0.9.7.tar.gz 15761465 BLAKE2B f272bf9358b4beb1157ff0e2098413de3b81a9598453f76b27c101e370d23280928efbf7399901efd48a319437ac6717ee3496d19a7213eb6d22f50adeb7b319 SHA512 a4abe3e6ddc624725f42c8a80df880a2763d1985d3583cb010d6a01c2866fbeef4e6870cf4e4d1e4403c49bea262a2c967d64040bd36c70ed2f4fc3f4ec988dd
 DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
-EBUILD olsrd-0.9.6.1-r1.ebuild 2337 BLAKE2B c7c96b2ce368d1245b5faab05686eb24ef8e3aae650a94939664ed0d50fa0a8c86011b0187c654dea359d6fe0fc40ad0928d89d094fdbed4ed260705a64e1f85 SHA512 bda205c6ada5a043a624e1a82385d4079258128698ae2acfc516bc74ae06ff8ef6ca8f30d1372a9645d1ea939e77b3c5792a408e5dbd2aaa373d128a19b60e73
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
-EBUILD olsrd-0.9.7.ebuild 2315 BLAKE2B f4c37336fcda28419ed3595520122c5e75d748200ae3331bb6546c972a47b5439a76dbd07c9b24fbd6cfbcc23605216c43edde62218dbea9bb89564a995c1ef6 SHA512 a0e7595542b075388398c22eeca02e311ecf9d8b31cf0ef54345f2e75ddf464bd2d4557b29eb6d16ee7fa25ce7ea8857e5dbdd66dbda7a6ca26810f225075287
 EBUILD olsrd-0.9.8.ebuild 2385 BLAKE2B 80f609c1c1a297231670e734a42bb941ff5ea70f45daca826a1c1aa6cae83b9c4665ce491c7a828489425371f13e10d21f09036dd9ed75f02b14b52712b63de5 SHA512 9895cd6623c23fd5213e761803d7974681ddda924a91f9027cd8fd3ccc250764fc1d37e1da26ff4c897a689c1cde798649506ab67c66d8346fcefd30e8d542fa
 MISC metadata.xml 243 BLAKE2B abda82f67bcaba5ce8d982effdcacbe18ac652918f14d3da341781d95cc22f48028d82571b66208263086adcece8809ee7b1f63159250de042766cd6d87efdad SHA512 703cf9330497469fc7feca884347f9b9cba7dd2f36beaf5b9901091eedad49fbd98399f1fab759d198850cffb979df1d2ed87267679afba07dba9f1f7c752226
diff --git a/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
deleted file mode 100644
index 32a6685bd66a..000000000000
--- a/net-misc/olsrd/olsrd-0.9.6.1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk pud"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	pud? ( sci-geosciences/gpsd )
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
-	"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
-)
-src_prepare() {
-	default
-
-	# fix parallel make
-	# respect AR
-	# verbose build
-	# fix default prefix, bug #453440
-	sed -i \
-		-e '/@echo "\[/d' \
-		-e 's|$(MAKECMD)|$(MAKE)|g' \
-		-e 's|@$(CC)|$(CC)|g' \
-		-e 's|@ar |$(AR) |g' \
-		-e '/^prefix/s:/usr/local:/usr:' \
-		$( find -name 'Makefile*' ) || die
-
-	# respect LDFLAGS
-	sed -i \
-		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
-		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
-}
-
-src_configure() {
-	if ! use pud; then
-		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
-	fi
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	emake \
-		CC="$(tc-getCC)" \
-		VERBOSE=1 \
-		LIBDIR="/usr/$(get_libdir)/${PN}" \
-		OLSRD_LDFLAGS="${LDFLAGS}" \
-		OS=linux \
-		build_all
-	if use gtk; then
-		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
-	fi
-}
-
-src_install() {
-	emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-		DESTDIR="${D}" STRIP=true install_all
-	if use gtk; then
-		emake -C gui/linux-gtk \
-			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
-	fi
-
-	doinitd "${FILESDIR}"/${PN}
-
-	gzip -d \
-		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
-		"${ED%/}"/usr/share/man/man8/olsrd.8.gz
-
-	dodoc CHANGELOG \
-		valgrind-howto.txt files/olsrd.conf.default.rfc \
-		files/olsrd.conf.default.lq \
-		lib/arprefresh/README_ARPREFRESH \
-		lib/bmf/README_BMF \
-		lib/dot_draw/README_DOT_DRAW \
-		lib/dyn_gw/README_DYN_GW \
-		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
-		lib/httpinfo/README_HTTPINFO \
-		lib/mini/README_MINI \
-		lib/nameservice/README_NAMESERVICE \
-		lib/pgraph/README_PGRAPH \
-		lib/quagga/README_QUAGGA \
-		lib/secure/README_SECURE \
-		lib/txtinfo/README_TXTINFO \
-		lib/watchdog/README_WATCHDOG
-}
diff --git a/net-misc/olsrd/olsrd-0.9.7.ebuild b/net-misc/olsrd/olsrd-0.9.7.ebuild
deleted file mode 100644
index fabb4f495467..000000000000
--- a/net-misc/olsrd/olsrd-0.9.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib toolchain-funcs
-
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk pud"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	pud? ( sci-geosciences/gpsd )
-"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
-	"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
-)
-src_prepare() {
-	default
-
-	# fix parallel make
-	# respect AR
-	# verbose build
-	# fix default prefix, bug #453440
-	sed -i \
-		-e '/@echo "\[/d' \
-		-e 's|$(MAKECMD)|$(MAKE)|g' \
-		-e 's|@$(CC)|$(CC)|g' \
-		-e 's|@ar |$(AR) |g' \
-		-e '/^prefix/s:/usr/local:/usr:' \
-		$( find -name 'Makefile*' ) || die
-
-	# respect LDFLAGS
-	sed -i \
-		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
-		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
-}
-
-src_configure() {
-	if ! use pud; then
-		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
-	fi
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-	emake \
-		CC="$(tc-getCC)" \
-		VERBOSE=1 \
-		LIBDIR="/usr/$(get_libdir)/${PN}" \
-		OLSRD_LDFLAGS="${LDFLAGS}" \
-		OS=linux \
-		build_all
-	if use gtk; then
-		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
-	fi
-}
-
-src_install() {
-	emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-		DESTDIR="${D}" STRIP=true install_all
-	if use gtk; then
-		emake -C gui/linux-gtk \
-			LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install
-	fi
-
-	doinitd "${FILESDIR}"/${PN}
-
-	gzip -d \
-		"${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
-		"${ED}"/usr/share/man/man8/olsrd.8.gz \
-		|| die
-
-	dodoc CHANGELOG \
-		valgrind-howto.txt files/olsrd.conf.default.rfc \
-		files/olsrd.conf.default.lq \
-		lib/arprefresh/README_ARPREFRESH \
-		lib/bmf/README_BMF \
-		lib/dot_draw/README_DOT_DRAW \
-		lib/dyn_gw/README_DYN_GW \
-		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
-		lib/httpinfo/README_HTTPINFO \
-		lib/mini/README_MINI \
-		lib/nameservice/README_NAMESERVICE \
-		lib/pgraph/README_PGRAPH \
-		lib/quagga/README_QUAGGA \
-		lib/secure/README_SECURE \
-		lib/txtinfo/README_TXTINFO \
-		lib/watchdog/README_WATCHDOG
-}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index b0c21931e1a0..b061db633969 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -2,5 +2,5 @@ AUX seafile-client-7.0.9-libressl.patch 558 BLAKE2B 92ab8e75e83a3693861e3b1c4f39
 AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
 DIST seafile-client-8.0.1.tar.gz 11679293 BLAKE2B 52ad28fb316d99240692883218e626a8ca33f8265d62dadfc2eed400c889d47e9aa7887ea6c6fd994596537a5db163b334fb72c791b38529f7219c5a25c813d3 SHA512 ca5dd5a6b27316e1f6fb670e3286d24015d99391c0e1447e2ed42f3d4f72769d6a3dda78bc388ad8d303d4ab1167e4e50844574ecd6f61149b1966e99a3a7719
-EBUILD seafile-client-8.0.1.ebuild 1209 BLAKE2B 8a6849cec8c10a120dc563c2ed582b287775c4ae0974574881d16cace8a94fd222cdb66d0c85fe69c50d21a75bbc37a5337685187123609f85c2a69fe9dfd161 SHA512 1495645504888704558c130ad0de57f6d2223fd3182b6829552f829c374b5e0ed0d8a5c0dcadce828775a388ffab6941f5c37d00b0725dfdf98ee2d6c8a2d995
+EBUILD seafile-client-8.0.1-r1.ebuild 1232 BLAKE2B 626f398d06141b00468e4196d8efbac83a4d385f239f1e8995a40a0de4676db963555cf32dec21a520fd6b050a157935a19552f894541447a8bdca70989108d2 SHA512 3f2d7544b363d21fb5743e7d178c7d48c39609d93164be51b2eb8941702bcc7361e79a7913e1b9927ac8d7b37078ab376e5498775aff932a02211d7047937f52
 MISC metadata.xml 576 BLAKE2B 2174b676e97ee6712305427fc4ffa5d11007872d943b3fada1d05d67d3c83a218c385559e4c24cf12b318e4b1eb4192cae79a33c86329c5442caf72af86c932b SHA512 1e0f7a2c1f0ea6011b55ab213d1783677307468ceb44d594ecade76c36ccdfb97ee94feb3ad8d90b451a7349b48f8372a92ff8bd669d257ddbbab77d1a75e4dc
diff --git a/net-misc/seafile-client/seafile-client-8.0.1.ebuild b/net-misc/seafile-client/seafile-client-8.0.1-r1.ebuild
index 778e77ff9371..b26abb8f4490 100644
--- a/net-misc/seafile-client/seafile-client-8.0.1.ebuild
+++ b/net-misc/seafile-client/seafile-client-8.0.1-r1.ebuild
@@ -16,8 +16,9 @@ IUSE="libressl shibboleth test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3
-	dev-libs/libevent
+	<dev-libs/glib-2.68.0
 	dev-libs/jansson
+	dev-libs/libevent
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 415bcd249492..038116281221 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -5,8 +5,8 @@ AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d936791
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07
-EBUILD socat-1.7.4.1.ebuild 1527 BLAKE2B 86e3e04f423fe199cae6ee0017d66aa0765f4bca095f1f02eec979760a0cd61205f36907e5ce9b83d2e9558bdf391afe5e305e2c937c9e7e65059658139f2668 SHA512 578929ddc138d0e0df22275f2351454bdbd1152d6e3deeb82e74e438a3b0abfdf8ef8960412054a20df92e80638310bf4bd4844b791899e1f1583a7fec66b76c
-EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1
-EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18
+EBUILD socat-1.7.3.4.ebuild 1587 BLAKE2B ddd3c6d94cdca7f462f018214a95fc4f8d22c8b5020acd43808814a9ae62fbac4341d9146ae0acaf0d055753a3547d6941baa044bb288e61eb8b6503eee228df SHA512 c09705ad3cb215318117ce75af1540c0468ee901a27de374622c01abc47f011fd90243874519f8ecc8bf37bb9395e9e3ceb26a6c35a5c8f3e73625979cff5932
+EBUILD socat-1.7.4.1.ebuild 1528 BLAKE2B 5fed5c3401ce50e1f2c2d2bb7edfc687d896a0c7d9ee01d3bb4af4f0eae3625f98cda5e7b169ca25e32318d889b62482ae0a56f22e126956d67272767c6983f8 SHA512 8022000b46d1ac3ce3b33f9dbe1f4f4825ba2d29b2c5ea64d0bb44dcb241cca3d50802e6e9df33b4bf1c05c8c6cf6089a6b789a25aee89def8f17ae3840ef2b2
+EBUILD socat-2.0.0_beta9.ebuild 1685 BLAKE2B 783283ae2c853992e7fde6e7057a99de9aa8d9fc19b00a65b730425c66a95f6b96a465393508ae8a3cf85b62735fff56273112bde46d5c4fd2a761df94e5232d SHA512 8a4e0dddf6e33f95eea3e39373ad08ad29e2c534dcca1d1309c9ac537ee0c32730b5742300658a34ffc4cbf77191b326d9b843ee4066e4fcb80470a353988d8a
+EBUILD socat-9999.ebuild 1407 BLAKE2B 6a4ba58aca53b4e7da902ea6fc075fb2f48f1482008de6702b42025927a8bb6e414b32ac5d632a5ccabb14ed9191352b1cb7eb851d5bf47655ac5610946c1f02 SHA512 67ea7dca8d4502220aa7160238fa0c4bc5c6d63af5058474ecb3ec8690556c071f5f38a4c89eb8284c1f579e499f3920f51aef3c97343813c2305eaf849f58f8
 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild
index 3eba54db2ef8..6a1961503781 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 DEPEND="
 	ssl? (
@@ -41,7 +41,7 @@ PATCHES=(
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild
index d064243f99d2..d7ded0482c7a 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 DEPEND="
 	ssl? (
@@ -37,7 +37,7 @@ DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild
index 0f00e1445827..9532a8284217 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="libressl ssl readline ipv6 tcpd"
+IUSE="libressl ipv6 readline ssl tcpd"
 
 DEPEND="
 	ssl? (
@@ -44,7 +44,7 @@ PATCHES=(
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index dada7a8478e0..b0f72ca9e8e3 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bindist libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ipv6 readline ssl tcpd"
 
 BDEPEND="app-text/yodl"
 DEPEND="
@@ -35,7 +35,7 @@ DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 
 pkg_setup() {
 	# bug #587740
-	if use readline && use ssl; then
+	if use readline && use ssl ; then
 		elog "You are enabling both readline and openssl USE flags, the licenses"
 		elog "for these packages conflict. You may not be able to legally"
 		elog "redistribute the resulting binary."
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
new file mode 100644
index 000000000000..3e939ada74e5
--- /dev/null
+++ b/net-misc/sysrepo/Manifest
@@ -0,0 +1,3 @@
+DIST sysrepo-1.4.104.tar.gz 673855 BLAKE2B 4b3a032538d469bb87d7975e559b329a2d0e1b7d805fda393de47d2be759ab0c37b6d8a7ada6058ec11ba636fb71f358c3e8af4c7a9064859eef9c319566d0de SHA512 a3d518cc2d9c808333906ea3123b09abacb4f83f430e621167577112b95280b389bf19fa0aa47a4e74fca469420d12d585d2ab9c0d63a06e6db087f49817bfb6
+EBUILD sysrepo-1.4.104.ebuild 734 BLAKE2B 1119853e40e1e6cbbaf815cad96fe5e4350215ae2038aebb1f933e263ca54796df9e322ea4cc3e54aa8d32184272575f659de0dcabdd3424962393ef7549b2db SHA512 8481d00488d91c59146b8c10f9fdb0d3a2b076befd44d238d73db13ba209e790124c3bdd49a34a088783e39d8c6b54817c47830101fb73c905048f367acaf908
+MISC metadata.xml 448 BLAKE2B 798011f819ee97c46422d54b813c029e04c3d6e093710b0e3f1c12b7b0dd7d5b36d5dc83910f33436a1a8d93b548286bc49d5c5510779494cad33e02ffca0dc6 SHA512 f98a83cb700cff73e694f8c70f8bb6de64304cb589c2871f4f4f794890a5178019ece7d4fbef4487508b3d5856dd29d009c70c7fe1cc9ba29b3084d85605c1ba
diff --git a/net-misc/sysrepo/metadata.xml b/net-misc/sysrepo/metadata.xml
new file mode 100644
index 000000000000..a5c3a6e9d3c2
--- /dev/null
+++ b/net-misc/sysrepo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sysrepo/sysrepo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/sysrepo/sysrepo-1.4.104.ebuild b/net-misc/sysrepo/sysrepo-1.4.104.ebuild
new file mode 100644
index 000000000000..b962fe8648e3
--- /dev/null
+++ b/net-misc/sysrepo/sysrepo-1.4.104.ebuild
@@ -0,0 +1,39 @@
+# 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:="
+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 f7fc09d6046e..92916c24ad06 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,11 +1,5 @@
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
-DIST teamviewer_15.14.3_amd64.tar.xz 13216052 BLAKE2B d5fa55609a2bb6257c1fc95ec9dd3f330a4729c2af230600730fed06239b5cf2991733958790e254edb1d83191fd3467ae4b82547b089208799ee264c913506b SHA512 2bdeb5563c48595ed6bbbaa21e3ab63f670da082bcef297052f974c62c15ec085385d055f9be6a6fabaa61aa57d213a8dd0aaa1700f9ff20ad8ced0655684d4f
-DIST teamviewer_15.14.3_i386.tar.xz 13733488 BLAKE2B 14def908b2c2e86b49649264b0eab4b15594e15425b98333720f0025a0530cf3e2c350f54b996f6d48a6f44dd368899fec95c38ddeb6b909992fecf80a2bdc46 SHA512 02a2843424a19252546ce0598f0ec52dd4a0d02148e379c944b7976bba794858cc1ca58724bf5b9828b6dd38e3f3989bab8b17d7ca9285596fd450d2ce753668
-DIST teamviewer_15.14.5_amd64.tar.xz 13224544 BLAKE2B 2cefeebce0a4c31ba84e554882400ee65b6a44d7c335125cd25dfd4e9e4aa02b34708d679873a52b31e46c5157ac7d6a89d8b77848453fc7733f8931964202fc SHA512 723a63d9490df367c3f072da9ed79d84e38de60c67ca78c10b01612f48fe1afe0d379b414f898f342ddab336b9689d2f38b76d9ff83654a789e8059b2da886ad
-DIST teamviewer_15.14.5_i386.tar.xz 13724612 BLAKE2B 09558e5bc3b5db9ac57a038af14eb56816a5f272a637cfb3f73bfe072836a3011ff14f5e8acdd50889d66a9422fdc0d14f50eccfa908c6e796544d93f30961ed SHA512 5c38cd3106adf69c6b27d8696ff6c3d49a1a1450e317b07af20e7b2c2351102fcd6a0d61a9e1ce1f75968db048461adcb3dd5d5b0cf98b3de94719ccfed93586
 DIST teamviewer_15.15.5_amd64.tar.xz 13264432 BLAKE2B 8f23c036b79c7ee7cbef1181825b5605afd77f22d0565e5359c928bd4014759c3ad56255d8e76ba75d3084c8a9bed98fcdd08f20e502c2906e6eaf6dd952a7b4 SHA512 e42cccb74c08ef1badcd4b78016078a9f6f3b69b700e4c64d6eae927fa4b748c11288ef5cc50aa962eabd17679479ececf8750e8c34f6361758da903e555a334
 DIST teamviewer_15.15.5_i386.tar.xz 13751236 BLAKE2B 32d8f6494c72b51feef54e2d5dd1096aee83c283a1d07680f428bd4321ede9975d1ee4e7cd55718f9250d54304d17887b98ae6e62617e7022ec78384fdde5a16 SHA512 315e6fcaa6d40aab17c47ac4eee6d894be3731ae7d0242e2b11bae279627de04540f8d46908826d53b6a6d275769c19a420c6f30e9869a734e87cb7d6832bfba
-EBUILD teamviewer-15.14.3.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
-EBUILD teamviewer-15.14.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
 EBUILD teamviewer-15.15.5.ebuild 4057 BLAKE2B d0f1fef8731e318303ed6b1c21b1756f24b2ecbc8946f18189199bae20db2b7581c22467f550f5880194a68a908361990882dfbdf23ad415ab18f0ea92dc2ef9 SHA512 d470a0db96124a5fab21a8a102e8a32139e3eb809e4ac0aadb34a5f97c85636f6eb739fca767ce53f9d7ac71c363b1baa833c87aa2e82282ca2c4b52d756738d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/teamviewer/teamviewer-15.14.3.ebuild b/net-misc/teamviewer/teamviewer-15.14.3.ebuild
deleted file mode 100644
index 4636957e3f98..000000000000
--- a/net-misc/teamviewer/teamviewer-15.14.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-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_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-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_PN}/*"
-
-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 -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # 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
-	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
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${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_PN}
-	dosym ../../var/log/${MY_PN} ${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 ${SLOT}" 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/teamviewer/teamviewer-15.14.5.ebuild b/net-misc/teamviewer/teamviewer-15.14.5.ebuild
deleted file mode 100644
index 4636957e3f98..000000000000
--- a/net-misc/teamviewer/teamviewer-15.14.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-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_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-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_PN}/*"
-
-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 -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # 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
-	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
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${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_PN}
-	dosym ../../var/log/${MY_PN} ${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 ${SLOT}" 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/vde/Manifest b/net-misc/vde/Manifest
index a860a8551313..730021d584ee 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -10,4 +10,4 @@ EBUILD vde-2.3.2-r6.ebuild 1491 BLAKE2B 25089bade969f2bcde7f4c16e85cf049d84b21a2
 EBUILD vde-2.3.2_p20191011-r1.ebuild 2253 BLAKE2B 70e765767c62982412cca9661897c475357d46effadafa6a27c98be8c6c00caa69bdb02639828cce31a6d5f95b05a814c43d5dcba8863d5d83522d5f9df36584 SHA512 1c4156310670d3a19c5b1835857bb226735a8f8d24a55a37d9e9d71f46a3cb5aa28ee1ccb90bdc77b197ff928768151cdd77355bf083b5ce5554f317b49dc56f
 EBUILD vde-2.3.2_p20191011.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
 EBUILD vde-9999.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
-MISC metadata.xml 985 BLAKE2B 93cbf3b5a644fc2c4ea5e40c8a367ba9763968fc6f769df2f1b7114d07734786570cae38d42195deb628007e3d49b1d5a5b4a943cf7575da10ae10eea59e4e28 SHA512 cdbc3fffa569b4a7f5daf04b3fbdb7dbb57df6dfa100398b61e6373efe61924daa523ba2b75cd21556414e592a91c2813aa396290abad91eb2afa01f7e178a01
+MISC metadata.xml 987 BLAKE2B 7470e3c50e1b3f15d56a2bb0a96da7112dff6799587a74ee6935f48c3d65dc560b55449f2938889085f0285c789891515c517b0eb4b336bfb6050052e70f6b5e SHA512 6d25c342154f85da0cc39ccb6d6a9fdf16977453fe46f62f73b3687d6fe009238c00a29ed27927908dd9c23769716d9abf48e255ecf61ff4782604ef4f3db189
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index 34884a027ada..c5372a943d33 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>NP-Hardass@gentoo.org</email>
-    <name>NP-Hardass</name>
+    <email>np-hardass@gentoo.org</email>
+    <name>Adam Feldman</name>
   </maintainer>
   <maintainer type="person" proxied="yes">
     <email>mlspamcb@noci.work</email>
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 01b62a0842d8..4b7774cc9b23 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2021.03.03.tar.gz 3303114 BLAKE2B f63f2aedb6494b22156df08b5aaa2c4438614fd99a7e2d45baaa754c71a278a2c22051086f578f54b4cfa6384aaf5e08e61d42b8023a754805a65e6b6a79ea58 SHA512 0a554ee6805ceaa1c68eab83be3bd6046bc56a26658c705e231f907c2970cdeb441e0ae57d5013385810b5bbee7e4de3ac7f6df36c3eef76a6fa9c5424b921a2
 DIST youtube-dl-2021.03.14.tar.gz 3306486 BLAKE2B 6c5705319e405e4bb098c72b696d41ba655f6e38884012b00da0a5f66a68ac49e34b1906cf22c5444ba62aed4f74d93517b81471b9ddebdc1ee72b3ae190a3a9 SHA512 12f08eaa8a4ba3598ab9caa1c313982e62168a4e4afa3f613f7dee0efef3bcfee701ffd525f1dd1ba1da66aa71bcfd8bed91fa64a8c7473aca6b9e6a09282a70
-EBUILD youtube-dl-2021.03.03.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
-EBUILD youtube-dl-2021.03.14.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
+DIST youtube-dl-2021.03.25.tar.gz 3313712 BLAKE2B 323ef3e1eda1549500cbea29bcbb55821b5ed6730d65100d6fdd95be4a5d98bb155a519c47fc42883889fcb03bda559edfbd52e38d999fa7fc19ad2aefb7f902 SHA512 77b3beb907081fd682c69d280ddc69610ef59d264b089597481cb4f57dfbac5abc90b54b38bc3691817e0f7a6a3df35b59035f49d5d22e461db87086081f426c
+EBUILD youtube-dl-2021.03.14.ebuild 2131 BLAKE2B 31e3a0216ea3c7fcc1452c7b2927a219bd8500ba7751c583b719cd0e784c21d8995eeda532e17a5e761500ad537856c3d5c8dcc81c56c47a5c01e65d7c34e05d SHA512 fc8cab9a01ca1e283329a3ccb76a1e27aa2a055e2dbfbd1f8cef3a9e8a698a1310a6240312cdf6dea7ead7f697fcfa80bf1a4c9f61cf26268094ca8a34fca609
+EBUILD youtube-dl-2021.03.25.ebuild 2136 BLAKE2B 9e62f12b344689ab951323e1fcde57b534c6bcf9321889bbea59f09e94fbeab6da8b6a0e28d6b18dd6fdcd69b9ca872bf12f1cc6188daf3c16e817658a538eba SHA512 2ad2ebc573ca63cd6dc966b73bb66273245bb4371426f14b8a5f3f0a66ea833a7912265b39c268eb4237c77d869fbf79d436fb6e7148618e5c88cce824523358
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B a1f8bf8a72ee78e4f6720b44da5c4f2782d16e6a63a5ac9bea156794492df0568a01de29e0015758668ac8902c510fdbae2855031f3b9f4902bf736753e3b2a3 SHA512 f14c1f7399ceeb6a367ecbdf790d9c99a74f0be93b27f1e140a681c8262739b9201cd12bde472f92e9041db7d3a21049cf646c58453f41f59b3edb77abc73c79
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild
index 9b024e43dbba..d787a3f3be53 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.03.14.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.14.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.03.03.ebuild b/net-misc/youtube-dl/youtube-dl-2021.03.25.ebuild
index d787a3f3be53..9b024e43dbba 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.03.03.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.03.25.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="
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-27 06:06:27 +0000
commit	8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree	4d26462d027b14926335894749d2e01d982234d0 /net-misc
parent	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)