gentoo resync : 18.12.2020

42 files changed, 677 insertions, 80 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1b4a6459983c..11570ffbb6c9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index d13ac52d20fd..9a34ec776281 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -9,5 +9,5 @@ DIST anydesk-6.0.1-amd64.tar.gz 5209989 BLAKE2B 5588b40460af9033aca744440d5ce43d
 DIST anydesk-6.0.1-i386.tar.gz 5130077 BLAKE2B 9d0467cb24493458efdac6d835b06ef22bb6db3aaeb7277386ae0749c215c3640e722e2e7d17964e32a668d63826a68f3429d3425fb7aabe59a2718648bd2b88 SHA512 58cf2ca8bb67f672ec2ac988216ab593479f09d32e8e6ace93b0d92640197f9d13a637480421be8b038f8840d91a89f97b937c9e3b3f115bc49a5fa852b2c064
 EBUILD anydesk-5.5.6-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e
 EBUILD anydesk-6.0.0-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e
-EBUILD anydesk-6.0.1.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
+EBUILD anydesk-6.0.1.ebuild 2675 BLAKE2B 0a7b6b11007f1418533cb5c601f5e5b190135864e58ac1df87861c8e2974050eb53705f61629f301fe83a18f229da6053e2a2ffbf5a88e612716fc7bc82f23bc SHA512 d1f13baff3bdf48ad72f47c29d3a756fc94a6537eccd3fe3a708275ef68147a88051350d1ac9e18946e6f04c0121eea4d123f42455e85402306b78e7d10dec8b
 MISC metadata.xml 677 BLAKE2B f5b86851aaa83fc0f0a22739416e5d6fa06e4f8bdd14ed33660219774e1179a9df5e08440e99a3b75f156b72835a6a2c9742ba176828ac6caea9f7d564ebca87 SHA512 824b2ba8de1e03f3089a248226612505b2d0e172443fadc488a45d8f5a4eaa26e8acb8c67f27476dc0d7d8dd8de25950a87225f8495cd1b38c573308c3d1fc3c
diff --git a/net-misc/anydesk/anydesk-6.0.1.ebuild b/net-misc/anydesk/anydesk-6.0.1.ebuild
index 6b1d45ed0538..3d912fed07f2 100644
--- a/net-misc/anydesk/anydesk-6.0.1.ebuild
+++ b/net-misc/anydesk/anydesk-6.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit desktop eutils systemd xdg-utils
+inherit desktop optfeature systemd xdg-utils
 
 DESCRIPTION="Feature rich multi-platform remote desktop application"
 HOMEPAGE="https://anydesk.com"
@@ -48,8 +48,8 @@ RDEPEND="
 	x11-libs/libXt
 	x11-libs/libXtst
 	x11-libs/pango
-	x11-libs/pangox-compat
 "
+BDEPEND="dev-util/patchelf"
 
 RESTRICT="bindist mirror"
 
