15 files changed, 155 insertions, 154 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 8489d4a06e7f..849597813209 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 4a0fe2496ee3..d5b99f81204f 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -16,5 +16,5 @@ DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
 EBUILD bacula-11.0.5.ebuild 11871 BLAKE2B f47ab3915e5b4fe49680c7a784c50fdaf573056322d7d8b969d64d290a1e98fc8e1f25322f6e74dbf34ecf4fb8157b041476e1f6e5d87e8105545b4eb6280c24 SHA512 b1b8a2721877e332d98b7ed1300b061ea9cc1f624d3b16dbd09e7f108a9b0a2005751b741422968abfe95dbdf3baac87aeeee774c2f33e7da74062f66849093d
 EBUILD bacula-11.0.6-r1.ebuild 11873 BLAKE2B 76c9e91f8f0a6c042f750ee8b752cc02959b1d08ded810f39b8908dc2f58fb399477966f5669c05ad1a8b93f53cff5c047c340299fe686986c9287ba89fa2ce6 SHA512 7c140c4a74e7acb5f376093af1df61fccbc3bd9936c00cccceaa64f4ce0b3dda239cf0d3241d88de002e3e54de4b8513cc8cd08af4b42d82f11d8c1634be4fe2
-EBUILD bacula-11.0.6-r2.ebuild 11919 BLAKE2B 271a85f455fdee8000f236b0a7f4e8b043304ea38c67e63bb452acc7e2b284ce6b006fd250ba00433e6d94dfea897a0a44da71210c8523f5ac5af693085d22f8 SHA512 2e532de7ad1af00b6383aa068e06e2a49e30d60ffebf7e875db512614f0d3d6ab28e471d5b2b54e0ad840c498f2b15ef87a73516a045d56be34b00b353b3e692
+EBUILD bacula-11.0.6-r2.ebuild 11917 BLAKE2B e0a0d4ab97ad5a2b419f68f2c0ed68978cc979b4afa5d5b03910c9cd857bb81ee7a96393db2319977df848eacaf492158b09f604a19583a978cfdebc855d8354 SHA512 c7164d7e06643dd4bf1ee4044096b165753b501bcd6d1e1d70ad18912947ca977c5c08c9359abc11cb5ce696d49e42dcfec85470089378d6e347558e80b4e8c6
 MISC metadata.xml 697 BLAKE2B 6fd293a1009c2d461a43d404eff2883443f4e2a49d862120f4c9477f7fae8f2462be4786a7e8f6216515373e881d071b433835b9fb8da3b2f30c0701ef4a7ced SHA512 6d0077158112c26232370f11ec0d00ccb14376ce2649cc8ef79d3f99332bbe1bf18968a42e9c20d82934be3f9b49d49cf1f848e4e837143f8a5914fade6b14f7
diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r2.ebuild
index 4f6706f68b34..785ae94c4709 100644
--- a/app-backup/bacula/bacula-11.0.6-r2.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
 
 DEPEND="
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 621f4fdb98c0..6ed01118b600 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.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
-DIST borgmatic-1.5.24.tar.gz 291853 BLAKE2B d8c695c8faf713cd75e994d8ae7633674d01981047ce79d35d392b9db5a2dfb47c2be4a91e0f183ab2ead5877ee68983d0fdfd88ae7d28355d8029d39cbfdc04 SHA512 cfa1bd1dc6119497fba99d02e4f53322aede907ba8b30068b6c1dadc67f5e30466d2f1f0d83f1f15f71dfac08ef5b0adb376d24d62f1cd44992e7a45f99fde34
 DIST borgmatic-1.6.1.tar.gz 300375 BLAKE2B b56c31da62591b8bfd3c0146e77cab7ab28f942c59ca0f6cf7342d80bc31249dfcbd59fae13025a0fe464de326b6758169be983d2b741ecc37062961541fb892 SHA512 c48fb89167ce188feeb9d51ae9caabf985f9c583d09840d3dd4aaf772a4acbd3c22399958740820b9fbf61603769a604dc92b72448e2c7196fae855549f3c6d5
