gentoo auto-resync : 25:12:2023 - 01:35:27

12 files changed, 96 insertions, 115 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index c817dccbafd0..25b6fa6e08a7 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 6954761f111d..4f298b0b9426 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,6 +2,8 @@ AUX borgmatic-1.7.13-no_test_coverage.patch 248 BLAKE2B 624e21cc8971d9374b34dee0
 AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6e46102a5e558c25444d82dd3679b81c0ba50c72dfec8ce8f935fdcb558ff61fec7bf30409b4b9809d76e7488554f4461c4b5eac035a60c07 SHA512 9b4c65b249a033f17b68c5209c0132bd94e310d46193a9a85090cb8520220705aacd91c19d713e11e6955c1e0b1e09823abcaf8164ab0f162ff9a62652bb7e56
 DIST borgmatic-1.8.2.tar.gz 396972 BLAKE2B d9444ec49c3d325d865d553fa1cb28de9416aa36e999ef6452c62a9a6519e58afbc922398c52f3a1de441fd8da02e5618bc03a67baae161677a15a1780209788 SHA512 8de49c071c54516d0fb3f0d918f05226ac00519cc0605eacf204795a239554764fd1f3b0f44f3110fc551d6a89e92a59ca34ddebbfb02bf3deabc326f81ccf9c
 DIST borgmatic-1.8.3.tar.gz 399031 BLAKE2B d560ccf69f86f35951521e44fba03a4704161abfe1208a8ef23067ba09b0060be84605761a2fa0b0878d466df10391a9314e85480c15af22faaf326c84211dd9 SHA512 3f798fddadb12742928e1542d1c71838b58870ecea18c62b260829880ae7ba0ec26303548a60ff7c8071b49eb630320bb055a9a1d67e4952c8952140f09100d2
+DIST borgmatic-1.8.5.tar.gz 580628 BLAKE2B ca4ae3fcda05ed4a7b11e98f767853920d1ed3053dedaedeaf16124c43ae32a4d89bc2a1ed594d88cb1e8da9da79ad75459dd3a8034b70c1a2d8b57776b1a725 SHA512 96681ee9d4aa55edeee1ab2ab2929022a3c49c60a20313c129d53736b40b0c46a3a6a5537ba3355d7cef74988655ed5af4ab689df9130de1373bcf6a8a665a9e
 EBUILD borgmatic-1.8.2.ebuild 1991 BLAKE2B c81061d1394caa8b6c262f966f3517f64cddc5f127a90b3268054117969ad7f5780c908f87ca04a2846326e2de9bfc84a26e8cc4dd82f08d8a54d90ceb3b8ab1 SHA512 1f13689944960516ff9906ff5006a6c83cc8ca822c996461998800003b149a31ab62dd0b9cc5223fed1e9866d1fd5eb85bbea10ae923b623f67a01067c907401
 EBUILD borgmatic-1.8.3.ebuild 2033 BLAKE2B 52d195cebb9984138268dc46da264cf72b5e67f9a8199974d68d795c439638516c925faaf6ba2ec6f3a63118347f59c6f1372bf4d96ccb27c3bbdddc8261aa56 SHA512 3da0753e46ce7bedbf78d1ab5a6ab10d1601eb6cad75eb4629445cccbcfe4e866a62b6f2e23fecd5551fa5fc5aa90f3d5ce36c8a6c72919b1604c28e4804cee2
-MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
+EBUILD borgmatic-1.8.5.ebuild 2144 BLAKE2B 119c1599ac1f8a4700091db3e1fc5b18171c38674334be02831ff30a8c616fd2108edc493e50b4b14ac8b78851f825f6aee28f85381a567543643e4248568feb SHA512 171de12f4c71f7c73df82bdc616184252b9583fc86cf1c624ec99343942579493f2c2c22f0d686a3104d3aa42329bd9a4cde002e02409ffe2cd3860e06c7ce09
+MISC metadata.xml 536 BLAKE2B 5e80422f7eefe88fca9b77830cdbf2a63beb4249afe374d39e961620bea17405e723bc942f2d6f99a5745b3ec3b9580b5e5045e9d533d5374f9fb02dc422faa3 SHA512 ccd19188ccba5f80dd6d12e43a84bcf5db3ca0ff3f7f7a6e42c4971d7a41931221677cfbe24e6f1b1f1f1fb77223e4ccb7dd44e1102beb431765fa9654a4a866
diff --git a/app-backup/borgmatic/borgmatic-1.8.5.ebuild b/app-backup/borgmatic/borgmatic-1.8.5.ebuild
new file mode 100644
index 000000000000..fcbf7c22109a
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.8.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 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 ~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}]
+		dev-python/setuptools[${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/metadata.xml b/app-backup/borgmatic/metadata.xml
index 8891ce86c8d5..4365e7fa2b90 100644
--- a/app-backup/borgmatic/metadata.xml
+++ b/app-backup/borgmatic/metadata.xml
@@ -9,4 +9,8 @@
 	<remote-id type="github">borgmatic-collective/borgmatic</remote-id>
 	<remote-id type="pypi">borgmatic</remote-id>
 </upstream>
+<use>
+	<flag name="apprise">Allow backup monitoring to send notification to a wide variety
+		of services, using <pkg>dev-python/apprise</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/app-backup/cdbackup/Manifest b/app-backup/cdbackup/Manifest
index fafed1f6aaa0..23dc9cb47775 100644
--- a/app-backup/cdbackup/Manifest
+++ b/app-backup/cdbackup/Manifest
@@ -1,5 +1,5 @@
 AUX cdbackup-0.7.1-makefile.patch 686 BLAKE2B 2cb4dad8c11a8f8d8f4858a5ba9b66eb5852925bf0b2d5a1527695032af4e3424d9e3006234cbaf23f5fef476fc2fcd3fc0c055df6fea3cdfeb02d9dc1cab53c SHA512 d3ace496c1195969f4b2cea0185dba4ad1c7987ebab9805e3c4badc65311647d8835deddd1835817e8543556d5e8677fc83f523f7b65f6fffc4ef915a948b377
 AUX cdbackup-0.7.1-u_char-musl.patch 295 BLAKE2B 9b45c61cf65b9888712e2822a5d634a8437157d49a4e12da287dfc2197c307b3c967b3fb0db8fa6a9bdb9c370007e6ec0b26d10f06ba25fb2c903a30ecdbc8a2 SHA512 0ab371124c1924f02e54de8dee09cee4a6751cd21e0ab83ffc56fd9dcdd85e7be14c064d51e62b3c4f843e80fdf2a97be8f1a7d532fa2fb8619558f3dbf76699
 DIST cdbackup-0.7.1.tar.gz 22710 BLAKE2B eb21cf8ebd0c0a5487a86fb1d8afe7743be070743bdf3245fd4131c06c8ffe97b4bb93096e8952fb8479fac0cf3d764375478437691386ab762607aa420f8540 SHA512 9246295090a7d52ff452d5d24a429f2a21179e4d8deb4e9d6f2ab607dd04230830e3524f25d0180e36f62c7f7f87dec11cb3c1c01cde51708d467d6e0a4afc8f
-EBUILD cdbackup-0.7.1-r2.ebuild 617 BLAKE2B f53b4c8c4d9dfa7ce5ac3076c521e0f17a4b95594cc568fb91b98f949f0e9e6be98d3390f32d5ae24a483cd34115173502b2ee83c79f19631d3b5e375cb25bec SHA512 2047408d77c3e7741c1ece1a9bc8cc79fbf601316c8ed56e5c46b18261c469dc2d3bc05c6b40e6f8e2f9469dc78b11bc3df83befc1ba34cdab47ecd0477c0244
+EBUILD cdbackup-0.7.1-r2.ebuild 619 BLAKE2B 39286c4c2d1ddd5b502fdbd5cf5716f48bb5a7b2b0c1a9e2449a0ea2fcde05f5eacad43b53d8143ddc7724c7a2f562d5fadbd598153a7fa7722c46bd35cc3850 SHA512 87564b712c051285748a3e794eee6fc27299ed1daea7e4d70056b78617623c9b25d995a5ba22717debadde18ab6d0d1ed0437c487d4dd98f5964d6c98c6ddbfd
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
index 89093287bfc2..84e00c74f339 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit toolchain-funcs
 
 DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s"
-HOMEPAGE="http://www.muempf.de/index.html"
-SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
+HOMEPAGE="https://www.muempf.de/index.html"
+SRC_URI="https://www.muempf.de/down/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-backup/cpdup/Manifest b/app-backup/cpdup/Manifest
index 476bb7bd5f27..cf8a34d4f7ce 100644
--- a/app-backup/cpdup/Manifest
+++ b/app-backup/cpdup/Manifest
@@ -1,5 +1,5 @@
 AUX cpdup-1.18-makefile.patch 729 BLAKE2B 23b9debbd16733e68459af41438c0cb22e7a5fe4ea9cf8bb7ff4f53067884a141788eacd90a1528601f1eb9460805b105e24db4b2ad5648932ff209a37fd14b1 SHA512 afc0863fbbc7c7ff0778ebcb9373f5b3340cd79412a769fa1ddddf6567c6d4bcd876a618d306011b1a6538fe73ca1c0a38d7d193e598a28f3692b5b3903cf2b3
 AUX cpdup-1.18-portable.patch 3652 BLAKE2B bbca984a31436d56b16e34fd4fc68af5aa304cd82563166ff97572bd7a53f0dd7ec053c75f6ee8a2e60064fcce3ec42b8c68ed0774ce6c4d0e68aaebe6706cc2 SHA512 579d3f2a3df106889c3393b9f682a9382a57a20ecbedce61cc75490b09df2ef404e0bcdef196c3d4a4932af65a1c8eb98f0c98dd40aeb6abe50be4d5f02aab20
 DIST cpdup-1.18.tgz 42841 BLAKE2B ebf18fd13b465be8483b9aad7af5353343e89e6960da967ddf59e7186bd199604a0d2b2d637efbb4d4d4f57611a3c600c5586861ef9780342d0ebed5de1ca3c8 SHA512 5c57be20951005d731866629a601b6dae91e112067f103d6cfc3f668fbd88b3b7b65990d9fad55f18c0e8238c2642a7b85aea543a0787f21084bda35e0da0e26
-EBUILD cpdup-1.18-r1.ebuild 690 BLAKE2B 35b8822a80769167a3156767956e589defe89b547a090451a046ae2045fc4ea26c6c4da0853a1f1e1377bf7abfbf1f100030fd172b1baa017bbfbc6da3061538 SHA512 b27dce969e6989f110e1dd829738289e3dda3259d8a743f41f0247512b5cdb312b4e8c152f03b769e9511fe5df0250bff59cedd32e963a484908b38a3df1892b
+EBUILD cpdup-1.18-r1.ebuild 690 BLAKE2B 294327bc7b671e9ea46e473ca23d1f610ceded8dd517a0a3e86fd3afc2baf6d9b95c82f41431dd0e6a7b69716238194fd46197e31649ffb15b4fcd81bf475ca6 SHA512 06a27c340cbc0dc20850cb5bfde5be489574b44b5f6d1ad29307ac42bf550b768937a0d3ce15b942aa76f4dfa235cf91ae24a3202e82cf5e5202d7fcf0a33be4
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-backup/cpdup/cpdup-1.18-r1.ebuild b/app-backup/cpdup/cpdup-1.18-r1.ebuild
index 5e6eccb3db93..1af7748bfda1 100644
--- a/app-backup/cpdup/cpdup-1.18-r1.ebuild
+++ b/app-backup/cpdup/cpdup-1.18-r1.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 inherit toolchain-funcs
 
-DESCRIPTION="A comprehensive filesystem mirroring program"
-HOMEPAGE="http://apollo.backplane.com/FreeSrc/"
-SRC_URI="http://apollo.backplane.com/FreeSrc/${P}.tgz"
+DESCRIPTION="Comprehensive filesystem mirroring program"
+HOMEPAGE="https://apollo.backplane.com/FreeSrc/"
+SRC_URI="https://apollo.backplane.com/FreeSrc/${P}.tgz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="BSD-2"
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 4fa2166e20b2..37bdb2fe0bc5 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -3,14 +3,10 @@ AUX duplicity-1.2.2-fix-docs-cmd.patch 616 BLAKE2B e138d8778896254cbf0daabf5457f
 AUX duplicity-1.2.3-fix-docs-cmd.patch 621 BLAKE2B ca8f2aa4099ffac152cb7844e5f871679fac0a8c28a19f9c445b820b4a40ec95835f70cdbd2db16f22e2f7dacbb961147f85810682744e058525930ef78dd4e6 SHA512 df3da633bd6d2d1ff250a8d51824be13756d59809fb893ddc48fa7449ef80b5f43464bbfaaaba5efb1bbb3782745a2375e321944b86d2e902f617381b088a9d9
 AUX duplicity-2.1.1-fix-docs-cmd.patch 612 BLAKE2B 5ca3ddb929e492d54ff337b08d5e729c2e54054838541783eee9685313191e844eaadc19362c488c24d3cf9538bf279729b021ed458af1cc34d1034842467f10 SHA512 531028745892557ea133c28d0c6f8816991bada6f5134e5623eeb83db35e1d5b59790458406279af427a2b166c3b5d5d22b052939f8ae34b4dfd0699ed318fb8
 AUX duplicity-2.1.4-fix-docs-cmd.patch 583 BLAKE2B 0f57dee13013e53b21196a2ee0a6518d472d20203b69daf0042051d3b3b0288d376b505167c3442da1ff7944e7f7e5444f0c5cd25a54ebc89ed87ca7f84f8b31 SHA512 a438332f371f8c23ddcb7ef66820490652cad6036e93b0e1bf258a979460f512e091cf562d301aee4d8340feb0d7ac780bdb740f75fcbd9427f682b6131cbe2c
-DIST duplicity-1.0.1.tar.gz 1928618 BLAKE2B f7ffdd488e42219b66b6174dbb944283d02910f57cae9fcf849e8f5363986664a49ba7e316d6b3efdce89deec7e4c6a65a95bcb365fa23b928244b5e8f29d48b SHA512 dab8341b990b1899de6080f2539681f0a84f1875fabf04ccd68908e8dcdf55cd31f26d1431488b49ac6b048a1e7ff2e0a0afa27f6eccfd6a20f47dd7193b4563
-DIST duplicity-1.2.2.tar.gz 1427493 BLAKE2B d30f91054c59695483a60a684ebc11440b1a490dc635fdc856d7e3e75d7c3b8bc3f8680ecec0af435fe3064c292c6ff0db392e6bb33c682e9527561196e842e1 SHA512 5da4addd0742afa93c62c506f49235b396a7d4bb6576bfd5ec223e04936072ef92e874c533f0f7ece3c1460bf017c2e1875d4ed5c08181113e2509dd28b4521b
 DIST duplicity-1.2.3.tar.gz 1438570 BLAKE2B 12afa69f537d2207343c1638df1cf69ad3e170b2f1368e5d8b86716ccc67564834798e2076a90f021bae8f1d8574ff50f0615fd873cdcddf1399349974d8d4c2 SHA512 d2a31b4ed2c0a188d6d2ac543d3d4a474b4c10028a3005b26f57bd57e8c7441eb96e361aa9805fedc6aa09e76e86d3d1e99800669dfb7b2510233e2c0aba15de
 DIST duplicity-2.1.1.tar.gz 1420132 BLAKE2B 35cfa7c6c2caa647f3b2046783185973203b5d838c0d1a1a8e24982f1c7f74a1d025e0b0740c0c7bc14d516c59d3e691a2712b19b30882e9dbb411cecb90f4be SHA512 fb19b1723e1e220ca72a41c3678ca29d889b2315c7fd043334d55cc2040d991e66480d71c6cc3f2ee5d17d9e1d9fb24ddc4c0ed771bbbefb6f1f6aa14cbe0347
 DIST duplicity-2.1.4.tar.gz 1556341 BLAKE2B d8302a7097519fd593fc05c8390101e615eaf11333e9d15e1ba7756b8ed9764709db80df41c741ee39eda0fa6de22c910b53db32d558c1ab09867c66724a056c SHA512 91804c6f4dc13d700cbe4747317f9611f530996de8a22a0907d714fb6f8a7fadc3371c270a2257c24324c0233bb4501a4b7d33aea7631862568c8530f7173ef1
-EBUILD duplicity-1.0.1-r1.ebuild 1093 BLAKE2B ad89ffef1f265315f0d17557314d3d864a8220d4891b08e01a1077abadad66076530fc03ef4ba20e12d9c2621368cab486b84035389e6ab64477d3b52613fd60 SHA512 6c0c8a13954b22ebe7b24ff1aee17d505ca4ffcf68e28168456d4b33cddf6d3dd2b729846df878de1bb6410f32cdcb3a3dbd03505f06254bd06b7dd64e30bcee
-EBUILD duplicity-1.2.2.ebuild 1127 BLAKE2B a7aaaf28b6fef482d6859f9a15e54ba8e215226b5f8bd67284955e107e15b40cb8797589a804c347b083aa4b9e46558742e3133a25b7d6f6a1831fb44fb4cb26 SHA512 a7986e75be1320bf0c9e9bb00d23a9f2888efc16bcc9e4b4e0f00e38f8580a878658281c4baf8aa00dabf37e562055fe99179e879445eaaf67fa92a6de3f60ea
 EBUILD duplicity-1.2.3.ebuild 1125 BLAKE2B 9874a0f6755e920108d0f470ed49019244f490f2b0e3b6764b81760d5e0bdfcbe2687ea0195e6fa7477e74ab9d040f9271d69eeee205436952621c036bec1ce5 SHA512 ed5c81c476a67b5d0680a6277d6f0001140cea1916ddecc9cac695183948a89a20528af83a6c0f148220d28bb5abc6805f81e07cecffba2b6298700b9b047314
-EBUILD duplicity-2.1.1.ebuild 1106 BLAKE2B 00f2105cdc6b2f27998734a9cce83faa46f33c8010fc86739a4e1477d48356fe9c80af65062f52f20a633c68a010b0cc674bffacb91fa8b3239be146fae34e57 SHA512 9df3d61d61a466351cc0991ba70a1a212ea07900634cd3dbaf21ab357ae27b429d1d208df4169928cbb5b11fe87e0615e43a2ed3ca8db106cff484a7ec83b174
+EBUILD duplicity-2.1.1.ebuild 1105 BLAKE2B 4692bad0d78c119663718d6a9003bf3ed2cb5efcd12928408b7436b65d4eb76e7bc57802673da348e3c4472a64c9468a9a33cf4adb04d7ca88679073a0e900c6 SHA512 aca08b7e7b068422d6b7416d66c159e947df88f1d2a7855a00a9e2893cc2dd041e3cc65655247aa77cf4116f1876c6cf53f25b3262b8b9680295b5d160965703
 EBUILD duplicity-2.1.4.ebuild 1106 BLAKE2B 00f2105cdc6b2f27998734a9cce83faa46f33c8010fc86739a4e1477d48356fe9c80af65062f52f20a633c68a010b0cc674bffacb91fa8b3239be146fae34e57 SHA512 9df3d61d61a466351cc0991ba70a1a212ea07900634cd3dbaf21ab357ae27b429d1d208df4169928cbb5b11fe87e0615e43a2ed3ca8db106cff484a7ec83b174
 MISC metadata.xml 404 BLAKE2B 9fa4c854c3f8ad4cf2583806f1335a86271123390ff3b2ae887fa5c2acae5e7a69c38a79d6ca09d9a6a30d2d81b5806f1fa0e580a55ac37fa61a54a52d348193 SHA512 9c0ff92038e96fca050bd49d48d5dd0027fa1e5e1cd5269e7cb42e3fdf2b526365ce8df8dba918feeb2dbe246bf1e2163b42b77ce0f8b5bf5b990ab8b9722dd8
diff --git a/app-backup/duplicity/duplicity-1.0.1-r1.ebuild b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
deleted file mode 100644
index 6409f16b3d9e..000000000000
--- a/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 python3_11 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://duplicity.gitlab.io/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-1.2.2.ebuild b/app-backup/duplicity/duplicity-1.2.2.ebuild
deleted file mode 100644
index fc665542a7f1..000000000000
--- a/app-backup/duplicity/duplicity-1.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 python3_11 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://duplicity.gitlab.io/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-2.1.1.ebuild b/app-backup/duplicity/duplicity-2.1.1.ebuild
index 003ceb5ad3d3..cc8bfbda51fd 100644
--- a/app-backup/duplicity/duplicity-2.1.1.ebuild
+++ b/app-backup/duplicity/duplicity-2.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://duplicity.gitlab.io/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"
 
 CDEPEND="