@@ -58,15 +58,17 @@ QA_PREBUILT="opt/${PN}/*"
 src_install() {
 	local dst="/opt/${PN}"
 
-	dodir ${dst}
 	exeinto ${dst}
 	doexe ${PN}
 
+	# bug 706344
+	patchelf --remove-needed libpangox-1.0.so.0 "${ED}${dst}/${PN}" || die
+
 	dodir /opt/bin
-	dosym ${dst}/${PN} /opt/bin/${PN}
+	dosym "${dst}/${PN}" "/opt/bin/${PN}"
 
-	newinitd "${FILESDIR}"/anydesk.init anydesk
-	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+	newinitd "${FILESDIR}/anydesk.init" anydesk
+	systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service
 
 	insinto /usr/share/polkit-1/actions
 	doins polkit-1/com.philandro.anydesk.policy
@@ -74,9 +76,9 @@ src_install() {
 	insinto /usr/share
 	doins -r icons
 
-	domenu "${FILESDIR}"/anydesk.desktop
+	domenu "${FILESDIR}/anydesk.desktop"
 
-	keepdir /etc/${PN}
+	keepdir "/etc/${PN}"
 
 	dodoc copyright README
 }
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 2b2219bd4010..4edc76549e6e 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,5 +1,7 @@
 AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
+DIST aria2-1.35.0.tar.xz 1534460 BLAKE2B fc207ad0054e211b79ee1c6302c6bf83d0638fd5659d19dbd63d7cfb31101feb7d1a661b989ec42552c9a5c072dd660d2f7203063c3c1e14f53d5ce4c5a3c317 SHA512 82b49cecd61064ae33b4a422a2320d533f54afea8fab0f014072a46afdc05972d2e9c603e843960c097410adf87290df65849f4ee05e047403618ae50db151ef
 EBUILD aria2-1.34.0-r2.ebuild 5021 BLAKE2B 0ecbf5266128c9a48b44f2ca436586a88a15dcb7b631815522b936134e031a00616d9c5d798250b20652bd1b28ff7302800fc62ddf792339851e55d75d0a9930 SHA512 eb66d6bd33872e0b65f5be17819ca9c6deed57c29e07c1ff403a14afd4e35d0830fb669469122ea61fccb960745e476820bc2ff16548c302b59cd78e9196e2d6
-MISC metadata.xml 1331 BLAKE2B ab520da311f770e10183a680eaf5ef9ef5ede6abdd30a4eddfadaa338a9007af6bec9ea591dd38a11b56e8b8f4416f0d422e144bf67a0959b78473dd074d7ab3 SHA512 805cb1b92b2d5f79edafd68bb42b08a494ca13e3f9ec8c215fb5252a47c596f0d60377dc350eb01598fecddffdf3ebc33e742b44a2e481ef3ad82daa026eac7d
+EBUILD aria2-1.35.0.ebuild 5076 BLAKE2B 956267a42993045c8ebe7cfcd1dd368c68d0ff5e550542587b8a34a388232ff0a1d4ebc052540535c235f190119e042fadcfb8b05e9334115ccc2b03c6815db2 SHA512 f7a9ae3691589c7dff989f719de562aeddc75ee19c5c598ed45223ad259114dfb4215010ea31014e832d1bd6db05833146b031686c0add72415ee97fc7cdabd8
+MISC metadata.xml 1325 BLAKE2B d958c3669bbebc969e706f70ea93d91f2068d19fe117d4112a818f711e0b3d421f35d67ad303ad856d6abf87b3f85ae0be17c487afef9df48f0a47264aa390e8 SHA512 668bea0c2d30e3fb10131a9ea0a9ba860cccfed7d5e810d165cc01d0ae9bb5d49653cba5aabe1cf5eb42bfbc1759198a82bec63e205a2c0dc05e4f93fac0d696
diff --git a/net-misc/aria2/aria2-1.35.0.ebuild b/net-misc/aria2/aria2-1.35.0.ebuild
new file mode 100644
index 000000000000..a1e3b996fae8
--- /dev/null
+++ b/net-misc/aria2/aria2-1.35.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )"
+RESTRICT="!test? ( test )"
+
+# Crazy GnuTLS/OpenSSL/etc. logic below:
+# 1. Those libraries are used for two purposes: TLS & MD.
+# 2. Upstream preferences are:
+#    1) gnutls [tls]
+#    2) !gnutls? -> openssl [tls+md]
+#    3) !openssl? -> nettle [md]
+#    4) !openssl? !nettle? -> gcrypt [md]
+#    5) !*? -> bundled md routines (we don't use them)
+# 3. There's also gmp usage for bittorrent with nettle.
+# 4. You can't really control features, just dependencies.
+# (we are skipping native Apple/Windows TLS support)
+#
+# We map this into:
+# ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
+# !ssl? -> nettle || libgcrypt
+RDEPEND="sys-libs/zlib:0=
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( >=dev-libs/libuv-1.13:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? (
+			>=net-libs/gnutls-1.2.9:0=
+			nettle? (
+				>=dev-libs/nettle-2.4:0=
+				bittorrent? (
+					>=dev-libs/nettle-2.4:0=[gmp]
+					>=dev-libs/gmp-6:0=
+				)
+			)
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	!ssl? (
+		nettle? (
+			>=dev-libs/nettle-2.4:0=
+			bittorrent? (
+				>=dev-libs/nettle-2.4:0=[gmp]
+				>=dev-libs/gmp-6:0=
+			)
+		)
+		!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	)
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND+="
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+	# Fails with USE=bittorrent && FEATURES=network-sandbox
+	sed -i -E \
+		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcherTest/d' \
+		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageReceiverTest/d' \
+		test/Makefile.in || die
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+	)
+
+	# See TLS/MD logic described above deps.
+	if use ssl && ! use gnutls; then
+		# 1. if ssl & !gnutls, use openssl and disable gnutls
+		myconf+=( --without-gnutls --with-openssl )
+	else
+		myconf+=(
+			# 2. otherwise, disable openssl
+			--without-openssl
+			# 3. if ssl & gnutls, use gnutls
+			$(use_with ssl gnutls)
+
+			# 4. switch between nettle & libgcrypt
+			$(use_with nettle libnettle)
+			$(use_with !nettle libgcrypt)
+		)
+
+		# 5. if bittorrent is used along with nettle, use libgmp
+		if use bittorrent && use nettle; then
+			myconf+=( --with-libgmp )
+		else
+			myconf+=( --without-libgmp )
+		fi
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 19197a13c240..22e0dd50cb1c 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -17,6 +17,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">aria2</remote-id>
-		<remote-id type="github">tatsuhiro-t/aria2</remote-id>
+		<remote-id type="github">aria2/aria2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 7ca1ff273ec8..e2f49a9c12fc 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -16,12 +16,12 @@ DIST asterisk-16.13.0.tar.gz 27735450 BLAKE2B 64cc75c7aa715734ebaf06fe7b3df54cfa
 DIST asterisk-16.14.0.tar.gz 27740877 BLAKE2B f8a09d39c36c1cdcc17878f1af69da7691503290177583ec1a92ac0471c029e527a3b62bd731a7340c43fb7abeca32b604303f0739e614c5a1edb0131f07e0fd SHA512 699b0c701a00df0ffcb7094f5cc732b645775deb85486e044685685b81aad09e6b2e9558436e80c505de93add630b76cf49d7261ba8eaae46f93272844346234
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
-EBUILD asterisk-11.25.3-r1.ebuild 9180 BLAKE2B b07f75d272f64b8f33207c0b244607886370e5b341339807b3f1c8a4a51ef19b259c875deb5ce3e35c0631ec8de60d312a5b71a7fde05b96ff38c1cc649c1f2b SHA512 4ee25871b10b4d9aa8c21ecae7d6b2b87cc60710472a46c984cde8677230eb4cdf12990d3d128aaa6d84ff0f8cda82f4caf2aa10ca58797b6014386517518595
-EBUILD asterisk-13.34.0.ebuild 9114 BLAKE2B dff3812c7fdfce38e14426d4fcb04ac1829303be1ef1caac40ac98c1ecbe6fe5f3cef33847047f16a5af163e26c9a669a2960f2d145f80f1bfa13800e93b600c SHA512 b144e6b3820628dd2ae44c69e18056967cd96e8a7ed9cf397cbe31cf8587233cb82c9b3f4ffbaa2086cdfa1a1e5cb987f36f940be759ae424e5ac0455147ec5e
-EBUILD asterisk-13.35.0.ebuild 9185 BLAKE2B 499a0edee30087662bd0d1206ff4c48096b32e36e847cc63218fcf6b579b0f405613681b401bc42024714eb8de488432da5902e2d7cad0e7f5b43f1b192cd817 SHA512 8db46328ef142fbdf522ff0b4a379d8bdd8122d9ac9b3c617ab3a61b7d00601293e30cdadcd99b7ec825c36c3abddca7feef444660f27b0b46863f9fcee31110
-EBUILD asterisk-13.36.0.ebuild 9183 BLAKE2B 6640b497021dfeda7443648344b50d71b5c98c881073e4eb5f88ff715e4b0ceb671096aa037a43629cdc09e6082f3ff6f7d871c07794acb9765a4eaf00ced6cc SHA512 1e6be35fcc57045582af7cf1cf4d00b3c2e52f791d3902367622602e84b34e4ef9dabab545e9a0ece8d294822af3a6ae160bc317118d3b176429a9c94e086c89
-EBUILD asterisk-13.37.0.ebuild 9185 BLAKE2B 499a0edee30087662bd0d1206ff4c48096b32e36e847cc63218fcf6b579b0f405613681b401bc42024714eb8de488432da5902e2d7cad0e7f5b43f1b192cd817 SHA512 8db46328ef142fbdf522ff0b4a379d8bdd8122d9ac9b3c617ab3a61b7d00601293e30cdadcd99b7ec825c36c3abddca7feef444660f27b0b46863f9fcee31110
-EBUILD asterisk-16.12.0-r1.ebuild 9362 BLAKE2B 21c376575631bae725a96adfed3ead1b4cd0503d053e802d8ebc6dae77742c04853bef6f66a7b81bca55f8b23505c950a381527b1daecaa6b8ef179942d7f6ea SHA512 8c458c9f2498387f2cdc91bf25d2176b24916e9da459509182a526c2a123077e76fb72f509680d72d19c8a93e151ec008e5a489f7518ebb607e345b157577221
-EBUILD asterisk-16.13.0.ebuild 9362 BLAKE2B 21c376575631bae725a96adfed3ead1b4cd0503d053e802d8ebc6dae77742c04853bef6f66a7b81bca55f8b23505c950a381527b1daecaa6b8ef179942d7f6ea SHA512 8c458c9f2498387f2cdc91bf25d2176b24916e9da459509182a526c2a123077e76fb72f509680d72d19c8a93e151ec008e5a489f7518ebb607e345b157577221
-EBUILD asterisk-16.14.0.ebuild 9362 BLAKE2B 21c376575631bae725a96adfed3ead1b4cd0503d053e802d8ebc6dae77742c04853bef6f66a7b81bca55f8b23505c950a381527b1daecaa6b8ef179942d7f6ea SHA512 8c458c9f2498387f2cdc91bf25d2176b24916e9da459509182a526c2a123077e76fb72f509680d72d19c8a93e151ec008e5a489f7518ebb607e345b157577221
+EBUILD asterisk-11.25.3-r1.ebuild 9181 BLAKE2B 9c7434766c9849f24c52f7ed62ccdaa1ba2c754c53ae4d989f975b44c70af73edcbca248eb9c817cf7729a18218c3decf5f996fe69204fbdaa60797ddb83b990 SHA512 288732af4757047e57486bfc47d3b1568a3d056a08b575fee641fd35eb9b2fe1248dc63f24b515898a43674713ee824e61d1f273d1701a8e0c2770211ee6dbfd
+EBUILD asterisk-13.34.0.ebuild 9115 BLAKE2B 700712cc94fbf23b4d75cfec564ed72597b492192343faa39d08fb5063d1e798a1995cdf6606a01201ef99553e003988333554364a60a01b80fd0c47b20775c7 SHA512 8ab0c0dbab33194ece3355d90a7552ceed2da00a1ce072d9229d765f763e36b1da193361f3be5abde9223c0b067626c3b84444eca0006a59fb968cdc7bb4cb62
+EBUILD asterisk-13.35.0.ebuild 9186 BLAKE2B 933de7a389ff20b6f71b6b8a4eed6943a5a26217f744ac70b6b00394f4684e4eb8a7182095c05a094513fde4c65f0961a5512766ef41cf511e1fa95e47fd36a3 SHA512 5bf2dcb1ca6d14783b5745a2718466da783900ce923699a137d0ebe1ba99ca3aa424ae7f90013d2119861914dac2b41695825e3bb55520575fb8fb74e54f33e7
+EBUILD asterisk-13.36.0.ebuild 9184 BLAKE2B 7a91118e4d0abbca316d7cfeb22b458dbde3d7311efc82ced7bdc082a3f44d62df207251aca41a2be878e817db6ea879fc53e73b55c49202c8fa007e7637ba03 SHA512 2fbe03f264440b50a73d052bc45394d65fc32ee3e717387cb5e2c96b24cd3f72d15dcd5d3ee0ae2ce6625e486898030c95d43791de1b254eec4fd7458f07a8bb
+EBUILD asterisk-13.37.0.ebuild 9186 BLAKE2B 933de7a389ff20b6f71b6b8a4eed6943a5a26217f744ac70b6b00394f4684e4eb8a7182095c05a094513fde4c65f0961a5512766ef41cf511e1fa95e47fd36a3 SHA512 5bf2dcb1ca6d14783b5745a2718466da783900ce923699a137d0ebe1ba99ca3aa424ae7f90013d2119861914dac2b41695825e3bb55520575fb8fb74e54f33e7
+EBUILD asterisk-16.12.0-r1.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
+EBUILD asterisk-16.13.0.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
+EBUILD asterisk-16.14.0.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
 MISC metadata.xml 1301 BLAKE2B 0989c94d86393562384681c19a2809dc6ebedfcdd592543b606206a8bd7829a4ca6768cb74082f74e75635c72804dda9154df3a4d61dcdbcc43eda93aa881322 SHA512 009e4dba6f55b8ff08940aab4722df6b76a055add43c7634a49dbc0fb68fe11e6c102a7a27ac84a253a2853b0d719f3a73bb40c86c2d2faa186b707e773987e3
diff --git a/net-misc/asterisk/asterisk-11.25.3-r1.ebuild b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
index 6d56de398ae6..0b7c8896f0ca 100644
--- a/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
@@ -58,7 +58,7 @@ CDEPEND="acct-user/asterisk
 	xmpp? ( dev-libs/iksemel )
 	ldap? ( net-nds/openldap )
 	libedit? ( dev-libs/libedit )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( virtual/mysql )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-13.34.0.ebuild b/net-misc/asterisk/asterisk-13.34.0.ebuild
index 35bff47da138..f24978bc7634 100644
--- a/net-misc/asterisk/asterisk-13.34.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.34.0.ebuild
@@ -60,7 +60,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-13.35.0.ebuild b/net-misc/asterisk/asterisk-13.35.0.ebuild
index b4c18883346d..847f1d498afe 100644
--- a/net-misc/asterisk/asterisk-13.35.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.35.0.ebuild
@@ -59,7 +59,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-13.36.0.ebuild b/net-misc/asterisk/asterisk-13.36.0.ebuild
index 5ae8a5660949..c34a89ba8f6e 100644
--- a/net-misc/asterisk/asterisk-13.36.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.36.0.ebuild
@@ -59,7 +59,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-13.37.0.ebuild b/net-misc/asterisk/asterisk-13.37.0.ebuild
index b4c18883346d..847f1d498afe 100644
--- a/net-misc/asterisk/asterisk-13.37.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.37.0.ebuild
@@ -59,7 +59,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-16.12.0-r1.ebuild b/net-misc/asterisk/asterisk-16.12.0-r1.ebuild
index 44f1f489f95c..da613c5156fa 100644
--- a/net-misc/asterisk/asterisk-16.12.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-16.12.0-r1.ebuild
@@ -60,7 +60,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-16.13.0.ebuild b/net-misc/asterisk/asterisk-16.13.0.ebuild
index 44f1f489f95c..da613c5156fa 100644
--- a/net-misc/asterisk/asterisk-16.13.0.ebuild
+++ b/net-misc/asterisk/asterisk-16.13.0.ebuild
@@ -60,7 +60,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/asterisk/asterisk-16.14.0.ebuild b/net-misc/asterisk/asterisk-16.14.0.ebuild
index 44f1f489f95c..da613c5156fa 100644
--- a/net-misc/asterisk/asterisk-16.14.0.ebuild
+++ b/net-misc/asterisk/asterisk-16.14.0.ebuild
@@ -60,7 +60,7 @@ DEPEND="acct-user/asterisk
 	iconv? ( virtual/libiconv )
 	ilbc? ( media-libs/libilbc )
 	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:* )
