13 files changed, 502 insertions, 83 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index ef5c3ea9d114..85da7a73fee4 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/icingadb/Manifest b/net-misc/icingadb/Manifest
index 4b12132274ae..14f733dad2e3 100644
--- a/net-misc/icingadb/Manifest
+++ b/net-misc/icingadb/Manifest
@@ -1,8 +1,12 @@
 AUX icingadb.initd 387 BLAKE2B 3e5830deb53904501553cc9920fc534f79ce2bd1788984c20ac4fe0d13e9d68639c684b1969aad210847668768dd5f9693fea9a417282cf7aaf60bb76325e0b6 SHA512 afc8edfff090a76e707788f3ffc1dbfd5233b50bbcfd165929d68e9b19c67cc5658acc61ec34efb011d22c642ea930949b4d5d13baef4706e31ead714ef13f36
+AUX icingadb.service 319 BLAKE2B 392afaa7f8abd0e06c18198b7089b6bb6fd862b3ad5ecb08ed6c36d0bb335b1a983f1122301780c163282348912e15a5903ac479a8e1eb73c033627008e10919 SHA512 623b1db5ca2209c27c548da039dddc9631669d2ac32491cd6409e970818ef7bfd6032f5e74003bf470c6175f869c29be145fbd01b0be378eb30237c0e1741006
 DIST icingadb-1.1.0-deps.tar.xz 9188036 BLAKE2B d816220d66d354f348c7eb9874d2edd65d67418d2c5ff0352c5fad524239e9bbcba53cec0cbae710a8d075fce2365c76f20a0cbca10afca62844f51df9e43092 SHA512 94534e7d8c1479d5579336ff353b142b62d19c36030e59667d0276caf6fa643f7024557c1c2ea6bfe7c70e2abd87b9ae25ac6213272627c25d927ebf06760270
 DIST icingadb-1.1.0.tar.gz 3865617 BLAKE2B e71b577f799ff6c069f86810b35731411eedbfb15c5e741aac987f9fdb852e342bbece3b3995af7fe1f957988314e71af8d92cbda118a6bf8d91639cfe8734e2 SHA512 a7659004802acabe9f3fdc2b843e37928b0b8835428d1f12a730fc3842bb7550f380e6abc8b253bd00fe5b5df6710573fef847f657a61b10f4cf617fb03b4ea0
 DIST icingadb-1.1.1-deps.tar.xz 9308260 BLAKE2B 95d9e87bc48661af9eeee5b14beea50fcee5ad5fdf846e207795e676b3a0f8a7b95f9410ef3ab97e490be275928f8d21e8b4c54d15fd9b4c0c4036504c4d885c SHA512 d43819ac8979e4396def929bc2cc0777683b5afb2d80d3c95c83a46b5ef2e9463b93e338c1ba1fafee780e4dc7ded53d0044d15258565a01acd178fde85c39ca
 DIST icingadb-1.1.1.tar.gz 3868785 BLAKE2B 9f07cfca9acbe170189f28c42d71433c1d1faba55f6a25348b3a5cb76675f72df5e2c8c0f2c984830766a6239db4e1098da9e5daddb5dbd3c24b42c8058161b6 SHA512 25dab9cb93d786b6bccb3e305cf9f36d7910e8919a87148805fee61378c072107838741a2066eddcbadde9f1d345d79e9d12c46b87789ac79b272fb4d01d3ab4
+DIST icingadb-1.2.0-deps.tar.xz 9714708 BLAKE2B e79ab63b8bec42ee61cb402db37dbb346f9521aa4188667e3bfe98ea5c3a44f8bada4e228c2f8e06c73d522fa3a97aa11eb23bb7e54500b53c4191f4a458f6a1 SHA512 83c3aed34923c23ea723220e637e54788435ef53837a454ebad00ce0e714c7c33a1e57adaef5702b5e2ebe541659286cb9889e4680986c0bd786b9aa48d87291
+DIST icingadb-1.2.0.tar.gz 3345811 BLAKE2B 7cf985e1209ee1bab9f0ee63745fd367ed15000d9807cf776e0301691c11d1dfb63c88e39dfa522ab1ab3daf0ee0165993e82747b32fb8db1ec6fab3857c0c70 SHA512 ab5e01b4ef606c765970e4f32b26d79f956c2363e9ce4213e037413ecbde5cbc85c57cd8c7ae730524c1c103306dd6f78cce47fd758cb58384f1ad0bc963b920
 EBUILD icingadb-1.1.0.ebuild 894 BLAKE2B b39b05c2cc9b28bf36cb5226dfa94db33388fbec092c36e95256bc45d3227254a1be2c5dbd0055743a436578077bf1d70e11e0a9976dbc866e6c1c8bba462034 SHA512 87a0d21a1621185bdf117c67429b74bba3b34eee3d2899460e0f995e832b85fd7c8efc48807078b9f3452f19a44809f5b2affad6042052ae728ed02b7f1ae146
 EBUILD icingadb-1.1.1.ebuild 883 BLAKE2B 118b15f927b355b4514ee4276d3c5357fab07b9a47f86c5200162069584cab8a96f9640f09f95f299b3538fe709132f9af21c4d0f010090ef61a6ebed3c0c080 SHA512 9a4e12ef6557ab2a9af9ec60ac63fb9592a5572123c48d94a85478361e300f96d3f6b74eb4dfc7d7ed2cefe1c77e8d92b34c8affe2a7caddd79b0e2b4a5ede04