-DIST borgmatic-1.6.3.tar.gz 320186 BLAKE2B 232c2878b0778f039b0c2fa7e6b4de37477b81c13082772752a78e8de0fff0b52fb6976a02ae6f13d9a33a74d96c2689ceee48f97d85381a2d06d0b61f6bb658 SHA512 eadca728680d86dc16c8444ac653c46e9c61e49f3eced1228d46ff77138e44985ee794dd21921f829db063106cdd697c997677bd983bf000aedb89c6c00c8f5d
-DIST borgmatic-1.6.4.tar.gz 322306 BLAKE2B 48d01b56065f08db464ffab71cfdc6c2924ed899e07a6788f37217448d19d15d59ee3771ad545bf1c576da6a26d754f8c24eea82361d77fa616bebb54a6dd878 SHA512 8d0d4b1b6bbb562fcab49a8ba2cfd1d33f6e5053566096a6f01b83b2f69c37a437836d78d3547100f66bb1320c1e028a2223fcc2285ed0fb8d463c8d6eae5819
-EBUILD borgmatic-1.5.24.ebuild 1904 BLAKE2B 7b8c6ec7ce028a24d68d7ff2e27bbc5bcacb8df2e73c557b7ddd403205bcdb732e63e2188566af5f7db23e68dbbc073aec584023e8e0406543c95df6bf64093a SHA512 00b517d74bbc68b814b039492e92ac36b7d96f1626ae6f7187cff72b2387b657bec4d4d3c7f6c777d74ad2e07231b5d72c878ac88c7dece7ebdb2c6a61b3efbc
-EBUILD borgmatic-1.6.1.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
-EBUILD borgmatic-1.6.3.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
-EBUILD borgmatic-1.6.4.ebuild 1905 BLAKE2B 394591623f5c59b1b839dbcc06590585d5217505f3b9db9a4035b6b3a92a3ea2b2d8571e826fcad6a80369aac73b2ba0af26520f0c2e3fd05971e2e96b55191b SHA512 7bd673ad1b1f7ae9ea9f9a90c2f89305176c39a660bb2651840951c059b6e99d5682270cdfe5df4c401dd2b7c6c657b3d4a59dfcd8671616c6245f1a1417e595
+DIST borgmatic-1.6.5.tar.gz 322857 BLAKE2B 8d342800ad92a9bddae95eb7b0ee8aabdf792f4b36e696ae15c7dd1318f18c983dad4984c7a7a0a0aeab21760533655d97bc199cd3066dbb01f329cc1c7d15d2 SHA512 26438886b9b22760c12565a58e2337a45fad5d54e3fb061119c73b2a2ac36b3decdff656303796649107a74de8a5a09f8edd70b4e1d94533a662a67d2f124b95
+EBUILD borgmatic-1.6.1.ebuild 1904 BLAKE2B 7b8c6ec7ce028a24d68d7ff2e27bbc5bcacb8df2e73c557b7ddd403205bcdb732e63e2188566af5f7db23e68dbbc073aec584023e8e0406543c95df6bf64093a SHA512 00b517d74bbc68b814b039492e92ac36b7d96f1626ae6f7187cff72b2387b657bec4d4d3c7f6c777d74ad2e07231b5d72c878ac88c7dece7ebdb2c6a61b3efbc
+EBUILD borgmatic-1.6.5.ebuild 1905 BLAKE2B 10224bb4e213836832f4485be1aa572062d4e840c0c74fe45791020f99153315eb1459febeb57e790ad8f73f4f1102cc6f7919147ca967fa5aeb71e725d3f44b SHA512 7c1f1d3a5b05bda5581e1a6fc81af6763a0e1094373bd0476cd19de3537602191b9d60154c9f170207fcff28d89ede7b1ec189c07265718dc469bd928a55c439
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.5.24.ebuild b/app-backup/borgmatic/borgmatic-1.5.24.ebuild
deleted file mode 100644
index 4b88643aa9ca..000000000000
--- a/app-backup/borgmatic/borgmatic-1.5.24.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/borgmatic/borgmatic-1.6.1.ebuild b/app-backup/borgmatic/borgmatic-1.6.1.ebuild
index f48f145dc769..4b88643aa9ca 100644
--- a/app-backup/borgmatic/borgmatic-1.6.1.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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.6.4.ebuild b/app-backup/borgmatic/borgmatic-1.6.4.ebuild
deleted file mode 100644
index f48f145dc769..000000000000
--- a/app-backup/borgmatic/borgmatic-1.6.4.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/borgmatic/borgmatic-1.6.3.ebuild b/app-backup/borgmatic/borgmatic-1.6.5.ebuild
index f48f145dc769..502919f25ae7 100644
--- a/app-backup/borgmatic/borgmatic-1.6.3.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 682074d950a6..d9f1158ce273 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,3 +1,5 @@
 DIST dar-2.7.5.tar.gz 2404076 BLAKE2B 2887629cecf069cfb5063132299279b8be985785485c6f04a8389dfd4930f00b073b421fbb17915d69f5efd46ebb4c3d371c10d3936bfb16d82a191218af350d SHA512 a4e01dce8a078ba81b3032a1910d75f0f59a23511246f570a50ade135f49f11e522ed8916a947aece1799dcd1d37308ba6e4a009313b80d6a1561698c3d5623a
