14 files changed, 240 insertions, 272 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index e67931ca525d..e9220055a17c 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index f2b999c4750c..0ae82351894f 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,8 +1,11 @@
 AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677340707e98550ab8e0d4c574a9bfe36fbb9c178f2050ca726ce995927bf2a186363243cc64f4e8be3b99a12b7b2b37ad0d4f6892ae6f730e48d SHA512 6484fdcc4ede6f5c57bfef985a290b9d8a74aecaea43e239a3368cf79aa6797d7fa4842fa331b259afd25084d9c514e643916c39c34d4a8b33bc668c93d9b180
 AUX backintime-1.4.3-no-compress-docs-examples.patch 5177 BLAKE2B 333ccfd9226bd041491692f27954ec02bcba20b56123864043e0faecf6367c54befbccf24616e14a110b6dda04dd07ec745efeac1d03e738d79559e6543dd51d SHA512 5f62c58d38ea5aace125b41d57501847a3fe82a2bf35630f92ca393fbab459f207e7e3530901e330da4c28642f44608620372620a21328316e7fd89baa5b710c
+AUX backintime-1.5.1-no-compress-docs-examples.patch 5048 BLAKE2B ad040805124b92b8f21e45576d5e4a757e34a3b6bcca72504c5d31d54436208a0e0a01cd027316224ca59d4178d502d6cca6414ef383b3cd1bfde8fddee4870a SHA512 17941b3cbc79e9e527483f570210682422de72f1922e4b038a76e34b92ae7a9edecae5b9decaf89834f2ec4edc6d0db526576acd6153c295f2d1670cf0f7f425
 DIST backintime-1.3.3.tar.gz 751422 BLAKE2B 5c6723d1b190c5331b8453d4cf2b14e00a4bb64777d73e3b2a1405be51ebc5418f749fca654032154f1cec2389efcd41e52c571c1f9f1f982bbd0adcb0b7dd59 SHA512 f91157133166869665c8d7475c870cd5418135e17f5e7c8ae5788eb8cd3be39e8ea3d7652aa5945f64d9906b6baed0ed3ee16eb46b81a088210459333efe9372
 DIST backintime-1.4.3.tar.gz 1900866 BLAKE2B ee9f389a7995e0ca059dab7f94ce59b2a0285bc213ffa2fcdc2d3ed2b9920762c16beb0c2d961ac922837c55fa30e1ce27a9de26c6ad0e879f5c70e876644298 SHA512 d5470590d9807c5f4c1c6f46062465ecac9432831f15d1948a95b3f7ba06015939eb292bbb53d2f039ef9e967a93b6bea0e08b928a009370995d0cc2db1f7fdf
+DIST backintime-1.5.1.tar.gz 2009248 BLAKE2B 5136b4c59f5d9e4d8e79b9e004ca666caf494d8613697a6a3ab1c9c31b42cbdcce832f821dc98adda624423101d15c787e730922da479bb7ae657cbf87375ad2 SHA512 3c629a49c5eb2e740dfdebd49d8b04cae6a15a1602a68429097d62e652c6fe18b5fdeb45460456c157a1e148cca30a220ccd4decadf7836487ba8c03f075e294
 EBUILD backintime-1.3.3-r1.ebuild 2143 BLAKE2B ed7bbbd80c7934977ae5db2a90d803660561d9bf1a9f30609ca0ec386e690a729f11d4faf350222a3cc7094097cf131fffb887b3c0c450926b2e167840494804 SHA512 648987a53be2b53891c35fdc3a6708feebd128d30273638f5fdd9617aebd55e9f38706a9806abfd8ddc7f490f23d25a60ac65a154adc0fa88ff5bf7081b8c660
 EBUILD backintime-1.4.3-r1.ebuild 2341 BLAKE2B 976b27c75a7c7cde84607e945d600058af3060206f922f7fde428c363c265d062dc151770c377393f3de9617cb35298cd93fcf967988280c9911957a5e041737 SHA512 2da5efe66d6c824dca51716e2327133cb6bf1b892e1b16299275b1f413592a7b9f8a786107f50188fb6ac2b42b81aa55ece716c80e2bae7a95b1099a8ea0e514
