gentoo resync : 08.07.2021

29 files changed, 1267 insertions, 65 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index bc1c2c1d44a7..92e9bbc842e0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 921df057bf14..de9bcc0b9c72 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -2,5 +2,5 @@ AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a48694
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
 DIST chrome-remote-desktop_91.0.4472.10_amd64.deb 38240812 BLAKE2B 34a91fba76c70abe3ae3aa4704f977f2f4788c412962a77c9c3f4c54aec0452cffb9705f650ee0688a63482ad20ccce8dcd2348cb606db6c2dd143592e68e222 SHA512 882138361926cf0975739ff9cee4105a3b95336021a1c63461a42e1eb76f8ae94fef4a36589da5ccda0c16bf8e9655be2517035e925f1bad08609f8d1f404553
-EBUILD chrome-remote-desktop-91.0.4472.10.ebuild 4787 BLAKE2B ab4a02650efabcfe489d91ace5251a6d69bccd9a484986b1589d3a22d2d57f72e6606643785e2ec31c3750bca12a271b0a687e7d6c7d97a9e40de3151989367a SHA512 286d12360e725a9bc70d01aed9e88e27f84ce7999ef0fd48bf85c5b9bf6e8d906cc347d1f5055aa30d4c3b638cc0b091e29d040cb84d87f8c7a90ec649350222
+EBUILD chrome-remote-desktop-91.0.4472.10.ebuild 4784 BLAKE2B f3c4cacbd1293c8d5f79c8a1115cd3871cdae6244a8cccfc6a3a9134958eb72ad9d461cced109cb7f9a2fa7ec7040766ee47aeeda34d88c4881e913b06b940f1 SHA512 9138c318e04ad0515493dd653744d573bc000637eb8cfbf154aa413a9cc07b95a0b0f16d4c59467815dd3dfe8251c849451c9e23c5874010717c60c934b711b7
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
index f2057d508820..df0836d47b36 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-91.0.4472.10.ebuild
@@ -18,7 +18,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{7,8,9} )
 PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW"
 
-inherit unpacker python-single-r1 l10n optfeature
+inherit unpacker python-single-r1 optfeature plocale
 
 DESCRIPTION="access remote computers via Chrome!"
 PLUGIN_URL="https://chrome.google.com/remotedesktop"