+	lua? ( dev-lang/lua:0= )
 	mysql? ( dev-db/mysql-connector-c:= )
 	newt? ( dev-libs/newt )
 	odbc? ( dev-db/unixODBC )
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 4ff43d1572a5..46e37aa834a3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -12,5 +12,5 @@ EBUILD curl-7.71.1.ebuild 7695 BLAKE2B d47481a0edef1362479059a346768e2c2ad9a9059
 EBUILD curl-7.72.0-r1.ebuild 8807 BLAKE2B 812d527d58295be590bb46afa53de21e1623945f8885ba308c0421d6938d27551ec6a7ad7e1a6c0238bc46e7dd0846e1d592910394298f457d1eb0ce254710ea SHA512 c421c48d772108e62a1809ac01b5984f741c3ff5ce20c57f8f2558721a426e23bac8ea10772f18adadb7d40b40bcdab675abbcc6837315c2afd4ed47847f09a0
 EBUILD curl-7.72.0.ebuild 8725 BLAKE2B be5a57258f10186d79ca54ee4dcd1eaa2475ec35bcd5cb5120fb526b71a3cef87706cc152259ab871efaea6fe32313cdc960bcc33119bffa8009906982242405 SHA512 b52bd92c3703eaefdaee0b1fa55ae0e3bc1ca602c78cf052811c88118442f9677245f89fa839aff00c36966dcc46e29c266620f9e311c82f4ade117b0134f2ca
 EBUILD curl-7.73.0.ebuild 8865 BLAKE2B fcad66ef5b64d166dc3a10eff742d97a4f33cb4da004f922df8b21db55aec687450c7c92cbe3374d76637aa3671257145aa6f9610ede9fd0896be5fa431011d4 SHA512 c1ad8d29b8f692d17ed455b822a8efbd7a848d798209dd155fbec1753ba72aa64ec7480d270afcedc0b018531af0e4a253e4fe78b9f50739422d6ad9abfe0e12