+DIST dar-2.7.6.tar.gz 2410200 BLAKE2B 925b4854c66fec9287e0f42d213f94f208b5248d09eb6abe4e36a41df1fc57641d7a6b41e1f8aaa202e6f74ad04399c70a8cb74dc63685985a5671ba54efdf93 SHA512 517fa06a5b8caa53ad111e4287446583f328ee2027169db067610877e05291e63179c1bdd92312a6885d1c7eba0566a86301e974d1d48df56f0fce9ccfdb3a19
 EBUILD dar-2.7.5.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
+EBUILD dar-2.7.6.ebuild 2230 BLAKE2B 7ad96a0246b7db5069e3c93b2ee6b32d711b82e24afc71a48bc3e7a77d18bb215c76e35193bffe3c6c13ff0c66f38e4e6d3d534dcf6774a1a3f040afbcf76223 SHA512 f5efb4de42e27c74f6910d368d18a3284d4d0007c792f1306f3d31ba85bb56edd56aaf64a52cd6a36002d2059c0ee60a50190ce91fe8e78e94e85845cfee6f44
 MISC metadata.xml 1284 BLAKE2B b70f06ea13076c3de9470fa1b65d9a17de048db8f52ade94246c62241828be74f308dcc39067b27ed99ff963c3554e371611aba0bb04ed6d57d14d4f7fd7f9dc SHA512 5cbbbff7e0652a85f717f2eb6a574d6fe52d478e049fa81e1c25b1bbe034086d433558952be1bc56ea4492c9c43f6da1e0968cc9132d18e7342890434c0a19d6
diff --git a/app-backup/dar/dar-2.7.6.ebuild b/app-backup/dar/dar-2.7.6.ebuild
new file mode 100644
index 000000000000..ef7cc64225b7
--- /dev/null
+++ b/app-backup/dar/dar-2.7.6.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
+}
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index e624de900155..b4fb6cab724c 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -4,4 +4,4 @@ DIST rsnapshot-1.4.4.tar.gz 374269 BLAKE2B 1e4a0c99d12d48cf4dacd3817b621f7e6b0ba
 EBUILD rsnapshot-1.4.2.ebuild 1336 BLAKE2B 8ee3cbd073f40287f5b6a7c9e3e6d05a6d4003a22d5c74460f0dec473a8cbf96abf07417cee854d7a7a35b405f2e281d36c3959f26fdcfdcaa8b1737bafc1c6c SHA512 f6bbd4d2d6a89acb6a80ddd916b1b3d8c91a59e2865586dc0b9dbeb842da1f31b1819fdd2d7ec6d8103cb9d2c20f42db11d3589d61dae5652ab0b273413f3a97
 EBUILD rsnapshot-1.4.3.ebuild 1338 BLAKE2B 7dd719ef9c19ae983fd825fb36b1d771720c9e91a54c63dea5d48edcc36d247ab7d081996e3d002f7af2050d7369982db7b25b5a6cd91b79ba89aab2b9be1b5e SHA512 aad5bb2cecbb471e0c7af89dd0143b74676dc10ec496092e67d58cbfcb80c91205e3792768353961ede0de2650e45af05b25f986e364b29b80a9a41c70982cbc
 EBUILD rsnapshot-1.4.4.ebuild 1338 BLAKE2B 6239209405ed60e4aaedc8aed906509580a8b62f90f1d93f1e111598888597a1c78f085f67e42d8012ef21906fe3f3f3b2ca09c655fab9fd0d9e9d89d4076a9e SHA512 7399a1f7339ca86d2b5d05eba55d271803a63e5fc2cfc0df184f6a3a0c3f8b44da15d983a3818334f96af54de30547a32b1e484bc795637af16b127dda32c263
