From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 16 Apr 2022 13:07:24 +0100
Subject: gentoo resync : 16.04.2022

---
 app-backup/Manifest.gz                       | Bin 8540 -> 8542 bytes
 app-backup/borgmatic/Manifest                |   2 -
 app-backup/borgmatic/borgmatic-1.5.23.ebuild |  65 -------------------
 app-backup/dar/Manifest                      |   4 +-
 app-backup/dar/dar-2.7.4.ebuild              |   2 +-
 app-backup/dar/dar-2.7.5.ebuild              |  91 +++++++++++++++++++++++++++
 6 files changed, 95 insertions(+), 69 deletions(-)
 delete mode 100644 app-backup/borgmatic/borgmatic-1.5.23.ebuild
 create mode 100644 app-backup/dar/dar-2.7.5.ebuild

(limited to 'app-backup')

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 6b6b638edbbe..1b68626006f2 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 1240e0a097af..b4e371978981 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,9 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
-DIST borgmatic-1.5.23.tar.gz 290506 BLAKE2B 9924d9df1cae7e4f97ff70eb16f84a2ee8a0fe0cd3a08add7a7ec59d269fb693f74350cdb45633fc4d76816614216a69a205504cac9c7608a635fc364253add6 SHA512 1b811fec2e814854459d10e4c90e552d90e0450d908931dbca5a838dc091c40dc6075c6fa09653a5aac69073e5b7600aed4beda4bc765daf0c6d8d2a00983ad7
 DIST borgmatic-1.5.24.tar.gz 291853 BLAKE2B d8c695c8faf713cd75e994d8ae7633674d01981047ce79d35d392b9db5a2dfb47c2be4a91e0f183ab2ead5877ee68983d0fdfd88ae7d28355d8029d39cbfdc04 SHA512 cfa1bd1dc6119497fba99d02e4f53322aede907ba8b30068b6c1dadc67f5e30466d2f1f0d83f1f15f71dfac08ef5b0adb376d24d62f1cd44992e7a45f99fde34
 EBUILD borgmatic-1.5.21.ebuild 1865 BLAKE2B 641b95b1f94585bba6822f4cfad1ec487d5030ae795aff13d776ded939dc98ae1b7cfb4a8ecd59c81a8ed675c4af73cdbccee6a3b8fabc89099a7132144b4833 SHA512 48c64a3fbab381ded06c5b56e971d0895eaee5ede8b77d6bd25c2176e1f45673651531bf9fb901e7003ee51f1c554012f876a0562c9be5110668ccc1eaad90b2
-EBUILD borgmatic-1.5.23.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
 EBUILD borgmatic-1.5.24.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.5.23.ebuild b/app-backup/borgmatic/borgmatic-1.5.23.ebuild
deleted file mode 100644
index f48f145dc769..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.23.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-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 ~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.5.16-systemd_service_bin_path.patch
-)
-
-# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
-# executable so making it work would require passing --install
-# to distutils_enable_tests. Given that this is the only test requiring
-# this and that all it does is make sure the NEWS file has been updated
-# for the current version, just skip it.
-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/dar/Manifest b/app-backup/dar/Manifest
index 31098ee8c07c..1000f5a03cc1 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,7 @@
 DIST dar-2.7.3.tar.gz 2398624 BLAKE2B 9d34d233968efcd390db6a1afa1bb93477b6dcbb4bb8c6beb315e927f7ae624bdf23b77f32233a63e3ddd437701fbbd1ee19e5c7ab4f0366ef7e646bacdab46c SHA512 a8a930cd39cae66199e402e61fc48609fe22b821c12407ab7922b8bc8f43f9b11b2f0732baf8198b41d193442a1f82d18536a0d6a7fd7282aaed3600342c7d48
 DIST dar-2.7.4.tar.gz 2404731 BLAKE2B a3b8cb2049f1b12048023916e2951ca9efc57791afa62df58ceb796f69503c9d2795e0b6e11f2b3efdde51f2e0f78e972a7e08742f2278f92231db94a21dfbbe SHA512 fcdf222c4244d02797dff06797a67baefd1b7bdd409ed09da05e23430b025b1cc66ee98e85aa43b481ec3d17a84b7c2bbcebe4c8f23a2a480146845d3da93477
+DIST dar-2.7.5.tar.gz 2404076 BLAKE2B 2887629cecf069cfb5063132299279b8be985785485c6f04a8389dfd4930f00b073b421fbb17915d69f5efd46ebb4c3d371c10d3936bfb16d82a191218af350d SHA512 a4e01dce8a078ba81b3032a1910d75f0f59a23511246f570a50ade135f49f11e522ed8916a947aece1799dcd1d37308ba6e4a009313b80d6a1561698c3d5623a
 EBUILD dar-2.7.3.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
-EBUILD dar-2.7.4.ebuild 2230 BLAKE2B 7ad96a0246b7db5069e3c93b2ee6b32d711b82e24afc71a48bc3e7a77d18bb215c76e35193bffe3c6c13ff0c66f38e4e6d3d534dcf6774a1a3f040afbcf76223 SHA512 f5efb4de42e27c74f6910d368d18a3284d4d0007c792f1306f3d31ba85bb56edd56aaf64a52cd6a36002d2059c0ee60a50190ce91fe8e78e94e85845cfee6f44
+EBUILD dar-2.7.4.ebuild 2228 BLAKE2B 05c95cb7fdb78071ead4a32faae5059090261c4b54b5287a958c9df7ad93a3c21bbf79893c3f295eadf646f3ff8a161bd8e4fe967f2fa587b06027d7e228119c SHA512 f6a2d06d2dfc5bfb779c9d8c1429a427a60710cff11bfe9d416c9b6d306679b48602944cab4be9ad45dc97084b93d473915398de1e802a7ba66a847036a5fe32
+EBUILD dar-2.7.5.ebuild 2230 BLAKE2B 7ad96a0246b7db5069e3c93b2ee6b32d711b82e24afc71a48bc3e7a77d18bb215c76e35193bffe3c6c13ff0c66f38e4e6d3d534dcf6774a1a3f040afbcf76223 SHA512 f5efb4de42e27c74f6910d368d18a3284d4d0007c792f1306f3d31ba85bb56edd56aaf64a52cd6a36002d2059c0ee60a50190ce91fe8e78e94e85845cfee6f44
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.4.ebuild b/app-backup/dar/dar-2.7.4.ebuild
index ef7cc64225b7..8ebf3d5fcdac 100644
--- a/app-backup/dar/dar-2.7.4.ebuild
+++ b/app-backup/dar/dar-2.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${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 threads xattr"
 
 REQUIRED_USE="?? ( dar32 dar64 )
diff --git a/app-backup/dar/dar-2.7.5.ebuild b/app-backup/dar/dar-2.7.5.ebuild
new file mode 100644
index 000000000000..ef7cc64225b7
--- /dev/null
+++ b/app-backup/dar/dar-2.7.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 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="mirror://sourceforge/dar/${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 threads 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:=
+	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:= )
+	lz4? ( app-arch/lz4:= )
+	lzo? ( dev-libs/lzo:2 )
+	nls? ( virtual/libintl )
+	rsync? ( net-libs/librsync:= )
+	threads? ( dev-libs/libthreadar )
+	xattr? ( sys-apps/attr )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+"
+
+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 !threads --disable-threadar)
+		$(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
+}
-- 
cgit v1.2.3