19 files changed, 215 insertions, 73 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 05573550c70a..903105b07b9e 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index c99db0c32ea8..9a71f058c523 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,4 +1,3 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003-r2.ebuild 936 BLAKE2B af298f040eb91cb211c01fec54027bcd6675c81cd3697db5ebcde297c7afce9e3ffa802fa3d2cddc81f88bbee3644d94f8db5c02be3eda74804c9d89f2f46087 SHA512 06eb93318636644c45b1105b81678f627849e05d8f35539f432c12363a966ad14ba0e8aeb3b296dff9873c6d77c1d87fe0e25847501f8413b3046d6d772fffb5
-EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B 8881fb5d7c81599db764e1a07fb771d32475b1a48b2163b76630581f289941db9f4b2af991276d55f64170fef0ba1dcbca327394105dab02aad2061fa54ad7b9 SHA512 1287250d93fc96b91aa647e0d7ac4db274ed48e1f75f03377f897b53ce17be8dfb900173cfeb4bbd5ec8096495470b9381026564a5e79184e50ab8b652007eda
+EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B d35971123606983189e7a891dce12bfc7b6c7c31051d29924baa7603e616be6eabae74558ba3801174ee79eed526502e517bfa0df58d7b1a7aa79c566b277608 SHA512 b3166f67bc5454ebab958b097418cea3662671ed377f3c3863804f47dfcf954b37dc4563756932f4c8ea6a7a63e89a9476026c7ea94c563139619719cad6056d
 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
deleted file mode 100644
index 7358a56ef944..000000000000
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
+++ /dev/null
@@ -1,38 +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 desktop python-single-r1 vcs-snapshot
-
-MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
-
-DESCRIPTION="Desktop notification integration for connman"
-HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
-SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-
-EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	net-misc/connman
-	virtual/notification-daemon"
-
-src_install() {
-	python_fix_shebang ${PN}
-	dobin ${PN}
-	dodoc README.rst
-
-	make_desktop_entry ${PN} ${PN} ${PN} Network
-}
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
index 217e156b72ed..da4fd73408b0 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit desktop python-single-r1
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 9cb45c4fda48..127a65aa6efb 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -11,4 +11,4 @@ DIST curl-7.84.0.tar.xz.asc 488 BLAKE2B d74dea89fa89b6ed0a928e01987669f7dde0bcbb
 EBUILD curl-7.79.1-r1.ebuild 8166 BLAKE2B 69d521028d1ff2d37b270539c8ad37a8033923d60ad057a347b843587a035c0afb829361fb605ef4186243657bef6a94156e493321161c62d16ecc2b4a73d0f0 SHA512 05ef78d4080f609ff1a5deb191d1d7d09ddfe58c617cd8688c231c4e71268784ebc9c2eee1a5a023488868d23b15db7b04718e6e7a3b4dbe17ac9880eeaa1eb9
 EBUILD curl-7.83.1.ebuild 8274 BLAKE2B b9f06416a4b68a17616c90d91be3a629020110aaa7c3d9caac79937c3606982f0c28d4fe8a798311cdf623e62455d4c6aa8708faff46bb1805ed2a514bf014d9 SHA512 77992858391e805764c4b5b9eccff0e87465def7eeb105151e5a5754270d29e5e815d4239f90c6543dcad90dccac46cae843194e278ea8335aa1669a8deff4c8
 EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
-MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
+MISC metadata.xml 2099 BLAKE2B fd6994bf9bf8dcfe79a8677cbf2449a8638cdbfbca8bd21bd0a84ab65ab31bc4e001cd595df95b3884c20626160fa7b4310614d856891e3fb699c43a4d142dd5 SHA512 3905bca0ea55e6756f68535d9e5de11e8c7ae37768a4e236e5a75087c45803b077c1c84ecc74e54899fb7a6309b88819e3c668e73a3f4b903e48ca9123853f8c
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 48461136292e..a6e835644b81 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -36,5 +36,6 @@
 		<remote-id type="cpe">cpe:/a:curl:libcurl</remote-id>
 		<remote-id type="cpe">cpe:/a:haxx:curl</remote-id>
 		<remote-id type="cpe">cpe:/a:haxx:libcurl</remote-id>
