gentoo resync : 25.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-26 00:10:07 +0100
commit: 95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree: 867dce371a84a696e91be255d89f282975aa0480 /net-misc
parent: 46eedbedafdb0040c37884982d4c775ce277fb7b (diff)
52 files changed, 512 insertions, 429 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 77593519123c..88f95165cdcc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index b7eacb76ea01..4bdcf6f00f8a 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,3 +1,3 @@
 DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4
-EBUILD dhcpcd-ui-0.7.8.ebuild 1267 BLAKE2B 2ee0d2a0f9d333f826c0d59e5b84abbce55c4e0a76b5efa98beba880e925282dc9c9851936b8efb04bd9c8815f4958317abf90265f1dc7314b7adf4adb5d1a5d SHA512 e099c7c854489d0213a5ed8431bf390d44b450a871366b0f969acd70a225fb0754b3369dcf3c2ba8472ca4df5e9ce179927c8245d8bea791c832930da34e9424
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD dhcpcd-ui-0.7.8.ebuild 1317 BLAKE2B 9184c0a56b1163f7ddf4a2de6f84bf6a3ee3b0d25029686aa55c1a8f4ed00a318ca586bde1b5798ca2c42afbe5979d098a997eb0e9e9ea517384f97aab0036f8 SHA512 d19ab69d655ae6886654cc69fb49a2ec5b8bd2c07d66fc62f92806e6ce437f5425783ed365dac7f91c05a6dd8fbf7b1780f8b65ed9a8171523f088fe57c7dee8
+MISC metadata.xml 263 BLAKE2B b158e1cc9bc26face8e3b7b4d791a998a637db216ab41d8b809061c1652df0028ff4ffdd67ca515be38304b2a6c53d366fcf05b3e06e816e67e9689b1aadb46b SHA512 2b6c4b4581d1103715b80c20f9d0c5afe2899935f9d18157b8336e72fa5cbf646d38ebd90692af3c8727b1f8484aab162dceb280b0aa331f68bf9fd20a95d26d
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
index 8df1568682ce..fbb1017029b5 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit qmake-utils systemd xdg
 
 DESCRIPTION="Desktop notification and configuration for dhcpcd"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd-ui https://roy.marples.name/projects/dhcpcd-ui/"
 SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
 
 LICENSE="BSD-2"
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 115e9d64a669..7ee7cdf1b15f 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">NetworkConfiguration/dhcpcd-ui</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 51de59cc2063..cca4e00070c7 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -4,6 +4,8 @@ AUX dhcpcd-9.4.0-unlink_socket.patch 1657 BLAKE2B 6c66e78fb0be1ed60176bee31240b9
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
-EBUILD dhcpcd-9.4.0-r1.ebuild 4744 BLAKE2B 18cde63628669a0de7c93100ae02ac541634b699dc24e5ffd3fcaf0932d9c953900e3c73d82d11bcd0fd5e72a4c80fc1a9e763ec0dd65e25e2e7bba4b79a9a61 SHA512 27f78b73542d848065fcff74ca4a34d5bfb500aa1b718bdb59ff199d583842f0baa14917df0a5560ce16e2da08a2f9f4ae36d654000cdd31229816bcf6a64804
-EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
-MISC metadata.xml 703 BLAKE2B 1ccb8d42cc3cfa93ac1721ecbc1b63d130ed3cdbe80d6242370b1072a42b7da740b759930b7529f91c517fab71cf4e57b765dc4df9188319b1a73737a5fa985c SHA512 355f9522baae2d0e9ea337b34258e54a9b947c241b50350dbd5ab7502b24aa81dd2872967e1fe04b733b0af5386ab1b8c1851628e33aead59ab257c9f7c6af73
+DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
+EBUILD dhcpcd-9.4.0-r1.ebuild 4801 BLAKE2B a8f34f5fb98801eeba23b6c6da40415fdd870a378faa40f8eb40b7a0d67c049a3be6a8f9e50c1b91589a2828fc6de528370615506c3a05f8c1919a1445f88cc1 SHA512 3dcc64f1f441d10bbc21ea4c42515b0e2caee20a01c7bd47c0b4282001d87a4b6649300ce54bd4b32f0129436b494324263754580e0fa183d10c13c56c54e0e8
+EBUILD dhcpcd-9.4.1.ebuild 4670 BLAKE2B 589609544f68b6db7c6790a46caea33cc4b418f95a66e78cad1073f76450336cf0ce4cb1e7ea87e2319dca103ba3c4272863acd6320f509e9beedd8ebe65a047 SHA512 9065db3caa1bc3b955b50f1997348205b5dc266d08594ff772cc5d6ba140ce1ca7cc5b50c9b0117e9130a4bbe7b30d6a162e748e884b008aa6d92e269b56a713
+EBUILD dhcpcd-9999.ebuild 4670 BLAKE2B 589609544f68b6db7c6790a46caea33cc4b418f95a66e78cad1073f76450336cf0ce4cb1e7ea87e2319dca103ba3c4272863acd6320f509e9beedd8ebe65a047 SHA512 9065db3caa1bc3b955b50f1997348205b5dc266d08594ff772cc5d6ba140ce1ca7cc5b50c9b0117e9130a4bbe7b30d6a162e748e884b008aa6d92e269b56a713
+MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
index b70fbf92e08a..abe76a4939a1 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
new file mode 100644
index 000000000000..5726f78a3a5f
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 092c6e4a1dda..5726f78a3a5f 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
@@ -18,7 +18,7 @@ else
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index a6bcbfaf27f0..6455e11f0a2e 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">rsmarples/dhcpcd</remote-id>
+		<remote-id type="github">NetworkConfiguration/dhcpcd</remote-id>
 		<remote-id type="cpe">cpe:/a:roy_marples:dhcpcd</remote-id>
 	</upstream>
 	<use>
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index b608fe8e34f7..ab542add8b1c 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -10,5 +10,5 @@ AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
 DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
 EBUILD exabgp-4.2.11-r1.ebuild 1299 BLAKE2B b15271c374199edaa379240a18c56e5dc485714874a547f5436855454e4f4e6e8a4020620d7896b2dd19ca05e419ee66eadae0c715729b9d21b1c28445fa4ec6 SHA512 cfef1786caad92e870e52f7ca300b24c63d05049c9a4d3a057c7c5523bd94de3d291422b2346a6a5b8ef17137604577ca60bd00df76688018cb66b618aa1f0aa
-EBUILD exabgp-4.2.11-r2.ebuild 1487 BLAKE2B 50adc3f2ce14108cb64d7b2a59ff043e87f0fa3e8b04f85b2ccc65a1a83831fe10b8950e80167a35ce53cd2bc2e68e5d0c3bd659503d880c7cc50c07853e0fc9 SHA512 b1bc2e7e8d540197a3d2ff0a88c12cafc7688894814a5adf3658cf4672ceeb634502765789a13baff31e73eb1fd472084dd136a7ae07e83784a2d673a4dc4f35
+EBUILD exabgp-4.2.11-r2.ebuild 1489 BLAKE2B 3fc3ec8288a013c49f517b862411102035cae79d7d7d25d196a65913e4fd444f5e0890bb8b27b98889db8a73eb7aeb575b0bf38907e5886631f0be7787f0e16c SHA512 4c441e47f710a7582e44237e5447e27241ccebe4d95b580e73f3f020dbdd9ef33b60fd28a19c4409664e213f7f1452e893ddd1171d1760ce196586aad5e9b5fa
 MISC metadata.xml 344 BLAKE2B 20bfa14279184ddbcd77773d12fb120d9182b2eab6f5e99c044229efcad49de8861f50ac3560cf85d79aec6fa67c54fef8b1a3a5fffef7c2ae9c36d1eb134bb4 SHA512 f10156cff443ec23883c09dcf78b83d2ea44c9730214b9197e2efdc56f3df0b934ed6db5eed258c5ca89886ec13049f9ef904972043a602606cc2529e8912d19
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
index be3a94116ae7..0c9b22c44818 100644
--- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit tmpfiles systemd distutils-r1
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c8bc5f3ecdd7..55908fb5f3eb 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,11 +1,10 @@
 AUX freerdp-2-openssl-3.0.patch 2257 BLAKE2B f1df2fec92572b6afd3bdddbf5b55586d313bb521c84ce49878db969b0dd631b842a292cd17c6d3ace11846d558d3921460a95cef392221d4620a99ef4b6eac9 SHA512 c48514bc83266bfe35e50a83624694f637668cb8b90a650931626c72f100182318036a09ddcfc48f89e7b71f9520afe5212b684926585424e02bd1e830ca2402
 AUX freerdp-2.4.0-TestUnicodeConversion-big-endian.patch 1275 BLAKE2B 1a9352b0288f1d833ba3ded840ec12033aba3bc285e7a82141d7bd6a737f53e821390fc1261abc7e8bd52d95bdca1b4ac3958caf5f34a9b425a165be7ff8929a SHA512 d251f377d37764295276e337c7638a6cacd5cd127b96040f50b71e028c67b394461ef84e1ec51e461b6d3c52616c508d941c2a83ddd65e00a3184054d257f840
-DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
+AUX freerdp-2.4.1-rdpei-free.patch 859 BLAKE2B 2bf990acf4b4294bedb11acd824637b168fc9e03c4e41b9437388e0e09c2dbfa90e955c254fef2d8c6cae7e796b09cc1875953688c58c13462bc7b05d2a85b11 SHA512 5877a95569d0f3e099d1de35bb8ee5fc8c6889f76aa3f410bd095932440ab6c50c0fc88322ff8982a0ee34a93da97becfa07b52a76804fc262b9a06d9e789f20
 DIST freerdp-2.3.2.tar.gz 7284490 BLAKE2B f6017752993fcd9213117016825344953872b3ad6b6717039ba78555bbeeb276eb548c2c097c5df46d25d19678b8e275ac25a4c62e212c087e1b52d9ce672de9 SHA512 b8502d34c73113a42bf2dc240431967829064d68f507cc42ff06432a784213eee4a2c001b174f1b970545aec75b3caf21ba5f4ee1ca8c07c7ef834131413204b
-DIST freerdp-2.4.0.tar.gz 7244549 BLAKE2B a48c48ca7af044a8421d15b7cae971e3f568b55b26b2bc44c99dfb5cbcd7558fe73ae8b59ee127f40cfafa30fc26fc45bf34cc86ae71cba9b3b9c450c88b131d SHA512 5dc34e66ae7185393981ae33676d689e3e3e8d7f738b37d53675ab991a762a42450d02d738166fc49f196d32453249eb36e35728f86edae6ddec866a913551f3
-EBUILD freerdp-2.2.0.ebuild 2805 BLAKE2B f351598a209d0c2fb18c711e9f76e9d26325d31605cb6ceb1f06d0508030cd6c127384794b03e5156fb866841a8e27915be0e5edc0e84d66c77b671f4c0639c1 SHA512 452305faf9d31e27b6571f1ada542bfac588b6491e6d451a35b132b816e74e25d8cc88b1abfeeb485989fd96eed79e030f68686b6502295b3895453c1b96dab4
+DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a
 EBUILD freerdp-2.3.2.ebuild 2929 BLAKE2B 47576d816fcb596e2e02d8b38cb3075a494975f59c076a5f7ae313c5f780d73e2f5d6e1374e6b11186e25c68ac5a84c2412404c39b1ed8af3c64517c468dd88d SHA512 fc46e1cb5462847fcc0c469c18a4c58983854af89f553ad8bc7ad798250c0dd5e1a1afca1d53b8f41f211500db578d71382ea6b1fa1ef19774fd1f751ace2d87
-EBUILD freerdp-2.4.0.ebuild 2942 BLAKE2B f104f1f79be3918c80eee1bd30bc497bdb61d2a4f7b359feeaf17cd8827fb59f4f1bc605223192bc7e3b3f0bc8f0253b61461306c7b08974849e395c6d08ec04 SHA512 c561e82e204e4251ba8b0af4a9c885bf8b3a2842079bff299292582b35f2d66b8dd41f4f4fa447fa76d4b47da928e7af84c5a37697bbd7c83161c46183a4064f
+EBUILD freerdp-2.4.1-r1.ebuild 2877 BLAKE2B 6715b2b48d87ca94c6501b20317f2c0be9b3fdeb6bcf5f0915b7c953a346332bc63733f7b4809cb4483eb1b6e90f24a1a08030fa81b5aa191c7d7c924d1a675c SHA512 2233ad029c8b5d4b93e92c1d64477cca8d78082e66ee7adab68189f492c51bd69154209afa03cb46aa11e906a464b19922e5f382670eaa7cca3a90ef5c68cd50
 EBUILD freerdp-2.9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 EBUILD freerdp-9999.ebuild 2811 BLAKE2B 71ecfc100f2dc04e368e8561fb06c0799e1aa68d9ec64144958d4ba60af70961e66c3f6ac46da48ebd07ffc9e02869d8bb0699bec778b68600332c181aa1ccc3 SHA512 4312971f4594c7c5f966bdc505e5d3483392a1e0289fb84790550d7f270e1a84502c1a89cc3c779675eddf593eda0b6fa15a72280db6442e1cfd286af651c3ff
 MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