@@ -91,13 +91,13 @@ src_prepare() {
 	cd remoting_locales
 	# These isn't always included.
 	rm -f fake-bidi* || die
-	PLOCALES=${PLOCALES//_/-} l10n_find_plocales_changes "${PWD}" '' '.pak'
+	PLOCALES=${PLOCALES//_/-} plocale_find_changes "${PWD}" '' '.pak'
 }
 
 src_install() {
 	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
 	rm_pak() { local l=${1//_/-}; rm "${l}.pak" "${l}.pak.info"; }
-	l10n_for_each_disabled_locale_do rm_pak
+	plocale_for_each_disabled_locale rm_pak
 	popd >/dev/null
 
 	insinto /etc
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index bb6b0aebbaa1..c1a523baccfc 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -6,5 +6,5 @@ DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b
 EBUILD cni-plugins-0.8.6.ebuild 887 BLAKE2B 22a40a3a3e6269454c8393f45af4c03fb75d100f1976a89b58e56ee3add1e22d4b60aa4858bc49bdf663369df1f5ffe77e49b727df65efa8aec31e81cf46e917 SHA512 64f51abba277243b73f48e14abfeca29c6c68a1c74acd2023c58c27608ce7b7257102380926bfd982661325b668eb9ae3532cf2e1b64b80fc3a1c70603f19e8a
 EBUILD cni-plugins-0.8.7.ebuild 888 BLAKE2B 79bf0e6b70ca215ab02e203393dc0d1da9fbe67f5e1b2553fdda95a65083a5e974560e513d29c633a95b6823700052ed516efdb206b7ef87fd850dde26696a36 SHA512 2e183a9fd0587c39803d63eeaf25a04441776ddd993ce2b94167e0bf024c41b333ab4336670dc3ede154b4ac0983c6e8e59fa186378c19661d64cea4f4adad96
 EBUILD cni-plugins-0.9.0.ebuild 936 BLAKE2B d59052c6ac0291afc86987e72fad3b6dafb0abae2d452147d50884a9956830e35b7acc5b771bef4b6f9968b1d7b7918480b60417118232b4c7fdf34c5c1de2db SHA512 71e599ad2edccd2d18f86ac9d8c63b2cb28c39db2539714211d8a5fafb7781b8adb3811058b536bdd819fe97cc30763ce8c6065906aff1193fdcf3575c03a5af
-EBUILD cni-plugins-0.9.1.ebuild 936 BLAKE2B d59052c6ac0291afc86987e72fad3b6dafb0abae2d452147d50884a9956830e35b7acc5b771bef4b6f9968b1d7b7918480b60417118232b4c7fdf34c5c1de2db SHA512 71e599ad2edccd2d18f86ac9d8c63b2cb28c39db2539714211d8a5fafb7781b8adb3811058b536bdd819fe97cc30763ce8c6065906aff1193fdcf3575c03a5af
+EBUILD cni-plugins-0.9.1.ebuild 943 BLAKE2B 38824fa01bee283a1cb2825b70a8570db576b236071e8a357f7c3c9d052652577adb6d2b3009b890bdf48828d291f7ae13436d7b254810826ce86b62f097d5c8 SHA512 c39a1afb6a8a37a078b2df6de12f919804a84006bc8facdb5af0ac047f9bf88926cd369913282825d99bd232251c967ddff48824989f73607ce69f8dde60bbbd
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
index 3ef070097fe8..0a19fc7de659 100644
--- a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="hardened"
 
 CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 2ebebb3a21fa..1d0caa73f1d6 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-125.4.3474.tar.gz 98803434 BLAKE2B 9416f95e297ba5f278dde845c5f4b0b6e2d5c53dd8336017b27bfad8546d685a5f7ab4a953a0db471e87cab6a544178fd92dfd737aeb9f9b052364da41f18305 SHA512 2e3a8843d083a754513cf2d8c897910ccad9591d939bce84026e39a5cf4a9fc3489dc05ed7981fedd194c078a45bac412217cc5f629cdf1d77e70cbcdf7f9c5a
+DIST dropbox-lnx.x86-126.4.4618.tar.gz 99181455 BLAKE2B 3f7326d719c2a71d76a584173356d249164750fdb6c97e12d47de0d99cb43559a0b51d07f90ba7918c9e50d95cef77aec4eac854eaebdc56f0fa366d5ad44cc8 SHA512 4ca715e5309dd2dcec53721c8be93a3ad3898550edc42f6da90e99818593f812eb59040a9df5fe88517970893d6769cd2e39961ebc5c1c73de5df22e128bd02c
 DIST dropbox-lnx.x86_64-125.4.3474.tar.gz 101953751 BLAKE2B 5ef621e2dba90ac08e52678eb8a63eaf3c97d3e294bd237499ef988a17a16d6b9425e5b0c17caa1dccc3d81ea7b558b0103f9120eb31ca1ff28baa487e43cd20 SHA512 dca1088d3e2467b54eb7494276cc3b97eb83ef8089bba513f7abb6e0007807f549615d41d3574ac9b53f74c84203d5863018dc374f883a485d60450e9a6c0a07
+DIST dropbox-lnx.x86_64-126.4.4618.tar.gz 101031058 BLAKE2B ff05f235d574824d45857d737db146b548813f4c8a3097a5103af273326ad3bb07d6b11e08c322afb9591479a325f25598a9196cfcc6ec0743452b1c51778bb9 SHA512 6c2d52bfbb53512ab4a35851dba2116f66387760e71b0744f863024599a68fa5fa948b5a5747cd45628da53cadae29a5239bb6d2412ec2f11a8b73e2e6975f15
 EBUILD dropbox-125.4.3474.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
+EBUILD dropbox-126.4.4618.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-126.4.4618.ebuild b/net-misc/dropbox/dropbox-126.4.4618.ebuild
new file mode 100644
index 000000000000..be2fed244fff
--- /dev/null
+++ b/net-misc/dropbox/dropbox-126.4.4618.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcb
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index d51fdf84589f..69f0613e9b53 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,6 +1,6 @@
-DIST gallery-dl-1.17.3.tar.gz 353605 BLAKE2B bae09e7a71457510c5d05c897e0082a6dca1b9c9a0a7bb57cd4585fd3a3748af7dd9c85cd92340fe3fb8329562c7153af717ef07d7c0a4a486a3400d37869031 SHA512 ee11058f04197695a2a47b50a9bef81f91b10875959841bca0f9ae27d9229b9ce1fa1e6fd32b7199163d458d698ccd92be7a700aeaed55078feaf70063883f47
-DIST gallery-dl-1.17.4.tar.gz 354616 BLAKE2B b8730759af439b9a06b3498cbe2aa5ca758040dbdd812d00f5944d82e050ab09bfd69658aeb861d29bf597b6fa8976e29d3ce41e7a2073c479536cf819b83046 SHA512 f46fa38fcb58724fcfbed247c5e9da91f06ac70bc9fbaa8013f7bafd6de1f0563ac2b5c712216686d660e400aac9cb3f95b74218c8cfba85210fb0417e8f6db2
-EBUILD gallery-dl-1.17.3.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
-EBUILD gallery-dl-1.17.4.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
-EBUILD gallery-dl-9999.ebuild 1004 BLAKE2B e0190d0149b34c2a93c7514e36284e092f31178772aaeda49124b64dde02884ff8b77fbd8113c45d73f2b23e796362026dd3035cd6bd7a6adcca0da0ebf5f037 SHA512 4707beda8e5d127d58a7415caff052732e517b8b233ac6303d74c8f6383e5090ea947550d8c22b1e6af7a08907e1562bdd36125c466dbb26c06c14754506227c
+DIST gallery-dl-1.17.5.tar.gz 359212 BLAKE2B 12c8ba8e25e8979cb9230283b40f9e11c23032f281cdf73975b1099c76d9007c68246be0e961d29d4686ce12790cf31c4ed0e3c83d91984ce11b0008176157a3 SHA512 c630156c3b16499f33d3850935f5f37d85a443041448f1edf5d0b91a36b8b73a83248a9b2f6da99d5c679b6d1759100eb42f6b50650b914f67c1928e2491bf00
+DIST gallery-dl-1.18.1.tar.gz 368692 BLAKE2B f92eb7a876563ed5bc78ca1222b8c45fe78ad6d899a55bf2edefece14209acfc784bc3ac84c7e84397746f5a5ab01c2c6f94efcb0f28d2aacac3cbd68ebcd545 SHA512 20e4f983160870a646a66963505d2c53f5498b9bbbb869a603ae53848ee788f26c6df4c5951805d99f225954ddbe692c2da5501a409650cc3e522d97f34a7c0d
+EBUILD gallery-dl-1.17.5.ebuild 965 BLAKE2B 88f228909259371c5d92e2525a20c028053bf7cab0d6a5b4b2cc208a33fa1f7e9fbec02155fba304a7805edfc47c6be184a49c7cfa6464e5dc8e57922113576a SHA512 ca022794a80d6f060653b0a10caf896157e860367d5515a9c714dd0d8fa100659d9a370952a611d9b5ab3dab44ed99427a04de2c93346deb0172b599bd430c2b
+EBUILD gallery-dl-1.18.1.ebuild 965 BLAKE2B 88f228909259371c5d92e2525a20c028053bf7cab0d6a5b4b2cc208a33fa1f7e9fbec02155fba304a7805edfc47c6be184a49c7cfa6464e5dc8e57922113576a SHA512 ca022794a80d6f060653b0a10caf896157e860367d5515a9c714dd0d8fa100659d9a370952a611d9b5ab3dab44ed99427a04de2c93346deb0172b599bd430c2b
+EBUILD gallery-dl-9999.ebuild 965 BLAKE2B 88f228909259371c5d92e2525a20c028053bf7cab0d6a5b4b2cc208a33fa1f7e9fbec02155fba304a7805edfc47c6be184a49c7cfa6464e5dc8e57922113576a SHA512 ca022794a80d6f060653b0a10caf896157e860367d5515a9c714dd0d8fa100659d9a370952a611d9b5ab3dab44ed99427a04de2c93346deb0172b599bd430c2b
 MISC metadata.xml 793 BLAKE2B 0c014ab324d1fce9d2242f124aaea8273cb6de0553b5c0c6a65479d853ade3f1a9b8a7f482da9bd4ed6ff72ffd6138c35cde4cb373e92b5019e94405e29ba69f SHA512 2e7b177f458f13b084e28e0a59613ee58dce7ac0ad9483b04a2bb79df48583043924f13b5e3899d5f76a44b76ce2e4a04c63e71bea1916031c378831ea613fad
diff --git a/net-misc/gallery-dl/gallery-dl-1.17.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.17.5.ebuild
index c0680f91535c..fec914ad2ced 100644
--- a/net-misc/gallery-dl/gallery-dl-1.17.3.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.17.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{8,9})
 PYTHON_REQ_USE="sqlite,ssl,xml"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -12,7 +12,7 @@ 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
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
@@ -20,19 +20,18 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# tests require network access
-RESTRICT="test"
 LICENSE="GPL-2"
 SLOT="0"
+# tests require network access
+RESTRICT="test"
 
 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
+	emake data/completion/{,_}gallery-dl man
+
 	distutils-r1_src_compile
 }
 
diff --git a/net-misc/gallery-dl/gallery-dl-1.17.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild
index c0680f91535c..fec914ad2ced 100644
--- a/net-misc/gallery-dl/gallery-dl-1.17.4.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{8,9})
 PYTHON_REQ_USE="sqlite,ssl,xml"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -12,7 +12,7 @@ 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
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
@@ -20,19 +20,18 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# tests require network access
-RESTRICT="test"
 LICENSE="GPL-2"
 SLOT="0"
+# tests require network access
+RESTRICT="test"
 
 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
+	emake data/completion/{,_}gallery-dl man
+
 	distutils-r1_src_compile
 }
 
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index c0680f91535c..fec914ad2ced 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{7..9})
+PYTHON_COMPAT=(python3_{8,9})
 PYTHON_REQ_USE="sqlite,ssl,xml"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -12,7 +12,7 @@ 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
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
@@ -20,19 +20,18 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# tests require network access
-RESTRICT="test"
 LICENSE="GPL-2"
 SLOT="0"
