gentoo resync : 25.08.2020

5 files changed, 78 insertions, 8 deletions

diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index e24780201040..51ffe7cf3609 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,9 +1,11 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
-DIST borgmatic-1.5.1.tar.gz 67401 BLAKE2B c11f4b9f9acc7d7bf4e482953968dbaabc33f1513ec8f20868518bca22ffcafee90569c06ec603be919d47d724dd4a3a904e44fbb40c2309d8cb78e9277b5cc7 SHA512 9ded9bd5d6db866d196fedee88737f3d3eef6cb0e61c5f55ac543602c4429adcb57608d7f6c798edfd6ac1ecd14aadd9a88fdf94ef1f0eab4c26a9d2a29c5e38
+DIST borgmatic-1.5.10.tar.gz 71743 BLAKE2B b2b5f9135a15730ca7ddddeaa7f621f82207f1dcf383c3be7459eb39dbffc85a310184a4ddce3fb0bd47aa213cb588eb3f3e2f73418659330a421b7da5b87698 SHA512 52436535810ce42f5ab30ae8a4705005e8c7a5d91d52520aab4160320215196cdc088dfae1a21a0d65d0161fb2bb3c9b984cfe2cb5204f7b9bd0ed27c3a38c5b
 DIST borgmatic-1.5.6.tar.gz 70075 BLAKE2B 23e233c7457c25ae5b83571436dcfac4e70bf4c9a9bf9af95b8722533b48fdd82089152da220b7d61a01569233f2aedddf300c3a5ad2c69c631060f0b08e6b59 SHA512 e314fa1f20516dd52f4435c782bf634821a034925c0f11553483a1e55eef5d588e54e7abb1a88d239c1619f291548a5058a8f636d16dd829680089c20c601a79
-DIST borgmatic-1.5.7.tar.gz 71084 BLAKE2B b6ab2f80af47ba49e8f584b555b910bf94dbfb72da8a55433f147410059948fa844846bea007b317f10cb76811c5da6bd1c22f7fefb5c062213670fadb326cd9 SHA512 26fa9ee1b158c05cdb3ed60faa16b4eac431691ced454149091c302876550277f622cd67e45ef42a3070896e76b94d8a39f1604a08f604bada5bab1ec6691902
-EBUILD borgmatic-1.5.1-r2.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
-EBUILD borgmatic-1.5.6.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
-EBUILD borgmatic-1.5.7.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
+DIST borgmatic-1.5.8.tar.gz 71078 BLAKE2B 488a2d3a1689d16ac2e4e2e9e0f842fab51322a83b024f5bff742e31290d70e6acb683cfe74cc610b0bf0e3ff9d523bacd7faa309560f2ebb8b5b4820de54119 SHA512 25f38bbd48eb41ded8e315620fdcd929c10b38b89a3fc428db9e0053d4c1c46941962f6693018c5e26aa2187ed20bf366424b1b03f9c61cc56274c7008e824e9
+DIST borgmatic-1.5.9.tar.gz 71857 BLAKE2B c30c2629e327168ee81e9ecc26c811c5bab7369063f5711cd79567922f21d4e5c0980fe34021340d94923cea85ab0c307f9f348268c3f2063d084d0360e5fdfa SHA512 a1ea62ffdc1457fc1e7b964a474bc25d2b2d3d153ba2026018d5081011acf8d6d1329a440c2616e201ebf0351bf2f12a1e37ec2477a6f5da44de315ec3bb0c3a
+EBUILD borgmatic-1.5.10.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
+EBUILD borgmatic-1.5.6.ebuild 2023 BLAKE2B bb2ede921d9b7087b4665a5146e0bf5a963d34eb0d48d5e57a401974b80577429776ac4e9b581825a8ed8c3da907cac202500084dda839b3654fc4c9feffbe52 SHA512 c07d3132f22f4db916c9996f44e588429d5162a0d064253c7ef080e4b3e479eba58c64bb488a55a741de6281557872f5f2610bb5edbd4526b64bff25f142e187
+EBUILD borgmatic-1.5.8.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
+EBUILD borgmatic-1.5.9.ebuild 2023 BLAKE2B 175bcf279ff3809a491f0adda60907973ee7d3b25888bd13760a9f9aa90cfd17cb27310d27d83c3dea94febb853aab77cf0f671bc6ada7e986f9f8974b21eb63 SHA512 647c6005ffc4c3e86236b0ddab1c403e14a0599b3cae57bad130ef1fa618e0ad3093fb22c304a2b516b7b43765c74cefaa2e53dd1d19ea2e1667188504fecfee
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
index 040e887e7ced..80e8098f34d2 100644
--- a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/app-backup/borgmatic/borgmatic-1.5.6.ebuild b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
index 040e887e7ced..81303b9f901e 100644
--- a/app-backup/borgmatic/borgmatic-1.5.6.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/borgmatic/borgmatic-1.5.7.ebuild b/app-backup/borgmatic/borgmatic-1.5.8.ebuild
index 040e887e7ced..80e8098f34d2 100644
--- a/app-backup/borgmatic/borgmatic-1.5.7.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
diff --git a/app-backup/borgmatic/borgmatic-1.5.9.ebuild b/app-backup/borgmatic/borgmatic-1.5.9.ebuild
new file mode 100644
index 000000000000..80e8098f34d2
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.17.0[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/flexmock[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. distutils_install_for_testing would likely
+	# take care of this - but between the aforementioned behaviour inconsistency
+	# and the fact the only test run from this file as of version 1.5.1 is the
+	# parsing of contents of 'borgmatic --version', just skip it for now.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+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."
+}