new file mode 100644
index 000000000000..d6e73631c6e2
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
@@ -0,0 +1,27 @@
+From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 24 Oct 2021 10:04:38 -0400
+Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array
+
+This was fixed on master as part of
+268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems
+like too much for the stable branch.
+---
+ channels/rdpei/client/rdpei_main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c
+index f20d58a13..1d95054a0 100644
+--- a/channels/rdpei/client/rdpei_main.c
++++ b/channels/rdpei/client/rdpei_main.c
+@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
+ 	return CHANNEL_RC_OK;
+ error_out:
+ 	free(context);
+-	free(rdpei->contactPoints);
+ 	free(rdpei);
+ 	return error;
+ }
+-- 
+2.33.1
+
diff --git a/net-misc/freerdp/freerdp-2.2.0.ebuild b/net-misc/freerdp/freerdp-2.2.0.ebuild
deleted file mode 100644
index d02a1f971769..000000000000
--- a/net-misc/freerdp/freerdp-2.2.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-	case ${PV} in
-		2.*) EGIT_BRANCH="stable-2.0";;
-	esac
-else
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	usb? (
-		virtual/libudev:0=
-		sys-apps/util-linux:0=
-		dev-libs/dbus-glib:0=
-		virtual/libusb:1=
-	)
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	!ffmpeg? (
-		x11-libs/cairo:0=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHANNEL_URBDRC=$(usex usb ON OFF)
-		-DWITH_ALSA=$(usex alsa ON OFF)
-		-DWITH_CCACHE=OFF
-		-DWITH_CUPS=$(usex cups ON OFF)
-		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
-		-DWITH_MANPAGES=$(usex doc ON OFF)
-		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
-		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
-		-DWITH_JPEG=$(usex jpeg ON OFF)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DWITH_OPENH264=$(usex openh264 ON OFF)
-		-DWITH_PULSE=$(usex pulseaudio ON OFF)
-		-DWITH_SERVER=$(usex server ON OFF)
-		-DWITH_PCSC=$(usex smartcard ON OFF)
-		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
-		-DWITH_X11=$(usex X ON OFF)
-		-DWITH_XINERAMA=$(usex xinerama ON OFF)
-		-DWITH_XV=$(usex xv ON OFF)
-		-DWITH_WAYLAND=$(usex wayland ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.4.0.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
index 963570637e5a..79d2f82e8349 100644
--- a/net-misc/freerdp/freerdp-2.4.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
@@ -89,8 +89,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/freerdp-2-openssl-3.0.patch"
-	"${FILESDIR}/freerdp-2.4.0-TestUnicodeConversion-big-endian.patch"
+	"${FILESDIR}/freerdp-2.4.1-rdpei-free.patch"
 )
 
 src_configure() {
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 20aab998874b..2121f9085289 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.24.tar.gz 5043449 BLAKE2B ef2de570dbad46b90be450e2bc342d96eea3fa7898380e01cf43933a60d0fef6ebef3ed857b9d0fc648355f6f335a406bce3677fd23d87a68e7923bb8bbb2631 SHA512 7b917106836cb77cdb90ecdcce2f0ce183feed52906b27b2dfa0146c12ffaa5e41733de57c0932e0104e55aad501b6508607301648a5d3997d10613daa0c1f19
 DIST gns3-gui-2.2.25.tar.gz 5043324 BLAKE2B bd9a04dc91a35b80cdbf8fee7e8bed98ae5d4d8dd887e8902c3f8d2b08c405b9d6ec707fc9b0202053b1409b3326d9b09be7804cb85d0f14eb90af2db13ea5cd SHA512 d70806efa9251e8be419d838ebf0361bcc7d1ca923962dc4c9b364032772e37f2ae9d646b5e6b96b6c54cc7100dc3b1814eb85270d09e21c1f2679a4a3afda53
-EBUILD gns3-gui-2.2.24.ebuild 990 BLAKE2B 5d5fdaa73087a089e25b465de45d52e6e712ce9826eebc0430aa031e93e6ab71a70bb7f5fd4e803120d71ce84d24d3f9f8bccb78fe5ec0799e71c25071eff1e6 SHA512 e562b389923a191040f322f805034627db7cad6d1f75f50043a6d9b372738cc93eb535b739c67f07f17834c52da7bd5659d1c3c5944ea0fa1d67b4bca3afdf63
+DIST gns3-gui-2.2.26.tar.gz 5043462 BLAKE2B 119c7ff65fde1624e6742215d23976137e13c90761314cbb8cfb5abb3772e5893c21b600acc5dca6e9874654088a3ebbdfb123d41acd9f1ee456c57f87aa3bdc SHA512 b994ae1b844956e4303b23688b71ccb70c2bc1d0803a316ad489fd5de61b7adbf126693e551618f6cf3c15c2404dadb02344e4821fe7e52a2ec8c42293e9a8f6
 EBUILD gns3-gui-2.2.25.ebuild 1026 BLAKE2B 4a79dec0da1dbf35efe0f774aaca11548911c2f3dbd4822361e3c47d991dc5923da301c23fba63f46e0d0e5b301973116b569d263a4c4e99c5fa8d79cb1301d0 SHA512 df2c2f7f612bb41a1054e6017867017da626d9d00e88ea7600e2bd3b0507b7011cda3e4a9b3566861010004f5d44ca6f3be029cce8c4e625b1352113029b8599
+EBUILD gns3-gui-2.2.26.ebuild 1026 BLAKE2B 4a79dec0da1dbf35efe0f774aaca11548911c2f3dbd4822361e3c47d991dc5923da301c23fba63f46e0d0e5b301973116b569d263a4c4e99c5fa8d79cb1301d0 SHA512 df2c2f7f612bb41a1054e6017867017da626d9d00e88ea7600e2bd3b0507b7011cda3e4a9b3566861010004f5d44ca6f3be029cce8c4e625b1352113029b8599
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.24.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.26.ebuild
index 23ebc84553ad..aa3b783123d6 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.24.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.26.ebuild
@@ -4,12 +4,13 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 virtualx xdg
 
 DESCRIPTION="Graphical Network Simulator"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/GNS3/gns3-gui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index d29df131c26e..4c9c1a6c25d4 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,6 +1,5 @@
-AUX gns3-server-2.2.24-Fix-tests.patch 2975 BLAKE2B 91d3da6f87e88e172f3e31afc941b0e7f8199e1a601d018847834df57687eafee36f2a8130293b77449bda8f6de94a5d786e950207dc3e21ff4702193367dc1d SHA512 b7f7570977aa6c36b3eeadb15c2327d902e77abae06d2496b8d72914abb442e1ba80b7b54787d98e3df66e38d175f7e2a1085695c13fa07891a808c0964e2480
-DIST gns3-server-2.2.24.tar.gz 9057352 BLAKE2B cc49127afa9b3422f25ec2d10e53b7cedc59a4b872394d7b7c47ac34e6859fd5f22547277f351ba75b6520a0881b2ebbda6ba932af31108f070c2ccd92574020 SHA512 22a4394f645b5909e75b07d63164ad4fa362f78d69c6f30e8e2daf15bc910c238e8cd983a9f1cb3c1045a0722f9a1c260002b4afe8fb5915033b3ddb20814a17
 DIST gns3-server-2.2.25.tar.gz 10229566 BLAKE2B 73827940698335dcf9ef6d4b6c4c88b162852ec493f8ea05eebbdca20df3c84e4f5ee2ac218ed72755350df2f0e27cfc6cbd34b541e9e5bc0eada2fcb8e266ac SHA512 c7fa163eedc064fd266100658d7d2084ab0c542280d6689938a06943534df320f905c0e46175580bd3792218369936c55f9e135a12577f8a4b7eb86ac8fe9739
-EBUILD gns3-server-2.2.24.ebuild 2208 BLAKE2B 4baaf0cb904aed94173092f4ce584120bb247cc157a66acb63ee84cb44789127c3f6a868943a474eae48838112fe18e2d24090cc8396056a1c3400802d59aec7 SHA512 5675af064e4194b765ba350ced456424688e9f2b3fbd01f099ca854ea1c40be30ec5382795c60cc999ddb1411b0f73b7c70b546b585e453db4d437e55cf9a5d4
+DIST gns3-server-2.2.26.tar.gz 10230386 BLAKE2B 9b9de96cc22aeb1da92a48c9c04a0bf0271f3e47909bf09de76f357d727a4dfc2aa8181c47713192a9c88e55497ca3d8577f34635bf1f2f353387008c1bd13b7 SHA512 80a3e2939374b7a8f7e961f565b16d8a7575414793a3772235b41eadc184d02543ddae18122e90a2602ca51ce24513e1add17b1e7732f44c108daf3d6bc9dc7a
 EBUILD gns3-server-2.2.25.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
+EBUILD gns3-server-2.2.26.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch b/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
deleted file mode 100644
index 3d0556ab4a1c..000000000000
--- a/net-misc/gns3-server/files/gns3-server-2.2.24-Fix-tests.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4eb8491cfa61310066395f078009ccc822488eb8 Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Wed, 1 Sep 2021 19:31:37 +0930
-Subject: [PATCH] Fix tests. Fixes #1950
-
----
- tests/compute/qemu/test_qemu_manager.py |  1 -
- tests/compute/qemu/test_qemu_vm.py      | 12 ++++++------
- tests/compute/test_manager.py           |  2 +-
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
---- a/tests/compute/qemu/test_qemu_manager.py
-+++ b/tests/compute/qemu/test_qemu_manager.py
-@@ -71,7 +71,6 @@ async def test_binary_list(monkeypatch, tmpdir):
-         assert {"path": os.path.join(os.environ["PATH"], "qemu-kvm"), "version": version} in qemus
-         assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x42"), "version": version} in qemus
-         assert {"path": os.path.join(os.environ["PATH"], "hello"), "version": version} not in qemus
--        assert {"path": os.path.join(os.environ["PATH"], "qemu-system-x86_64-spice"), "version": version} not in qemus
- 
-         qemus = await Qemu.binary_list(["x86"])
- 
---- a/tests/compute/qemu/test_qemu_vm.py
-+++ b/tests/compute/qemu/test_qemu_vm.py
-@@ -818,21 +818,21 @@ def test_options(linux_platform, vm):
-     assert vm.kvm is False
- 
-     vm.options = "-no-kvm"
--    assert vm.options == "-no-kvm"
-+    assert vm.options == "-machine accel=tcg"
- 
-     vm.options = "-enable-kvm"
--    assert vm.options == "-enable-kvm"
-+    assert vm.options == "-machine accel=kvm"
- 
-     vm.options = "-icount 12"
--    assert vm.options == "-no-kvm -icount 12"
-+    assert vm.options == "-icount 12"
- 
-     vm.options = "-icount 12 -no-kvm"
--    assert vm.options == "-icount 12 -no-kvm"
-+    assert vm.options == "-icount 12 -machine accel=tcg"
- 
- 
- def test_options_windows(windows_platform, vm):
-     vm.options = "-no-kvm"
--    assert vm.options == ""
-+    assert vm.options == "-machine accel=tcg"
- 
-     vm.options = "-enable-kvm"
-     assert vm.options == ""
-@@ -878,7 +878,7 @@ async def test_run_with_kvm_linux_options_no_kvm(linux_platform, vm):
- 
-     with patch("os.path.exists", return_value=True) as os_path:
-         vm.manager.config.set("Qemu", "enable_kvm", True)
--        assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-no-kvm") is False
-+        assert await vm._run_with_hardware_acceleration("qemu-system-x86_64", "-machine accel=tcg") is False
- 
- 
- async def test_run_with_kvm_not_x86(linux_platform, vm):
---- a/tests/compute/test_manager.py
-+++ b/tests/compute/test_manager.py
-@@ -190,7 +190,7 @@ def test_get_abs_image_recursive_ova(qemu, tmpdir, config):
-     config.set_section_config("Server", {
-         "images_path": str(tmpdir / "images1"),
-         "local": False})
--    assert qemu.get_abs_image_path("test.ova/test1.bin") == path1
-+    assert qemu.get_abs_image_path("demo/test.ova/test1.bin") == path1
-     assert qemu.get_abs_image_path("test.ova/test2.bin") == path2
-     # Absolute path
-     assert qemu.get_abs_image_path(str(path1)) == path1
--- 
-2.33.0
-
diff --git a/net-misc/gns3-server/gns3-server-2.2.24.ebuild b/net-misc/gns3-server/gns3-server-2.2.26.ebuild
index 78581b451547..9d91356deda2 100644
--- a/net-misc/gns3-server/gns3-server-2.2.24.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.26.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 optfeature systemd
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/GNS3/gns3-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -37,8 +37,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-Fix-tests.patch )
-
 distutils_enable_tests pytest
 
 src_prepare() {
@@ -49,9 +47,6 @@ src_prepare() {
 
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
-
-	# add setuptools dependency, bug #809278
-	echo setuptools >> requirements.txt || die
 }
 
 python_install() {
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index da1ac978284d..bf22533a61cd 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -4,4 +4,4 @@ DIST httpie-2.6.0.tar.gz 1133495 BLAKE2B 3ac61fc68ab59ac7523b030a8c7af85c4af0535
 EBUILD httpie-2.4.0.ebuild 1577 BLAKE2B 09c82238242dd6bc2bfede83fd47e219ca29f34ca848b660f097156f4576d65ba6a575bd08c98ccf70a8113638d73195207e7f1f2f91a9ffe6e7a18ecf47075f SHA512 68a57ce1e74b68e0245a8370531ce9382b899f0ae732412eace4988cb068aedff5eb98a2bab04c3a8c0dd16bdcd15077c435958b7035dff5081add48ad7efa93
 EBUILD httpie-2.5.0.ebuild 1076 BLAKE2B bc703c118eaa94b490676b198e4807c749dc54ff93d2a8a4a1582b46c7813051af3a153e7d90febc4ed2f6a7254f3abedc7b13e48a4a30d2bf5df804d81b2759 SHA512 c3a3b70c43e563b30414527e36b2519cfe899a0a7d16ccebfae7a5e59e65353c16041a4e091a7d4d5003b1e3cee6840e824e710978784826759a0ae00d4e6c4d
 EBUILD httpie-2.6.0.ebuild 1125 BLAKE2B 85f3ac8ece9cbea6d0a66e76aa5cdcf7f40d350bee9ece10632fe14389266120ca08ee6ee648091fbb5182fa7360aedf71384cea35de073d98353f4444188d32 SHA512 18ce841ff29a0c8f11281cb261788d53e1f8a48c23a29a74b66e2e2ec49d9c05d794d5d7faf1da2e0304accaa0685f8d10f2315abaddde668b4410a7bce9a368
-MISC metadata.xml 1165 BLAKE2B 38bffb922e5057ecaef199ed37d2908776056fa851d24ff9c3fb798e124de4a8edd3c8f0c74f3175cab852f97bbaf634a27aec90162d7749da73fa3dbac18ab4 SHA512 e63434bfdefb4eebe1971f2b92df5a478134fa3be286db6fff6bbfed1e2c8c457a3941facb9bef68f25bb5db97ab4d0dce0ecfc68459fab33564a872c7eeeb47
+MISC metadata.xml 1018 BLAKE2B 590895c58cac7c3c12b1c605c7d9f6adaa35a88a5148bfae2f4ecbff8151996dfb58e4e8852d74e9a292e0b563cdf9b491fb5360a623e5b09db86ece421c43d2 SHA512 89503eeb43253c9237b1e1be0671f6dcfd50a1a7445aaea13bca4a832d4d2e6cb2c0c420d0803156a44b3a2a6ea4bc98531950067a7d73bd5555703a71c0a1fa
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index 4bfbb6afe5f7..73d29e0ff649 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>mickael@apible.io</email>
-		<name>Mickaël Schoentgen</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
 	</maintainer>
 	<longdescription lang="en">
 		HTTPie (pronounced aitch-tee-tee-pie) is a command line HTTP
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 57174f78a5af..959ab94aa727 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -5,7 +5,7 @@ DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f5
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415
 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670
-EBUILD iputils-20210722-r1.ebuild 4589 BLAKE2B b87aacd353a2a9c3b55b981b17ca232a4b83641f2cb6a1517d0761c3c77995202aedd51709545068116ad11e75639cac6c3fd32a52f4921375bce161e74e383c SHA512 99aaa84707dc893fa3e9af8a4d326d342e098654efe28bbfccad1d7ca92ef0df7f2afa1d58a41bd8684169c7d009798ba456741df6322b398549268343b11879
+EBUILD iputils-20210722-r1.ebuild 4581 BLAKE2B 44e8c6bd74ce932caa428c85413d9f85bda0b7047f55d96de55f6de1526210ddb0a78e75f2fea8a084a4abe3aad96ba1818e5066e42b24920830b0b7111761c5 SHA512 27c4db1d21ca0d47aaf9c3791574306a978a2fa8be7a6cf74c4794a9fb766e1cb16d6a5c6510cbf1a28d6acc06f30da92564fe36cf5cf8216f2aacadee70afb1
 EBUILD iputils-20210722.ebuild 4513 BLAKE2B 5d94157b66c766964d395df24eef93068f17ee892592e28412fa0f28596e30f07ce8c10654fd641fc8954a7faa9f97c677d09e20d6700ee3788e0ab56f2e6919 SHA512 32be9ad976dd770b14fa267a97171e21f44723afa4c413c1ba49819a6504e75b271c4f17c541f9d92d5791234960ecb7e75977a889cf0338ae95ede75ccc7b39
 EBUILD iputils-99999999.ebuild 4440 BLAKE2B e752bc9085ee4a631a7c93b6f5a533bc2ea88009020aa336add86167cb68296a418e436af05469e06e8d11f6c49bf7bff9534e8258258d8eda5674e7011481bf SHA512 2b30c9bd6a5470381d016ab68338de9da471ebb0f351a19585543a33b77ab4f586a13590f592fc7b5c92a976d04ee9988c6da3d7d83ff15a55f295535021ac52
 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9
diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild
index 7d70dc9970a2..f572846d61e0 100644
--- a/net-misc/iputils/iputils-20210722-r1.ebuild
+++ b/net-misc/iputils/iputils-20210722-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/lanmap/Manifest b/net-misc/lanmap/Manifest
index 389849a8619a..5b81b5fa3396 100644
--- a/net-misc/lanmap/Manifest
+++ b/net-misc/lanmap/Manifest
@@ -1,5 +1,5 @@
 AUX lanmap-81-make.patch 1930 BLAKE2B 0c4ccc3173e3d5bb9babe39f6ee32f0a5c6f045cebc6d59041af24f51b906dfa4596e0a54270c49b9b6b29813af0d8a4f7f1aa98392cd61dfc2d689879a62c61 SHA512 601a570e55ce987d41106cf1c79a2564e55d8756bf8ec1cd58c63df38ebdccfece6b60d29b24f36aa828289f0762c3c54ae58b30b61355c2479c27fa9322b86c
 AUX lanmap-81-printf-format.patch 303 BLAKE2B 90cfcfc8d3c94e0ef1a3a929500e5d86de51e9c046987a5e68317ec5435a4bdf739a6caf3869fc334561000e0c4cb66c87c95c01c03955499986cefb931e0710 SHA512 644e269b1c3b872f66707d452129033f9f2d67ad895244b5aeb34886f1cf572482a7ad82f97f4d23ac3e652ce64f56f9bdaa8c11aa76cb5d6cac42c170f30285
 DIST lanmap-2006-03-07-rev81.zip 405933 BLAKE2B 6ccf3bd502d7417a4c795ec536e6b970bf0e5c8e0666db45a80e25ced7a27e56e64aec6482cbcf6808d2ee653e7a3a5552dc7215127660cf2c7551f051c3ab9b SHA512 9216d753548fba48f4fcd18a55136a50c0dd01c87f1d5f7736319a7a71b28bd50f082a9aa94d8c426924e0fa4fb6537cd8c8cbd2a289736ede54fd4c6f4679f2
-EBUILD lanmap-81-r2.ebuild 824 BLAKE2B 140d2531e9a8310179b7c3690b9cd1bbe7a800bcc8a6dc9d1b09103022efa68f49e34c4088e62274f30a9a24d327a20bad8525923f3066ef3355d892f7799238 SHA512 ea8ea9ae68d4bd5bda3fab0f024d548161d3707db8a539fabdfec754e1223d092baf44d6dd793611c17e210fed614add0e3d4580abc29cb63588b67506c6d45a
+EBUILD lanmap-81-r3.ebuild 805 BLAKE2B be5dd29d74af0b37d879b7b26e7253c4abc907de249614c8344eb2348e1c0593e3ae0d26316783bdcdafddd91bd6c16a721eda8a4f3a438a313b90603c46e6bc SHA512 b4fcf331bf945ebe3c527af5061d1484fbd113e8cf4660c86227c76e1e1e2e96a5f2b09db750244d5401d2dff47bf9a5101ba651986e6e2a42b9750020aa5270
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-misc/lanmap/lanmap-81-r2.ebuild b/net-misc/lanmap/lanmap-81-r3.ebuild
index eead125ec3f6..d2bb7fd585a4 100644
--- a/net-misc/lanmap/lanmap-81-r2.ebuild
+++ b/net-misc/lanmap/lanmap-81-r3.ebuild
@@ -1,40 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees"
 HOMEPAGE="http://www.parseerror.com/lanmap"
 SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-CDEPEND="net-libs/libpcap"
-RDEPEND="
-	${CDEPEND}
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
 	media-gfx/graphviz
 "
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-printf-format.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-make.patch \
-		"${FILESDIR}"/${P}-printf-format.patch
+	default
 	rm configure || die
 	eautoreconf
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	tc-export CC
+	emake
 }
 
 src_install() {
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index be610e9e4527..dae826e43b35 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -6,10 +6,12 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
 DIST lldpd-1.0.10.tar.gz 1961631 BLAKE2B 06d3b7d659dae0df4b10f3568a6ffa96c8e848863eb5ecb11b046806b4c23afdae084ffcab8b07b93e6a111dea2c24bd2cfc81a7f1c2559a39b3b2ed8f80814f SHA512 6835bfe36cbaffb0e7f0dbc958d234b7a16787bd51d0c5423c7b775d71dc89635ab28c005e2df550c40f4ee76ab461c0c7cb2a09b011878cadaca18153485d8f
 DIST lldpd-1.0.11.tar.gz 1962748 BLAKE2B 13b6efe44a7dd0f9ec681ec5ef96358ca01c500f0238460ce633b59a1506d9caf405baf3ac910be9baa5840f3751b9d9e0bda127c96083f012eb4af75ba7b9e9 SHA512 2433c81d892b8f8f43c4a897eedfde6fff41db8514fc212bd60b71d080b963b12346017f554657d5abe6d0f02256cf49c9f8b82c8e402763ad0a5c53d459ac32
+DIST lldpd-1.0.12.tar.gz 1965028 BLAKE2B 7725d650573d463e267670135fad20717b2fe2ee5f1c5b9f68a68890f6e74e7cac52bcb0aefad68b8bcade9eacd18f6aa783eec4a71e895adc173ddd2a554322 SHA512 893add53c814d904894dd768ea2e412f288bd7767090fb9b5f686ce3fed65a436ed1365039e5d7f8ef8f5ae9206800b087c71515caa16d1d375389dd7558050f
 DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
 DIST lldpd-1.0.9.tar.gz 1961522 BLAKE2B 83a853bb3bde7abd15b4aa167d213d97677db817aba773b152f032b0d0bf299d5cc891c56871182b2f11fc3bfb2d6c88153f32973fdec5844df5c6fc6bc97b8b SHA512 5f5d5abed7fc73efc59932a1f2ee07eedbdca6f82d002221886b4ddf704955aef432acb92084adc72a965fef3e660f3c95b2a1b8892cf05d9616921501e6aae0
-EBUILD lldpd-1.0.10-r1.ebuild 2377 BLAKE2B 921143630d48be88873be3d721267570fffcf129f8c22740fda65ccf39f10de88ec2c2e5ee0bd3953aa8733e27986b586f43fc7adf71e26eb8df92a5e32568cf SHA512 4cc55b6808c5338c10b3bfd1ef5f153a34141f4e322d11e3ac2ae9ee054c5f3a84b100d19de588f4ad0decabf891e78ba2a279e1ee5d7c605ed1b8a2bcdd28d1
-EBUILD lldpd-1.0.11-r1.ebuild 2375 BLAKE2B ba0b75867585c20bc30834ba26132d318069582ce7eb504cf20102a95d49a4637e3506c8e07b641e0e6555545d68a0f479118bbdb82a18b72d8cde4410c3987e SHA512 3af2bb750d93626873ee7a04dce06ffb7102a4640c9db43588a6ce4d064e6aa03dfd4ffe396da13484e4193bd49ad36af37e93ddbe02af8210f84b4b5f19dbce
-EBUILD lldpd-1.0.7-r1.ebuild 2317 BLAKE2B 70eaee035ad5cf47d46aa5eed32728a9c75029e2a64fc7b67f5a18cf4e936ebc4936de25f8f526228618b13c0917e45452981688761686f2f908084101f36371 SHA512 22d3a805b254f51e081d66ec3d8fa3a9efb2b7ebfe6c6fd2a81891b0f81ebbb98cacda0a7ea4d0fcd8d9721f97b54a13050c15153219c8b2854d13e3845b1117
-EBUILD lldpd-1.0.9-r1.ebuild 2319 BLAKE2B db622f977457724e54f6fe6ed08d18ab5b6ac51b3afa8a186a86bde02a210a668709741d3f6b1434b6457b0c209aab73c63832091e98db54175b2db51ea98b7d SHA512 ca639a01537c74bf23eb7abb046550f6973675f843d3baea2446b8acb0edb81e5b029a36d1b62af7dccbc4978aca5d33a86b8d0a565b8f254b945112cf756bfe
+EBUILD lldpd-1.0.10-r1.ebuild 2362 BLAKE2B f4b71aaf10388d9648d542cb7bdf2b39e04e4f4af0be4b89281c4fc1735909da03997c62c8b2523c844a54f4b988b585f9c43fe204e61afe22fcfcc005802997 SHA512 dafbae1310b0eb8b7040136853778e6b78d86f111246727e02c93c85a95e0c157a355fe52e97f744c20d6342db7a3b04ca6c32b9bb30ed3dcd923eaf980200a6
+EBUILD lldpd-1.0.11-r1.ebuild 2360 BLAKE2B 6a1fb9c77f31d6324d19c194372fff28a2ccac6483e8849199a295930361b1b46670dac8f35ef6a82a4cdc39b5651639f4741da8be00b6d7c02cd313e581c0b4 SHA512 3a64968141e8c2d6959f07a846b9e6f347a4936a6af5e77bb5370ac2786de5fd660781c5f37e4750405f723a73837878151bbbe19ddc4dde74681e91b8b58386
+EBUILD lldpd-1.0.12.ebuild 2362 BLAKE2B f4b71aaf10388d9648d542cb7bdf2b39e04e4f4af0be4b89281c4fc1735909da03997c62c8b2523c844a54f4b988b585f9c43fe204e61afe22fcfcc005802997 SHA512 dafbae1310b0eb8b7040136853778e6b78d86f111246727e02c93c85a95e0c157a355fe52e97f744c20d6342db7a3b04ca6c32b9bb30ed3dcd923eaf980200a6
+EBUILD lldpd-1.0.7-r1.ebuild 2302 BLAKE2B 9b3336bd039900e932aee6bca5965177fa9bbdb865b818df72c5a6ab4024fc7d8ec37d119bf947f324df94a70c86366acab7640b07f6bedf98eedc34638c112d SHA512 62383e53e503debae1fc6e3ba4534c0e7d9a76bc4b6e94bff9d4aa65c4ba38c78ea116d6584639067fed2c12369a624734882c20880810406ba43b6ec90f5563
+EBUILD lldpd-1.0.9-r1.ebuild 2304 BLAKE2B fcf481e2ecb171fc7d1ff7e1125f56b57d5e45a5470e90968f2cbcbf2d7e09a303139c5c43a7440f918642d1728b7ac05d705e9b3be2366f48d8ac7c4b1f23fa SHA512 57c900810484bcbd1a6274793ef88cfcac332bcdee7ae20b58dab2b66b81a7d1aa45d6e5cc778cc0c72f4b293488f86264e26c8453db03ba05e54bbdb62cc73e
 MISC metadata.xml 2769 BLAKE2B 0e26b610c20744dafbe488e868e76ecb5b8540f1ad519952db8bd9586df14f6ae6ca0af66af443b5846861842351774013d03212b454fb488b2ee0788c2f424a SHA512 dc50bb275f32bae3d4ed6bba7007502c632c07f8f33876c211e52d159a62cc927ff263dae8f00c948e2ce10f88140b1a0fb970201c2cd2604a879147defabe12
diff --git a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild b/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
index 426784b12135..2e1925b588b5 100644
--- a/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.10-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+HOMEPAGE="https://lldpd.github.io/"
 SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
index 5aae55e4aaad..4f6497abc941 100644
--- a/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.11-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+HOMEPAGE="https://lldpd.github.io/"
 SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/net-misc/lldpd/lldpd-1.0.12.ebuild b/net-misc/lldpd/lldpd-1.0.12.ebuild
new file mode 100644
index 000000000000..2e1925b588b5
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.12.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools tmpfiles
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://lldpd.github.io/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+	zsh-completion? ( app-shells/zsh )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/lldpd-1.0.10-glibc-2.33.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
index 857f1e6a8607..276e1da109ae 100644
--- a/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.7-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+HOMEPAGE="https://lldpd.github.io/"
 SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild b/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
index 97aadd996bed..11ab20df05de 100644
--- a/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit systemd bash-completion-r1 autotools tmpfiles
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+HOMEPAGE="https://lldpd.github.io/"
 SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/net-misc/mstpd/Manifest b/net-misc/mstpd/Manifest
index 414f5d328354..b0012eb244ca 100644
--- a/net-misc/mstpd/Manifest
+++ b/net-misc/mstpd/Manifest
@@ -1,5 +1,3 @@
-DIST mstpd-0.0.9.tar.gz 113711 BLAKE2B 93ff0213a634fcbbb613c79227d737c3961f4de669e0ac2c7351fa1c22842669edc652ba0deb24917a44df5a465a4e905a98e46ab7ccc7e4ebfd13039e6acfe0 SHA512 1d4a926d8437b7c41c69d2a047718181ca6245f3150e4aeb631f437edaaafe0c40b29802a6c9ea38c9f1dfb1b94149934b473f550358be10bb796295fa632e1e
 DIST mstpd-0.1.0.tar.gz 115670 BLAKE2B d0b666f16941ebb161cf91ad849da9d8f1927e90052f02cbab759685864bdd6040525bcbb69ca3e602140fa7245f1a48eed00d7e8515eb849ae0bd586f41588d SHA512 c3f7e1045e89eaad05b212993e4fb79e3662d247e371340276c59b92e33c732a9d82ed3490ce3b51e79c666db9f999916667d2be5da1f928e1624b288b0295bb
-EBUILD mstpd-0.0.9-r1.ebuild 733 BLAKE2B 564c91acdbcab65c4bd1806da02dd052d8bcf619fbc5102e27219ec9a3abb50d38a329330a507dfde911062663f308fdd9a93ee4c7feff834e3b8039c7dbf3b9 SHA512 d16f59418b6884c3d335dad2c8c2ee9e11ec468fcdaf0a1707e430e1f074aade0d3fd78d1cd3e0b8ef28681e97d8c426b7698594aad63d0df756f925956c417f
 EBUILD mstpd-0.1.0.ebuild 733 BLAKE2B 990abdcd2c89d7a82a7fd308289e479a6c828935aebd1d6a78b6522727cae140e9e62d1c33e887bbb7a79ff781e353056507c96a5afd432673faaa7bd6cfb9ec SHA512 2c554f3655906a5ff648626b0ec7eb3d0be7d74e5061bad6227907824400f1b7e246af22236274190947ea3925e2a6b8d97763e86858c630e210a824fe4d06fa
 MISC metadata.xml 324 BLAKE2B ef9e36b394aac8a3f2bb74d5b9ebcc8fc6bed743cad7afc6937b9efdcb1b0389d13d59f5b6f8d23cbc5ed3f15a98b66cb9265e71ac875d7a0466e909d6d7e60d SHA512 e518c69f5f7d9a294a88ea36e2b9f01c1362759decb2779290349e359c47ac0c641cab4e7c50cf7e8e8358db90fd7598b90203e282068b0cb49473ebdc1dcb18
diff --git a/net-misc/mstpd/mstpd-0.0.9-r1.ebuild b/net-misc/mstpd/mstpd-0.0.9-r1.ebuild
deleted file mode 100644
index 29d66dea87e3..000000000000
--- a/net-misc/mstpd/mstpd-0.0.9-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 systemd
-
-DESCRIPTION="Multiple spanning tree protocol daemon"
-HOMEPAGE="https://github.com/mstpd/mstpd"
-SRC_URI="https://github.com/mstpd/mstpd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)" \
-		--localstatedir="${EPREFIX}"/
-}
-
-src_install() {
-	default
-	dosym ../../sbin/bridge-stp /lib/mstpctl-utils/mstpctl_restart_config
-	dosym bridge-stp /sbin/mstp_restart
-}
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index da05fbdc1af4..8cd6800a766c 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -2,5 +2,5 @@ AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3d
 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
 EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade
-EBUILD nx-3.5.99.26.ebuild 3518 BLAKE2B a93f7fe62e8261d380b8a0e243585c5f6e02029a905a48fa44214edbeb962b97888849ea75e6cecadde5fce61ea18803039999b555684e9abc595826e973e6dc SHA512 a63dbdc2de74fded16818f615a439d7a4647a9fe87e665d077e4619ac644ca58200c8622561bbeff9bdf5ef1deca7d2acb97d91e40201d741ce997d44ffe5221
+EBUILD nx-3.5.99.26.ebuild 3525 BLAKE2B 9d0bbcdfc90b01046c1df65c3d719b31715e0914ce92c9dd9ef1e0bac04915234f8e82284c41890243bc35962047127747789bc172d6ff0492d79d31310dfd17 SHA512 9f9e7f5cbd4805e6d90f4cce3fd3b76e9de32d397b4a13aec5ccd9bf9edfb8b0c119f677975ce0216e89ac8c4bc66189954efc32a4b3a13259391450de5af564
 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 2c7adf32ba37..6ddb12f1652c 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="dev-libs/libxml2
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index bd1a7c5d6044..f11e7bc8f1ad 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,3 +1,3 @@
 DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6
-EBUILD pyhoca-cli-0.6.1.2.ebuild 800 BLAKE2B f1cb3e40f1d54725a8da3f046e6d4187c30b0f19483de9dfc79a692d976d20e8fc4a685296ac94dd01deba7b6bb0ea10a08eb3373421057b94d3c8d225b382be SHA512 0e977e18c80369dbd861b6b3bbc6f26913f4f4bcb126a245d08e9f86165d2d006603f66a86f4eabc6d133554cf66ad2b325e5094ff84705e4ca3b5ee02898b90
+EBUILD pyhoca-cli-0.6.1.2.ebuild 807 BLAKE2B 75757366b32d2555c8c85396578e21a803406fa997bcdb47756c3ca9279225e7e9ea6511087144102dfab466dedf266e95b3efbb60853c7ce7a1a7e7d998187f SHA512 92d5561e6fa5296d4c803eb7451bb686e7ccff1f2ea67c4dc127433709d20d78c95e0b44c86ebd225d3af5036fd08d1af597c8bd2ed8ab217d6fcff9c6a9a901
 MISC metadata.xml 546 BLAKE2B cd794b3e556403990294a943ea4705813b33867c68f6a2729bf258d52b0ffca085b117bea7f26db21044cce96cc2bbff065c28f3ade8a270675898c74974d38d SHA512 63514d5f49ad45472c271a64b994c2c9ced6a15eb7d01660724392fce52be26b8ae5efb1e0ecce8b2e31128513461ef36d31aefd26a3a8e260e849eb63b26904
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
index 107198b5c85b..153510b8ebcd 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.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
@@ -12,7 +12,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/setproctitle[${PYTHON_USEDEP}]
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 18e07f3a537b..323954b14c1c 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,3 +1,3 @@
 DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc
-EBUILD python-x2go-0.6.1.3.ebuild 568 BLAKE2B e4a309332ff985b7ea01e8a7bc345864b92031270add0c4dbc2722bc028d41fa8119bf72acac32ad1c95653769e212c36d6575e2e2779f26fc1725049f3383a0 SHA512 f0060f41bd0ea8b2f040cf5c9880dafb7e8be4675ec6544db7046e6429905e7e6d3ae52ea1c65a40f43d09108ad9aa1243f47a6b9efa0ec90d25f5fe987ea8f2
+EBUILD python-x2go-0.6.1.3.ebuild 575 BLAKE2B 5fbe001e5c100f1c4405a3fafe36eaabdad89710551843c49724bbbe490f594cf14eb813cd7d005f010076ce8ef60dcba2da2b52e9a650fbd9e70b0c1c24d160 SHA512 e02f430a40b2532f90c3ecdf6565798e9da25eb01a926312c7e1b12405fa750407c4e2f47ebbfb4113016af928b6e9ef0421953e57814f0ef3e6ae62380f99e4
 MISC metadata.xml 508 BLAKE2B a44f0a85d8f456b9a428dd9c38d3359c681ba6b327f5c612549f9fafd7bce14671c0bbe8b8cd518a1c6c13f310a356a77b5578c3413282b7f8381f9a3802548a SHA512 c37de00993e2555dac8973c7a334c26dd756d03abc555e39482a25880983a1babdcc8733d83c80498bab9b1940a5695da4b9f50d8de2c513dd720c70b79b6b2c
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
index 0b9387f66df8..8b908430c3c8 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 # TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
 RDEPEND="
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index a9d570a1e53b..bdf4c81037a3 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,3 +1,4 @@
+AUX rsync-3.2.3-cross.patch 4091 BLAKE2B 1c42917ccd9edc4ae53da9bececbd1065e633f52e0dd97bee5d09300d86d0128670b641bc253c1f89ff037d4d64bf01b47014bb95b39a11d3713dbc7fd9fe803 SHA512 a70a742b1967c0d5f17837d045cf52598c546745f9a49d39f22af540f00fe1daa8a51982a4654c30ac9c59edd8e09c73e490704cc72b358d378f2cfb66e0a1d4
 AUX rsync-3.2.3-glibc-lchmod.patch 1836 BLAKE2B 14b2e4246c6c2d4623500e346bea3ad430defbb81de65ecb29672b390024e34e5116c660a87013f8d489a32d1841d535d03fa442cdc9e962d530355f389ad008 SHA512 76864a9002ef3e8c42a840906915de2bb8cfb1dea2597cbe657ee418b5d00b6d409a88cd441658f7a1ce3cab148a9889193ddd75d19b6ef2069379c728434231
 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
@@ -5,6 +6,6 @@ AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a0312
 AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.3-r4.ebuild 3963 BLAKE2B 17f902650a030111cb232102e132b8aeffc680fd2ae1a91a12cf9ee755a0bc4be79368b403aca6ba562c57da56c7e10520e5f6e0fc1c3709a25e7bafe51958d4 SHA512 1c2aeb0a0fd3e192f3bfd88298662e22d2626c8929fbfd3e49a43ac56e6b2c42c07c0c12c916b7bd85c47f2ab9ae683a86b2b8ac2004f5766e1338e65a6f2bda
-EBUILD rsync-9999.ebuild 3904 BLAKE2B 132baf8b3aab2eeb43b888947c1c280d478d3524f5a2f7a7f460952e82f9837367b83c86fee945da2ca9537655cc50c83c23fe8465e562717c5943aeccc761b3 SHA512 7986da32b9b1009f2f7d29c5e4b94b414e1520be8bfa6d1b0902bd1dc97cdc150ba68b50b99d1e68fca7ccde6c6126ece21461b7280be6154d9ed03967892fad
+EBUILD rsync-3.2.3-r4.ebuild 3498 BLAKE2B 7ed62167acab5e725dba71c258a9a4f770595142469ca6c3b43939c2f99669f08fadc5fa6ac0104a14b774f6e679d547065b58135f13b5f0bacfb22e3d1b03b5 SHA512 b1bcf2bc437955ff6c86a9f0dbf492b927103b05d93edbdc44823fa49496f373d11c477af5c0fd83a1894f8e12148f6eddc0767c6535ef78b5ea4394520e0fa6
+EBUILD rsync-9999.ebuild 3766 BLAKE2B 0343b2bd8957f9073295932f740e298789e0d7d2e5354ca640b1110d0ab47103878d6c3f9f7df57c1f30fb5cf128b98128f32c5ef61da134dc73cdc1ad42d984 SHA512 3f0366d6dd0ca85a75211766e6836d27a93d14006b8fe2718010007596f470c680b67e4a6c8b34ee17b2e3e2c8590d0d80eeca81d6f43700d57a4f45513d03c3
 MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4
diff --git a/net-misc/rsync/files/rsync-3.2.3-cross.patch b/net-misc/rsync/files/rsync-3.2.3-cross.patch
new file mode 100644
index 000000000000..1f23627853b9
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.2.3-cross.patch
@@ -0,0 +1,107 @@
+From 9f9240b661c5f381831b62d72b6ea928a91ff43a Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayne@opencoder.net>
+Date: Thu, 3 Sep 2020 10:07:36 -0700
+Subject: [PATCH] Set CXX_OK=no when cross compiling.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 64d2e6d6..109546a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -233,7 +233,7 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len)
+ 	in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]);
+     }
+ }
+-]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no])
++]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no])
+ 	AC_LANG(C)
+ 	if test x"$CXX_OK" = x"yes"; then
+ 	    # AC_MSG_RESULT() is called below.
+From 7eb59a9152a2ace7bc7858e9915c671b3ab54344 Mon Sep 17 00:00:00 2001
+From: Wayne Davison <wayne@opencoder.net>
+Date: Tue, 22 Sep 2020 17:19:45 -0700
+Subject: [PATCH] Change from $build_cpu to $host_cpu as edo1 suggested.
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 109546a6..e8c06f42 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,7 +211,7 @@ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'`
+ 
+ if test x"$enable_simd" != x"no"; then
+     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
+-    if test x"$build_cpu" = x"x86_64"; then
++    if test x"$host_cpu" = x"x86_64"; then
+ 	AC_LANG(C++)
+ 	AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+ #include <immintrin.h>
+@@ -283,8 +283,8 @@ AC_ARG_ENABLE(asm,
+     AS_HELP_STRING([--disable-asm],[disable ASM optimizations]))
+ 
+ if test x"$enable_asm" != x"no"; then
+-    if test x"$build_cpu" = x"x86_64"; then
+-	ASM="$build_cpu"
++    if test x"$host_cpu" = x"x86_64"; then
++	ASM="$host_cpu"
+     elif test x"$enable_asm" = x"yes"; then
+         AC_MSG_RESULT(unavailable)
+         AC_MSG_ERROR(The ASM optimizations are currently x86_64 only.
+From b7fab6f285ff0ff3816b109a8c3131b6ded0b484 Mon Sep 17 00:00:00 2001
+From: edo <edo.rus@gmail.com>
+Date: Wed, 7 Oct 2020 08:33:57 +0300
+Subject: [PATCH] Allow cross-compilation with SIMD (x86_84) (#104)
+
+Replace runtime SIMD check with a compile-only test in case of
+cross-compilation.
+
+You can still use '--enable-simd=no' to build x86_64 code without
+SIMD instructions.
+---
+ configure.ac | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3fd7e5d5..e469981b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -208,12 +208,7 @@ AC_ARG_ENABLE(simd,
+ 
+ # Clag is crashing with -g -O2, so we'll get rid of -g for now.
+ CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'`
+-
+-if test x"$enable_simd" != x"no"; then
+-    # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
+-    if test x"$host_cpu" = x"x86_64"; then
+-	AC_LANG(C++)
+-	AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
++m4_define(SIMD_X86_64_TEST, [[#include <stdio.h>
+ #include <immintrin.h>
+ __attribute__ ((target("default"))) int test_ssse3(int x) { return x; }
+ __attribute__ ((target("default"))) int test_sse2(int x) { return x; }
+@@ -233,7 +228,18 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len)
+ 	in8_2 = _mm_lddqu_si128((__m128i_u*)&buf[i + 16]);
+     }
+ }
+-]], [[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],[CXX_OK=yes],[CXX_OK=no],[CXX_OK=no])
++]])
++
++if test x"$enable_simd" != x"no"; then
++    # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
++    if test x"$host_cpu" = x"x86_64"; then
++	AC_LANG(C++)
++	if test x"$host_cpu" = x"$build_cpu"; then
++	    AC_RUN_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST],[[if (test_ssse3(42) != 42 || test_sse2(42) != 42 || test_avx2(42) != 42) exit(1);]])],
++		[CXX_OK=yes],[CXX_OK=no])
++	else
++	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([SIMD_X86_64_TEST])],[CXX_OK=yes],[CXX_OK=no])
++	fi
+ 	AC_LANG(C)
+ 	if test x"$CXX_OK" = x"yes"; then
+ 	    # AC_MSG_RESULT() is called below.
diff --git a/net-misc/rsync/rsync-3.2.3-r4.ebuild b/net-misc/rsync/rsync-3.2.3-r4.ebuild
index 34c869e7619a..38c591855af9 100644
--- a/net-misc/rsync/rsync-3.2.3-r4.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r4.ebuild
@@ -3,24 +3,21 @@
 
 EAPI=7
 
