gentoo auto-resync : 21:08:2023 - 21:44:47

6 files changed, 5 insertions, 129 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 72c70c52c453..5d2cb8c265dc 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 2a8cce20fb97..969d1c4f3a0c 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,4 +1,3 @@
 DIST borgbackup-1.2.4.tar.gz 4056513 BLAKE2B 90c4d7ce43acaa4512a5cce3d0c96c883699b293efb1e5d5b516b803cf4d03bcece85b026bfa6e47ccccb1f5ec1b115e2c70ccb081d01accfde0d8b080cb4ea8 SHA512 9326a58605a085f521ba75a2eecfb4bdb790d3da18c77076bddaeae641678cc08171d997a758182a739ec6b145bb04d982f8314ae60f93c3ff093eca15515dfd
 EBUILD borgbackup-1.2.4-r3.ebuild 1343 BLAKE2B 3428ff418dd34b16402dd59379bc108f1ab6afc7aba286268ecf3b4a19d0ecc2c3c1272ea16f3fa1f21f297624151960ab86cf95e00a828964208e863c365c72 SHA512 5b14d964ce732114660f560f88cab30179763f16d0efefa20d79e603e5fa221e4c95aabd35e4ceb03168984654b0a75d12e2a9191b7479c524065c02437c4b3d
-EBUILD borgbackup-1.2.4.ebuild 1254 BLAKE2B 4b35a27b9166351b899f69d6380923b4eb0058ff86b442ca0506146c3f24a68b8694295bdb1842e09c57c9c4e9baf80083dad9641994c6c753111b45840b4da8 SHA512 390075e91617cd8250fad3621b44e2f8b657474787ec463b2e71d3daf8ffcbc741397ddb341792d42ae9204bf8fdf2ef6fb843354e908fc36b227b40d9e9f01b
-MISC metadata.xml 296 BLAKE2B 3f0aba58d462b6e50677f94dbef5b44bd3aa2dd92a44bb10777f0a19aff17d02792384b49e44915611c962cf6775b4dab33230e1d6b0ae4ef3f359e30ecfd2b3 SHA512 f223dd74fb089d81f0d8cab8efc2a1edad6dba0b8b37dd72ef4758cda02b3be229a0809783fdb563aa4e8e71ef41962d892be4925d77e110fc7453d4b41cedfc
+MISC metadata.xml 374 BLAKE2B 4d93ab445b3d3a301d7c7c34017d7ccf0dc2962fb9c6b7f33bc9839788825f37f2ee99f5750c0d6288ddef21a7501fab69504adf15e20a35c61ec8b07014af68 SHA512 b91c72d1eff24d44443280de335d7cc23c862774e4e23b35d0f0730c512cb16304a48311e953292d01b0b69101bcdb01ab3bc22439cdaee65b9d5265e5140564
diff --git a/app-backup/borgbackup/borgbackup-1.2.4.ebuild b/app-backup/borgbackup/borgbackup-1.2.4.ebuild
deleted file mode 100644
index 6be9270fabef..000000000000
--- a/app-backup/borgbackup/borgbackup-1.2.4.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_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 bash-completion-r1
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-inherit pypi
-
-DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
-HOMEPAGE="https://borgbackup.readthedocs.io/"
-
-LICENSE="BSD"
-SLOT="0"
-
-# Unfortunately we have a file conflict with app-office/borg, bug #580402
-# borgbackup is *very* picky about which msgpack it work with,
-# check setup.py on bumps.
-RDEPEND="
-	!!app-office/borg
-	app-arch/lz4
-	virtual/acl
-	dev-python/pyfuse3[${PYTHON_USEDEP}]
-	~dev-python/msgpack-1.0.5[${PYTHON_USEDEP}]
-	dev-libs/openssl:0=
-"
-
-DEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	${RDEPEND}
-"
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/*
-
-	dobashcomp scripts/shell_completions/bash/borg
-
-	insinto /usr/share/zsh/site-functions
-	doins scripts/shell_completions/zsh/_borg
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins scripts/shell_completions/fish/borg.fish
-}
diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml
index d44a5ed88690..17284e4eaf25 100644
--- a/app-backup/borgbackup/metadata.xml
+++ b/app-backup/borgbackup/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">borgbackup/borg</remote-id>
 		<remote-id type="pypi">borgbackup</remote-id>
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 9f5d7cbffd17..fb708e72db52 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -4,10 +4,8 @@ AUX borgmatic-1.7.14-systemd_service_bin_path.patch 604 BLAKE2B 534a545b5a8d65c6
 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.0.tar.gz 388945 BLAKE2B f765f135f4c4a99216928764ce769854d4364b20959ed547c07f3f9a88fa756765caf85fa4e726e7fd2bbfc704b509e860619383f53e731d9b44911ad930b65b SHA512 3b94095dcc0c8f199e59caafc0a3ec06780b7b87b532d4e7d666d2f84a8920d3671e47a0fd156ce67eae1e7914307c789a7bcf826fba46c0a7a34d333a14cde1
 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.8.0.ebuild 1992 BLAKE2B c45e0bb857401d5eda366e90597c79c66bfb6797178dd54ee251ff0b85fc647dbf9185040430aa18feafbfe528e0f3a92d2c71f99674749ad2ab9170a79ba7e1 SHA512 bf354928158c8044a01ef646698c5aaba164e0453aeee2c9fb89df90b3367dfd6eba88b0cc88c5a4fe9b53941c91fcfa7819c4cbc738ecf07e613068e79cbdfb
 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.8.0.ebuild b/app-backup/borgmatic/borgmatic-1.8.0.ebuild
deleted file mode 100644
index a4334bf572b4..000000000000
--- a/app-backup/borgmatic/borgmatic-1.8.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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"
-
-# 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.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."
-}