+		<remote-id type="github">curl/curl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index a088565eca92..96fbe655277c 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -2,4 +2,4 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b
 AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 EBUILD mosh-1.3.2-r2.ebuild 1495 BLAKE2B 37b69dd27d145709d283351072318f9c121d9d0b291138c8e65deb75af2f30956bbb1172497fa6e109511d19829e1e589fceacf0d9d25e3448aae416e5d3cfe0 SHA512 5ab027e930195649efbfeda59f32ab06513880fec2e54b85d8104c31b3620a2b49d81eff887bd79319a413b688230748493e4f7f3530ea09c9281c66e6b3ed0a
-MISC metadata.xml 1047 BLAKE2B 86b2beea09ccbdca70646b00a5af74f253ecd18fed70f364287b122520f4e15f507416c3ef9b40fe28b267e3dad9e8e16f0139dd0966c55d1597a5cae1c411b5 SHA512 3940264e614abb7b646d24e6786503793b3a651af7f802f5ef5bf1d395e89f38542eae2df5b2d737bf2474963215529771c1ba2eabc785a5649ecaa1da4713db
+MISC metadata.xml 1104 BLAKE2B 9da21afbf989104205fd3c8d8b9b0f597496efe9e175f1577c6c5e1866ca6dbfa9353ef03bfd72c850cd21fa2067be9146a82a261d2bd68ebe64cd49deff8e94 SHA512 4fd1d994fb0ca6bacc07a6c3a970edffc3a2e70bcca7cd6ecc74687794ba7ec6212994cb5997712946c555b3e66063caa36c8656ae737ac193031bf997ec7e13
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index a4282e889985..065a0d495315 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -21,5 +21,6 @@
 	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
+		<remote-id type="github">mobile-shell/mosh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 31d82bdaeb6c..01911c31fac3 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -7,4 +7,4 @@ DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c
 EBUILD openntpd-6.2_p3-r2.ebuild 1757 BLAKE2B 4fb06062691bbe2e55c1b143f45cb7f2696647eb08cb94e75ef1cfb35cfaa3e96cb4fb5cf650fe8dec3e726f32406611172a395b0060eb3a99ef4bae0cae5a70 SHA512 6fae243f65a065c73ba9ad9660a1558609b72f60e36e0c7d966bf00411276a52d3f1542a1db095cd44300b8d606b727ba69261665f96cf1097126d0816a8e2df
 EBUILD openntpd-6.8_p1-r1.ebuild 1707 BLAKE2B a000176a5e592b92fad1fc54bd0cda48dccf05fff84e119f621566485059689409c7042b5c6e774322af9bedd7b07f712dfe09cbbcfbfe287742c35efa3d13dd SHA512 cdb369814721f52440ef26aed7bd8d6bb7dc7e68a399540dd2286743a6b4cb3eb42b03db3e731413ee61fe5797d2879951809683d0b24a820c62934199294430
 EBUILD openntpd-6.8_p1.ebuild 1621 BLAKE2B 685e978d396f9306453d5f7a66c0727039b0084252d347995d94c45128fcd6af636b954f93e7dffe07acca4518a4fec3b2c3554b1b53d729975920cfa4654cb3 SHA512 2c9fc6b72fe8e690f43cf7b3e77803325b1b021fab58f403b59f83ec86e5cde135ad1ed45279c75f458c95ec42c58f1804e7a7827d381b4d2d4b67918cf2c673