-inherit prefix systemd toolchain-funcs
+if [[ ${PV} != 3.2.3 ]]; then
+	# Make sure we revert the autotools hackery applied in 3.2.3.
+	die "Please use rsync-9999.ebuild as a basis for version bumps"
+fi
+
+WANT_LIBTOOL=none
+
+inherit autotools prefix systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
 HOMEPAGE="https://rsync.samba.org/"
-if [[ "${PV}" == *9999 ]] ; then
-	PYTHON_COMPAT=( python3_{6,7,8} )
-	inherit autotools git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	fi
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
-	S="${WORKDIR}/${P/_/}"
-fi
+SRC_DIR="src"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -37,28 +34,14 @@ RDEPEND="acl? ( virtual/acl )
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
 
-if [[ "${PV}" == *9999 ]] ; then
-	BDEPEND="${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-fi
-
-# Only required for live ebuild
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
-}
-
 src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/rsync-3.2.3-glibc-lchmod.patch"
+		"${FILESDIR}/rsync-3.2.3-cross.patch"
 	)
 	default
-	if [[ "${PV}" == *9999 ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
+	eautoconf -o configure.sh
+	touch config.h.in || die
 }
 
 src_configure() {
@@ -76,11 +59,6 @@ src_configure() {
 		$(use_enable zstd)
 	)
 
-	if tc-is-cross-compiler; then
-		# configure check is broken when cross-compiling.
-		myeconfargs+=( --disable-simd )
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index a0178f21af56..8c91d4f3a17a 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit prefix systemd toolchain-funcs
+inherit prefix systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
 HOMEPAGE="https://rsync.samba.org/"
@@ -73,11 +73,6 @@ src_configure() {
 		$(use_enable zstd)
 	)
 
-	if tc-is-cross-compiler; then
-		# configure check is broken when cross-compiling.
-		myeconfargs+=( --disable-simd )
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index c7e558b13216..18345b95f757 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,5 +1,5 @@
 AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501
 AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f94a5a4c729d7be49e8ef3cfca2fcefa49769ba98e5c53b743dfe67b58ae1189ec8d75e957716fa1 SHA512 d98032d8de463d2023f087106ff68367077dcd4680c673e41e50e42c91578925c72f741508e2b36b0711478e9bc12c61efef76d57c578bc726950c9d6fd2f5c3
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
-EBUILD ser2net-2.10.0.ebuild 621 BLAKE2B 666010295d8a84759ba44388ff0f1339e22392b84a27d5f51d0f957ec99cf353b1b2122471c5ff0fc5a4e1d0787b77092dc6351f5d75533cb43775d48d301a5d SHA512 78e21c0e0d1de2550035dc8059cf9ba28dc410977cc16d48074dbf8a0498a046ca02ca41c9524f5f6ec858ed224cd4d235eea9783318e845f065f29c9965e4b4
+EBUILD ser2net-2.10.0-r1.ebuild 620 BLAKE2B ca674be4338a1086172eec784ae9250a524ba4db3ad10eec03ea219b52d03b5a4c88797f2c2877bc71aa088ec0318caa1173eaa397946962da82e30d923dba81 SHA512 a0b220160c3bdcdc60b8ab42f588d9b1aec94f706b0cb931c328ae336861ebea697051a98539681126b6effee939ae2448b1dc634c1ffa72b2534a3840ab1339
 MISC metadata.xml 245 BLAKE2B 283e669c2eaccbce6c5325e25d008486a91fee37eea3825d95b9659ba080b98865682e7713d1f2ccfb0b9fc4f1172dea97b8adf709582101ebe3b1dffb20f3da SHA512 01f6412344b7d183c04fe517d920e61d02ae502d820d2c41f49d3d4bdc9d76cf15429cf1dddbea33bb9d8a0c70cf2cc20d2d9a751258c41d1fe1a9aebd690ec4
diff --git a/net-misc/ser2net/ser2net-2.10.0.ebuild b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild
index 16b462a5cb7c..6e1a55411988 100644
--- a/net-misc/ser2net/ser2net-2.10.0.ebuild
+++ b/net-misc/ser2net/ser2net-2.10.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Serial To Network Proxy"
 SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
@@ -10,12 +10,11 @@ HOMEPAGE="https://sourceforge.net/projects/ser2net"
 KEYWORDS="amd64 ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE="tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
 RDEPEND="${DEPEND}"
 
-IUSE="tcpd"
-
 src_configure() {
 	econf $(use_with tcpd tcp-wrappers) --with-uucp-locking
 }
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index b42c95742f50..2a2acf912add 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,9 +1,7 @@
 DIST yt-dlp-2021.10.10.tar.gz 1913112 BLAKE2B 05c6f56a633311b99834f077b1dd3be6374144d5cf5dfdcc38cbd7fa246e380f2f8f7b667dde9e83f6f0270bac38e21f4183726c9ced922dc0c3ca96175c15db SHA512 c53cc4458b294dc579de37e9d603cd32bb1890ed921270097bfe04e4e8769b91f6594cd4834e7094c706a7c9f447854438b33ab28ddd7247af585837c5ca76b1
-DIST yt-dlp-2021.8.10.tar.gz 1807968 BLAKE2B 664f9f5680c18531bb1c194e6e26a31b6be62894a88c6748bf146fbba79164fec6f5e6db017785daf6c8f5a2c1b7cfc0c2ee6c0d437b9d7bb4e1835eff73650f SHA512 fb321d308e634f6358f046762cc3e827b036083b4764d495bbcef253d06ce445152f4a330c51b5aac1eb3b21a8a345fc791f0fdbdc01089ea2a414b1cd457f20
+DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8
 DIST yt-dlp-2021.9.1.tar.gz 1846252 BLAKE2B 2cb056b89d1c3f5dfe442c96e983b2500185ade621c285669ef513d0fe9af9aabea3ad121344d1c521b6c89eddc77bf7698edb48d92f6f5f7b58b8939c80817d SHA512 26f778bf63b9be9e487b96f098e56abf65c7c7a89e9c5754755cf73d55e441638174d7b0e7220e994e40c0740edbd792e1fee28b44946cab8197dfaae2eee26e
-DIST yt-dlp-2021.9.25.tar.gz 1890559 BLAKE2B 9573fc4214fa8654a4b1ca44dd40b81f590f08ffe56225d8ad9923e4c3d188be406a59443e9ec134a1eef523e39e33cecba9ba76ef05edb908713d72d1ac233d SHA512 2c1fc18f05108420caaae9ca4072fc1ee0c67932ac144ee69c3e412850e1f1873938e302b9e0953bea29678bd2c512e58c124088243818ce0662449bcfa92175
-EBUILD yt-dlp-2021.10.10.ebuild 1001 BLAKE2B a5baab2dc005b8706279caf49ae749eb463f4e4ae324fc508c5a65c11ba4fe337b660baab0cd657121feaeac84100882347a07f521cd67938067031a0f095c90 SHA512 3de4ddc9959b6a97468843af26a3a01b73fde17a90e1c399dd0dc0617d1fe7c8d1a68738c16f89912ee74b53bd74855f84e1ec09fc5b90af9dad3047a771c2cc
-EBUILD yt-dlp-2021.8.10.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
+EBUILD yt-dlp-2021.10.10.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
+EBUILD yt-dlp-2021.10.22.ebuild 1001 BLAKE2B a5baab2dc005b8706279caf49ae749eb463f4e4ae324fc508c5a65c11ba4fe337b660baab0cd657121feaeac84100882347a07f521cd67938067031a0f095c90 SHA512 3de4ddc9959b6a97468843af26a3a01b73fde17a90e1c399dd0dc0617d1fe7c8d1a68738c16f89912ee74b53bd74855f84e1ec09fc5b90af9dad3047a771c2cc
 EBUILD yt-dlp-2021.9.1.ebuild 1131 BLAKE2B 75a09269e874dd723959481fc123ad9116bd2e94633a3b71fd288e405f2536ad2a751c938912928bca8be9011aca18736239d51bc3e19a805154cd8e9fe05091 SHA512 9350dfa756115e0642fc59780f33a3f9472ec3455ee3930e8bb6b0c46d91ada5df059b0363ca98bcefac41f210c5a707079326f385e5922e510adbba59dd07a4
-EBUILD yt-dlp-2021.9.25.ebuild 1133 BLAKE2B d08de5fd6d20d47c9687c28691225cc3b74d0745d195017afbb3959764a90162b788fb1bee6e6330f6c55a849fc9e53fbd3e51663d01768d1df20ae0719504a0 SHA512 bb5e06e853bbeeacbf7bd2e317d629867761d07d2ba6be8f5099158d30108be754c76b436eeec5d06ad64ab8d9396071ac4df05434690d31e9df9b4f841068c5
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild
index ed4cc85dbe9e..e4e5268e2804 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
index 4c0bfc7cd619..ed4cc85dbe9e 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.8.10.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
@@ -1,47 +1,43 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+inherit bash-completion-r1 distutils-r1
 
-DESCRIPTION="A youtube-dl fork with additional features and fixes"
+DESCRIPTION="youtube-dl fork with additional features and fixes"
 HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~riscv ~x86"
-LICENSE="public-domain"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
 SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
+	dev-python/keyring[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
 	dev-python/websockets[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-
-"
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-video/ffmpeg"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 python_test() {
-	# make_lazy_extractors.py tries to rename it out, so fails if it does not exists.
-	mkdir ytdlp_plugins
-	epytest -k 'not download'
+	epytest -m 'not download'
 }
 
 python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
 	doman yt-dlp.1
 
-	newbashcomp completions/bash/yt-dlp yt-dlp
-
-	insinto /usr/share/zsh/site-functions
-	newins completions/zsh/_yt-dlp _yt-dlp
+	dobashcomp completions/bash/yt-dlp
 
 	insinto /usr/share/fish/vendor_completions.d
 	doins completions/fish/yt-dlp.fish
 
-	distutils-r1_python_install_all
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
 
-	rm -rf "${ED}"/usr/share/doc/yt_dlp || die
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
 }
diff --git a/net-misc/yt-dlp/yt-dlp-2021.9.25.ebuild b/net-misc/yt-dlp/yt-dlp-2021.9.25.ebuild
deleted file mode 100644
index 4c0bfc7cd619..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2021.9.25.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="A youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~riscv ~x86"
-LICENSE="public-domain"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	dev-python/websockets[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	media-video/ffmpeg
-
-"
-
-distutils_enable_tests nose
-
-python_test() {
-	# make_lazy_extractors.py tries to rename it out, so fails if it does not exists.
-	mkdir ytdlp_plugins
-	epytest -k 'not download'
-}
-
-python_install_all() {
-	doman yt-dlp.1
-
-	newbashcomp completions/bash/yt-dlp yt-dlp
-
-	insinto /usr/share/zsh/site-functions
-	newins completions/zsh/_yt-dlp _yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/yt_dlp || die
-}
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index a06d5ae71bae..9ce10a17fb5f 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,5 +1,5 @@
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
-EBUILD zsync-0.6.2-r1.ebuild 1093 BLAKE2B 85dadd36b2625900b338e192331bae71a1b9cc3ab3c7b54c7c842bf3b85170a9830b4863aaeac6040f5319cf2dec7eca3cff405c5d3349097e9014667829ae92 SHA512 5f526a4e1ed4c2a6ec6c26a603f1396400a6ab7daf6454f8aa9c129ca8e883ca23281a1ab09ab26b954135ef4de112918af2a890a71cf7ba7ad303f201366f18
+EBUILD zsync-0.6.2-r2.ebuild 1083 BLAKE2B 7bb0a3c22a5676f5f261e8fa0594b1f444c611796e17a4b5fbdedf8c0aa5eb2fca9873b0522b296e5c48b8d5db03faffa7819657094699712d965513de476368 SHA512 4e7abef9c548469a6bc1ef581f4628e41ff957dd6a8c524179e267d423e505ccd3f18b62237260b1caf14261eaaf8c955a4f417e08d6c5a4bb64f00b0efbb4e7
 MISC metadata.xml 1249 BLAKE2B 709056930c2d88355c1ad7cc829463a891aa546c85c295177a81e9e639410aca44d6f8073f82bda3159dee5140090cbf7427de324a0c66ee4b75636cb378d79e SHA512 ce9edad4ae43b83c52638195560d2b9df59fc691d3bcc9eaf163b8fa568d2f718c266d425b1fd94499676de536c7b5d6297cd9b303d044b6ebd4cd74a9eb35d6
diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild b/net-misc/zsync/zsync-0.6.2-r2.ebuild
index 70575e7f4895..c99fa2fdbb5d 100644
--- a/net-misc/zsync/zsync-0.6.2-r1.ebuild
+++ b/net-misc/zsync/zsync-0.6.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch
+inherit autotools
 
 ZLIB_PV=1.2.3
 ZLIB_P="zlib-${ZLIB_PV}"
@@ -14,23 +14,22 @@ SRC_URI="
 	http://zsync.moria.org.uk/download/${P}.tar.bz2
 	http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2
 	http://www.zlib.net/${ZLIB_P}.tar.bz2"
+ZLIB_S="${WORKDIR}/${ZLIB_P}"
 
 LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-ZLIB_S="${WORKDIR}/${ZLIB_P}"
 
 src_prepare() {
+	default
 	# Move old zlib-1.2.11 out the way
 	mv "${S}"/zlib zlib-1.2.11-modified || die
 
 	cd "${ZLIB_S}" || die
 	# I am not sure how many other zlib patches we will need to port as well
 	# This covers the security vuln in 1.2.11
-	epatch "${FILESDIR}"/${P}-${ZLIB_P}-support.patch
-	rm -f Makefile || die
+	eapply "${FILESDIR}"/${P}-${ZLIB_P}-support.patch
+	rm Makefile || die
 
 	cd "${S}" || die
 	cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die
author	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-26 00:10:07 +0100
commit	95461df035e3867364495f065e5e805bf629b2d7 (patch)
tree	867dce371a84a696e91be255d89f282975aa0480 /net-misc
parent	46eedbedafdb0040c37884982d4c775ce277fb7b (diff)