+# tests require network access
+RESTRICT="test"
 
 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
+	emake data/completion/{,_}gallery-dl man
+
 	distutils-r1_src_compile
 }
 
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 8914381aa082..797e5c2fa47d 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,5 +1,5 @@
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
-EBUILD iputils-20210202.ebuild 4204 BLAKE2B b996ed5f8320d4dc5683ead7cac68d52a5fcc0343085c12861b6fe2cacb3bf569c2dbfb03a44926d727a6fe529f1bb2e51b7aa8c8092ca4a25931fbe3dfcb239 SHA512 234295b2a40af2d53df0cacb7bf0d1f4ca4f22482baf63e940378d5f3d43c25047fba8c6cb1b28543408a93c1af05f15fa3a3c3c1cdbe8e3bb26d2cb222cfc54
-EBUILD iputils-99999999.ebuild 4212 BLAKE2B a45d944f0e136bc15848dba417c8022739443ceff29d611579e4f2c61bc70ed7227322cc4a7edd1d992065446271aaafa57e1fbcee4c2d772885f13c920f6af1 SHA512 180e520783f660d714761edd9ef6bdf9e8f75a30289d4c5148248362459e192f18fa3833ae500fe61006d8bdbecfbadddda90296843b2925b7d160378caa3779
+EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
+EBUILD iputils-99999999.ebuild 4218 BLAKE2B 155c1e2581e7a2c49b5685fc100cd58f9486bb2b45d892b91aec2134ab3273aefe0cb9803fadb8ca8843eb360ebeb7a8b72b3f74d995ff3e6eb9e2c63102afd4 SHA512 f6105cce94fa3ed8af8b4cda65e709499defdad5f5d635b8175691ce6f0217420a52600698beeac4662ec8804efed5a8b178381fab9a0d8e92ac9329a6af974a
 MISC metadata.xml 1509 BLAKE2B 800c6f657d331ad2f73fbd3e6a199732549f89ba31188e8caf5612008b89f60c6a7fb925f2740fcca07d3772f12ea9c5590de834e77201730b848a877061a97a SHA512 5b358f53068f6a49f00141c47f75fde84fe609fd6652e3e717b97b9d36abbfb80ea52c1ef8c2e3a850ab3724f1d4a87093b2bfc1ee5497d082ce1937dc3aa83d
diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild
index 2e35ddc1ea7a..429e1a716287 100644
--- a/net-misc/iputils/iputils-20210202.ebuild
+++ b/net-misc/iputils/iputils-20210202.ebuild
@@ -12,7 +12,7 @@ EAPI="7"
 
 PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
-inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
+inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
@@ -65,7 +65,7 @@ fi
 src_prepare() {
 	default
 
-	l10n_get_locales > po/LINGUAS || die
+	plocale_get_locales > po/LINGUAS || die
 }
 
 src_configure() {
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index c77ade4aac5e..731796a22c5e 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -12,7 +12,7 @@ EAPI="7"
 
 PLOCALES="de fr ja pt_BR tr uk zh_CN"
 
-inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
+inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
@@ -65,7 +65,7 @@ fi
 src_prepare() {
 	default
 
-	l10n_get_locales > po/LINGUAS || die
+	plocale_get_locales > po/LINGUAS || die
 }
 
 src_configure() {
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index 5b63a95faa6f..6e7476e9f2e1 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -32,5 +32,5 @@ DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48e
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
 EBUILD netkit-rsh-0.17-r13.ebuild 1778 BLAKE2B ec51ebf68d2bb3fa775677a7901980df01305190c3581e6bfbc8deb5a5f880ff6e05f43c1cedb7145d0348fa18faf327ec5458c1e138b0eaa0c0bcfa6a9c6f63 SHA512 1f0c4bc1b2c3a052b30efe2c118f8120d8f04503ca0c8f6d66b69da93cb252b9f5372bd7f7ba0b823e6fee0bdd48b19d4ca330e7420c9285f835716501339732
-EBUILD netkit-rsh-0.17-r14.ebuild 1748 BLAKE2B f33ecf5d32286b0271c087106c21cf3b24db2f4b14b14e85edb60512f74e41844b2a3a4b5f37d1a52d92900cdd9e9c235540b5219f539eb262d62996737adac6 SHA512 c41c74d3de09b9b5d92e86a6402db6e7f4b049f78d36e9f59c5d0e3de5576bf8ce9d9ccf77fd3534c29bc71d5508e48c067106a7132615ab295472dfbc16e9f5
+EBUILD netkit-rsh-0.17-r14.ebuild 1755 BLAKE2B e55b61fe5a5a266b175851364ffad5738be38c6ab20c0d02682912ef57aecfbe2b6cf34a2cb44852850549f1b290fa23c845a86f1d483f47e364e55accf2a9c9 SHA512 540a74008fc2b16fe3a2ce90cca001b38f3f9daea901dbe9aa57b0412f67bb6ce0f24c7b2816d750e67698d192dc75d5ba40a9b223514ebb8d39af04365bd33f
 MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
index ade4c58496a1..5a63a30bd282 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 IUSE="pam"
 
 RDEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 34a975298f95..47d94ed779d7 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,5 +3,7 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 DIST NetworkManager-1.30.4.tar.xz 5303420 BLAKE2B c2d81fe03f75f4afd05cac06741d9e7fb0d2892bad30462788a39d9c84afd056614e8f8d3371f15f4de7398cc40a32861814498fc36911c43bbe8e43f5053cde SHA512 ca42907d0c0fc6a981d94798a5e264dd58c7d11576a8dd52c8ef6799334af46848091d872e9cec553714766c51457cbe12c5c2017eaac63abce968823b047624
+DIST NetworkManager-1.32.2.tar.xz 5242372 BLAKE2B d19dbbb86cafd29023e0bd1b3a1ce69580d769d77a993b5e0db6cc526de7b1cce573e74c96483bf88c3a45f3ac7d4831a27d1efb1d8414cc8dd6e5671bdbf4f3 SHA512 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1
 EBUILD networkmanager-1.30.4.ebuild 11206 BLAKE2B 2eac583bf5c83f16e7417ebb890155a5386b91550071d2ad819d14a089ecd120a823b53b73eb01da2b212b2eef0095840a0de68bad7c8984aaaf8177ad2b5027 SHA512 5523dc378109cbf5f058a34dbfbdd75891d53f90cbf32d86c0bd15eb16b442082b37b8983ff59ef3f52756bff5472f855471906cc5d9a238d0f5434847a3792a
-MISC metadata.xml 1837 BLAKE2B aa043d2334596bc186550d670e239a7aa272345fa7f93b50b2080e8ba238c0e604a5e2b1e6da9c4e122da4cf372c7a1ae2e491e9ba211815e4d31455c094bdfd SHA512 3af46024f51345dc5aa914539d43f74015bf75e8b5e92e008bb9fc65055fe0fa29e397ac86cd2ca23e6c048b51ac7f15de2458b4033a83d77c0c134629ad495d
+EBUILD networkmanager-1.32.2.ebuild 11373 BLAKE2B d404928b488ea79a12e278df5e8f822ebd17fff4edef38b4877ff8888e38ebeedeece4eb903f71c838bf15430f1aa1506b46a9658d0938c2379a7b5f8138c62c SHA512 443b1a5471d1af71bb1796e242b1c8b6b21aff1203bf732ad2610e52f316678705157c379a0b925fec7eb016c31e24527f41d6a0bf55e0c720f3ab9f71110a29
+MISC metadata.xml 2062 BLAKE2B 117ea58d66dbedc65d59db38a46aa9e4b5c49bf1699748aa03c52c4b1543c4074f8ebea462ff0ac855f153702201bd14cec246dfd8496f5426bbfa10aad53b88 SHA512 083e9b2ddddf781116e7b337f6cd80278e1bc4ea218d9612feed313ed61cfb6ba531b8be818d80eff7e076bab66b7d7d73d96f58d410c7b3708e02e43e724b97
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index bad2d1a41b75..70f8a3206ee3 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -6,30 +6,48 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
-			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
-		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
-			getting ip</flag>
-		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
-		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
-		<flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of
-			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag>
-		<flag name="modemmanager">Enable support for mobile broadband devices
-			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="connection-sharing">
+			Support connection sharing (uses <pkg>net-dns/dnsmasq</pkg>)
+		</flag>
+		<flag name="dhclient">
+			Use dhclient from <pkg>net-misc/dhcp</pkg> for getting an IP via DHCP
+		</flag>
+		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting an IP</flag>
+		<flag name="elogind">
+			Use <pkg>sys-auth/elogind</pkg> for session tracking
+		</flag>
+		<flag name="iptables">
+			Use <pkg>net-firewall/iptables</pkg> for connection sharing
+		</flag>
+		<flag name="iwd">
+			Use <pkg>net-wireless/iwd</pkg> instead of
+			<pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default
+		</flag>
+		<flag name="modemmanager">
+			Enable support for mobile broadband devices using
+			<pkg>net-misc/modemmanager</pkg>
+		</flag>
+		<flag name="nftables">
+			Use <pkg>net-firewall/nftables</pkg> for connection sharing
+		</flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
 		<flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
 		<flag name="ovs">Enable OpenVSwitch support</flag>
-		<flag name="ppp">Enable support for mobile broadband and PPPoE
-			connections using <pkg>net-dialup/ppp</pkg></flag>
-		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
-			DNS information in /etc/resolv.conf. Generally, a symlink to
-			/run/NetworkManager/resolv.conf is simpler. On systems running
-			systemd-resolved, disable this flag and create a symlink to
-			/run/systemd/resolve/stub-resolv.conf.</flag>
+		<flag name="ppp">
+			Enable support for mobile broadband and PPPoE connections using
+			<pkg>net-dialup/ppp</pkg>
+		</flag>
+		<flag name="resolvconf">
+			Use <pkg>net-dns/openresolv</pkg> for managing DNS information in
+			/etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf
+			is simpler. On systems running systemd-resolved, disable this flag and
+			create a symlink to /run/systemd/resolve/stub-resolv.conf.
+		</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
 		<flag name="wifi">Enable support for wifi and 802.1x security</flag>
-		<flag name="wext">Enable support for the deprecated Wext (Wireless
-			Extensions) API; needed for some older drivers (e.g. ipw2200,
-			ndiswrapper)</flag>
+		<flag name="wext">
+			Enable support for the deprecated Wext (Wireless Extensions) API; needed
+			for some older drivers (e.g. ipw2200, ndiswrapper)
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-1.32.2.ebuild b/net-misc/networkmanager/networkmanager-1.32.2.ebuild
new file mode 100644
index 000000000000..0ab6357947d6
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.32.2.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iptables iwd kernel_linux +nss nftables +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+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
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-nft=/sbin/nft
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			src/libnm-client-impl/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 9870609e0dfd..0c9dbf5131bd 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,12 @@
+AUX nextcloud-client-3.2.3-inkscape.patch 3190 BLAKE2B 432a1d418e61c982ff6f4d7a43151c5bd8ffb7d231542abc3ee42f450fad2eeed4e1d3e641ee4ac246d43174d69de4de7384516dd9a22c26a1c878ab0aa06f7e SHA512 0a92815371923bce701edd362583e11977556f17866fedf13ea48ed26e409610b80eb7a6b6181702b59250fa3868319624bdad34911746490f5a8330ad94b4a2
+AUX nextcloud-client-3.2.3-webengine.patch 15574 BLAKE2B 8cd752db888f87f075f3b69cf34e3e84fde99f3f2dec4891092d47c020b60efc49968bfee7ef8136b6e0454cc331b778fcbc2a94903b11c1cc3e587d153e3aa9 SHA512 b3ea743ab50ef8eda12a0bef8513d1563d3682c54e6af586ccf60cf7b4377e93913c4d6eb0ba1b65075203608bfa81f934dfc408b89c5bf3b84352524bc08091
 DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
 DIST nextcloud-client-3.2.1.tar.gz 15234115 BLAKE2B 2fcbaab4e73db3cfbf7dea750a0e0782c6cb8bb03c867653a47d2f21cfe369da8e4eff8bf1f0ff548c62909e770132799a927e18f9c732a4d551b97ff6362572 SHA512 bf2b4e1c85e07ad32ed00efa4a56d6b4195b42f4d95c7cb32d8c43d2c5564ac1512155a9f51508d522366c5ce44104f1b076f1addef1147a77ace5a11bd500e6
 DIST nextcloud-client-3.2.2.tar.gz 15398900 BLAKE2B b91c814977486db57b1864f71d3763c64f676449a5547f21bb379154f66a38bc4db355bb16cc6a70781cb45d4a4704f55238dd570f123b450c512bc3e0ce5b3c SHA512 ce6adbb09ee8495448b7da0c5e9637b3c775d28b8ee1656864843264bdacffbc402c9f507ced3e3943896ae25ee73975054b8ffa1577bdd3d32dc453c3f94d74
+DIST nextcloud-client-3.2.3.tar.gz 15381488 BLAKE2B 14ee239321d7c530dada9d4727fa7cc9801637827fc8dd065ea9b68c54f3559cdb56b0d0e0e37fc7aa5c668be51e3839bc33b20ea9ab73e4a1df4ba260b0ab9e SHA512 bbb247ce4945503a5b1af55ee200edaef000bb21220a9408657e057c98bd3f7bd646dedbedc57048e9f593f3a1d408ac37b4b01c390ecf85dca82868792e922d
 EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3
 EBUILD nextcloud-client-3.2.1.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9
 EBUILD nextcloud-client-3.2.2.ebuild 1987 BLAKE2B 99a990f7413277e794c4c59050bf33bc4ea786955c6c2b65ca1b30f63a7cce3170f85577fd69449c971405a6a96c0a72afde08d12c3a3fa9af9b8615f0fbcaca SHA512 4c5db01203e7c93f2878f549b589d7b2e618b814a403423dfd88de4cc0f6eed0d8328ce64f854d04a4b565665c4df3083b10ce044f4b0e0356f7d69878c087c9
-MISC metadata.xml 513 BLAKE2B b63b5116dcf22fc8b7608cf7a13b5749668a139f8e670419733cbcbd44284bb45227d16b9a3d5d50d505440e2d50fff77b98cfe4321afc78b20fd22ab3a495c9 SHA512 491340b64cb8bbeb0efc5cba4de9878aca75231bbfc19b8fdd2de895ed0cacaf154add48cec8964412a68e496f348dc539262afa74b08e38d2d7a27ed220ff5f
+EBUILD nextcloud-client-3.2.3-r1.ebuild 2175 BLAKE2B 9f3c68d6afd38a786b1808860b77b2f05c53361b7dbfae0a52bb0f46114c56f2f6c510b3d339179549af132b34478ae84e361313e47362ca53677dc0025b62ff SHA512 93364128839e839fb76752cb753301652dec39a6ff936dac43e90ca636180703889b1e48c79a0f9e814a9c094534e96d474583d2aee3222eabd3b3b4410a8797
+EBUILD nextcloud-client-3.2.3.ebuild 2034 BLAKE2B 6b5c122bd2c5d519ee1945a175298b723d5198043b00780d1cf937110a0c016014d34f8f66bb23bdeb4e5cb2aa8b82abe6a4a4397b2ccded916e34ab1217377f SHA512 6498817e25c0b7155afdf7a53fcfa0ca52cb7a3096645efdf72f8f35df7d5247db55677abd7524f78ea795813db23af7ae6d932c5adb5c6bc6c352eeb7fd25b2
+MISC metadata.xml 604 BLAKE2B 046885e743e6e4d73f3a829c4095fe1e9abba18f52001694ab7a2c5c27050c90c25bdbb15478741dabd63b7b670dd6a275049143b84c60c9e7477632b478ed43 SHA512 9ff591bd55d8fda95d54e20410506612a99920a23d5f40555aa17a53d9ad093cf36a330e65811f71a46751fb674d7ad6c24d5a5f16708d06b49f2e602a0e6eab
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch
new file mode 100644
index 000000000000..8b02ab2a8086
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch
@@ -0,0 +1,79 @@
+diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
+--- desktop-3.2.3.orig/src/gui/CMakeLists.txt	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/CMakeLists.txt	2021-07-06 19:20:34.225000546 +0200
+@@ -241,75 +241,6 @@
+     set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
+ endif()
+ 
+-# Generate png icons from svg
+-find_program(INKSCAPE
+-  NAMES inkscape inkscape.exe
+-  REQUIRED
+-  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
+-# REQUIRED keyword is only supported on CMake 3.18 and above
+-if (NOT INKSCAPE)
+-  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
+-endif()
+-
+-function(generate_sized_png_from_svg icon_path size)
+-  get_filename_component(icon_name_dir ${icon_path} DIRECTORY)
+-  get_filename_component(icon_name_wle ${icon_path} NAME_WLE)
+-
+-  if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png")
+-    return()
+-  endif()
+-
+-  set(icon_output_name "${size}-${icon_name_wle}.png")
+-  message(STATUS "Generate ${icon_output_name}")
+-  execute_process(COMMAND
+-    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
+-    WORKING_DIRECTORY "${icon_name_dir}"
+-    RESULT_VARIABLE
+-    INKSCAPE_SIDEBAR_ERROR
+-    OUTPUT_QUIET
+-    ERROR_QUIET)
+-
+-  if (INKSCAPE_SIDEBAR_ERROR)
+-    message(FATAL_ERROR
+-      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
+-  else()
+-  endif()
+-endfunction()
+-
+-if ((APPLICATION_ICON_SET MATCHES "PNG")
+-    AND
+-    (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg"))
+-  # We may have no svg application icon in when customers use PNG
+-  # icons in brander, but theme.qrc expects a svg icon.
+-  file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
+-endif()
+-
+-if(APPLE)
+-  set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg")
+-  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16)
+-  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32)
+-  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64)
+-  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128)
+-  generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256)
+-endif()
+-
+-if(WIN32)
+-  set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg")
+-  generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70)
+-  generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150)
+-endif()
+-
+-set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
+-generate_sized_png_from_svg(${APP_ICON_SVG} 16)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 24)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 32)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 48)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 64)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 128)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 256)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 512)
+-generate_sized_png_from_svg(${APP_ICON_SVG} 1024)
+-
+ file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*")
+ if(APPLE)
+     file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*")
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
new file mode 100644
index 000000000000..8152528f30cb
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
@@ -0,0 +1,419 @@
+diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt
+--- desktop-3.2.3.orig/src/CMakeLists.txt	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/CMakeLists.txt	2021-07-07 20:26:40.620839467 +0200
+@@ -4,7 +4,13 @@
+ 
+ set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
+ 
+-find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
++find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
++find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine)
++
++if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
++  add_compile_definitions(WITH_WEBENGINE=1)
++endif()
++
+ get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
+ message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})")
+ 
+diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
+--- desktop-3.2.3.orig/src/gui/CMakeLists.txt	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/CMakeLists.txt	2021-07-07 20:26:40.620839467 +0200
+@@ -128,12 +128,17 @@
+     wizard/owncloudwizardcommon.cpp
+     wizard/owncloudwizard.cpp
+     wizard/owncloudwizardresultpage.cpp
+-    wizard/webviewpage.cpp
+-    wizard/webview.cpp
+     wizard/slideshow.cpp
+     wizard/welcomepage.cpp
+     wizard/linklabel.cpp
+-)
++    )
++
++if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
++  list(APPEND client_SRCS
++    wizard/webviewpage.cpp
++    wizard/webview.cpp
++  )
++endif()
+ 
+ IF(BUILD_UPDATER)
+     set(updater_SRCS
+@@ -339,9 +344,12 @@
+   Qt5::Qml
+   Qt5::Quick
+   Qt5::QuickControls2
+-  Qt5::WebEngineWidgets
+   ${synclib_NAME}
+-)
++  )
++
++if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
++  target_link_libraries(nextcloudCore PUBLIC Qt5::WebEngineWidgets)
++endif()
+ 
+ set_target_properties(nextcloudCore
+   PROPERTIES
+diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp desktop-3.2.3/src/gui/creds/webflowcredentials.cpp
+--- desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/creds/webflowcredentials.cpp	2021-07-07 20:26:40.618839464 +0200
+@@ -16,7 +16,9 @@
+ #include "account.h"
+ #include "configfile.h"
+ #include "theme.h"
++#ifdef WITH_WEBENGINE
+ #include "wizard/webview.h"
++#endif // WITH_WEBENGINE
+ #include "webflowcredentialsdialog.h"
+ 
+ using namespace QKeychain;
+@@ -144,8 +146,12 @@
+     // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2
+     auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
+     connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) {
+-        // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
++    // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
++#ifdef WITH_WEBENGINE
+         bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow);
++#else // WITH_WEBENGINE
++        bool useFlow2 = true;
++#endif // WITH_WEBENGINE
+ 
+         _askDialog = new WebFlowCredentialsDialog(_account, useFlow2);
+ 
+diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp
+--- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp	2021-07-07 20:26:40.618839464 +0200
+@@ -8,16 +8,20 @@
+ #include "owncloudgui.h"
+ #include "headerbanner.h"
+ #include "wizard/owncloudwizardcommon.h"
++#ifdef WITH_WEBENGINE
+ #include "wizard/webview.h"
++#endif // WITH_WEBENGINE
+ #include "wizard/flow2authwidget.h"
+ 
+ namespace OCC {
+ 
+ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent)
+-    : QDialog(parent),
+-      _useFlow2(useFlow2),
+-      _flow2AuthWidget(nullptr),
+-      _webView(nullptr)
++    : QDialog(parent)
++    , _useFlow2(useFlow2)
++    , _flow2AuthWidget(nullptr)
++#ifdef WITH_WEBENGINE
++    , _webView(nullptr)
++#endif // WITH_WEBENGINE
+ {
+     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+ 
+@@ -49,10 +53,12 @@
+ 
+         _flow2AuthWidget->startAuth(account);
+     } else {
++#ifdef WITH_WEBENGINE
+         _webView = new WebView();
+         _containerLayout->addWidget(_webView);
+ 
+         connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched);
++#endif // WITH_WEBENGINE
+     }
+ 
+     auto app = static_cast<Application *>(qApp);
+@@ -73,12 +79,14 @@
+ void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) {
+     Q_UNUSED(e)
+ 
++#ifdef WITH_WEBENGINE
+     if (_webView) {
+         // Force calling WebView::~WebView() earlier so that _profile and _page are
+         // deleted in the correct order.
+         _webView->deleteLater();
+         _webView = nullptr;
+     }
++#endif // WITH_WEBENGINE
+ 
+     if (_flow2AuthWidget) {
+         _flow2AuthWidget->resetAuth();
+@@ -89,9 +97,14 @@
+     emit onClose();
+ }
+ 
+-void WebFlowCredentialsDialog::setUrl(const QUrl &url) {
++void WebFlowCredentialsDialog::setUrl(const QUrl &url)
++{
++#ifdef WITH_WEBENGINE
+     if (_webView)
+         _webView->setUrl(url);
++#else // WITH_WEBENGINE
++    Q_UNUSED(url);
++#endif // WITH_WEBENGINE
+ }
+ 
+ void WebFlowCredentialsDialog::setInfo(const QString &msg) {
+diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h
+--- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h	2021-07-07 20:26:40.618839464 +0200
+@@ -13,7 +13,9 @@
+ namespace OCC {
+ 
+ class HeaderBanner;
++#ifdef WITH_WEBENGINE
+ class WebView;
++#endif // WITH_WEBENGINE
+ class Flow2AuthWidget;
+ 
+ class WebFlowCredentialsDialog : public QDialog
+@@ -50,7 +52,9 @@
+     bool _useFlow2;
+ 
+     Flow2AuthWidget *_flow2AuthWidget;
++#ifdef WITH_WEBENGINE
+     WebView *_webView;
++#endif // WITH_WEBENGINE
+ 
+     QLabel *_errorLabel;
+     QLabel *_infoLabel;
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp	2021-07-07 20:26:40.619839465 +0200
+@@ -119,21 +119,6 @@
+     _ui.leUrl->setPalette(leUrlPalette);
+ }
+ 
+-#ifdef WITH_PROVIDERS
+-void OwncloudSetupPage::slotLogin()
+-{
+-    _ocWizard->setRegistration(false);
+-}
+-void OwncloudSetupPage::slotGotoProviderList()
+-{
+-    _ocWizard->setRegistration(true);
+-    _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
+-    _authTypeKnown = true;
+-    _checking = false;
+-    emit completeChanged();
+-}
+-#endif
+-
+ // slot hit from textChanged of the url entry field.
+ void OwncloudSetupPage::slotUrlChanged(const QString &url)
+ {
+@@ -228,8 +213,10 @@
+         return WizardCommon::Page_OAuthCreds;
+     case DetermineAuthTypeJob::LoginFlowV2:
+         return WizardCommon::Page_Flow2AuthCreds;
++#ifdef WITH_WEBENGINE
+     case DetermineAuthTypeJob::WebViewFlow:
+         return WizardCommon::Page_WebView;
++#endif // WITH_WEBENGINE
+     }
+     return WizardCommon::Page_HttpCreds;
+ }
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h	2021-07-07 20:26:40.617839462 +0200
+@@ -67,10 +67,6 @@
+ protected slots:
+     void slotUrlChanged(const QString &);
+     void slotUrlEditFinished();
+-#ifdef WITH_PROVIDERS
+-    void slotLogin();
+-    void slotGotoProviderList();
+-#endif
+ 
+     void setupCustomization();
+ 
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h	2021-07-07 20:26:40.619839465 +0200
+@@ -46,7 +46,9 @@
+         Page_HttpCreds,
+         Page_OAuthCreds,
+         Page_Flow2AuthCreds,
++#ifdef WITH_WEBENGINE
+         Page_WebView,
++#endif // WITH_WEBENGINE
+         Page_AdvancedSetup,
+         Page_Result
+     };
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp	2021-07-07 20:26:40.619839465 +0200
+@@ -54,7 +54,11 @@
+     , _flow2CredsPage(new Flow2AuthCredsPage)
+     , _advancedSetupPage(new OwncloudAdvancedSetupPage(this))
+     , _resultPage(new OwncloudWizardResultPage)
++#ifdef WITH_WEBENGINE
+     , _webViewPage(new WebViewPage(this))
++#else // WITH_WEBENGINE
++    , _webViewPage(nullptr)
++#endif // WITH_WEBENGINE
+ {
+     setObjectName("owncloudWizard");
+ 
+@@ -66,7 +70,9 @@
+     setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
+     setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
+     setPage(WizardCommon::Page_Result, _resultPage);
++#ifdef WITH_WEBENGINE
+     setPage(WizardCommon::Page_WebView, _webViewPage);
++#endif // WITH_WEBENGINE
+ 
+     connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
+ 
+@@ -78,7 +84,9 @@
+     connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+     connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
+     connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
++#ifdef WITH_WEBENGINE
+     connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
++#endif // WITH_WEBENGINE
+     connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
+         this, &OwncloudWizard::createLocalAndRemoteFolders);
+     connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
+@@ -230,9 +238,11 @@
+         _flow2CredsPage->setConnected();
+         break;
+ 
++#ifdef WITH_WEBENGINE
+     case WizardCommon::Page_WebView:
+         _webViewPage->setConnected();
+         break;
++#endif // WITH_WEBENGINE
+ 
+     case WizardCommon::Page_AdvancedSetup:
+         _advancedSetupPage->directoriesCreated();
+@@ -256,8 +266,10 @@
+         _credentialsPage = _browserCredsPage;
+     } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
+         _credentialsPage = _flow2CredsPage;
++#ifdef WITH_WEBENGINE
+     } else if (type == DetermineAuthTypeJob::WebViewFlow) {
+         _credentialsPage = _webViewPage;
++#endif // WITH_WEBENGINE
+     } else { // try Basic auth even for "Unknown"
+         _credentialsPage = _httpCredsPage;
+     }
+@@ -281,7 +293,11 @@
+         button(QWizard::NextButton)->setHidden(true);
+         // Need to set it from here, otherwise it has no effect
+         _welcomePage->setLoginButtonDefault();
+-    } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) {
++    } else if (
++#ifdef WITH_WEBENGINE
++        id == WizardCommon::Page_WebView ||
++#endif // WITH_WEBENGINE
++        id == WizardCommon::Page_Flow2AuthCreds) {
+         setButtonLayout({ QWizard::Stretch, QWizard::BackButton });
+     } else if (id == WizardCommon::Page_AdvancedSetup) {
+         setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton });
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h desktop-3.2.3/src/gui/wizard/owncloudwizard.h
+--- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/owncloudwizard.h	2021-07-07 20:26:40.619839465 +0200
+@@ -128,7 +128,7 @@
+     OwncloudAdvancedSetupPage *_advancedSetupPage;
+     OwncloudWizardResultPage *_resultPage;
+     AbstractCredentialsWizardPage *_credentialsPage = nullptr;
+-    WebViewPage *_webViewPage;
++    WebViewPage *_webViewPage = nullptr;
+ 
+     QStringList _setupLog;
+ 
+diff -Naur desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp desktop-3.2.3/src/gui/wizard/welcomepage.cpp
+--- desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/gui/wizard/welcomepage.cpp	2021-07-07 20:26:40.620839467 +0200
+@@ -13,6 +13,7 @@
+  */
+ 
+ #include "welcomepage.h"
++#include "guiutility.h"
+ #include "theme.h"
+ #include "wizard/owncloudwizard.h"
+ #include "wizard/slideshow.h"
+@@ -94,11 +95,18 @@
+ 
+ void WelcomePage::setupCreateAccountButton()
+ {
++#ifdef WITH_WEBENGINE
+     connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
+         _ocWizard->setRegistration(true);
+         _nextPage = WizardCommon::Page_WebView;
+         _ocWizard->next();
+     });
++#else // WITH_WEBENGINE
++    connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
++        _ocWizard->setRegistration(true);
++        Utility::openBrowser(QStringLiteral("https://nextcloud.com/register"));
++    });
++#endif // WITH_WEBENGINE
+ }
+ 
+ void WelcomePage::setupHostYourOwnServerLabel()
+diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.cpp desktop-3.2.3/src/libsync/networkjobs.cpp
+--- desktop-3.2.3.orig/src/libsync/networkjobs.cpp	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/libsync/networkjobs.cpp	2021-07-07 20:26:40.619839465 +0200
+@@ -30,6 +30,7 @@
+ #include <QCoreApplication>
+ #include <QJsonDocument>
+ #include <QJsonObject>
++#include <qloggingcategory.h>
+ #ifndef TOKEN_AUTH_ONLY
+ #include <QPainter>
+ #include <QPainterPath>
+@@ -958,7 +959,11 @@
+                 auto flow = gs.toObject().value("desktoplogin");
+                 if (flow != QJsonValue::Undefined) {
+                     if (flow.toInt() == 1) {
++#ifdef WITH_WEBENGINE
+                         _resultOldFlow = WebViewFlow;
++#else // WITH_WEBENGINE
++                        qCWarning(lcDetermineAuthTypeJob) << "Server does only support flow1, but this client was compiled without support for flow1";
++#endif // WITH_WEBENGINE
+                     }
+                 }
+             }
+@@ -985,20 +990,24 @@
+ 
+     auto result = _resultPropfind;
+ 
++#ifdef WITH_WEBENGINE
+     // WebViewFlow > OAuth > Basic
+     if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
+         result = WebViewFlow;
+     }
++#endif // WITH_WEBENGINE
+ 
+     // LoginFlowV2 > WebViewFlow > OAuth > Basic
+     if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
+         result = LoginFlowV2;
+     }
+ 
++#ifdef WITH_WEBENGINE
+     // If we determined that we need the webview flow (GS for example) then we switch to that
+     if (_resultOldFlow == WebViewFlow) {
+         result = WebViewFlow;
+     }
++#endif // WITH_WEBENGINE
+ 
+     // If we determined that a simple get gave us an authentication required error
+     // then the server enforces basic auth and we got no choice but to use this
+diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.h desktop-3.2.3/src/libsync/networkjobs.h
+--- desktop-3.2.3.orig/src/libsync/networkjobs.h	2021-06-24 12:04:33.000000000 +0200
++++ desktop-3.2.3/src/libsync/networkjobs.h	2021-07-07 20:26:40.619839465 +0200
+@@ -444,9 +444,11 @@
+ public:
+     enum AuthType {
+         NoAuthType, // used only before we got a chance to probe the server
++#ifdef WITH_WEBENGINE
++        WebViewFlow,
++#endif // WITH_WEBENGINE
+         Basic, // also the catch-all fallback for backwards compatibility reasons
+         OAuth,
+-        WebViewFlow,
+         LoginFlowV2
+     };
+     Q_ENUM(AuthType)
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index ea54627aff84..588dc46f7e60 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
+		<flag name="webengine">Enable old Flow1 login using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nextcloud/desktop</remote-id>
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..f5a364e114c6
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-inkscape.patch
+	"${FILESDIR}"/${P}-webengine.patch
+	)
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild
new file mode 100644
index 000000000000..4bf713797b35
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	>=dev-libs/openssl-1.1.0:0=
+	nautilus? ( dev-python/nautilus-python )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-inkscape.patch )
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=yes
+		-DBUILD_UPDATER=OFF
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index d68493b1cc9b..df09745b2d4b 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,3 +1,5 @@
 DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f
+DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750
+EBUILD r8168-8.049.02.ebuild 924 BLAKE2B f4ff3e0f5177124d6628f6c3205f62512e6c3343e0a8de91d87073c7af0f57fcab421e2834434da7a9d309e02a604e6a006294016c78621e7864f276cb8e9a88 SHA512 b82a87e40ed975c981eacc6e03410dca1b824319cf0ae7aa75bad04d30c986af62fb14f164e587a7d585b50eba216225bb8f316c089b18ba6d46b8702b27a053
 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/r8168-8.049.02.ebuild b/net-misc/r8168/r8168-8.049.02.ebuild
new file mode 100644
index 000000000000..7a3513fe3b08
--- /dev/null
+++ b/net-misc/r8168/r8168-8.049.02.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
+# we need to mirror it to avoid users from needing to fill a captcha to
+# download
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="!R8169"
+ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 99ae688236b8..0ec03259ad32 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,4 @@
 AUX wol-0.7.1-musl.patch 347 BLAKE2B 4ebedc009fb77556004f8bdda8679ca2f0eaca22145aa395a69ce6e78319a6c3fb430bc4ea30c4887dd4e870ad1ff36d7369ec3dc50a419bc5e8ebcdd29ebd7e SHA512 b7568aa53f20a0402aeb9ed579fab2846245df134c000cc4483ce63f01ec64943708595fff9f78c73e6c6156ddd06781314dee46a06c216c9abcd0f1ec696208
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r2.ebuild 606 BLAKE2B 30192450a7c09e88123028a2790e3bc70d4c977134b32a19090f5aba11ef72fcc01dd5d5a4c19f04a7a88d875da3ec6d76d80bbd63792a7f706055b1e228cf86 SHA512 908c5a9ccac7fa826770b7176075180f10f51186c18d62351e29f65d34e22492fffcfe3ab39014417e52a53e1082d1a4efc680703302cbabb75f851594fb9add
+EBUILD wol-0.7.1-r2.ebuild 605 BLAKE2B 01808aadcc0e2f4d3d9c6b74f00a131039905b4564560996fd5b6d3d7c547db0ec2e68486cd50680e08d2b3976889b77d28a7a81450fb0da220d1bc947349192 SHA512 307e2042782eff6d4038dc0995106eb9e2d397f80d8e33e8384058ded9a4300b302d5c0912b83bfcafe24255d6f871a46f68ce7e3aa0070eaea3b084e0d49f4c
 MISC metadata.xml 616 BLAKE2B 5beea9884b74086c02e1cf37e08157dee574c98c56f06371e96132a31747be644761601429ff79211eec98004dd468b5e51e7a71c480b0d6e3e43d3e5941dfa3 SHA512 ba5865dcd92e68b01a21d126aadb530d936639bb391b959c683e83daefcc671201b772a713fc0a6397eb892558c8e9691700ee97955b3992fd64ecf1cdc9c240
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index 00f3b222ff49..4c9eb1184f11 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 PATCHES=( "${FILESDIR}/${P}-musl.patch" )