-MISC metadata.xml 416 BLAKE2B 87a6c0a31a2b91d72a3af397a31f6af0a5b50f0ab8a5c91c41e2453b1928ec29d46ea5668d3f1ee4dcfcee7c62301ff0ba57b1b7c58811015b56f44c2f4002e5 SHA512 94d7fae6147134a88c3874b0a84eb3b7d066629964aba8d5e7acd3be92a009f47f74bb75b720602ac0113a9947e0a29dda229c198e28fe8717cb62477bd9c6b0
+MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index 50ca680ecca1..85e4ed814fa2 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>Sergiy.Borodych@gmail.com</email>
-    <name>Sergiy Borodych</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-backup/vzdump/Manifest b/app-backup/vzdump/Manifest
index 8e40dcf78a37..8a2abf729813 100644
--- a/app-backup/vzdump/Manifest
+++ b/app-backup/vzdump/Manifest
@@ -1,3 +1,4 @@
+AUX vzdump-1.2-no-compress.patch 1340 BLAKE2B c14a66c2e79b20145b035fe4c3668c7cdec262f0740ddfb780945a00ad6bb7f03c7c8d448bb15e0c273c433b6fdfb4b0471f1bf4607c747fdde400ce20ccb013 SHA512 cb406b4b98ba7cd69a175726e742c1694102d9770c47255d2b4309eeb774c80fedcb7e21c5550919eebbf82159ef4c18937ffadb26df50287b0327634f8139a0
 DIST vzdump-1.2.tar.gz 20296 BLAKE2B adbf4c8a51b9d87f022f6c415db566b5df41c33ca6fca800f362d4eb6b25de53bcc7106b54790e59fe22091e9b519d467750e20e467656ed0ec6d9ac90e66ff4 SHA512 c24bf785704ca3a624127b322a87fee5436fa272e42db159bd08b575405a9ec427d9ad3c82bb0a839495ece4f53b7dafcadc0430b8074368bb8cd844eb31b6cc
-EBUILD vzdump-1.2.ebuild 703 BLAKE2B 148956fbff1e399db44cdfb44d6c4b5e6c6abbb10110f9392dbc48ebaa0300648c3f19677e06cd4bf204088e366df6a4b07fbf97dfe0049bbc8bb19ae3101f40 SHA512 74640f09cd21dce1ab59b4de81f8da5b58b0b8ee72989811df4cb6735b09660491aaf9960641ca1fdea3d541393aa505225e8d342cec091b0b9e1b72897cc309
+EBUILD vzdump-1.2-r1.ebuild 751 BLAKE2B 1b41b57398c6339b81e8dc17d9702af3330e69a7ce3d9bcc90d3d85cb67aeef60027cabaf38c073dfcca002bc657e2f307cf4e9171aa8f718e0c72144bad9d8d SHA512 0ab94b25c36178d825639a6954b947ddadb4cc6e0627217901d0a2c4da2912fb9b524c8a50973ef9da56992794b450da62911bf7fb08cda7aa43181869725770
 MISC metadata.xml 577 BLAKE2B f0f1a68fba73fc748155c0bd8ea9a41897ba2cd4cfe39a6e384aca487dbfe325ff653a0af0a17d899467ca684bb80605556c5bbd377766c195e30cc64fa34ae0 SHA512 a114c68571d7dd1c14937325cb543b9a715f35ef6ee919231acb28051d7204871ed34dda5951f46464892f3d93690cc12ba59f8e6253ba53d68172e803ad44c8