+EBUILD backintime-1.5.1.ebuild 2336 BLAKE2B 18c610f4c59aaf0431e2b4f18c8ffada61c354557dc3af15008d667a3c4d48277840e03e138519423e2f456d6662be2a933ee60f77278ebb1cb5b5db59eb74e2 SHA512 dd75730c49c9b87742c245b5f2406fb6a55782d0cdebf60322c5030c12930dbf90c8896c091ebbd4fc7622b2ee9228baaaf2a3b0fb6e7d637505e132b98f8350
 EBUILD backintime-9999.ebuild 2341 BLAKE2B d8dcd3d276d2f553049f9c206572d33ca7995db6362abad233ba9de2a2e714e8b1d1b1be3a9a39ab69ac4fae43232123e354ca8ceacfda0f7a34dbd2831b1134 SHA512 597e6b1bdcfad7452722aace771c923ccd7c37137552b2aec0582509b0445b9cbe922de0b1cafdf6d3c71349cf3cbacd6d4a1e0665e826749519910d286dc134
 MISC metadata.xml 749 BLAKE2B f8741c8434d71df70c6ad9859318c935343315f1da5d98f5635d7b85cf7235018661765da5f76e0b740c1969e3602f5fdf55a19590c42c76f25a65ba97f8420f SHA512 c956b979a350711b7ff5e880b26dd424f25c80284ddc9e79b683e88ce049a479827a4949537c60c09b32ff386280b436b23f5af7bb5e0162ba965121b1640db6
