gentoo auto-resync : 22:08:2023 - 15:46:32

6 files changed, 2 insertions, 86 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 5d2cb8c265dc..5e6df6eea19d 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index fb708e72db52..bd77235ddd3e 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,11 +1,7 @@
-AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 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.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
 DIST borgmatic-1.7.15.tar.gz 390819 BLAKE2B dc9086a0363afb8acbe943776cd6f388ba85a18e50554b5187c86e7054e7ff748ea878623d9b46c19564198faf5c566b137e54681812086115311970bc517455 SHA512 cf1f6da782a5ad547a76b9e4cb00cbd4ca4232cfb5dcd027c6fee9f1a3b97fda894f27c512007b449b8e11e939249060f63c3cdde29aee3aa86710200cf8d2db
-DIST borgmatic-1.7.8.tar.gz 350233 BLAKE2B 3fcd392983f73ec5e97f0dc6b96e211d7f1e1d1a4ce95c635c675cf043e796925df53c30c1e4f8eb1a095d9ec5ff81e90edee5ff2576f4683053d3108004afd9 SHA512 bcc65fdb7ea1171fb61deda9b1f69a00596e1e10a99508d336977b694bd8f93d74837aad9211bf1065b785220aaf1460a3ea403bf23fa4873d1bf4c6b4016525
 DIST borgmatic-1.8.2.tar.gz 396972 BLAKE2B d9444ec49c3d325d865d553fa1cb28de9416aa36e999ef6452c62a9a6519e58afbc922398c52f3a1de441fd8da02e5618bc03a67baae161677a15a1780209788 SHA512 8de49c071c54516d0fb3f0d918f05226ac00519cc0605eacf204795a239554764fd1f3b0f44f3110fc551d6a89e92a59ca34ddebbfb02bf3deabc326f81ccf9c
-EBUILD borgmatic-1.7.15.ebuild 2040 BLAKE2B c204fc85f282faf5e1b7834a2900d524c5bfa0bce9de4ff8b56736787d0c2c9f9beb3b75ef96dab3cf490a8b7008182d995465ef41c4ae4c884969e6a766358b SHA512 6aed82522fcc67f7c20234a2eae5810eb02f4d24cb297192fc56aa67b22193b62631fd47ed042eba995ce21ffbeb1189c0c3b092fbc54d6ac3ca454bbc18603f
-EBUILD borgmatic-1.7.8.ebuild 1643 BLAKE2B 9e05c2bfc9894d3e3636d17254cbd6d386d44fdb3305d16278be5a42d6bd56f3d1e0b81c53245b264d91118b10c03fc9515573146ad47b15b5b8148f77c849e5 SHA512 0c3788e897ab3a838548f456a6b3ccbc644d877f7ce83bbbbea59f9f586c3e69af44222016cfb0fe803e639baeebe61d7e77b5160b4ed7ea223add48c3dbca6b
+EBUILD borgmatic-1.7.15.ebuild 2039 BLAKE2B 540bf3b3ba70492896efc4d9e8aaa9b37350fc22889d48427b3cb4f20fa30eeacc7c09049db66dca6f0db0efcb7ed514f4393008961e0904203bcb452a64442c SHA512 a0a789d4167cb688e85f678a8ae0717e22fefc9bf629e026a3b2898725b39c25dbe8c644cb42c493043a66f465797464500d442d07dee1f33201f221e4c72ca0
 EBUILD borgmatic-1.8.2.ebuild 1992 BLAKE2B c45e0bb857401d5eda366e90597c79c66bfb6797178dd54ee251ff0b85fc647dbf9185040430aa18feafbfe528e0f3a92d2c71f99674749ad2ab9170a79ba7e1 SHA512 bf354928158c8044a01ef646698c5aaba164e0453aeee2c9fb89df90b3367dfd6eba88b0cc88c5a4fe9b53941c91fcfa7819c4cbc738ecf07e613068e79cbdfb
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.15.ebuild b/app-backup/borgmatic/borgmatic-1.7.15.ebuild
index 952c8c26725e..ece145444689 100644
--- a/app-backup/borgmatic/borgmatic-1.7.15.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.15.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"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.7.8.ebuild b/app-backup/borgmatic/borgmatic-1.7.8.ebuild
deleted file mode 100644
index c707d4ebecb2..000000000000
--- a/app-backup/borgmatic/borgmatic-1.7.8.ebuild
+++ /dev/null
@@ -1,61 +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} )
-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"
-
-# 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/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.3-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 "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch
deleted file mode 100644
index 28562398a407..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -3,7 +3,7 @@
- 
- [tool:pytest]
- testpaths = tests
--addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end
-+addopts = --ignore=tests/end-to-end
- filterwarnings = 
- 	ignore:Coverage disabled.*:pytest.PytestWarning
- 
diff --git a/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch
deleted file mode 100644
index 25b283777408..000000000000
--- a/app-backup/borgmatic/files/borgmatic-1.7.3-systemd_service_bin_path.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/sample/systemd/borgmatic.service
-+++ b/sample/systemd/borgmatic.service
-@@ -61,4 +61,4 @@
- # Delay start to prevent backups running during boot. Note that systemd-inhibit requires dbus and
- # dbus-user-session to be installed.
- ExecStartPre=sleep 1m
--ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --verbosity -1 --syslog-verbosity 1
-+ExecStart=systemd-inhibit --who="borgmatic" --what="sleep:shutdown" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --verbosity -1 --syslog-verbosity 1