diff --git a/app-backup/vzdump/files/vzdump-1.2-no-compress.patch b/app-backup/vzdump/files/vzdump-1.2-no-compress.patch
new file mode 100644
index 000000000000..7c9ff3ed10d0
--- /dev/null
+++ b/app-backup/vzdump/files/vzdump-1.2-no-compress.patch
@@ -0,0 +1,45 @@
+--- a/Makefile
++++ b/Makefile
+@@ -55,9 +55,9 @@ DISTFILES=			\
+ 
+ PKGSOURCE= 			\
+ 	vzdump 			\
+-	vzdump.1.gz 		\
++	vzdump.1 		\
+ 	vzrestore 		\
+-	vzrestore.1.gz 		\
++	vzrestore.1 		\
+ 	VZDump.pm 		\
+ 	Plugin.pm 		\
+ 	OpenVZ.pm		\
+@@ -77,8 +77,8 @@ install: ${PKGSOURCE}
+ 	install -m 0755 vzdump ${DESTDIR}${SBINDIR}
+ 	install -m 0755 vzrestore ${DESTDIR}${SBINDIR}
+ 	install -d ${DESTDIR}${MAN1DIR}
+-	install -m 0644 vzdump.1.gz ${DESTDIR}${MAN1DIR}
+-	install -m 0644 vzrestore.1.gz ${DESTDIR}${MAN1DIR}
++	install -m 0644 vzdump.1 ${DESTDIR}${MAN1DIR}
++	install -m 0644 vzrestore.1 ${DESTDIR}${MAN1DIR}
+ 	install -d ${DESTDIR}${PERLLIBDIR}
+ 	install -m 0644 VZDump.pm ${DESTDIR}${PERLLIBDIR}
+ 	install -d ${DESTDIR}${PERLLIBDIR}/VZDump
+@@ -104,9 +104,9 @@ deb ${DEB}: ${PKGSOURCE} ${DISTFILES}
+ 	rm -rf debian
+ 	lintian ${DEB}
+ 
+-%.1.gz: %
+-	rm -f $*.1.gz
+-	pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"  <$* |gzip -c9 >$*.1.gz
++%.1: %
++	rm -f $*.1
++	pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"  <$* >$*.1
+ 
+ .PHONY: rpm
+ rpm ${RPM}: ${TGZ} ${PACKAGE}.spec
+@@ -134,4 +134,4 @@ ${TGZ}: ${DISTFILES}
+ 
+ .PHONY: clean
+ clean: 	
+-	rm -rf debian *~ *.deb *.tar.gz *.rpm *.1.gz vzdump.spec control ${DISTDIR}
+\ No newline at end of file
++	rm -rf debian *~ *.deb *.tar.gz *.rpm *.1.gz vzdump.spec control ${DISTDIR}
diff --git a/app-backup/vzdump/vzdump-1.2.ebuild b/app-backup/vzdump/vzdump-1.2-r1.ebuild
index e7b4d1b5be01..24171295d3e1 100644
--- a/app-backup/vzdump/vzdump-1.2.ebuild
+++ b/app-backup/vzdump/vzdump-1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-functions
 
@@ -12,7 +12,6 @@ SRC_URI="http://www.proxmox.com/cms_proxmox/cms/upload/vzdump/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="dev-lang/perl:="
 RDEPEND="${DEPEND}
@@ -24,6 +23,10 @@ RDEPEND="${DEPEND}
 	virtual/mta
 	virtual/perl-Getopt-Long"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2-no-compress.patch
+)
+
 src_compile() {
 	return
 }