diff --git a/app-backup/backintime/backintime-1.5.1.ebuild b/app-backup/backintime/backintime-1.5.1.ebuild
new file mode 100644
index 000000000000..f0d3b8d77be9
--- /dev/null
+++ b/app-backup/backintime/backintime-1.5.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit python-single-r1 xdg
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/bit-team/backintime/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples gui test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	${DEPEND}
+	virtual/openssh
+	net-misc/rsync[xattr,acl]
+	gui? ( dev-python/PyQt6[gui,widgets] )
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pyfakefs[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.1-no-compress-docs-examples.patch"
+)
+
+src_prepare() {
+	default
+
+	# Looks at host system too much, so too flaky
+	rm common/test/test_tools.py || die
+	# Fails with dbus/udev issue (likely sandbox)
+	rm common/test/test_snapshots.py || die
+}
+
+src_configure() {
+	# TODO: Review https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#dependencies
+	# for deps (some may be optfeatures).
+	pushd common > /dev/null || die
+	# Not autotools
+	./configure --python="${PYTHON}" --no-fuse-group || die
+	popd > /dev/null || die
+
+	if use gui ; then
+		pushd qt > /dev/null || die
+		./configure --python="${PYTHON}" || die
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -C common
+
+	if use gui ; then
+		emake -C qt
+	fi
+}
+
+src_test() {
+	# pytest should work but it can't find the backintime binary, so
+	# use the unittest-based runner instead.
+	# https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md#how-to-contribute-to-back-in-time
+	emake -C common test-v
+}
+
+src_install() {
+	emake -C common DESTDIR="${D}" install
+
+	if use gui ; then
+		emake -C qt DESTDIR="${D}" install
+	fi
+
+	einstalldocs
+
+	if use examples ; then
+		docinto examples
+		dodoc common/{config-example-local,config-example-ssh}
+	fi
+
+	python_optimize "${D}"
+}
diff --git a/app-backup/backintime/files/backintime-1.5.1-no-compress-docs-examples.patch b/app-backup/backintime/files/backintime-1.5.1-no-compress-docs-examples.patch
new file mode 100644
index 000000000000..f7c56fd1e5bf
--- /dev/null
+++ b/app-backup/backintime/files/backintime-1.5.1-no-compress-docs-examples.patch
@@ -0,0 +1,119 @@
+diff --git a/common/configure b/common/configure
+index a750fd03..baf216b1 100755
+--- a/common/configure
++++ b/common/configure
+@@ -161,7 +161,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\ttranslate compress\n" >> ${MAKEFILE}
++printf "build:\ttranslate\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -192,28 +192,11 @@ addInstallFiles "plugins/*.py" "/share/backintime/plugins"
+ addUninstallDir                "/share/backintime"
+ addNewline
+ 
+-addComment "documentation"
+-addInstallDir                        "/share/doc/backintime-common"
+-addInstallFile "../AUTHORS"          "/share/doc/backintime-common"
+-addInstallFile "../LICENSE"          "/share/doc/backintime-common"
+-addInstallFile "../README.md"        "/share/doc/backintime-common"
+-addInstallFile "../TRANSLATIONS"     "/share/doc/backintime-common"
+-addInstallFile "../CHANGES"          "/share/doc/backintime-common"
+-addNewline
+-
+-addComment "config-examples"
+-addInstallDir                            "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-ssh.gz"   "/share/doc/backintime-common/examples"
+-addUninstallDir                          "/share/doc/backintime-common"
+-addUninstallDir                          "/share/doc"
+-addNewline
+-
+ addComment "man"
+ addInstallDir                                  "/share/man/man1"
+-addInstallFile "man/C/backintime.1.gz"         "/share/man/man1"
+-addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-config.1.gz"  "/share/man/man1"
++addInstallFile "man/C/backintime.1"         "/share/man/man1"
++addInstallFile "man/C/backintime-askpass.1" "/share/man/man1"
++addInstallFile "man/C/backintime-config.1"  "/share/man/man1"
+ addUninstallDir                                "/share/man"
+ addNewline
+ 
+@@ -237,15 +220,6 @@ addSymlink      "backintime"        "/share/bash-completion/completions/backinti
+ addUninstallDir                     "/share/bash-completion"
+ addNewline
+ 
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t# Man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+-printf "\t# Config-examples\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
+-
+ #translate
+ printf "translate:\t$mos\n\n" >> ${MAKEFILE}
+ 
+diff --git a/qt/configure b/qt/configure
+index b2044754..12741123 100755
+--- a/qt/configure
++++ b/qt/configure
+@@ -138,7 +138,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\tcompress\n\n" >> ${MAKEFILE}
++printf "build:\n\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -149,7 +149,6 @@ printf "install:\n" >> ${MAKEFILE}
+ 
+ # Migration
+ printf "\t# Clean-up installed old files that were renamed or moved in later BiT versions\n" >> ${MAKEFILE}
+-printf "\trm -f \$(DEST)/etc/dbus-1/system.d/net.launchpad.backintime.serviceHelper.conf\n" >> ${MAKEFILE}
+ printf "\trm -f \$(DEST)/share/backintime/plugins/qt4plugin.py\n" >> ${MAKEFILE}
+ addNewline
+ 
+@@ -199,15 +198,6 @@ addInstallFiles "net.launchpad.backintime*.policy" "/share/polkit-1/actions"
+ addUninstallDir                                    "/share/polkit-1"
+ addNewline
+ 
+-addComment "documentation"
+-addInstallDir                        "/share/doc/backintime-qt"
+-addInstallFile "../AUTHORS"          "/share/doc/backintime-qt"
+-addInstallFile "../LICENSE"          "/share/doc/backintime-qt"
+-addInstallFile "../README.md"        "/share/doc/backintime-qt"
+-addInstallFile "../TRANSLATIONS"     "/share/doc/backintime-qt"
+-addInstallFile "../CHANGES"          "/share/doc/backintime-qt"
+-addNewline
+-
+ addComment ".desktop"
+ addInstallDir               "/share/applications"
+ addInstallFiles "*.desktop" "/share/applications"
+@@ -215,7 +205,7 @@ addNewline
+ 
+ addComment "man"
+ addInstallDir    "/share/man/man1"
+-addInstallFile   "man/C/backintime-qt.1.gz" "/share/man/man1"
++addInstallFile   "man/C/backintime-qt.1" "/share/man/man1"
+ addUninstallDir  "/share/man"
+ addNewline
+ 
+@@ -230,11 +220,6 @@ addUninstallDir                                             "/share/icons"
+ addUninstallDir                                             "/share"
+ addNewline
+ 
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t# Man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+ # Uninstall
+ printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
+ printf "uninstall_files:\n" >> ${MAKEFILE}
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index eff8a5a27a9b..4c8964f1ff2d 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,12 +1,8 @@
 AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee002635d9090576ba785cf3b6da7c10a91f439fd8e11b335bb33dc9c3b7421b4a5a8982e2a5f67b723b06051969651d626f09bf972 SHA512 fc549c0a63a6182b1848d89a1c9aacd3057f07988d1e8ec3b6ae1defb0675e7b934b0c65c9b09edc431172bc550521058ab73cb64ae6e577072331d4d5269e78
 AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6e46102a5e558c25444d82dd3679b81c0ba50c72dfec8ce8f935fdcb558ff61fec7bf30409b4b9809d76e7488554f4461c4b5eac035a60c07 SHA512 9b4c65b249a033f17b68c5209c0132bd94e310d46193a9a85090cb8520220705aacd91c19d713e11e6955c1e0b1e09823abcaf8164ab0f162ff9a62652bb7e56
 AUX borgmatic-1.8.12-datetime-utc.patch 920 BLAKE2B d4cd88e05aeaac5167f288747035d9b74c32baa9303c97bf9a9c4c24581f9d58f7fc99251b9c0c6b263b1ddddbf675dbad3c2edff73a79ae29a526b87fa416ed SHA512 72d1ddd507f1aa4f22009971fe35d747f2dab7895d36b7c96c466ebe8d0bb8a0da48cb193c59cf7878986393a5116d30c422179646b9ee33629a60efd94ab1b6
-DIST borgmatic-1.8.10.tar.gz 599453 BLAKE2B 1ae994d452d29139d23940500d7c9f01e7fc1ddbd36254bf0c36d7f56064ccba7fb8434741dd0114d42271eb241098a12f8a07b83046447ae2225f7cd2ab12ae SHA512 10f5d962f6d25ef42ba4d076e238e1986dcfcd9832b3eea08560f367524824fdb0f80f42962ea6a471d711c6a0e293669b85abdc160475c20eed851ce7ad7f42
-DIST borgmatic-1.8.11.tar.gz 600265 BLAKE2B 04c5e419de892e636e644185681c3e9ce0ca2dd9b62a043dfdabd38a32ca2f101f6a845fd1ebc68a025625066ea9c53aff9ab1e831a2aeaa566bccb7ec4827c7 SHA512 da19a341713302378409c0e90395a0e5ac4759b1ef593fe53a50113a0c90f130af060d38f49dae80018b8d8605da87415b841fedfc2d2778eee4a690aa5cc311
 DIST borgmatic-1.8.12.tar.gz 602369 BLAKE2B 79589e1510be9065d70b48ac5b8ce83a8d82776040cfe0ec833e7c9cbc33e4d285a2292870e2237902900ebb03204c6aafd702a2729b8860aec234429ec00921 SHA512 9cb91a4e7047da4effff69dfaea2358bd0d0897197d306775a3e9e260a2da6cc183c7675e02885fcd3d853c185171372371638b482b3e8b2f1bfcbcb2a14e4b7
-DIST borgmatic-1.8.9.tar.gz 592715 BLAKE2B 3586404985b8cc0d5575f570ba6679c406e95b83453a7c2414872049067b1736010b9f8498fa92e91d281b1cdf75882bc09e40d6d9e443bff33c399ee1392ff9 SHA512 05386f6321d78e304030ebb78c495aee53a1b6f17241f101e73a097aa4208ac641d6105b1e8161cf714b2eab7c34fe682e082e9e997dc4ac6a6a4207253e8421
-EBUILD borgmatic-1.8.10.ebuild 2114 BLAKE2B 211a365fbe7f4a0caca44b1118348d0ca0b5a63655e79fc2ce710fd203d6c3269505d3bbdb6475897b9faa0fcddfab8995b9b01977cebdfc86a035ff17fca4d7 SHA512 3237f5954d637154e739d3c5d8e39267511b8b3cc69bcf8d7a9ce3e0f49cab4603c41ed59917019532946f7ba659a05ba8a1504a0348fa6d14e11f0cf0d9c2f7
-EBUILD borgmatic-1.8.11.ebuild 2114 BLAKE2B 211a365fbe7f4a0caca44b1118348d0ca0b5a63655e79fc2ce710fd203d6c3269505d3bbdb6475897b9faa0fcddfab8995b9b01977cebdfc86a035ff17fca4d7 SHA512 3237f5954d637154e739d3c5d8e39267511b8b3cc69bcf8d7a9ce3e0f49cab4603c41ed59917019532946f7ba659a05ba8a1504a0348fa6d14e11f0cf0d9c2f7
-EBUILD borgmatic-1.8.12.ebuild 2179 BLAKE2B 7b51da55d819112cd8929129bdea99852946f13d1bd7ca8cb51015a4b5fa6739ea05447cd2cfe83a3eb7fa45a53aa8ab8f975a5050ca7b6b149190a39170ae66 SHA512 f7031663d15547c7af421b1c912d1cb0dff05eeebe700be0135234e4aac69c18f40f86de96f3b98a23d14a50cacde560e0ff5a812c91ea19ac9d6aa655defd21
-EBUILD borgmatic-1.8.9.ebuild 2113 BLAKE2B fd62e06d43871b3c0d1ed770e46b16ec709df12bda518d7bb9786825a6d0fc0964cf1745d1cf3ebf8da0047ae242374d49b34695e90a51ad8e2559029986143c SHA512 50148509d71cd0c0bc219d625642b6ae6f35306cb8ecdcc3f571049ccd0902b40c247c729aec10d9ff61b5fa6f999100149837675d1fd97c63d41c5fe261320c
+DIST borgmatic-1.8.13.tar.gz 621942 BLAKE2B abea4779d6b8dc2e7885c4e5ff4e6e4a472ecdba8b248f28b137ab25df5c12ce31e71489485966a0df27c8ff388476049ed8f58fcd53d16d09f01e9fa215ac0e SHA512 0057ba195c493c47ecb4eaaca1987b68c332632ebe5015ac20cd5f59f3f8f8b00a06749d828f003866986b3f70c3794a945577f4f49bf775153aa0f75fdfcf49
+EBUILD borgmatic-1.8.12.ebuild 2178 BLAKE2B c966a5c3cf673a52e3f3b6918eec7fdf139a8baece51c92acb81767e7979af33bc12254283262925f33cfa403367e068ab1b1e46bfd1f16c1d616aa8c140c202 SHA512 b98a448e87bf51f2eb7e03b7aa53708b3f8dd640fcbc553cd6838ffb836f64a710f5df23364673a2739ff496b8764afacbc38ce567c7777d31d2c4d9f39b9a1a
+EBUILD borgmatic-1.8.13.ebuild 2120 BLAKE2B f197d4ff641ddee4b641f1bbf325dd9830ebd80d96299bf6e51536ee0963ac9d8b2324083513b0e74ab40a8a3d057a2636360d9e9c3eeff81b9cab9e0ee0b9bf SHA512 7e2f2c43f365244b172de70d7098b6f97a4aab31198a997ab24b74eaf58ba898f16a5a74f0fa4597c72236a490881c7f18a723239367d043962b0fc789fb1657
 MISC metadata.xml 461 BLAKE2B 700c5863d623abaa1a88f91ef5281c6d3d8c2ce8eeb5b15cadbbd93b1d50bfce5445cd2f133bbe998da36de9e2953ce154e1b8eb033d36f33bb88881e672aeb6 SHA512 e739f7ff60f69c3b4d5c72daeda65b9c042bf01d74ce6a60b2684e7e52eea5deaa946a2aa5f1dc84ae16f6eaf4bff8f46628f41ba55c394ff4fe70b5935663a2
diff --git a/app-backup/borgmatic/borgmatic-1.8.11.ebuild b/app-backup/borgmatic/borgmatic-1.8.11.ebuild
deleted file mode 100644
index 09e09f4eea4c..000000000000
--- a/app-backup/borgmatic/borgmatic-1.8.11.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
-IUSE="apprise"
-
-REQUIRED_USE="test? ( apprise )"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	')
-	apprise? ( $(python_gen_cond_dep '
-		dev-python/apprise[${PYTHON_USEDEP}]
-	') )"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    ${PN} config generate"
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.8.0; then
-				ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0"
-				ewarn
-				break
-			fi
-		done
-	fi
-	elog
-	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.8.12.ebuild b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
index cac1b9a834e8..6d9d450762e2 100644
--- a/app-backup/borgmatic/borgmatic-1.8.12.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.12.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://torsion.org/borgmatic/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"
 
 REQUIRED_USE="test? ( apprise )"
diff --git a/app-backup/borgmatic/borgmatic-1.8.10.ebuild b/app-backup/borgmatic/borgmatic-1.8.13.ebuild
index 09e09f4eea4c..de16568a999b 100644
--- a/app-backup/borgmatic/borgmatic-1.8.10.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.8.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
@@ -17,8 +17,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 IUSE="apprise"
 
-REQUIRED_USE="test? ( apprise )"
-
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
 	$(python_gen_cond_dep '
@@ -34,6 +32,7 @@ RDEPEND="app-backup/borgbackup
 BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
+			dev-python/apprise[${PYTHON_USEDEP}]
 			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
 		')
 	)"
diff --git a/app-backup/borgmatic/borgmatic-1.8.9.ebuild b/app-backup/borgmatic/borgmatic-1.8.9.ebuild
deleted file mode 100644
index 0155eb3b0714..000000000000
--- a/app-backup/borgmatic/borgmatic-1.8.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd pypi
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="apprise"
-
-REQUIRED_USE="test? ( apprise )"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	')
-	apprise? ( $(python_gen_cond_dep '
-		dev-python/apprise[${PYTHON_USEDEP}]
-	') )"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.13-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.14-systemd_service_bin_path.patch
-)
-
-# A fragile test whose only purpose is to make sure the NEWS file
-# has been updated for the current version.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    ${PN} config generate"
-	else
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.8.0; then
-				ewarn "Please be warned that ${PN}-1.8.0 has introduced several breaking changes."
-				ewarn "For details, please see"
-				ewarn
-				ewarn "	https://github.com/borgmatic-collective/borgmatic/releases/tag/1.8.0"
-				ewarn
-				break
-			fi
-		done
-	fi
-	elog
-	elog "Systemd users wishing to periodically run ${PN} can use the provided timer and service units."
-}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index b6936e064446..d0fed7b54031 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,3 @@
-DIST dar-2.7.14.tar.gz 2443548 BLAKE2B a68ad06a2bf53b25a0b393f3e85eef5676382d63bfd86ba77696667786a688e326c118d937cd5dae6b1e78410e40295c67d8ba4677c37f7139bbdd2794c4efeb SHA512 0436c67e0dbd8f5e96e01a0db48a469d80fb81a7c7f37aed98308bd55d60d699b21c755d95fa83891690231fd2510eaa6c6652fb99a1bad9c8210084031391d4
 DIST dar-2.7.15.tar.gz 2443741 BLAKE2B 6af22a471dc0b5230843b73b7bddf931c281b8b3f0ea4cf1eb01f37e06651fa90a06b3e45be342ab799960f27460dfa8b95022791b9b471df2834a786784951f SHA512 c35c47c5ef307e3a36394cff44b37de0b9e7ad95d2810de476197897d368fa20401d567b18b763d39663167ec2ca093e54535fb5741c99a8e4bf9b78a460eaba
-EBUILD dar-2.7.14-r1.ebuild 2315 BLAKE2B bc9c627c7c9a5fee8a97ddf4bd0edd1c7cb695c4c38203f35d2a2a2697391c9d2325e85f1ea1c99dfce27ce64bedf268401ed707713e210888132357c6f3aef2 SHA512 2406619a8267e427a831962bd648f29b8efc197fe760888d32d94a744bea54357343eaaa04b9a5786fcc89d8f92bbc13de077429940508685525691ef7e6064c
-EBUILD dar-2.7.15.ebuild 2325 BLAKE2B 44d4fe13038f7dfe838ad4d9943d9bed7534e2d0ac60491f048bb66a8c319d87050d08e14efb3a677027c63f31c5ac0b3ba7e53be9f69c68afbb6929f91185df SHA512 0b62b4619ef9075d00e1ff326540ffe0312a412b920778fc9a380f9d66b138fd7a119c5ab6b545678b8bb737a74197b9208b064508be4e1dee0da950267a420c
+EBUILD dar-2.7.15.ebuild 2321 BLAKE2B 066625f535504d11f59303bf88d5df20712ce59e1c0423a40f85a49de50cec5f41624a94738218e9405bf07e3f4958c0a132301fdcc1ea4e4a68c2819778ff0b SHA512 4bab29f6debe6297d334d1264e392f09588bfdd8de89a57cb844a660e12b271782b8a1e5646b4e6072b3966133beac0d0575be64c4e9f8fbeea484e5f41b8b91
 MISC metadata.xml 1180 BLAKE2B d978c1b969e7aeb013862c6b76ceb7b466af7b0a16d334bfbaafcdb49e13b4f07727073ff8a24da0f0422161f48805310b8ed7c0cc97b07190b241ad77cec254 SHA512 f8107b5f81d0d00a1873089b084250c98094625274b9c01f8ca11f6dcfa890278ec89d039849c203ccccc8115d54ee3f9365d9f6afc38cb3411f6292c62c11c0
diff --git a/app-backup/dar/dar-2.7.14-r1.ebuild b/app-backup/dar/dar-2.7.14-r1.ebuild
deleted file mode 100644
index e155de50717b..000000000000
--- a/app-backup/dar/dar-2.7.14-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
-IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr"
-
-REQUIRED_USE="
-	?? ( dar32 dar64 )
-	gpg? ( gcrypt )
-"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-libs/libthreadar
-	sys-libs/libcap
-	>=sys-libs/zlib-1.2.3:=
-	argon2? ( app-crypt/argon2:= )
-	curl? ( net-misc/curl )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	gpg? (
-		app-crypt/gpgme:=
-		dev-libs/libassuan:=
-	)
-	lz4? ( app-arch/lz4:= )
-	lzo? ( dev-libs/lzo:2 )
-	nls? ( virtual/libintl )
-	rsync? ( net-libs/librsync:= )
-	xattr? ( sys-apps/attr )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	doc? ( app-text/doxygen )
-	nls? ( sys-devel/gettext )
-"
-
-QA_PKGCONFIG_VERSION=""	#862025 - upstream has a different numbering scheme for libdar
-
-src_configure() {
-	# configure.ac is totally funked up regarding the AC_ARG_ENABLE
-	# logic.
-	# For example "--enable-dar-static" causes configure to DISABLE
-	# static builds of dar.
-	# Do _not_ use $(use_enable) until you have verified that the
-	# logic has been fixed by upstream.
-	local myconf=(
-		--disable-dar-static
-		--disable-python-binding
-		--disable-upx
-		$(usev !argon2 --disable-libargon2-linking)
-		$(usev !curl --disable-libcurl-linking)
-		$(usev dar32 --enable-mode=32)
-		$(usev dar64 --enable-mode=64)
-		$(usev !doc --disable-build-html)
-		$(usev !gcrypt --disable-libgcrypt-linking)
-		$(usev !gpg --disable-gpgme-linking)
-		$(usev !lz4 --disable-liblz4-linking)
-		$(usev !lzo --disable-liblzo2-linking)
-		$(usev !nls --disable-nls)
-		$(usev !rsync --disable-librsync-linking)
-		$(usev !xattr --disable-ea-support)
-	)
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
-
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-
-	# Bug 729150
-	rm "${ED}/usr/share/doc/${PF}/html/samples/MyBackup.sh.tar.gz" || die
-}
diff --git a/app-backup/dar/dar-2.7.15.ebuild b/app-backup/dar/dar-2.7.15.ebuild
index dbcd82bb8c00..eb57b2b189fd 100644
--- a/app-backup/dar/dar-2.7.15.ebuild
+++ b/app-backup/dar/dar-2.7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dar/dar/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr"
 
 REQUIRED_USE="
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 955ef58b0978..a8ec5a8bcc54 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -6,5 +6,5 @@ DIST restic-0.16.5-deps.tar.xz 172231640 BLAKE2B 76dafbaf761a62c3830fbb44f2f64ed
 DIST restic-0.16.5.tar.gz 23990221 BLAKE2B ffdbcbcd5cbd2c22009c7d9c58cbc943c542cdc8d11e2a41cd87df58e0319ec396d6d880396aaaca103012efdfbb68f4fa5d42bd7f3df9208f9b9d80b6dadf0d SHA512 57a1829e28c4317172c06e095d91d760466c589cc9d2f2a5f20491ffe60f7a7c60e4666377fa5ae275b3238c10c27ab9265ea4f9f98c34b288fbd1e70a0814c6
 EBUILD restic-0.15.2.ebuild 1123 BLAKE2B bad05f9623f42c02e02799d6cf8937b4a60633a3c6c5c80c1665c38924cbfa7e7e66695ba53b974afb331c0f6283efc65c33d62913c7ad58087bed60daf4d1e5 SHA512 f67d7375f460c521f7825000e0a0a37ca79051a82df30e9d741a83fd0e1cc52418ac956631c044fcdfeb20fafdbab771011f1c054c0dcc8aa57d1538d9dadf9b
 EBUILD restic-0.16.4.ebuild 1150 BLAKE2B 7237f258e2582f96117347d1f55fd9af01c29c525287dbb09ad63bed7d14852e4e483091498b30be90c6ce4be696e13e4f63e489a950af53fc6802926e38026f SHA512 b997b64cd92075264cbddf4e2e107e2d5e4778746a21baf77f57013d5dd57608f3f25025b75117cf7c8ab63a184e323580845f34d2a128a92518ea78d050ed31
-EBUILD restic-0.16.5.ebuild 1154 BLAKE2B 59673198d2ffae0cbbfc2d3317c4bdd8aa9745ad2cacfbdbedd6909b17cc3c2819b40e70b8c3367304647b42eff0cba9d7c7eb5a7cc034fafb466e672a81984a SHA512 1ccf51b3073297c4a8808b3b67f7145cd1e5af30b58d9f028115266ed2de2a09250283d80161dab93ea2e0f263846ac9707a95f7892ce152bede4251348bff0f
+EBUILD restic-0.16.5.ebuild 1151 BLAKE2B d3d17f41ea7bdbde087829dac8bffcdd0e4babbd9708c00efc25b606e45c21444decf2388687bb6e4b1b09ac1942f275624a75e278378796cb0eb858f8b53859 SHA512 83ae1162772ba5fc19a5c6bfca8b2aa5786ee838fd930e80097471419356976c841c1938886cdfbc672e6065e9ec2a6977c86d235e9e5641f7a1faab3b72cbe2
 MISC metadata.xml 584 BLAKE2B 76c5cf916e847dd9e8cd3dd205c9c6e68198aed895c1067ddb7e73a6e8610d973313d6ffc553c89ea5ca1caecf1b19d02424ec3f693a191e85a1a9ecae1e4721 SHA512 676f7b108bae1af9ee9431f9a08b8870a8207a92ec3214cd2d5774112c1065453a5c8f56c1e0a49180ba2c32a02c990494cb85a15487be62e02d76580eabc611
diff --git a/app-backup/restic/restic-0.16.5.ebuild b/app-backup/restic/restic-0.16.5.ebuild
index 1f7370b91e27..f8da04ab40e9 100644
--- a/app-backup/restic/restic-0.16.5.ebuild
+++ b/app-backup/restic/restic-0.16.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}"