-EBUILD curl-7.74.0-r2.ebuild 8813 BLAKE2B 0acdcb86225afe12a2eb65df925f28c15764f5f0e2738be4cbf13a9d43026c4a4fc7f72f8c266dd5e1df13b024cf5e3f7639ce88bdab8179ad8556b9c4900bac SHA512 ca1ac677e0f1c7e79b270ca69fc4fa14e27aeadedd79b22e3f6a5e28cf0a683b4932bc2ff76101d086412f32f1c12098632f8960bac8c6b19a311abfc770284a
+EBUILD curl-7.74.0-r2.ebuild 8812 BLAKE2B ff2681563818204045cea93f73da25f2b94fd7f5e794843f4e2c7c3c55791607a7c70cb966aabc078e744e4800cbc6540da09be660d5e37918c3cb99c038e222 SHA512 c3825cfd961c663215cec11b22611b28eca1e8c2098194574559db873010b4f750f73b9907f39e9d992f96f157f0e6d378413fad766a3b0876ffa8ffc779fa03
 MISC metadata.xml 2032 BLAKE2B b9406f27a492123f45151d54e34056f26aac11aed12c8c69230f0a41602b42198d102edcdb36d6b890c818fc0b0ccce82b459e376f102d39a096646a17462475 SHA512 c33c12443b4489d36b9506b1a361547d5691bc0a6d997d5ae68869dc8f7936a6418b209bf80f61502c74e6722907c241d269089cb49b7c43a3c086dd52c8c16d
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild
index fdeb3b561d5f..9954194aeba8 100644
--- a/net-misc/curl/curl-7.74.0-r2.ebuild
+++ b/net-misc/curl/curl-7.74.0-r2.ebuild
@@ -12,7 +12,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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index a34cb2433b30..abe94531f208 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-111.4.472.tar.gz 98640604 BLAKE2B 326c5290857bc511116f4375a1900570843ae0d50575ca8025ef3e431dafba7059a9952e8742d37ef0a297ac967ab115ebe4edc80f7f86a07aa04c6541ef2648 SHA512 4411f4f261bf4cde4d1d23c50696414119f13c5a18cb3e9cadec823570eed30c3f277b770068656d73e3a36e710c1554a58d51498ca1d2433905a2c03eae63a0
+DIST dropbox-lnx.x86-112.4.321.tar.gz 99004752 BLAKE2B adec5e29703d36ceadcaed1447b03d5edfd2249f06ab295c55c87684bf4b4c9c59a49a59b71158c17908753cb4dac51e17629cc2fb07c4b44d32d094cecae8e5 SHA512 222cb754713233b05fcf918995ca21d5b5663757304d1303534007872ea83e432641fa13b758b21dcd24568b63fd88b3fed1e45d15b0422226040e655796d369
 DIST dropbox-lnx.x86_64-111.4.472.tar.gz 102674853 BLAKE2B 13255b9737859b9594901955d3819499173b43f12a0eaf476a402bf4bbfe3f1ca5881bf3fda5bdf47d0936e2e9d4bed58abc89c58feeb907074d965739e75021 SHA512 f70a37e0a6fa4f56353d1482b8621b526ecba31a9fdc6da337f3c01e075c87c28728cfd80f7f1a1f74286e294652684e2b7e671c7a6b195cd96eee64f785b3c4
+DIST dropbox-lnx.x86_64-112.4.321.tar.gz 103084021 BLAKE2B 96c15e627434557663712bd6f679efd11b8a6e353757becf1a09830e6f16fb5652159af9601ae1ca84ec397aee277161bcaf1988589b782c43ec433b7ed69a66 SHA512 e22c5595ba5dc90e3fcc958be92ac5fb403f76d8567a03bcfb14e5ea058147f23564de6a2d020a37da4f5a0c34dc85ccbc528bf1f1c683b370899e22f6e652ab
 EBUILD dropbox-111.4.472.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