-MISC metadata.xml 752 BLAKE2B 47083f5ef4bc9d1465d6bfec1df9c0b40edcd478951187ea3ff04b072fd772652f3b9d95aae94f1717b5bad164190a0c1d6578c25fed8e59eb66d085a74642d1 SHA512 4ef6302e26cb9325c6c5aa80f78456aa6ef71436d1bf9ba91600d8c74baea3511b4959eab57bf0d21927a42c6b953991b36c626f9d1d01ac4bd6471f1c970071
+MISC metadata.xml 852 BLAKE2B c312b9abb37945299cdcf264fce2003032f385c72e09bdc5803751991ded8c1ece183a15fd92d62ed4a441705a35e2359d90e222636876edae69a0f4daf67ac3 SHA512 e06d361e0ea7e03c59555c1804cac448c9450a5cf1dcfc388b313820e433ae9bddc68e425478e0a6d8bd9494b6707fd022468576ffa54bff3e31117629aca63a
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 75ed1f5d2f63..4ce09235179f 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -18,4 +18,7 @@
 	<use>
 		<flag name="constraints">Enable HTTPS TLS time constraint support</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">openntpd-portable/openntpd-portable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 97263897a7cb..4f1b23dd8f24 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -36,4 +36,4 @@ DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a2
 EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
 EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772
 EBUILD openssh-9.0_p1-r2.ebuild 16937 BLAKE2B a87e2567925aa66ab898ec130951822b21087fcfcd28cd9cf5ca61a4281f89e55ca585811cc6241fd2f8a5b26bfcb1b8f07c4d08f4f545039119915b901264a2 SHA512 5e55cefd3da1d9f348f298687dd549d59a96527a91eaa8d007eecefe5c4cf85c91b74fba5e0f0fd91f41e372b0f6722b626695bad568bf6e294f07300276680f
-MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd
+MISC metadata.xml 2047 BLAKE2B 87356343744e121075383ad94ba6b821d2db5c3f5af16745130078f939e53b6a83281c19b89f272d20509753bc734bfdd3aab024d72651c7d5c69df27b36841a SHA512 a5b69ff7fa94b00062e78eba36b6d321fd923d27e953fc24ae81d8e25040bebde9ccb8b1555912726eff2b39ee0256aee0da52359e326fb4b1edd394e4f1e406
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index f23eae1e1222..699281fbc1f3 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <longdescription>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
 OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that 
 increasing numbers of people on the Internet are coming to rely on. Many users of telnet, 
 rlogin, ftp, and other such programs might not realize that their password is transmitted 
@@ -18,19 +18,20 @@ The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp
 replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of 
 the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan, 
 ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0.
-</longdescription>
-  <use>
-    <flag name="scp">Enable scp command with known security problems. See bug 733802</flag>
-    <flag name="hpn">Enable high performance ssh</flag>
-    <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
-    <flag name="livecd">Enable root password logins for live-cd environment.</flag>
-    <flag name="security-key">Include builtin U2F/FIDO support</flag>
-    <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
-    <flag name="X509">Adds support for X.509 certificate authentication</flag>
-    <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id>
-    <remote-id type="sourceforge">hpnssh</remote-id>
-  </upstream>
+	</longdescription>
+	<use>
+		<flag name="scp">Enable scp command with known security problems. See bug 733802</flag>
+		<flag name="hpn">Enable high performance ssh</flag>
+		<flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
+		<flag name="livecd">Enable root password logins for live-cd environment.</flag>
+		<flag name="security-key">Include builtin U2F/FIDO support</flag>
+		<flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
+		<flag name="X509">Adds support for X.509 certificate authentication</flag>
+		<flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:openbsd:openssh</remote-id>
+		<remote-id type="github">openssh/openssh-portable</remote-id>
+		<remote-id type="sourceforge">hpnssh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index d99d1e5df0f1..2aafe024c9fe 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -10,4 +10,4 @@ DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a12982
 EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-9999.ebuild 4490 BLAKE2B cf88182b642dea41913431c96f3fe67d5a254767cb65721139423702f53d613c6fa59d614ae6c0475314e5153525682e8bd6c154aaddba92c486c1ae00833592 SHA512 ca478bfa7cb1c50712816631c1d4cdbc4284eac6240306f10e8498956f1209f8dac94d7bc7f540bcfe21911fbafd5412fb42ea1d271756ef48ad5d799e9e05c0
-MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4
+MISC metadata.xml 707 BLAKE2B 54c2a5840dd4fabb9055652c6bd39d657fab4846891b5ea3fbc59345d98a494b28033336f52d7dfe69b783f73bc64e40496b5c1d09f735545fa1bd74c04d69a8 SHA512 607337487ce0a6b7a5d52f9cdd0a8c5d40daf67ae9e1a3a2107b366484aca6b1eaed05840b95839a2957971accb28ce228f5a4922c7bbace1cc65fb29151df6d
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 6a684b27c6ce..b653378a9b72 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:samba:rsync</remote-id>
+		<remote-id type="github">WayneD/rsync</remote-id>
 	</upstream>
 	<use>
 		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest
index e511dd02fa02..786b1b278732 100644
--- a/net-misc/smbc/Manifest
+++ b/net-misc/smbc/Manifest
@@ -1,5 +1,8 @@
 AUX smbc-1.2.2-cflags.patch 323 BLAKE2B cd95f0d01e1a0f000c362544420fb55e9fed0b2786a05c2ecf90ce8066ea94c4e0e949f8b9cbdac2471ea2e5599675a51c2176c1c2a303eb3d04160d959935dc SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9
+AUX smbc-1.2.2-multiple-definitions-gcc10.patch 2191 BLAKE2B e0cb38b0799d87d78c152bd7227dd8c73e074deff608cb7ec870dc90574118f4558e6bc5c7a417a1e8154a52a9787a8873ab413c3825053c04c39b221bfedab2 SHA512 3ce7d6b76cba3abcf52a4efb2e4cc012788a3f1c182cc046a2395d3fd9f42f3d0fea49854ca02840af8eb5093684c51f973c09437957b0df6f779b258251e7ae
+AUX smbc-1.2.2-samba4-includes.patch 2402 BLAKE2B 966fcbf20522e8bd5fdb349e65551c9d37cffe091800c6c29e3b10d74dfba512e31e43a2841c05e1cb1ab9222f0009d1f301cc6e01ec960d2fcc9b3fe972b8a6 SHA512 0cd27c9c4b2ab8b749ee779b7fcba4a321979602ebabd29c65dfef15f2d7fec3ffd38efeef5868fc0cfc44412b83b5f37acf21586fae3b2ee7cd8879d0ee3dba
 AUX smbc-1.2.2-size_t.patch 551 BLAKE2B c4cd80f4af3285cdca7e6a5c9812742d6a662856bb986f11d395a5d4a44e3210c1087c976b4e0055768401b99fda6de081c330a1429a901fb4adcd461108934f SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa
+AUX smbc-1.2.2-tinfo.patch 480 BLAKE2B 6b882d6f2b39b7b0876b632382c6ab073918fe3e1d37ec908c8d3d460b3d4ad0fd671a33675bf543ce4304ace59d6b58851ab786bd1bbcca055933f021864557 SHA512 b210ad4e3607429131f5ba6b3fc79ea179cb4c5cc0316ca327f82f59aceac1a0e1157d5376cd374b0142458ee8e821ce33d07ee47e9c7dd8481d9c2e3ed4f70b
 DIST smbc-1.2.2.tgz 977908 BLAKE2B 481bf7e16b8f6d89abd62e619a13a8692ce1f3ed169a1b3c35864a2a66f2cf10753d7d4151f95acc3428ad628b5888a12f452836297d18f9c8b3ce1d17550010 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84
-EBUILD smbc-1.2.2-r3.ebuild 811 BLAKE2B 58380c2cfe43601fbf9f0a318d93bc9ea93a17175fc75e49bd8ef49d9dae47b1a9286d1f6ac18bc7c3eff09158216c4f4df127447542a57311c865916a7f8fdc SHA512 6cafd0ab443524469b05c1f567bb9a77e56534506fc13eef9b0ba243984602494eb150e3c6c964a2376404b7b1149a27784be7aec138506f34fb84da68667c60
+EBUILD smbc-1.2.2-r3.ebuild 1043 BLAKE2B 0fe6c802d84c1be2838c0236351798e00673708ada52959e9dd14993798fbf55b6e25479df1410c4b82d3da91f347a255270d401b8c056d5dbc9c8730c484630 SHA512 8ae11fcb1315f5c610168634238a46aa70e5dee632ca7aa8eb1a5cdb275f2a787f540c0b80fb399fea3d9ad87bb5e33bca5666e606327780852809462ab9a3fb
 MISC metadata.xml 652 BLAKE2B c14dc29057d46d671853ac571c5b8eee0da08ecdf049302147b92e12482d530ba5956a2e3d66a39ce46576942552f1acf570b4ff879564d9e0748c893e81707c SHA512 60f80fba5a3f5b3b6c0d2f89f0beebbb66054e8f51930f62391f359960c30317b1d4fb46b022dfae5ef8ca8e9a3ce735b279104dd7b607d2881f2851e30999f7
