6 files changed, 49 insertions, 35 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b739f5dfcf38..ed7a1919d637 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 863c674ea268..8cf1ce3e6616 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,8 +1,7 @@
 AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f704466836a81ed3f3215afd646a10750274f0ce4bac1bd3f02545af71b0b834e51a6dd26aabb48449dc876d743045bce323408818 SHA512 b3a25b6d18256381fde7ae9cb91d7eabedaca27214398fb29949b5a816d2ac0dced8dd188aade8469186cc82df8e4c5620489a3ca0f0598b337885a8fff3b741
+AUX rdiff-backup-2.0.5-py311.patch 1649 BLAKE2B 89a4885cabb8a921522ee39f96187ac81dcd3d5b37a9c9ae3f0d3cd526eca432e1a007fc7add4dd436b03e09dcc57b016542437f0cd15fc5203e04f515c05124 SHA512 f085eab1cc1ec6de1f5c166752db0d1cfa07618e60537008c4d6edee0085a039a0f3d460c0d5ceefd2810d1aa3870a5b176567796577921c00359d9cb039c22e
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
-DIST rdiff-backup-2.2.3.tar.gz 940780 BLAKE2B 37f36ab06e3ebbe67f42af9edc26e1862b11043777775fc100ffdbdc44f9442972601df1fb298c5ca0c5caebb18e0bdfeff86cdc1636a2a615c5f830448373a2 SHA512 5b243316deb04b444c48f64677979e9df208a21699bfd6af0f1459cea331d60deb37f664d168b3ec45a9a774a8898d5d0a8b0e3e9bf711931839e2d1174fd4d0
 DIST rdiff-backup-2.2.4.tar.gz 941625 BLAKE2B 5635c8a418f482d44bac354415f33ec46d7f82fe4212517aef65712977ff9024c253515ef74b5696d200cf3d2b4f132887c22d35b633f02963ce56cab687b89d SHA512 3777038f90a702aaf0d87737ccd79dd6a0bc9d6bd49dc8154fbcd240b9b1971f5a5f3cc0ebffb623f1eeec82cb939fbdee75a813d27ef9eb78d5700ecc2716b5
-EBUILD rdiff-backup-2.0.5-r1.ebuild 1012 BLAKE2B ac77f2576c939098ff7bd56e0a24bdb01ea152e70b60fa459643c42f32cd10252bc8621af4b33687492ef0f1d3fcc9a8f5882f4039c1c03d79b613385d046372 SHA512 817d5be88a71dddcab46a751ce25eba49b9781c0c76c70b1865e84d35160819bc025eb293842f439c1f00921e570eead17e912a60d16c0bce6212d63adb2b454
-EBUILD rdiff-backup-2.2.3.ebuild 848 BLAKE2B e07bda4bf8c72e22a678e40c7f1121436171a14c0219549924f5ba6681d05d5a86046bdb58756aff1bfec222c3eb42945cd5d7fd95c4a029d3eeec2546a7de53 SHA512 d51a0fc350686be296fb6dc47839115c48e09730754633b72c751863c673e162544f996307869c5984ded32db8cac49d8ee87ae91afb77ea695fd252c580a031
-EBUILD rdiff-backup-2.2.4.ebuild 848 BLAKE2B e07bda4bf8c72e22a678e40c7f1121436171a14c0219549924f5ba6681d05d5a86046bdb58756aff1bfec222c3eb42945cd5d7fd95c4a029d3eeec2546a7de53 SHA512 d51a0fc350686be296fb6dc47839115c48e09730754633b72c751863c673e162544f996307869c5984ded32db8cac49d8ee87ae91afb77ea695fd252c580a031
+EBUILD rdiff-backup-2.0.5-r1.ebuild 1044 BLAKE2B 20b4ce3754dc0cb0fa6118ee294ab24ecddfb72905bbeb89dc9b89cd047a633bbd3527caeb7d6e0950f8c2549ed007d3a97b32fd003c425a70743964efb7155f SHA512 6b29b36819e311e9cdb3b4dde30e1465742d13c19776eaeb955317ad7b54995400506b5bd6fc5eabdd0e95696d3ba7c2d55d03e7796ad59e7bc0172b280593f1
+EBUILD rdiff-backup-2.2.4.ebuild 869 BLAKE2B 267233fd4e7ed9c19ec3e611009eddd809648fab57295598266fdab7ddbdf34bb86648ed7d572be230c0837a9153c3c31450069307813d4f158892289839dceb SHA512 120fd57b040d988f806dce90de6b4000aae5ab7557506f088f95696bb6907b8f3a0ff932d4671c572dc0747de0fb21489a1a75fdb0f0781b961112827960c968
 MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch
new file mode 100644
index 000000000000..87531ca7c4a6
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.5-py311.patch
@@ -0,0 +1,42 @@
+From 5e5cc54b5a633d3c6c0469283b2f26dbdde7908f Mon Sep 17 00:00:00 2001
+From: Frank Crawford <frank@crawford.emu.id.au>
+Date: Sun, 2 Jan 2022 18:44:57 +1100
+Subject: [PATCH] Added patch for Python3.11 as per bpo-39573.
+
+---
+ src/_librsyncmodule.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/_librsyncmodule.c b/src/_librsyncmodule.c
+index a46567fc4..158104d2e 100644
+--- a/src/_librsyncmodule.c
++++ b/src/_librsyncmodule.c
+@@ -25,6 +25,16 @@
+ #include <librsync.h>
+ #define RSM_JOB_BLOCKSIZE 65536
+ 
++/* ----------------------------------------------------------------------- *
++ * Update for Python 3.11 - Contributed by Victor Stinner in bpo-39573.
++ * Compatibility macro for older Python versions.
++ * ----------------------------------------------------------------------- */
++#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
++static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
++{ ob->ob_type = type; }
++#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
++#endif
++
+ static PyObject *librsyncError;
+ 
+ /* Sets python error string from result */
+@@ -540,8 +550,9 @@ PyMODINIT_FUNC PyInit__librsync(void)
+ {
+   PyObject *m, *d;
+ 
+-  Py_TYPE(&_librsync_SigMakerType) = &PyType_Type;
+-  Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type;
++  /* Update for Python 3.11 - bpo-39573. */
++  Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type);
++  Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type);
+   static struct PyModuleDef librsync_def = {
+             PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, };
+   m = PyModule_Create(&librsync_def);
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
index fc69bee691f8..8c9cb96bac99 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.5-r1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-no-docs.patch"
+	"${FILESDIR}/${P}-py311.patch"
 )
 
 python_install_all() {
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild
deleted file mode 100644
index 144527672536..000000000000
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYPI_NO_NORMALIZE=1
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi
-
-DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-# Tests use a tox environment and separate steps for test env preparation
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=net-libs/librsync-1.0:0="
-RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	>=net-libs/librsync-1.0:0="
-
-src_prepare() {
-	sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
-	default
-}
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.4.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.4.ebuild
index 144527672536..883866476674 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.2.4.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.4.ebuild
@@ -17,11 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 # Tests use a tox environment and separate steps for test env preparation
 RESTRICT="test"
 
-DEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=net-libs/librsync-1.0:0="
 RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=net-libs/librsync-1.0:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 src_prepare() {
 	sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die