+EBUILD icingadb-1.2.0.ebuild 1195 BLAKE2B d5a399159a87a63e5a0131783168753d0b248bb49153d1266ff0ae9b98dfff5243d590c0abba343c1f5d6f164273b8470b3a0203b44697a9f531701558557cfc SHA512 d2ccde56fa02b1c6a6a0757ffc23b01b627095dcf5d8159b917482c34f7bd099de2dba44550410a9c43a659da95e9d7eaddb111157a7f2bd89c447fb4ba9b23a
 MISC metadata.xml 593 BLAKE2B faea52f504ea9b34d73f4770add41e0013b8d16144323fafb53c9f5a3cdd38f533056fe274f21baf007224099afdfbe8dcdb676c6976a470d3c4561676713e03 SHA512 898730acbd59f190c54985498180517f96c183ff58633bbab1ca9fa2077364b8f479974831f3c29ac36010dc2bab265548ced6a16ff2c236d6226f32aeb4c4d9
diff --git a/net-misc/icingadb/files/icingadb.service b/net-misc/icingadb/files/icingadb.service
new file mode 100644
index 000000000000..c55d36764788
--- /dev/null
+++ b/net-misc/icingadb/files/icingadb.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Icinga DB
+Documentation=https://icinga.com/docs/icingadb/latest/
+After=network-online.target redis.service mariadb.service postgresql.service
+
+[Service]
+Type=notify
+ExecStart=@EPREFIX@/usr/sbin/icingadb --config /etc/icingadb/config.yml
+User=icinga
+Group=icinga
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/icingadb/icingadb-1.2.0.ebuild b/net-misc/icingadb/icingadb-1.2.0.ebuild
new file mode 100644
index 000000000000..b29d48bda9dc
--- /dev/null
+++ b/net-misc/icingadb/icingadb-1.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Icinga configuration and state database supporting multiple environments"
+HOMEPAGE="https://icinga.com/docs/icinga-db/"
+SRC_URI="
+	https://github.com/Icinga/icingadb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~sbraz/distfiles/${P}-deps.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	acct-user/icinga
+	acct-group/icinga
+"
+
+DOCS=( config.example.yml doc README.md schema )
+
+src_prepare() {
+	default
+	sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}/icingadb.service" > "${T}/icingadb.service" || die
+}
+
+src_compile() {
+	local cmd
+	for cmd in icingadb icingadb-migrate; do
+		pushd "cmd/${cmd}" || die
+		ego build
+		popd || die
+	done
+}
+
+src_install() {
+	local cmd
+	for cmd in icingadb icingadb-migrate; do
+		dobin "cmd/${cmd}/${cmd}"
+	done
+	einstalldocs
+
+	newinitd "${FILESDIR}/icingadb.initd" "${PN}"
+	systemd_dounit "${T}/icingadb.service"
+
+	keepdir /etc/icingadb
+	keepdir /var/log/icingadb
+
+	fperms 0750 /etc/icingadb /var/log/icingadb
+	fowners icinga:icinga /etc/icingadb /var/log/icingadb
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2b4ad0baf7ac..b834f18cb5dd 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -21,6 +21,6 @@ DIST openssh-9.8p1.tar.gz 1910393 BLAKE2B 3bf983c4ef5358054ed0104cd51d3e0069fbc2
 DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a33551f142499624165dac708fc05a6d077df81555aa41037b45f6301e4e5db3161a7a23404473f8a233a877fc55cc3 SHA512 4df1f1be2c6ab7f3aebaedd0a773b0e8c8929abb30cd3415873ad55d012cfa113f792e888e5e772dd468c394aeb7e35d62893a514dbc0ab1a03acd79918657f7
 EBUILD openssh-9.6_p1-r3.ebuild 13807 BLAKE2B 61ce712b91455496975c2f5daec0d50fc32dd677aee7612f7734c9a690724c2ae9d968b50a56216e765dc1aac289491e16a1e80856c3cfc745e0ab869d409ff2 SHA512 66cfc7769271649448389e2b25987ee1702d0a9bce45699e746374cd923065e7ff6d8b6df0616a3af80381e7963500512acee66995a6a5088b5bc49266ec2010
 EBUILD openssh-9.6_p1-r5.ebuild 13949 BLAKE2B f87a0bca07c8d17c5842f1edd3a26ac9af2a2fd462c63afbb5337198d477152100b2af7f6816875db82046b107132e201f98676b60d2afd72600ce4e8d5f7693 SHA512 fbf4d6ddbfc11debfbf8b4279b48f3d7c3c70e2b9ab705988a6a136aeb829e84b444b18eec05d11e21bb02e1273d9918c46084cc640aeba079b41cabcb200f3c
-EBUILD openssh-9.7_p1-r6.ebuild 14123 BLAKE2B ca52b359044de9227eb24866bf11a43ae7bad28ab36fd5d5ded17fea9bb53a8a31e0ef879c09012c51c7382f0a947536ca565e4a76975089c210218526c34b13 SHA512 60ec7e6f4497901eea582ca92058a6c2cb7bed1e99af0175fc20457b5c3d4ebe7b1adc6167d49b1ca428eef7ce3b5d0ba6d2ea26b371bca284dcef839bdfa3ef
+EBUILD openssh-9.7_p1-r6.ebuild 14122 BLAKE2B df8bc52cabc5df054c75f0479ea10f1c4ac258d0ffddbcf70c1cfa7072fed9633a1e8dc3cba53455f90a0703c0bf20c57880ac36e76034c23fdbbb5bf2a14e73 SHA512 698e26c7f14acb0628e00123489e0e8d1c53e7be29b87b03ef9d5006c35730a79d5faabb1df4697d124541d064e0d7450e48e3ee8eaab0188f674524000f9740
 EBUILD openssh-9.8_p1-r2.ebuild 15284 BLAKE2B 26db07f62b9a6997d34398bc684ae034d53f8aeb9b3851870cde66ae4f09a464b7f76cfc2ebe0a68fecce64bbf6817eb543aa519e544a3781a1ce2c46b94baec SHA512 397c641df559470747f246212ec33590b3005fe9956d279a93ee1fdcdbae4a2bb5c8cfc3e5b66585703edd43b0ad826bc2741ef62c75e0c6c6d88aa2852ec46e
 MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca
diff --git a/net-misc/openssh/openssh-9.7_p1-r6.ebuild b/net-misc/openssh/openssh-9.7_p1-r6.ebuild
index dfe20d9c2272..af5db8a1a650 100644
--- a/net-misc/openssh/openssh-9.7_p1-r6.ebuild
+++ b/net-misc/openssh/openssh-9.7_p1-r6.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index ad0f16013085..5dbcf81baa32 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -2,6 +2,7 @@ AUX rsync-3.2.7-flist-memcmp-ub.patch 773 BLAKE2B 9a30609a0bf09298dc2b1daeae7dcf
 AUX rsync-3.2.7-fortify-source-3.patch 1947 BLAKE2B c907e4ddc07693d8a6292f32782831953eee8711148c2e9aa5623dc5615474b59f25e309302c103a6c4a4177b18291a00983a62fa77c7faee04731114634c65d SHA512 b2bd012f318b1816a299a766c28a64cfc86307e4e1b047098f2a0334d775513f83724cdfa33ce567120c9b4fbbf9f6b8e0bbad0d434ac2444afff39fb5fa41da
 AUX rsync-3.2.7-ipv6-configure-c99.patch 1001 BLAKE2B 1ddb96eecef82a056af00ae221b9f5bc26284863a1ce63ae423e0b14979cfd57eb18f966f7572315e495ae25e4762da4115def7f04e32fe90cbc2b7a522805c0 SHA512 19a10798b8460741b8a3341a210d1828e1daeae707ad8cc910e4aa003e8bba405466a6cc64465294bd4eda81f1f876410a395e5012c3872cfce025f7ed0eec94
 AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7
+AUX rsyncd.conf-3.2.7-r5 474 BLAKE2B e8a78329dee2afba0e11ce6698089e8a3199e80a00300e0093f7333817cc5bab222f65ecf34e254fddd60b909299f94965de0291404294b2b9f4124ea2700b4c SHA512 7f03b5fdd6da450926aaf3152fbe953653a9453d0490388e28ff96e21e140df1b6275c273a1bd785c49c3458a6c4d645cbb34a48d2213d5ab34f129f737f8571
 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3
 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a
 AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d5137cccd73703e8311c33560580736b562ae03951520254b1e6a9ad26d587f5157866c2af1c9e648c3b SHA512 e7ff164926785c4eff2ea641c7ce2d270b25f1c26d93a6108bb6ff2c0207a28ebfd93dca39596243446ce41aceaeae62fc2b34084eb9c9086fcdbc03a657eed8
@@ -12,6 +13,8 @@ DIST rsync-3.3.0.tar.gz 1153969 BLAKE2B 75a3cc50452086aebd16f42d7a309c173cbc1ea1
 DIST rsync-3.3.0.tar.gz.asc 195 BLAKE2B bd077217bd44d406ac49a55b0c0d38c2accd4867b9fbf78a13fe906f52e1773d5a69aa3116a0c245abdeb1af54705d6ffc75aaba8b276ba9229bbb3340d7c3e8 SHA512 611d26374e0ff98ffb11b6ad6555f08773b9f09e1fbf232abc73c5d472b0defd28fd559bd42707774204d055b93be289f19f4db94bbdfe0b0935918fd922cced
 EBUILD rsync-3.2.7-r3.ebuild 5463 BLAKE2B 2f9d9817d012964c8a8d095c7fb185c997c26df59f00208668df2b22a7149a0cab46d357673b7eee83d93270e64032a2f5bb4789f2b414bcc15b207eede99049 SHA512 9ff32348b129137a44cc994f1fcaa60b0e55377f6d24916ff287e3f8ed4bc282423de2a55dd68265cd48e545b96c00f76440a796b48c16a8b5cec3e8c55ece48
 EBUILD rsync-3.2.7-r4.ebuild 5582 BLAKE2B cfa2f7b0ba29c31310de084183cbab8a393b63010a7b7ed9f50b897eccef635e1b33ea61f1cc473cb2ab5c9318dda6c3c0cab4969fd0308ffcd66d8c39499569 SHA512 25698f1a8b9e48105f3c559a0e207337ae0c901dc6b39ab3e2d074fc1c614d0f89e44419c0d17f744cdd8b23c1ee049912806ef36d770bf9f70c2cb31002c194
+EBUILD rsync-3.2.7-r5.ebuild 5582 BLAKE2B 62d16442fe1b5d4af196dffd8d3bd3a403f6bf889273864ae122a82c25c533ec658883b1588b17c8dbe63c58a3de5356c019fd924ffd94179e0068fb593028fd SHA512 47777cb8554c10dbd65aaaed5016f5ea71585e75900931de3c035ee5a786c3f0a8330a50d9bae951655dc9dd67d1356740b55022db72f72c34276034b825de11
+EBUILD rsync-3.3.0-r1.ebuild 5433 BLAKE2B 774e7af0d9469d5b1bc6b8ce4f44066a2a515fb5bbee9dd29f819b27e0222da3857f0e7e28c05a791fea73451af994b34feafcd4dc784c9999a0ceab4ffa0106 SHA512 4aa2449f84a909cdb482533fb254cca04bd3a69185482815d342839490b0bf1f46346b61db66fe65afa75b5966f9f0d2d1ca983a965166ec48fe2c5cef442e60
 EBUILD rsync-3.3.0.ebuild 5433 BLAKE2B 3e07553244ea988e4587e361fff6370bf05b84c41a01270a71fe803f34165d9e8a0d705bf03c3d1519474b29b32fa42a12eface098a4b002b8c1491e656cc136 SHA512 d1d5f99f90087b586270efd9c6e9a3bb8392bb3f00b7e28d9c851210c7f0d43c7b46300e0c82aa6e35db9ded34fdd8040ef1ed560e3cc3298a7218edde07f626
 EBUILD rsync-9999.ebuild 5441 BLAKE2B 7e4653ec80413738d0844fd3a632378dc39875b9a11c26a74b57c442667678fb42782c8fe08c74d2254d2cb74b7d97cbacaeba23920a9f2c80b931371a0e9b42 SHA512 15d820df00e43ea719c4ccbdeda0512680b6cb85afbbb22ff17dd69e0a2fdaad68a96d58601dac625fa480aca4b63dba5cb4daa6c196fd45c2c17976708784b7
 MISC metadata.xml 886 BLAKE2B 65871157f4f8f6340408431fa5f019d7dd58382212b7b5c2021d77ecddcfba56f5528594dda16e624882b79a99235a1c3f5a4f8e7f175551922edd67e2d7c756 SHA512 0291f2876aa480d7d1a4d5834ac9b2e0267bb4b77874f43079d9ebb0420ee64f17df0ca28d71f94d0c3738f92d6fda44222ea0904360826bf3ce87c92375d081
diff --git a/net-misc/rsync/files/rsyncd.conf-3.2.7-r5 b/net-misc/rsync/files/rsyncd.conf-3.2.7-r5
new file mode 100644
index 000000000000..fe9189182f83
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf-3.2.7-r5
@@ -0,0 +1,15 @@
+# /etc/rsyncd.conf
+
+# Minimal configuration file for rsync daemon
+# See rsync(1) and rsyncd.conf(5) man pages for help
+
+# This line is required by the /etc/init.d/rsyncd script
+pid file = @GENTOO_PORTAGE_EPREFIX@/run/rsyncd.pid
+use chroot = yes
+read only = yes
+
+# Simple example for enabling your own local rsync server
+#[gentoo-portage]
+#	path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo
+#	comment = Gentoo ebuild repository
+#	exclude = /distfiles /packages /lost+found
diff --git a/net-misc/rsync/rsync-3.2.7-r5.ebuild b/net-misc/rsync/rsync-3.2.7-r5.ebuild
new file mode 100644
index 000000000000..d3fe9c36b093
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.7-r5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Uncomment when introducing a patch which touches configure
+RSYNC_NEEDS_AUTOCONF=1
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+	inherit autotools git-r3
+
+	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
+	inherit verify-sig
+
+	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		inherit autotools
+	fi
+
+	if [[ ${PV} == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+	S="${WORKDIR}"/${P/_/}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/popt-1.5
+	acl? ( virtual/acl )
+	examples? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+	)
+	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( >=dev-libs/xxhash-0.8 )
+	zstd? ( >=app-arch/zstd-1.4:= )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	BDEPEND+=" ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flist-memcmp-ub.patch
+	"${FILESDIR}"/${P}-fortify-source-3.patch
+	"${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch
+)
+
+pkg_setup() {
+	# - USE=examples needs Python itself at runtime, but nothing else
+	# - 9999 needs commonmark at build time
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
+
+	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
+
+	if [[ -f rrsync.1 ]]; then
+		# If the pre-build rrsync.1 man page exists, then link to it
+		# from support/rrsync.1 to avoid rsync's build system attempting
+		# re-creating the man page (bug #883049).
+		ln -s ../rrsync.1 support/rrsync.1 || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		--enable-ipv6
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable lz4)
+		$(use_with rrsync)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	# https://github.com/WayneD/rsync/pull/428
+	if is-flagq -fsanitize=undefined ; then
+		sed -E -i \
+			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
+			byteorder.h || die
+		append-flags -DCAREFUL_ALIGNMENT
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
+
+		exeinto /usr/share/rsync
+		doexe support/*
+
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_newunit packaging/systemd/rsync.service rsyncd.service
+}
+
+pkg_postinst() {
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-3.3.0-r1.ebuild b/net-misc/rsync/rsync-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..ebe9b1a3ec8a
--- /dev/null
+++ b/net-misc/rsync/rsync-3.3.0-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Uncomment when introducing a patch which touches configure
+RSYNC_NEEDS_AUTOCONF=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+	inherit autotools git-r3
+
+	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
+	inherit verify-sig
+
+	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		inherit autotools
+	fi
+
+	if [[ ${PV} == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	fi
+
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+	S="${WORKDIR}"/${P/_/}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/popt-1.5
+	acl? ( virtual/acl )
+	examples? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+	)
+	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
+	ssl? ( dev-libs/openssl:= )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( >=dev-libs/xxhash-0.8 )
+	zstd? ( >=app-arch/zstd-1.4:= )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	BDEPEND+=" ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+pkg_setup() {
+	# - USE=examples needs Python itself at runtime, but nothing else
+	# - 9999 needs commonmark at build time
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/AC_HEADER_MAJOR_FIXED/AC_HEADER_MAJOR/' configure.ac
+
+	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
+
+	if [[ -f rrsync.1 ]]; then
+		# If the pre-build rrsync.1 man page exists, then link to it
+		# from support/rrsync.1 to avoid rsync's build system attempting
+		# re-creating the man page (bug #883049).
+		ln -s ../rrsync.1 support/rrsync.1 || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		--enable-ipv6
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable lz4)
+		$(use_with rrsync)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	# https://github.com/WayneD/rsync/pull/428
+	if is-flagq -fsanitize=undefined ; then
+		sed -E -i \
+			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
+			byteorder.h || die
+		append-flags -DCAREFUL_ALIGNMENT
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.2.7-r5 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
+
+		exeinto /usr/share/rsync
+		doexe support/*
+
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_newunit packaging/systemd/rsync.service rsyncd.service
+}
+
+pkg_postinst() {
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 225901922a67..3d7fce1c83d7 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,6 +1,4 @@
-DIST yt-dlp-2024.07.01.tar.gz 5667870 BLAKE2B fec104c68ac2a465370a6c4270154fd18f496e0ed319c8b2a1a48cb43d8ba55f438f3b83182a8feece23d36aea180ba2f00412872cad92afab5be7ce46480e44 SHA512 1b99d82eb838fb654082c8bad7bdbd87ed2cdf3d80f38288eb1cf7f7112981eb5f45b6fc7cf861d7b10cec89626a2a7bebf20d32ba53b9dcb5d37275e3f02d6f
-DIST yt-dlp-2024.07.02.tar.gz 5671980 BLAKE2B 63fd9a938fe1a07de7c9a762f42a1276260dc5c7c248c0a8b32953cd6184978e691aa778fa98eb0175f48dc6692793f85fac04decbdffec7f9bd637e2b4ee842 SHA512 7b9c41a5dccaf9188680cac88010b7695e0809f2b3cdea398af3c507717634067e8f9d0fe02f4d51828c026bce5a31d0ae2b89a2bcc83f51ca703b627dbb995e
-EBUILD yt-dlp-2024.07.01.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
-EBUILD yt-dlp-2024.07.02.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
+DIST yt-dlp-2024.07.07.tar.gz 5687365 BLAKE2B 877b8bd15d7650b0afa928f44bac587843d1e37b8f26b82a64af9171525a26f89930b40f5f24e8c81833220bf78da4669bea0e4a660211a673e6209e9e062f07 SHA512 f6cb892db1364ccce2c2f99c5b0cb859475cd7757c93f03e1059c8222aadf2fd2220c6ea3509334a16439858274bbeb889dce52d7a9158043d6de473d5346598
+EBUILD yt-dlp-2024.07.07.ebuild 2269 BLAKE2B eb46ced81ec2279b0566c33f5b3b0e2128ba8a28404c54154eb3a69a365d302881b230b31ac0a97901f0772ece54ac7bd4c6a20d828b61bf7dd1e87144753ce4 SHA512 a9a4c068f027e9fe169e6a7fc9656ad68d2cab8543f85e47f2b045025f3b14d60b20ac42cb571c7e663ec661e3713aeb86d72d9afb04002b96a63d8f8d896ff7
 EBUILD yt-dlp-9999.ebuild 2436 BLAKE2B 3be5da21d8b1ffef30cb8c204121d7c7ce59ca12d0e369ce6c232dba59a1cf8c057c7f6b09b6bca4289533f04db6075c72843d5154221b0c8f18dd6cea809d4f SHA512 c83a141c85ac1fb1091525f6f3b7600d3fc9132b2a4cff39f5460fb2c20c5d9094e2176450cdcde24b05877c2306462045929ea6e3690d9d48012e234a8381ca
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.02.ebuild b/net-misc/yt-dlp/yt-dlp-2024.07.02.ebuild
deleted file mode 100644
index 68214ba4c2eb..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2024.07.02.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-inherit bash-completion-r1 distutils-r1 optfeature wrapper
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
-SRC_URI="
-	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/${PN}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# adjust pycryptodome and drop optional dependencies (bug #828466)
-	sed -Ei pyproject.toml \
-		-e 's/("pycryptodome)x/\1/' \
-		-e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails with FEATURES=network-sandbox
-		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
-		# fails with FEATURES=distcc, bug #915614
-		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
-	)
-
-	epytest -m 'not download'
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2024.07.01.ebuild b/net-misc/yt-dlp/yt-dlp-2024.07.07.ebuild
index 68214ba4c2eb..68214ba4c2eb 100644
--- a/net-misc/yt-dlp/yt-dlp-2024.07.01.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2024.07.07.ebuild