+EBUILD dropbox-112.4.321.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-112.4.321.ebuild b/net-misc/dropbox/dropbox-112.4.321.ebuild
new file mode 100644
index 000000000000..7286be94a2dc
--- /dev/null
+++ b/net-misc/dropbox/dropbox-112.4.321.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 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
+"
+
+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/electrum/Manifest b/net-misc/electrum/Manifest
index 3998c0ba3e58..e8781cc19d8b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -4,8 +4,10 @@ DIST electrum-4.0.4.gh.tar.gz 4415688 BLAKE2B 1811b3a5534c343b6bc1efccfab822e255
 DIST electrum-4.0.5.gh.tar.gz 4429965 BLAKE2B 1aad8c0407f1dbe085f7cef580785335823fc773296c040a7ce118b0e3edd4a1972ad0712b98754cc548df841fda6df0c854797557c2a2f57a37bd4f3cc2cdb8 SHA512 a0f2eeb57020dc16b568a4d4fce37522f212036455b4e79abf1d44bc20065e896a861bf1a5547fbcae87c2659720d7937c9c0c817e787209c119a06c05549e76
 DIST electrum-4.0.6.gh.tar.gz 4430258 BLAKE2B 883e74d5224c24012d38b3730ef2138abd397500c0271b98938802d55d4ca50075e2e171779868ef4c789fc1feba5bfdecb295e032c2bec92da2d0d34e21987e SHA512 ae8caa827456a75a0e84e35477edf4b0ba28862438571ad54807062e54c673023b3767dd5bbe63f8bead8dc5a8b19a1e3fb1dbeee0c2141d59b8454eafb03965
 DIST electrum-4.0.7.gh.tar.gz 4431614 BLAKE2B bd0d0c4b52492ab439f5e5b6879edeafc0a9c45c3aa7b5fad340a702203a09da858fe7165c89e8c2e788d6e3f26002007012ea8f377f432d189018f9ac7c7e2e SHA512 2a036d19140b56947d374d1d64b6c51e12aba2eca7ad992d38305c884572ef7cf06c7bfa3bc89fa20e22e249cfda6de76dc006f86490e1af1d580c23406cb6f1
+DIST electrum-4.0.8.gh.tar.gz 4437153 BLAKE2B ae16db36f572c37e6640c5a6264d56f83dcf6f377da8493ec2ccbbe49007d41e5f14635e267e80da69a0025a1bdf478fae7479c9d7a677dc959e5146763c3cc1 SHA512 acc653162f706ee2bdb116d1a3e7f0bc5996c9d74bf634c395665fffac9ab4c15015aef8a10aff15621d9f712ee216eecf45a52bc718a56e6d8f65c71a7e92e0
 EBUILD electrum-4.0.4.ebuild 2400 BLAKE2B c579900e61c708b2f721fde772889488f0b43579517c34b21d24c1d665b1d7097a4cf367a52ea561bcd3856c2b7565dbd3c9044a3454ca04a3c1d5e198e94d38 SHA512 c45735ed759d721775892f5126a11038a7df85e616259c5627e6bade3654d85f1396bada52a240d1a02509ddfaa2b3711f0c4ad1c62b7c4e25b980dfb04f51d3
 EBUILD electrum-4.0.5.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
 EBUILD electrum-4.0.6.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
 EBUILD electrum-4.0.7.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
+EBUILD electrum-4.0.8.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
 MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
diff --git a/net-misc/electrum/electrum-4.0.8.ebuild b/net-misc/electrum/electrum-4.0.8.ebuild
new file mode 100644
index 000000000000..de86b6ef7b46
--- /dev/null
+++ b/net-misc/electrum/electrum-4.0.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="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.18*[${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"
+
+	# 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/gsasl/Manifest b/net-misc/gsasl/Manifest
index 428b83a4e1aa..593e990f322d 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -3,5 +3,5 @@ AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
 DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
 EBUILD gsasl-1.8.0-r1.ebuild 1797 BLAKE2B 5919ec09d3f0c47dd7cb447639d91de50a0bb774e3a74fd30b965d7c6a68c87e46b5cbe4bb249d0acf99e2e5c0afacbfb5a060170933a7681893be6241f77039 SHA512 a445f4165baf5fe2e1f0cdb66e58c0d93173b654a85a4acb72863cdf7c25d96c62710a77db3642de9af7010ec28b946c2f687d92898e4919151c54570a87d217
-EBUILD gsasl-1.8.1.ebuild 1800 BLAKE2B a34868d9504d585cdf1c06370072a3c830e2ada88049376fbf1b82664b840d5a56fe330b50b8b5c02e0f24e9d4d414c52427c17bea15022d46e37ce6b767a995 SHA512 e48ae7ec875fb5fdd9803e8611c150a1adbd7a55403d06ea0e523086dede6ba93a394d24e4ad352bccba02a94f4df8f2a1fc4747379e8b19f9c1414bd8423fad
+EBUILD gsasl-1.8.1.ebuild 1798 BLAKE2B 76113a6a9399032c223054299dc4d71588bddfaed19566fac3c202ac23e9c6079b4a07d1d78d2cd5de222594a897de1f66610b8e9d44d233d04383d962d0a666 SHA512 03a83c1d6fd9cbb2a25cdc94b736ae441646c18cf6db79b0dd86ccf6e4904d006adf31169b412d25d91372c2a9f570dffbdeb1cfb31f497617233c96d5529462
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild b/net-misc/gsasl/gsasl-1.8.1.ebuild
index 0317f3443ee2..903d03e2ce86 100644
--- a/net-misc/gsasl/gsasl-1.8.1.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 495b88cf1406..958e7f05a712 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -15,6 +15,7 @@ EBUILD iperf-2.99999.99999.ebuild 729 BLAKE2B 7fbe549c0035bdc6accaccfc53a2f02a84
 EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5
 EBUILD iperf-3.7.ebuild 947 BLAKE2B f292caa6b05da89f13a0465ce03a04158cd94cb626607bb62dd119af16f9ba08bf714acd1f91a948c857aa66e5f21023bcac1fef8d635171f5393ec407d6f068 SHA512 1bece2a1ce119fa2b2bf9c34f1093f61b233726539bc885c6d078a0ed2641cb009b7a521bbad0eeb958e11bc569249efb0adfce8db2af7cb6cbfa833ec4f64ea
 EBUILD iperf-3.8.1.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851