diff --git a/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch b/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch
new file mode 100644
index 000000000000..37dcedc4cc1c
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch
@@ -0,0 +1,46 @@
+--- smbc-1.2.2.orig/src/static_str.c
++++ smbc-1.2.2/src/static_str.c
+@@ -21,6 +21,32 @@
+ #include "static_str.h"
+ #include "fnet.h"
+ 
++char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
++
++     *Rm18, *Rm19,
++     *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29,
++     *Rm30, *Rm31, *Rm32, *Rm33, *Rm34, *Rm35, *Rm36, *Rm37, *Rm38, *Rm39,
++     *Rm40, *Rm41, *Rm42, *Rm43, *Rm44, *Rm45, *Rm46,        *Rm48, *Rm49,
++     *Rm50, *Rm51, *Rm52, *Rm53, *Rm54, *Rm55,               *Rm58, *Rm59,
++     *Rm60, *Rm61, *Rm62, *Rm63, *Rm64, *Rm65,        *Rm67, *Rm68, *Rm69,
++     *Rm70, *Rm71, *Rm72, *Rm73, *Rm74, *Rm75, *Rm76, *Rm77, *Rm78, *Rm79,
++     *Rm80, *Rm81, *Rm82, *Rm83, *Rm84, *Rm85, *Rm86, *Rm87, *Rm88,
++     *Rm90, *Rm91, *Rm92, *Rm93, *Rm94, *Rm95, *Rm96, *Rm97, *Rm98, *Rm99,
++     *Rm100, *Rm101, *Rm102, *Rm103, *Rm104, *Rm105, *Rm106, *Rm107, *Rm108,
++             *Rm111,         *Rm113, *Rm114, *Rm115, *Rm116, *Rm117, *Rm118, *Rm119,
++             *Rm121,         *Rm123, *Rm124, *Rm125,                         *Rm129,
++             *Rm131,         *Rm133, *Rm134, *Rm135, *Rm136, *Rm137, *Rm138, *Rm139,
++     *Rm140, *Rm141, *Rm142, *Rm143, *Rm144, *Rm145, *Rm146, *Rm147, *Rm148, *Rm149,
++     *Rm150, *Rm151, *Rm152, *Rm153, *Rm154,         *Rm156, *Rm157, *Rm158, *Rm159,
++     *Rm160,         *Rm162, *Rm163,                                 *Rm168, *Rm169,
++     *Rm170, *Rm171, *Rm172, *Rm173,         *Rm175, *Rm176, *Rm177, *Rm178, *Rm179,
++     *Rm180, *Rm181, *Rm182,
++
++     *Rm231, *Rm232, *Rm233, *Rm234, *Rm235, *Rm236, *Rm237, *Rm238, *Rm239,
++     *Rm240, *Rm241, *Rm242, *Rm243, *Rm244, *Rm245,
++
++     *Rm300, *Rm301, *Rm302, *Rm303, *Rm304, *Rm305, *Rm306, *Rm307;
++
+ void 
+ RinitStrings()
+ {
+--- smbc-1.2.2.orig/src/static_str.h
++++ smbc-1.2.2/src/static_str.h
+@@ -9,7 +9,7 @@
+ */
+ // -------------------------------------------------------------------
+ 
+-char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
++extern char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11,
+ 
+      *Rm18, *Rm19,
+      *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29,
diff --git a/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch b/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch
new file mode 100644
index 000000000000..3238fc035e4b
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch
@@ -0,0 +1,99 @@
+--- smbc-1.2.2.orig/src/bookmarks.c
++++ smbc-1.2.2/src/bookmarks.c
+@@ -23,7 +23,7 @@
+ #endif /* not HAVE_STRING_H */
+ 
+ #include <libintl.h>
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include "dulist.h"
+--- smbc-1.2.2.orig/src/dulist.c
++++ smbc-1.2.2/src/dulist.c
+@@ -22,7 +22,7 @@
+ 
+ #include <libintl.h>
+ #include <dirent.h>
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include "fnet.h"
+--- smbc-1.2.2.orig/src/find-index-manage.c
++++ smbc-1.2.2/src/find-index-manage.c
+@@ -23,7 +23,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include "find-index-manage.h"
+--- smbc-1.2.2.orig/src/fnet.c
++++ smbc-1.2.2/src/fnet.c
+@@ -20,7 +20,7 @@
+ #endif /* HAVE_STRINGS_H */
+ #endif /* not HAVE_STRING_H */
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+--- smbc-1.2.2.orig/src/smb-pack.c
++++ smbc-1.2.2/src/smb-pack.c
+@@ -21,7 +21,7 @@
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <curses.h>
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include "smb-pack.h"
+--- smbc-1.2.2.orig/src/smb-pack.h
++++ smbc-1.2.2/src/smb-pack.h
+@@ -18,7 +18,7 @@
+ #endif /* HAVE_STRINGS_H */
+ #endif /* not HAVE_STRING_H */
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ 
+ #define RstrCmp(src, dst) (!strcmp(src, dst))
+ 
+--- smbc-1.2.2.orig/src/smbc.c
++++ smbc-1.2.2/src/smbc.c
+@@ -31,7 +31,7 @@
+ #include <dirent.h>
+ #include <time.h>
+ #include <errno.h>
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <popt.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+--- smbc-1.2.2.orig/src/ttlist.c
++++ smbc-1.2.2/src/ttlist.c
+@@ -20,7 +20,7 @@
+ #endif /* HAVE_STRINGS_H */
+ #endif /* not HAVE_STRING_H */
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <unistd.h>
+--- smbc-1.2.2.orig/src/winpopup.c
++++ smbc-1.2.2/src/winpopup.c
+@@ -11,7 +11,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ #include "winpopup.h"
+ #include "debug.h"
diff --git a/net-misc/smbc/files/smbc-1.2.2-tinfo.patch b/net-misc/smbc/files/smbc-1.2.2-tinfo.patch
new file mode 100644
index 000000000000..8c35c4b0b0d0
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-tinfo.patch
@@ -0,0 +1,18 @@
+diff -ur a/configure.in b/configure.in
+--- a/configure.in	2022-07-28 13:24:38.673242313 -0500
++++ b/configure.in	2022-07-28 13:27:43.726466613 -0500
+@@ -94,11 +94,9 @@
+              [AC_CHECK_LIB(popt, main)]
+             )
+ 
+-AC_CHECK_LIB(ncurses,  
+-             main, 
+-             [], 
+-             [AC_CHECK_LIB(ncurses, main)]
+-            )
++PKG_CHECK_MODULES([NCURSES], [ncurses], [
++	LIBS="$NCURSES_LIBS $LIBS"
++], [:])
+ 
+ AC_CHECK_LIB(smbclient, 
+              main, 
diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r3.ebuild
index 87ebd6eea0a6..434ea97b5718 100644
--- a/net-misc/smbc/smbc-1.2.2-r3.ebuild
+++ b/net-misc/smbc/smbc-1.2.2-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,20 +11,28 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls debug"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="dev-libs/popt
 	net-fs/samba
 	sys-libs/ncurses
 	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-size_t.patch
+	"${FILESDIR}"/${P}-samba4-includes.patch
+	"${FILESDIR}"/${P}-multiple-definitions-gcc10.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
 src_prepare() {
 	default
 	mv configure.{in,ac} || die
-	eapply "${FILESDIR}"/${P}-cflags.patch
-	eapply "${FILESDIR}"/${P}-size_t.patch
+	# for some reason some build 32bit x86 objects are bundled
+	rm src/*.o
 	eautoreconf
 }