+EBUILD iperf-3.9-r1.ebuild 992 BLAKE2B b3c1f1d1f21714441e8d9c2a4a468e49f0db473c4c3e4fedf66e69ab9b027ae3fb7ec893e16e288b7b5b963b07cae235064355b1981facf128d6d778555ed88e SHA512 3d7e3fdc6eeb7718dffe94e01dccfaee9b59dbb32aae4d6f16e59b27edffe3c81682927705e84e54a9b897a73b41649ce71935f03bf784dc501065efe18d2913
 EBUILD iperf-3.9.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851
 EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
new file mode 100644
index 000000000000..1b063463c5c8
--- /dev/null
+++ b/net-misc/iperf/iperf-3.9-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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/"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+IUSE="libressl sctp static-libs"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="
+	${DEPEND}
+"
+S=${WORKDIR}/${P/_/}
+DOCS="README.md RELNOTES.md"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with sctp)
+}
+
+src_install() {
+	default
+	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/kea/Manifest b/net-misc/kea/Manifest
index 2a716bbc034e..a96913537661 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,6 +1,6 @@
 AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
-AUX kea-initd-r1 1980 BLAKE2B 338cc159d54d62d3172fd8bba5213d82058bb90b90085be1d0e41a071966cdc76325ce881c075cfac04850c1adad8ea502c85873607fe7487168797a0658e184 SHA512 5685a83ac59f67f9832a270ab737672185200669b2b13f6c5df19a2285bd98ff89e44ac53097cd6f86858bd1f243f52ff3e2a4b334ab147d612cfa30d5ff34eb
+AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
-EBUILD kea-1.8.1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
+EBUILD kea-1.8.1-r1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 EBUILD kea-9999.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/files/kea-initd-r1 b/net-misc/kea/files/kea-initd-r1
index 57711b3c9d36..00c493f14be1 100644
--- a/net-misc/kea/files/kea-initd-r1
+++ b/net-misc/kea/files/kea-initd-r1
@@ -19,24 +19,34 @@ depend() {
 }
 
 start_pre() {
-	if [ ! -f "${config_file}" ] ; then
-		eerror "Please create a ${config_file} config file."
-		return 1
-	fi
-
 	if ${DHCP4:-false} ; then
+		if [ ! -f "${dhcp4_config}" ] ; then
+			eerror "Please create a ${dhcp4_config} config file."
+			return 1
+		fi
+
 		if ! ${dhcp4_command} -t ${dhcp4_config} 1>/dev/null 2>/dev/null ; then
 			eerror "Error in config file ${dhcp4_config}"
 			return 1
 		fi
 	fi
 	if ${DHCP6:-false} ; then
+		if [ ! -f "${dhcp6_config}" ] ; then
+			eerror "Please create a ${dhcp6_file} config file."
+			return 1
+		fi
+
 		if ! ${dhcp6_command} -t ${dhcp6_config} 1>/dev/null 2>/dev/null ; then
 			eerror "Error in config file ${dhcp6_config}"
 			return 1
 		fi
 	fi
 	if ${DDNS:-false} ; then
+		if [ ! -f "${ddns_config}" ] ; then
+			eerror "Please create a ${ddns_config} config file."
+			return 1
+		fi
+
 		if ! ${ddns_command} -t ${ddns_config} 1>/dev/null 2>/dev/null ; then
 			eerror "Error in config file ${ddns_config}"
 			return 1
diff --git a/net-misc/kea/kea-1.8.1.ebuild b/net-misc/kea/kea-1.8.1-r1.ebuild
index 3e20776fe7e7..3e20776fe7e7 100644
--- a/net-misc/kea/kea-1.8.1.ebuild
+++ b/net-misc/kea/kea-1.8.1-r1.ebuild
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 52c360d79de8..74133f55a7df 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.10.0.ebuild 3660 BLAKE2B 75ecbf8ac77126d61413f4f5c5f4c52ac678530760f7a003ba29988519fe4ae8d89ee7e5eed72cabd1eb9948d1c72700d96efd2fb3c2716c3ccc13267e07a5d4 SHA512 913122234bb46434ce0fa24a148f44cbb9bc93aca69c4b35c2e67cd47f3cb4a06f1478f08c091ab7b3c36efa56c4f052fc34dd101a0b36965e4d6a398ebab31e
-EBUILD modemmanager-1.8.2-r1.ebuild 3660 BLAKE2B 95ab23bf54720d3d15886437fe74c42c6b847d3b8310d84de4188dc901671855dba4be3ebd22ce94aec93bce215161a2267c69d9c4b3d26ea946844dedc679c0 SHA512 ef13e13c227cd257647f13cc6f15f8909602eaef328f9f5095e295ab9b69718511f44e7be1ad63b3a027d5caf3ba4464457a21ca7e96ebf451c1f0e34f82c50f
+EBUILD modemmanager-1.10.0.ebuild 3702 BLAKE2B 7b1d1e5ec167f1cc45d72e85e7a65919ff502f3e54a0a74d0227af24970f52b0bb51ffc571b458ff6e1d51cef4e5f9f0d3996c1e2864b8ded06cca6692a018e3 SHA512 283613155d8d8c791c315564482d083c9b0f60c8461c558a3192baecca36cef67f6b2de3b444d4593664f452248026422d77cbc097dfa90b5b0bfce77e0b9f0d
+EBUILD modemmanager-1.8.2-r1.ebuild 3702 BLAKE2B 6b166143bca2c72892dbc38147538f9cc9da01a5a677d18438597ed80115d46021c130c0d8c228cd007ace5fbbcca570fd76f26bc95e6600b9aa5096be4aadcf SHA512 f5ccf0d43cc548bfcc024b46f33b78d337910670c7eed1c5a882d47b43ca9341dce00d4f72dfdbc0bec5bd989b56d845e4269a0403ba0e9d21cbf286b7fb3c4b
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
index 0973aa512edd..7f108b8d46e9 100644
--- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 readme.gentoo-r1 systemd udev vala
+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/"
@@ -75,10 +75,11 @@ src_configure() {
 		$(use_enable vala)
 	)
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--with-systemd-suspend-resume
-			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
 		)
 	fi
 	gnome2_src_configure "${myconf[@]}"
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 1e50b9f22e50..347bb0a5d5f0 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 readme.gentoo-r1 systemd udev vala
+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/"
@@ -75,10 +75,11 @@ src_configure() {
 		$(use_enable vala)
 	)
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--with-systemd-suspend-resume
-			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
 		)
 	fi
 	gnome2_src_configure "${myconf[@]}"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 772da49d801f..e096d09dc410 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -12,6 +12,6 @@ DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3
 EBUILD networkmanager-1.22.10-r12.ebuild 8550 BLAKE2B 2bc90b456b46a5240e05c52a6afe59b4320d905363a3bad0ae4d0f41e3d0584d2743a76c255be198cc0dffacfd29109deb59d67749b06423e3155c1f624c9150 SHA512 00e785287a1ff4cf9260b8cb5d342ead2c1e3568095d5a7074b72df8269940a46e257b95f36a335055ec3de17de8fae527b99434253dd06d1bc04e0108b0e1f0
 EBUILD networkmanager-1.26.0-r1.ebuild 11208 BLAKE2B f69905ebe2031f6e707c9c1907e03f0c80fdb2546bec7964a9b21b3a8a6008c023a630e9cfbca5cef00ff937056d816755d62884428fc972814ac67cee755a51 SHA512 40009fa98e7a6317d87a22e8ab559e70d229bdbd0bfc91e49cfcff36f5bc551d86d16f9fdd2e52e3e2821123dd47eb4e3efb0a79d873a91d34eefcbaf9c50e2d
 EBUILD networkmanager-1.26.2-r1.ebuild 11214 BLAKE2B b9bf75442380146f2b7eb73f8022cbd30eaecb47e9f48ab96300e26471ecfa1949f076749b23604cc8c5b34264858788cf638c74221bbc5bef2d04e0f219e19d SHA512 eb92e2db85fb28e961494c6425eab2f3a03d61c4efa94d5cdbf1393b7f4d90e55b6cc958f2ec7c0079250f8a51827d42a477ec459bffaa508e6817f4ab8c0d12
-EBUILD networkmanager-1.26.4.ebuild 11356 BLAKE2B 05fca4bb3321bdebbcda5d8ea7cdcf798ef6c084b61c072e801e474da42ab6c2845559ce481fab70b3a3a0052464fab7947160e5562a72959b96a52cc122465a SHA512 fe1e531eedaafd43bb0eda3800edfb30ebe8a44508431ecd6523637e1d38433b82dd56745d8ad627b1b78165e093a4d6197249272a0bbfb0e8ef65663fcdfe8c
+EBUILD networkmanager-1.26.4.ebuild 11354 BLAKE2B e76905e2e9d0fb3e2215585242b704a3f01f7a287749a88c23b866a643ea5d6c090e5328d70691b778fcbd381e9303256588a59d6f21041b07479f600c00980e SHA512 c5830f50416a0eb83d4bb884f6fa0fe9777a489b4f2f3ec159bfd89e3521c6ea2fd44d6ed865ae623a68acdd51bc9ecf583d90e42d97cef8e4ef5fd119dcea74
 EBUILD networkmanager-1.26.6.ebuild 11359 BLAKE2B f129d1aa0f60a115786e6833fd6cfa43f7b28174fd83cf74c09db9fb69222235e2a424ea8a0993bf4ca14dd24f5e942961f2780a1fdb6806a0ead0f616a6fae7 SHA512 2568a02a564e5be9135880e6e80d587eae81fccbf1469c78830f3580da69ab02d6090a0371697919d39082da6ef50c6a35aeb1318fa7c25a1159c321767a677c
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/networkmanager-1.26.4.ebuild b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
index 1473c05de994..c9a390df6143 100644
--- a/net-misc/networkmanager/networkmanager-1.26.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 242e190a9751..f119f2bee797 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -3,6 +3,8 @@ AUX openntpd.conf.d-20080406-r6 255 BLAKE2B cdbfd0de5a238216efbf64c8ef9c5db89138
 AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f01bfd112bdeab3f7199775237c92726120ba7763f5584a21c4b3b18d7b27c4c28311202ee9c18b9259b0e853ee24d SHA512 eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
+DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
 EBUILD openntpd-6.2_p3-r1.ebuild 1815 BLAKE2B 7122205d5d6cc366b95a7023d475bb6e9bd403f889e02548056aeaa50c29f62bd70e2b5f27414f54a2e5bb34bc27c646cb23c4d631bacb1f9e84316e46e20e1d SHA512 af6eea8a35f132544bcb47d522353230468e395d283e041543cc65f511f06a7235be08d2a7989edf7ab3019128364f55cc52f012c25f79f6dd5130b2c20c494a
 EBUILD openntpd-6.2_p3-r2.ebuild 1875 BLAKE2B 97cca192fad2b6da1dede9659ab276a5f94b19be7302ddc1c7f377782c5936688af2c7a0d4c6f99efc2e9b5c637aecf2ba01cec79335d8ed7e12c2cd4cd9c134 SHA512 031159fd3892f291f2480b04c875b7a3ed612d8150898a808e04a41d28772205e87f0458e306e8d1c7a4defe51439a5b703ddaec986a2b69623c0e478e3d46da
+EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
 MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
diff --git a/net-misc/openntpd/openntpd-6.8_p1.ebuild b/net-misc/openntpd/openntpd-6.8_p1.ebuild
new file mode 100644
index 000000000000..ce6e6c788913
--- /dev/null
+++ b/net-misc/openntpd/openntpd-6.8_p1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_P="${P/_p/p}"
+
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libressl selinux"
+
+DEPEND="
+	!net-misc/ntp[-openntpd]
+	libressl? ( dev-libs/libressl:0= )"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/openntpd
+	acct-user/openntpd
+	selinux? ( sec-policy/selinux-ntp )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
+
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
+
+	# fix default config to use gentoo pool
+	sed -i 's:^server:#server:g' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+
+	# disable constraint config if libressl not enabled
+	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
+}
+
+src_configure() {
+	econf \
+		--with-privsep-user=openntpd \
+		$(use_enable libressl https-constraint)
+}
+
+src_install() {
+	default
+
+	rm -r "${ED}"/var || die
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index fc1f4e45d97a..8c011f63b71b 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -8,5 +8,5 @@ DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD tigervnc-1.11.0-r2.ebuild 4180 BLAKE2B 51b7ddb2c27200ccffe618f70c54dc6947b28948e5688450bd6ead4d1b0e822fb6adc4c4a400571f58f288c76080b1e210e6d88ba6573238debd7e1e85313166 SHA512 84e8878f281c23162689290ab4af514df1bb34898cdf770321fa33e83e5fbfe8390fd37ac7b47a390af3ca8327203a7b8cce218a7d5f7b5a8284f7b6c1ec36de
-EBUILD tigervnc-1.9.0-r1.ebuild 4540 BLAKE2B ff8f3c71c7bfc522a5f4ba7f028cebb9a6e01195f4dea198093171a0a860bdee4b0a34ac12513a75a78ad1b6936cad29b240e9491492c1bbc14ff7af6171f47f SHA512 709afdfba6be2772b1f99e1d2bea28e572bc99605864b6e4897595d47b0144a5290dbf78cfdf27ec49bff19170f82f0810bee3269c7fe57cfba9a4a3312b0d24
+EBUILD tigervnc-1.9.0-r1.ebuild 4542 BLAKE2B c0448931c65b8de3669cde0b0ebb24b57539c08c17ef6cac48a0ee81f92e3a89640b57e15d561a3a2399fc37a8521a67ec058a83007cec65b99d4f5aad7fc4b9 SHA512 9c13f09e7cf4df13a2857af86c23462eba0ddaceb098de6640419d8d6758d0b879d8d415e480f24ac5bc7863817918ef8b972b39f9be6fc7c2b6184f7dff1eaf
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 8e14c045fb53..ec0add271002 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 97a9903b5a46..d290b034ccdb 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -4,6 +4,8 @@ DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B d3dabea1b8b0d2a8c64716144d33265ba90
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
+DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 EBUILD unison-2.48.15_p4-r2.ebuild 3009 BLAKE2B c6d6f34bb42d24e4045040a02cf4e5f83e4fe803b1d68b539dce3b723d0ee7d45d14543657e9ded729eafda23bb02bfa347645d35384c511aa55ff8c2d1f0f8c SHA512 5debbdb871a92943168ee1d204518f69a0902be6d2f8f918533b492b8b3cd0e84e6409a7e6a7159e8b2843a10e2e1104ad3c38aa099fd7f2fefdcf39856b7307
 EBUILD unison-2.51.3_p20201024.ebuild 2783 BLAKE2B cd624dda358fae814145828dfa9af9dc40a0aad64d41d2bcb36f68af72be046a0efe755c1d7433d9d3ddfdb6dcde05fe8646780c3a1592218c9ca6102b312c13 SHA512 222888178e3c4163ca1c9ae3360caeb382929e53b2c3221a8cebc59fdb862e83838fce24136eeac38a97a3fe11af7c335818e59d004abe4f1518e3f606b4dea0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD unison-2.51.3_p20201127.ebuild 2763 BLAKE2B eda83c7269c84e0c4c72ddae78ac0d78cf6c55549e0b5cd83e8e71dfa95022eb579521cd4ce1da4f687ab7e5fa4c766fdd580319ff3bd5a5bdddbcea4ffcc292 SHA512 487451fbd0eed376ab0398cfbe1b4c6196391b45e3e4b7df7137bbf5e260919a4b90940eabf642186fb16a603fc84b105a0c1dd8f1f33785b39b31a79fa62e5b
+MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index 6f49eba8f496..5d879286e9ff 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">bcpierce00/unison</remote-id>
+		<bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to>
+		<doc>https://github.com/bcpierce00/unison/wiki</doc>
+		<changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild
new file mode 100644
index 000000000000..f1758eeb5557
--- /dev/null
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+MY_COMMIT="4713e608d2f9c998ba4412fee53b94dc9bef98b9"
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
+
+# ocaml version so we are sure it has ocamlopt use flag
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+	doc? ( app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_prepare() {
+	# https://github.com/bcpierce00/unison/issues/416
+	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+	# https://github.com/bcpierce00/unison/pull/415
+	sed -e "/myName/d" -i doc/docs.ml || die
+	default
+}
+
+src_compile() {
+	local myconf="all"
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS=""
+
+	if use doc; then
+		myconf="$myconf docs HEVEA=false"
+		emake $myconf CFLAGS=""
+	fi
+}
+
+src_test() {
+	emake test CFLAGS=""
+}
+
+src_install() {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	cd src || die
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+
+	if use gtk; then
+		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+		make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}"
+	fi
+
+	# Waiting for https://github.com/bcpierce00/unison/issues/411
+	if use doc; then
+		DOCS+=( ../doc/unison-manual.pdf )
+	#	HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+	eselect unison update || die
+
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 6e148eea6e72..b0d07f80bc0a 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -1,6 +1,5 @@
 AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c159808594dce0fc60c735757148a315c87d02d110695b343eaffa28b067668b2f874ad1f88516fe9cee4f98621ecbb15396b1b4f SHA512 52a0b30aa8a2beee0056112b49cfe6ef6021f682f7ba1ba38173d227f5e103f34fdded8c61b7b399cc548ca5e182b47d320af6dffe617673aa873f08c20e1bc4
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
-EBUILD wakeonlan-0.41-r2.ebuild 656 BLAKE2B d54b3d423bdc9e563beb94b7ff7a8bd11e15c2db232125966ce2f3036efec681d521f230b71cb245503ad890a8b4c606c7e59357370009d04d5f335a8628e670 SHA512 f1d799b8372909276834149a272340471e8a97312d4c5821f53c2382159dc160f8d2b4ab8ae60f9764fddbb5ee88df0703452a532b76571a4b099241b62b93cb
 EBUILD wakeonlan-0.41-r3.ebuild 644 BLAKE2B 85920ed07e23534e6576329b5b36d20e6ea06d5f7fbb7d33690f282c3479df9d68c5af6a2fd1cca6f514bb7b52df16d787eae31c23cf6c6709ed9737f402e63a SHA512 1283e5a841b52e1fa4d8120d315f245608afdae335185de9a5f39602efbf49c35fd118d4d4312ebfe0d6f4dab85ba1c9e44f00118e540f5e8f1aaeca768e148e
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
deleted file mode 100644
index 6edc22e53535..000000000000
--- a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL_SUBSLOT=no
-inherit eutils perl-module
-
-DESCRIPTION="Client for Wake-On-LAN"
-HOMEPAGE="http://gsd.di.uminho.pt/jpo/software/wakeonlan/"
-SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-ethers-lookup.patch
-	perl-module_src_prepare
-}
-
-src_install() {
-	perl-module_src_install
-	dodoc examples/lab001.wol
-}