gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-backup
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
47 files changed, 997 insertions, 241 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 2fa5c2ceb1a9..8489d4a06e7f 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index b282f6fd1677..32e4e63caf93 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -14,5 +14,5 @@ AUX example_amanda.conf 635 BLAKE2B c02539af8d0692d8ebf80fae47979845a872bd151596
 AUX example_disklist-2.5.1_p3-r1 177 BLAKE2B 3060151252a44a4abf02764c19db8349ea63691495bda0ca2db4112844c5aea60e4f8b13e668d9a9ac3707f4f52407c8639ed8cca353eac72e8ca7d9cf38dcd5 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3
 AUX example_global.conf 1377 BLAKE2B 712a3ce480b2cc5e0e47a168ac178621b1e655e9d9880c278dfd5aad9627db14f1f3f6be410c3abc4ce4bd33b0728db14d7832149c1643929bd1c53f27d2987a SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
-EBUILD amanda-3.5.1-r3.ebuild 15838 BLAKE2B 55c63e5e44e26a834f79c9c96a8d12aa2ab6106115789786cda3e7796e22120e22a190f9f38c41e6a3822d0e2feadde8557b0e610c7940445ec2d58860f8e676 SHA512 25e9e15683e3e09f1078f6ff76b3dc70001223be2db11800f9402ff6d1172be2e8a431032c4d60a1628c51d6104f7e18f0c5c7c601d3d6b2eb103385cdf56890
+EBUILD amanda-3.5.1-r3.ebuild 15844 BLAKE2B 51f63ded94813ac6b1315e616e65a3b1ca2228f7c1baa698c4b50e28781e8722ffb8dd49bc62ff96e5e5ce66c487072420c092dbc3ec84ff93335ca3a1352a45 SHA512 e233da6e0ccf9d79c06d75cdaa95ab489c8d042d5963b67b8e317efc06c75a87dd9ec9a843b2b3cdfdd9d9b3d7e2052ea5e2676a25a044d3d60458b3f909c1a0
 MISC metadata.xml 996 BLAKE2B 10cd2eb3c98dabee523db57f2c5111b8edac5282b591a776e07675e2add9f6115abaed871d59b36516c1604cddad9068201d32184044eecf43863d19365305a7 SHA512 5a2c81c0d331dcc7862efdc24bd4f1e2e652157a78b9374300dc2f84fb7500b6cde5d4095cd33af8240d5fbc6d382b72beb31159d79b42333faa4c9283729525
diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index 9498a6165145..f838aa934335 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -77,7 +77,7 @@ amanda_variable_setup() {
 	local currentamanda
 
 	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+	currentamanda="$(set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
 
 	# First we set the defaults
 	AMANDA_GROUP_NAME=amanda
@@ -106,7 +106,7 @@ amanda_variable_setup() {
 	# Now pull in the old stuff
 	if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then
 		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+		eval $(grep -E "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
 	fi
 
 	# Re-apply the new settings if any
@@ -152,7 +152,7 @@ src_prepare() {
 	# places for us to work in
 	mkdir -p "${MYFILESDIR}" || die
 	# Now we store the settings we just created
-	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+	set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
 
 	# Prepare our custom files
 	einfo "Building custom configuration files"
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 1ad467da925c..f0399c4dbb62 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -2,6 +2,6 @@ AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677
 DIST backintime-1.3.1.tar.gz 714401 BLAKE2B 5b6a294d5a22ee3928725caf1a9895b665bfcddd6b779355cd7f7e58b5a201c3d2158ef4b30fb73eb4525c1a54cacf878397874f28b06798b7bfd973df467a39 SHA512 faac8552748da75db62cf7fa7eea686fd8b262016d1072f432fff54a6c0c72929650582870b4c56efbaa4ef5984acaece9e1d76eb72abcce91c6fc92d34d52ad
 DIST backintime-1.3.2.tar.gz 714459 BLAKE2B cc53bd5391155705016248511e30cdfa7bc25f0a7cb170dfeeffda397e8be1b22f8e335063289d8c192f94c469430655064899ac8059f22f3b7582e3af87d373 SHA512 19f756d03cc7533e02bb5172ae3f8c167206bf5e8d60c0f3af1f647e01297a4eeb7889bbb5b58e46636bc31392ee436249b276ddbfa41697a0538c542fa26cb8
 EBUILD backintime-1.3.1.ebuild 1621 BLAKE2B e9e0ffa41497be3ce63c3c5827dbc6809123dc06b0427cbc438b5ed6367064502c6f8932bd57d2901882af1fa80914d8ff1659e37c73412e1d8a32ed5ad9d668 SHA512 15e5a2adb27450903befd78a80bf5480ac562be318b61fa4e7251247fc29313b38f147cbaa5496f7a96c98eac22282b1fea8ec86448af343831274761adc03aa
-EBUILD backintime-1.3.2.ebuild 1653 BLAKE2B 0900758a5a3e7bb4b77b7a4163d87a5cd099844da3b591dd35e80fe0b058f441e9e1c4e3eb5e706db1b4a0d3acb28107c3a32687c54628472bfea3e3d1fdbe50 SHA512 ec292d969d5cfb409d04fddd43e7a94109ba315add2e26e66e53cc013a086bd7040b58e9c40010a3f38a47b59162319ce6ebe8070fc87d66acccd7e22933ee1e
-EBUILD backintime-9999.ebuild 1583 BLAKE2B b08c2e4f33ae8f86b714a1871ea0a2675d36e12a0274fbf46062d267e0478db498773b5e4b7dde932744cabf006de24bf8a5fe2f9561ec4c9a40a42dc23a6e6d SHA512 8a11499f309c81db1e7508336e15cbca4e41bce3ff4c67d8e83fbca510a01176e60498ab7d5fd07dc304b8cfab6106d997ddab2b9d05189215f65d67748a754d
+EBUILD backintime-1.3.2.ebuild 1650 BLAKE2B d2bcd4542751449f0c09d5db417620faea80b70a8a3c17d755486941f9fe99804881de5e8399db5cd4b6602f458b0fc43498b4ba8a705134fac43c415b567ef7 SHA512 d7b3f219533d43d05ab333105a9047aee9d0c2ff66d977f46bee5cfb942c40dbdb2da52f7f2d090ff58d5d6b152fb0cdc4c0419249598fecec93e04dcb9bd9a4
+EBUILD backintime-9999.ebuild 1611 BLAKE2B b80a40437968c57066653ebad53ce96595559b2355c2619017a34107c48bff84630f4f60fa119df292b7fd008e692985f9b7169f97dbafdff7277a48dc3a29c2 SHA512 1eff1c238b84167c10af28bba259aeb52f2901d2d39c8471548114a0fb8c21f7ca4576f2dcb9fdd1346b50dfff46e7c6a91c4fdb5a3b4c0a2f384bbbd3d6d63e
 MISC metadata.xml 665 BLAKE2B 402f8b0414939dc87e826c6f635503c87343892033df66701d5be6d379df8d932ba155ffcc8764f7b5a71e3d89f8cb5c83b0ea3a515450c86f6899224298c79e SHA512 4d5271dc1500bb5d4e3f8c7090b95dfd6cb3df44d5c93a2c00fdda7ccdafaf2366c584e331a0b7c83087ea2ca5833f2317fd828676eb5c1d40cea1faa18fbf96
diff --git a/app-backup/backintime/backintime-1.3.2.ebuild b/app-backup/backintime/backintime-1.3.2.ebuild
index a22027e41a00..ab2f61e19ac5 100644
--- a/app-backup/backintime/backintime-1.3.2.ebuild
+++ b/app-backup/backintime/backintime-1.3.2.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit python-single-r1 xdg
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
@@ -13,7 +12,7 @@ SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples qt5"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index ec4851aa691d..8573020d0f1c 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1 git-r3 xdg
 
 DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
@@ -26,6 +25,7 @@ RDEPEND="${DEPEND}
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]
 	qt5? ( dev-python/PyQt5[gui,widgets] )"
+BDEPEND="sys-devel/gettext"
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )
 
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 4909728ef91e..4a0fe2496ee3 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -6,6 +6,7 @@ AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e
 AUX bacula-11.0.2-fix-static.patch 3752 BLAKE2B c910fa044c79f0f50abf5ac86b9f34489cd1bab599394449ec8cf27d2dbb65c36bed77fec80dfccc28c0b1b27bfaafee4127fdf90e77d044a2fed7351973f432 SHA512 63505e9c571b5fd034754da87052441f8438ca0efe4511406eaf142891bd09128c8e478c536f114c4823c53c9f09995bd734dc7efe3e10bdfda337d78c4667bd
 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
+AUX bacula-fix-sonames-new.patch 2090 BLAKE2B 1d181464b599fbb40b5d463b17b6364dc144bb82071e1a3454f30d6f60c8679f738b59dccbc01a73cc14f882997ca5dae438ba2d3d7d1ea20ac148e1da3e2e9c SHA512 c9f6ec30c15f22fc57bed05ed387f99102bc234d50de4762785ec17c4ef3a68d8f560c3878e5843dc3bf1b2680b41f9990dcc89a3c238760deeb5fd95ed5d50a
 AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f
 AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d
 AUX newscripts/bacula-dir.initd 315 BLAKE2B e2bbd011773307a24044a761f17ec7079e5c7cdbac074d7fc064be554bd346fce2d257a789b6b8126eb20460bc7ea80afbdb691dfc012461d6aa1eb14298e8ce SHA512 cbb52bb584e8639a12930491bb5fdd88c279e3ac79a2460c1ceb5d2b9ca4cd4b4fb5be460b8a366ba21d2056befedcc6298468834648d47a5daac814733685f9
@@ -13,6 +14,7 @@ AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-11.0.5.tar.gz 5982886 BLAKE2B 99e9c616c29ab6e0064b336e4ad9d0caf96aee9c51009e04b44bfa4f5f3f8d57de93d8bf6c06f60b01f50838fd8cba4500117245b06e82f42a14a6de507a27d1 SHA512 56dd3208f9774f637fbec2781a847d5e7899ceb4e54178c54c9283eba3fcd83b1579fa690aa380bc6aba363a465151f8e709ce728a582e2518ba715c6179af17
 DIST bacula-11.0.6.tar.gz 5986763 BLAKE2B 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 SHA512 44abc9e3598f3d3beea3e85cca0867e4b9b77c4e7a17cb1902a5e952b049fb2b15f8f6319436fce1dd92ad52d26f04d7225dd052372ecc30aa55fb668a639149
-EBUILD bacula-11.0.5.ebuild 11789 BLAKE2B 24d06c8bbd5f9dc53514d268f8c7a26548053c072360adbb1c7e26f51bf5313252fbc37cc3100b2bf9a0e4da27d28a76049ed42b3fc1d584798a69c8ec7e0960 SHA512 55557589d37717e3cd20e8a096bb110eb92a6ac87114508a52d284a1225ecd543a1004e8b52a2bb8d3665a10aee4ee171168811ff8e7ca64d0db3ca6d25aa291
-EBUILD bacula-11.0.6.ebuild 11791 BLAKE2B 911f6f854ecf518e0fe87eef7d4f8ce5d11c29288b044321e0db2d39f97b666e9b81de48a066a2fc5b76a3f921ad575891f7ab126cc6265e16040714e99f108f SHA512 0b06c0bd480be35dd0ec861bae349660877bf646bf593f724ede70681b9246cf9afdd7ba86057101aa1c2a77c7fa4efbf250e1f162f309b3409fe43fb5385c47
+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
 MISC metadata.xml 697 BLAKE2B 6fd293a1009c2d461a43d404eff2883443f4e2a49d862120f4c9477f7fae8f2462be4786a7e8f6216515373e881d071b433835b9fb8da3b2f30c0701ef4a7ced SHA512 6d0077158112c26232370f11ec0d00ccb14376ce2649cc8ef79d3f99332bbe1bf18968a42e9c20d82934be3f9b49d49cf1f848e4e837143f8a5914fade6b14f7
diff --git a/app-backup/bacula/bacula-11.0.5.ebuild b/app-backup/bacula/bacula-11.0.5.ebuild
index c33c1259fd03..50ddfc74dfde 100644
--- a/app-backup/bacula/bacula-11.0.5.ebuild
+++ b/app-backup/bacula/bacula-11.0.5.ebuild
@@ -231,6 +231,9 @@ src_install() {
 	emake DESTDIR="${D}" install
 	doicon scripts/bacula.png
 
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt5 && ! use static ; then
diff --git a/app-backup/bacula/bacula-11.0.6.ebuild b/app-backup/bacula/bacula-11.0.6-r1.ebuild
index 280ae3cb775c..fe60047ffdcb 100644
--- a/app-backup/bacula/bacula-11.0.6.ebuild
+++ b/app-backup/bacula/bacula-11.0.6-r1.ebuild
@@ -231,6 +231,9 @@ src_install() {
 	emake DESTDIR="${D}" install
 	doicon scripts/bacula.png
 
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
 	# install bat icon and desktop file when enabled
 	# (for some reason ./configure doesn't pick this up)
 	if use qt5 && ! use static ; then
diff --git a/app-backup/bacula/bacula-11.0.6-r2.ebuild b/app-backup/bacula/bacula-11.0.6-r2.ebuild
new file mode 100644
index 000000000000..4f6706f68b34
--- /dev/null
+++ b/app-backup/bacula/bacula-11.0.6-r2.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+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="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			dev-libs/openssl:0=[static-libs]
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	dev-util/patchelf
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/${PN}-11.0.2-fix-static.patch
+
+	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# remove not needed .la files #840957
+	find "${ED}" -name '*.la' -delete || die
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/bacula/files/bacula-fix-sonames-new.patch b/app-backup/bacula/files/bacula-fix-sonames-new.patch
new file mode 100644
index 000000000000..9a3abedb7d66
--- /dev/null
+++ b/app-backup/bacula/files/bacula-fix-sonames-new.patch
@@ -0,0 +1,37 @@
+# Fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
+# 
+# Actual libtool needs a patch to accept '-soname' command line switch, 
+# otherwise it will ignored.
+# slibtool in contrast responds with error and is not easy to patch.
+#
+# Solution here drops the '-soname' switch and uses patchelf program to 
+# fix the SONAME after the library is build.
+diff --git a/src/cats/Makefile.in b/src/cats/Makefile.in
+index d30cc75..9f87798 100644
+--- a/src/cats/Makefile.in
++++ b/src/cats/Makefile.in
+@@ -135,17 +135,21 @@ libbaccats.la: Makefile cats_null.lo
+ libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
+ 	@echo "Making $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+-							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
++							   $(MYSQL_LIBS)
++	patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-mysql-$(LIBBACCATS_LT_RELEASE).so
+ 
+ libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
+ 	@echo "Making $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+-							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
++							   $(POSTGRESQL_LIBS)
++	patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-postgresql-$(LIBBACCATS_LT_RELEASE).so
+ 
+ libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
+ 	@echo "Making $@ ..."
+ 	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+-							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
++							   $(SQLITE_LIBS)
++	patchelf --set-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so .libs/libbaccats-sqlite3-$(LIBBACCATS_LT_RELEASE).so
++
+ #libbaccats-dbi.la: Makefile $(DBI_LOBJS)
+ #	 @echo "Making $@ ..."
+ #	 $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(DBI_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 4b2b92e0fbf6..ed7d98541645 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,5 +1,7 @@
 AUX bareos-20.0.2-cmake-gentoo.patch 1332 BLAKE2B b84158913e0bf051013681f8583546add34d48ea56647beb057525a0da1fff57dcd06c20dd125f300e34a42adb450c3a00456077de914dedf50b5a68748ef1ae SHA512 61e2b119d12daa60bf1fa0bc1de81d4322df421c6c5d2de4e823686f8a8657f521d53256533b52b17a105a25ef8070058144620d71aa295b491d2a39bc7de2f4
 AUX bareos-21-cmake-gentoo.patch 694 BLAKE2B a01f469c1f61a5887dd75779c96fdebf666989c9ec203d478291bb58d8ae974e624c6d83977247f47fdc9cdcae0761552a2864e31ec26cbd64317610bc87613f SHA512 225afe4c2d9ee7774d34776071b8b8430c0a4c28e8a2b301fb5f3963ae4b02ea6f6020082d4bcc0ba937728cd57f77ba19fbc176f8f14c0dc28fa98135fb3c80
+AUX bareos-21.1.2-no-automagic-ccache.patch 837 BLAKE2B 81eea4aa487c59e5514e64e26760d5eaee4b124a2a07e7dc4098adeb0d163dcaa2986c8044b5de9f681e35a8612c3e6a72e5843454e7565747daa536a3e55711 SHA512 1c3b2b9633e7436ce4f782956c9f1722057186a0537a3c4e1f8d78e1ffc8f1afa80c532a6f06ea45a301d4580bc695684a1281b544db376462b613bcb98b803b
+AUX bareos-21.1.2-werror.patch 785 BLAKE2B b29c00d57818a911251b1ca487372679140131eed7844188ea98b43f654901e88ea5a592bd77330160b2bf401bac8d9118c7989e2d44e8566e847e9625d9b0dc SHA512 b050b796e2f75192b39a7540f2d5a065b97899de2159d5fb9ca5eda19cc00cfeae392550267389c7f6f85ae9106e929117bb8a62be5106b16ad30184381cd4a6
 AUX bareos-cmake-gentoo.patch 516 BLAKE2B 685734517fc166413250782ed35445761b19efd9b7ffedb8436a71f5aea84e38633c61318c914169d3ea40daf0c45e3fe229136cdb1a98dc087cd56b91a4b1d2 SHA512 c0d89844a66f851f556e00faf42e85157c744f1547b37d95f5dd0c58a0ab62fb60a8aead87546ea37f5f9d0eb247a3e1a715d042aafe9b422a3eefe37518b743
 AUX bareos-dir-21.confd 357 BLAKE2B 819a8c4bbf66a4a629128d3b23cc122fc340eb5672e406234d1a2960c30ed075989585e1e4801b2bde8f1edeca770d80b58e58bfcaeb45fa056afab4b610b013 SHA512 9858964a291ee9849e144f968a239758e3e6905bb5420717652114d8a583e3342e50f046efa41730f30cfc3f047b485251e93085fb13b327a6f2272d7c4c0309
 AUX bareos-dir-21.initd 541 BLAKE2B 07ec7d342948da390f26a7dbc2209b351ef1f56ada775a37505bd1a0d5d241e2198fa160c1f42dd05609a4b708aca8675684846bcdc038cf1f35d6c46be26c14 SHA512 0d1e1fb9d69bd003b6c99b4c0120c14a4e8bb9c5c112649d299e672623241f98453278667e315c13a0ab0e93b1c17a3d7c2b8f59544c2d764e32c691a1986f3e
@@ -23,5 +25,5 @@ DIST bareos-20.0.6.tar.gz 13373519 BLAKE2B 5f75078cc9b82384e06ad2e4545ab26c04520
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941 SHA512 acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1
 EBUILD bareos-19.2.12.ebuild 10915 BLAKE2B a06c580993370a9a65b1669847bccad0f216f2c0b02a9d5f477292572d0ecc4162d9d1cbac1d3b6d4f24bdae0707bfeee8ec39f26fa2b71065b8da2105cca7c3 SHA512 d23bfc9efaf6ae0ed2a0fe8035083583533e23d8c20d2887b32867c8d40fb1b4a4abe03e936524de7a51a012b1941dd03a1542084b8bdb7d35c661ce73da8ad6
 EBUILD bareos-20.0.6.ebuild 11407 BLAKE2B 00a225c47f39abb02990a088a7b763c73f95aca2b98d3fd49015b7ab852b50c9a0b7455aa881f63071b4fd31676806e13ade6001d8465e41e8b88bbb83524167 SHA512 0924dd4387fcce3821dd039729e6395e142b5de067bee06219de5362fa1068238928c3e9dc243f8648e76717428d80b304acf5ad2719548dafe18b705800497d
-EBUILD bareos-21.1.2.ebuild 10641 BLAKE2B f35237f6ae0188ada30feb79cfb97c2647e46d3566c3b9be64c618c55dd2724a9096aa2c6692d94b11a4caa2c6a05804abbcc7023295bd217cbaf665d307c46c SHA512 05193fd2602274445c6dc9a428b56199f30f771ae9f5cb08629193014c0cbfee7959cdfb5432bf8799eb613f36ee55049dafcc95033fdbbd5ebdfdf9fe824b40
+EBUILD bareos-21.1.2.ebuild 10750 BLAKE2B df1d2161957fb5e4b455255fedff4b419725922ec3a402280e15dd1760ba15bd3dd338baff6d27356bc20537105eef4fbeb6c1d6322b50195dbd68025d0c714e SHA512 252a646c81647b2e9f4857d22f62dec518ceda2286f23217b237d77e2019c072cec7268ed4b66185c9300c9fe7bf360ff1acb626a751c5503677041b32f51371
 MISC metadata.xml 1117 BLAKE2B c53e52cc72764097cf0e40ba5318e044d6f0dc8d852cae9bff5e7915062d75a75fb558c8dcdfb321fb42b204de0521c826394102bb8e312d0df874b19e7052ad SHA512 f2d8ac8e4d8f880b46a9535b709d1d0b0dbccf02e0f8ae0bb97bbe3ebf139f090951ad6e9f172804045928d0ed78ea602fdd378a91645e0faf2f4717b0096578
diff --git a/app-backup/bareos/bareos-21.1.2.ebuild b/app-backup/bareos/bareos-21.1.2.ebuild
index 4baeaaf6c0ec..0b224ba4eae8 100644
--- a/app-backup/bareos/bareos-21.1.2.ebuild
+++ b/app-backup/bareos/bareos-21.1.2.ebuild
@@ -143,6 +143,8 @@ src_test() {
 src_prepare() {
 	# fix gentoo platform support
 	eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
+	eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
 
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
diff --git a/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch
new file mode 100644
index 000000000000..22cdc2a41c36
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch
@@ -0,0 +1,25 @@
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -44,12 +44,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common)
+ 
+ include(GNUInstallDirs)
+ 
+-find_program(CCACHE_FOUND ccache)
+-if(CCACHE_FOUND)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-endif(CCACHE_FOUND)
+-
+ # switch on CXX 17 Support
+ #
+ set(CMAKE_CXX_STANDARD 17)
+@@ -584,9 +578,6 @@ message(STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION})
+ # A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). But
+ # there are also two variables exactly for this purpose:
+ 
+-# wheter or not
+-message(STATUS "CCACHE_FOUND: " ${CCACHE_FOUND})
+-
+ # Choose the type of build.  Example: SET(CMAKE_BUILD_TYPE Debug)
+ message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
+ 
diff --git a/app-backup/bareos/files/bareos-21.1.2-werror.patch b/app-backup/bareos/files/bareos-21.1.2-werror.patch
new file mode 100644
index 000000000000..10de9f1415b6
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21.1.2-werror.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/841734
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -96,7 +96,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+     -Werror=format-security compiler_error_format_security
+   )
+   if(${compiler_error_format_security})
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security")
+   endif()
+ endif()
+ 
+@@ -353,8 +353,8 @@ if(developer)
+   add_definitions("-DDEVELOPER=1")
+ endif()
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ 
+ include(BareosSetVariableDefaults)
+ option(ENABLE_BCONSOLE "Build bconsole binary" ON)
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index fa9f4e84c8ff..25a3c6c225c8 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,10 +1,6 @@
-DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa1c95d08418a43c176146243d83cf07b3033707ab5423eeb097e92bb31cf016f65fc3738ebff1bb8c704a54c6e8dd12 SHA512 db2f06a96897c07a71e9c4531d4f219ef5451009c08ae933348b1a02b7d6c95b4e814a25b4cf465c0021ff670fdd46076c486c2a466d056dd931cb7eee8b1ef3
-DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d89d025b1b3434c5d270539d1fc4aec92b52a750ab1079911e53478411f91c92be4f053c09289b1e38285caa03453f17 SHA512 9cdfe794329821c784461382633fd29f7f9b3cc6ef9e7fa2463ed178efd64ea367e56d49128d88b86bd516d36971282207ec173735ecb4eabc4ec7b4604ed773
 DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
-DIST borgbackup-1.2.0.tar.gz 4020793 BLAKE2B 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec SHA512 c06a797439078118fc57418be2a9af64e84248659ba25cfc04dff7c67f9f52a033a11cd1e830410be390ae59dcacd2474f97d8b5886db7d4910486d0ad9b7c51
-EBUILD borgbackup-1.1.15.ebuild 891 BLAKE2B fd7e6dc50e0ca6cfd0773115bae0888f23b8f54b6a0772f8bb1457fae9b991c1a0ed18c7f353a779771b1a46affbccecb06b2d74eea6ec2f649a934baa7a15d4 SHA512 6d7e21a3af4a26e7a3ffca6b317a0c509e9cfc94ab042c3698a634a4576aef02269642ac485de4cd23b6d8bcb22ccddfd36eccaa827111af8b7056b549b7c96a
-EBUILD borgbackup-1.1.16.ebuild 893 BLAKE2B 1abe061f0005516b4a28fc5e9b116c8c84c63cb0433fcbe5b9c8cec57fde4153959a6708af600a6a934cd882b35aff8425ef627548acb51c04292a782b77abaf SHA512 5581b6d662431756c2eac76b5281085387f82d77f30a633db73c7dd80edfe1629d2a854bdaf7d4a56add593cddb90eeb96c33fb3af83f651f9bd39290e239892
+DIST borgbackup-1.2.1.tar.gz 4017050 BLAKE2B 2841f3c02b6af76aba61064513ebd9039367be868a5f0dad2e10cbf3243236a5d29609bee63b79056f2a553052d3dc415178dbabd5c1e5af9c43111286942869 SHA512 47e95960c9ce7715897834f400ee1a3dcbbbd9aa1e4b69dc93618ade24caf6c046b844c9f3edd10e090795d06bed0136fbd42d6e679f0639f221b83d82545d43
 EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B 9e1165ef693d028e2936f22ba5bf0af42bbd7a83d1df32f667bd79269cea3d39ee90cbfe9b9718d8e650cb0ab33d6de5d909a78274897ca1ebefd918538db2eb SHA512 04fdb94a90a9a0bc36de20029c03d73625bae7f1ae099f96ce225e778cc60a00e60fea2ebe5cb40b35c2fb8af46fd0cade56a359e2a2d9eeef99e5581c560dd0
-EBUILD borgbackup-1.2.0.ebuild 1026 BLAKE2B 1743235df1ccecc8d0cbc13b53e83f42f390402a0faf1e38dafa3ef909ec94581d63ea7259e544ac05d590dc7b9c6b4522bea8c6b8889e03549d98444d5b0fe1 SHA512 49717a5443b67e2f864cb71a1dc1c8110030ab72690ea2377a2e4d4bfbca9f523c780c23c2dc0091acb44f1ea4d9467e6e76dcb7e7d395207ca1e1ae0165d07c
-EBUILD borgbackup-9999.ebuild 933 BLAKE2B 3af24e55a1fc6b941896d858831900bd23223af3474907ab17ca04c40ff482be1a120bd35f4d979a8e747bd42ab7e106841dbfd117830ed02d89e7624d99b348 SHA512 4ab024b404b49997cccb3a633320bc1f06d5e7fa36e785225302e1fe2efb29e00e5d13a2a47f4b7de5295c022d1fea34d2b18a051e2b8942599cdfb5de45afc0
+EBUILD borgbackup-1.2.1-r2.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
+EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
 MISC metadata.xml 494 BLAKE2B 885fa002bca2ba16e31bc66dde9d21aea8eb5a3ab5522cab3e824a9cde1d87f8819eb028eb21a9382d23622fe0a699a481e7cb7cd50fba897e59490ba0734d39 SHA512 bddc0ca7934315439e4a23b43fbd42d538c1570b43b0401efa9641c2854e5633d727db4bda82a34fe88ad2c1b512df47b6654b50f85a0501f0ef8405d7f8a667
diff --git a/app-backup/borgbackup/borgbackup-1.1.15.ebuild b/app-backup/borgbackup/borgbackup-1.1.15.ebuild
deleted file mode 100644
index 09a2b0afa097..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-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
-RDEPEND="
-	!!app-office/borg
-	app-arch/lz4
-	virtual/acl
-	dev-python/llfuse[${PYTHON_USEDEP}]
-	dev-libs/openssl:0=
-"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	${RDEPEND}
-"
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/*
-}
diff --git a/app-backup/borgbackup/borgbackup-1.1.16.ebuild b/app-backup/borgbackup/borgbackup-1.1.16.ebuild
deleted file mode 100644
index 0b6156de5e97..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-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
-RDEPEND="
-	!!app-office/borg
-	app-arch/lz4
-	virtual/acl
-	dev-python/llfuse[${PYTHON_USEDEP}]
-	dev-libs/openssl:0=
-"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	${RDEPEND}
-"
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/*
-}
diff --git a/app-backup/borgbackup/borgbackup-1.2.0.ebuild b/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
index 8bb8425e74c6..9ac4b1a5217a 100644
--- a/app-backup/borgbackup/borgbackup-1.2.0.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
@@ -22,19 +22,21 @@ 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.3[${PYTHON_USEDEP}]
+	~dev-python/msgpack-1.0.4[${PYTHON_USEDEP}]
 	dev-libs/openssl:0=
 "
 
 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
index 5b537bc22720..9ac4b1a5217a 100644
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
@@ -22,18 +22,22 @@ 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/llfuse[${PYTHON_USEDEP}]
+	dev-python/pyfuse3[${PYTHON_USEDEP}]
+	~dev-python/msgpack-1.0.4[${PYTHON_USEDEP}]
 	dev-libs/openssl:0=
 "
 
 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
 
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 30357e067588..621f4fdb98c0 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,5 +1,11 @@
 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
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.6.1.ebuild b/app-backup/borgmatic/borgmatic-1.6.1.ebuild
new file mode 100644
index 000000000000..f48f145dc769
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.6.1.ebuild
@@ -0,0 +1,65 @@
+# 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.3.ebuild
new file mode 100644
index 000000000000..f48f145dc769
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.6.3.ebuild
@@ -0,0 +1,65 @@
+# 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.4.ebuild b/app-backup/borgmatic/borgmatic-1.6.4.ebuild
new file mode 100644
index 000000000000..f48f145dc769
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.6.4.ebuild
@@ -0,0 +1,65 @@
+# 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/btrbk/Manifest b/app-backup/btrbk/Manifest
index 9387d56bbb92..99b92bb787a1 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -2,9 +2,11 @@ DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f836437
 DIST btrbk-0.31.3.tar.xz 109884 BLAKE2B 7f78d00815259e42bb3fd16ee48272717fe57913b7af83ca8a98f1dfd0de715cbf8b07177ea60b5b8bdcb9793ee0d5829b90b8327cd4810f6275611276a6e707 SHA512 62dee5430635b6a31edcdc9bed1829f549b60074ea09bb6f1fcd56d242d4215339846c8c2dbcd4bee05cd2a0cb32c1237ce7311d2b887885373c13fa15a6f476
 DIST btrbk-0.32.0.tar.xz 110408 BLAKE2B d9627d0f0a258bba9412b37707c3e79ca8a65870148aa27f38e615c90d0e26adfc5ecf697cc34052916127a0a26be850f5874ff52ab6cb193093d591cb05dab1 SHA512 201dde5ea9bf459e5a837b520d3e76ef1077a1769ed2e06b9754e34a93e2abd513a0da2b18abbe13c09fc3a945117a4b022ad423f805056b62a2b2be9c0f768a
 DIST btrbk-0.32.1.tar.xz 110364 BLAKE2B 5d2860e182701ba6c407b9d0f41e476442bdf0ebc8491c3fa944860228d087d6bbe13084a4e950a24fc6ea1e251e2c4c6cbf17e9e3a4cb4f3f9b7ea9b85b2c11 SHA512 a44c1a50696793661fa6a06fafc6a7682ba5db57b511666a9b77d2df79b724855e91187e4d13e1dfe340077f550b0aced8923c6dec955d25ce46f7644ed802f3
+DIST btrbk-0.32.2.tar.xz 111044 BLAKE2B f06e563d0a3f6a7096426b205c56446c8cba34767a0a2cd092f1d0d2661c1a38d88adfae0cd2046d2f43623fb236e9a2d7ef7281938a37b410f2cf842f5df83c SHA512 204bd48605b369909b1cb586bfa75dda5ee57b833c71a9d39699020f05f7305e2bc932c76face5aa0e435c1df46e13a566cbb2042c86975f6f8cd65c82ddcccf
 EBUILD btrbk-0.31.2.ebuild 2381 BLAKE2B dead45950b470fbd2303425a522186e5ac553711583ea1406112260a05484a7420884a3023dbc4314121f7ef28f4b473b78082a9a77ee9c6ab6c1afcb4a693e5 SHA512 6fb46ea01bb0f105ac50d28fb0c830b70934d8660ab24bc89c1f72eea2c5c1b6b150fab1eba9ade528a6e7b9cb514fe6f5255523ef455e23a634ae29a116c6f9
 EBUILD btrbk-0.31.3.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-0.32.0.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
 EBUILD btrbk-0.32.1.ebuild 2385 BLAKE2B f1ce5388d83881455a946299992622f44ff958cd8ef57e6d8f0ead9c8e490b784b3ac02da587119cf6415feae772d5fa4c449c9d2ba218fb9c780e94f15e98cd SHA512 b1b25893f4ded6f719b36216006de236210a3ca1b39d5c6b7d2468d4ffcff867b590be40a2e47415fdf3672873321bcf06e4393a89cce44098f7a71f83cb7f97
-EBUILD btrbk-9999.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
+EBUILD btrbk-0.32.2.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
+EBUILD btrbk-9999.ebuild 2385 BLAKE2B 34a17462e9aa80f5a86cedbb3ce25c0524aca74eeaed226f79a27b73eb604ddc4e1baa9472a113bf647871c37c7e7926baf42542f18e96245a573dc8f778b061 SHA512 763c8e25ca107eede4bd509b7c9a2f9f191e0965b4b156ff4286f3a67624b2c34b83b9db64c2e1b93d2e501f89e2eeb9629bb78de9d68da9a43a1f2846debb46
 MISC metadata.xml 1064 BLAKE2B e3267b1898185ceaed7098002d2cf08b58c4a68bb60ab245bed3796551c070f84721fb009e5c0b28181103b531160a647948e3c10bfa0f0156eb397765c312f4 SHA512 f166f4be76557a8b398a47874410fd436ce17eea543ec6752aa64282d7b29afcce04e341e9884a3a1ed18ea48005069f83fb68bda2bb694d997851b6e138c353
diff --git a/app-backup/btrbk/btrbk-0.32.2.ebuild b/app-backup/btrbk/btrbk-0.32.2.ebuild
new file mode 100644
index 000000000000..f75978a45363
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.32.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+mbuffer +doc +lsbtr"
+
+DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	mbuffer? ( >=sys-block/mbuffer-20180505 )
+	>=sys-fs/btrfs-progs-4.12"
+
+src_compile() {
+	emake clean
+	use doc && emake -C doc
+}
+src_install() {
+	local targets="install-bin install-etc install-share install-systemd"
+	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+		${targets}
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index f301c70cd559..f75978a45363 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd
 
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 658a10ba7cab..682074d950a6 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,3 @@
-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.4.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
-EBUILD dar-2.7.5.ebuild 2230 BLAKE2B 7ad96a0246b7db5069e3c93b2ee6b32d711b82e24afc71a48bc3e7a77d18bb215c76e35193bffe3c6c13ff0c66f38e4e6d3d534dcf6774a1a3f040afbcf76223 SHA512 f5efb4de42e27c74f6910d368d18a3284d4d0007c792f1306f3d31ba85bb56edd56aaf64a52cd6a36002d2059c0ee60a50190ce91fe8e78e94e85845cfee6f44
+EBUILD dar-2.7.5.ebuild 2226 BLAKE2B 305c99ac9f516c706032ec066f7e22d6c85690bc6e7c29cfe8eecd54fbb0a4ca2e2db17fd58edbd0d6de98c3f89af13500e48369a62036f6816880b6f116b3fb SHA512 c43754f566d0ff4772ba9bc8062ac2c121c2d9f9bf7bd85bf1153301b5c06b8e75200e1cbb75708abc19c283c07b40917de85658a42c46bbcedff96155b27092
 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
deleted file mode 100644
index 86e173b25733..000000000000
--- a/app-backup/dar/dar-2.7.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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/dar/dar-2.7.5.ebuild b/app-backup/dar/dar-2.7.5.ebuild
index ef7cc64225b7..86e173b25733 100644
--- a/app-backup/dar/dar-2.7.5.ebuild
+++ b/app-backup/dar/dar-2.7.5.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/deja-dup/Manifest b/app-backup/deja-dup/Manifest
index 6f246e75450f..e2d82313c382 100644
--- a/app-backup/deja-dup/Manifest
+++ b/app-backup/deja-dup/Manifest
@@ -2,4 +2,4 @@ DIST deja-dup-42.7.tar.bz2 1384797 BLAKE2B f462df835039606b721d935e086e51ee27e86
 DIST deja-dup-42.8.tar.bz2 1467818 BLAKE2B 6f02fc458890f076bf0a8e1ffdc9d72880fd9f1a692d439ecfa5d8b08234472f3ae27aa801144b3e42e9c8b67b550c0882dc93c23d27e6e428ce1eddd80a912d SHA512 76c98e8635ffae076008efa73a92860c6d4e67d39339d452c253269bb3ed032b819ac40d65c2d8fbf195ecaf304796f516e861b0552be972838f95bf59af0a5c
 EBUILD deja-dup-42.7-r1.ebuild 1060 BLAKE2B 6a6e1700456d62f20d3d4f3c381120b76c0a0f8b4878f0136769a6ae28383e0a915c10ec0c347fb878857963cc9cef53aaba6dc1488aef420976a139a4991f24 SHA512 a794d26fa59f326bb2b0e81a46102943f73a67c7fb1a2fa462b087a717189208cb9c3f558f1298feafb9230de1aa07f029410c490e1454fda734658734d9ed0a
 EBUILD deja-dup-42.8.ebuild 1071 BLAKE2B 0e1dfcbb7fe88940bbc1d8993af6da3dacdd52cc3ca75ff3b29480bf5db1837ab10e2e5436be687cb8cc010c8f5010892e03554b3b966032c1d56958ba6b3bf9 SHA512 802a7b4a207c6aa21fdb2d62cda0afd9e4c7a7c25b45e6294a881a76e6aa7b9c1c9393e5ecf1726535a132b927a030adaa76d799987bda06685c2824b55efab5
-MISC metadata.xml 1197 BLAKE2B b35d1ddd33fabcb87afbd41dd6116a51b8443af892c7836f8371b42697950ceaf4561b9cf644ab8924be29d1753fc4e749665cc64f0baae8a45c81b32197d92e SHA512 ffbda2f78255a0bcb32a702f4cce208822d737b3ebd7d36186ed98b8a8a481e246904ccddbeac283f95ba983dc2ba585c77540355d86d76babafb9b139f2ca3d
+MISC metadata.xml 1118 BLAKE2B e56ff39a4eb5290c056fbf39b8c34d56c62b63cd65c317786b9e2a14f0c850edc3102db7908e106a9b94c642f8a34dcbbead2fe08e20f8a44fac16a3dfc3afee SHA512 1b2b8c04079a2c6d08c14722b235ef106c4711156ed147b9ace5da0aa29cec362903adb27d13835e32cfb955b688428dffc2593ce7e4202e93233b879c07dd6e
diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml
index 1efc79539750..7748131688b7 100644
--- a/app-backup/deja-dup/metadata.xml
+++ b/app-backup/deja-dup/metadata.xml
@@ -25,7 +25,6 @@
 	backup apps.
 	</longdescription>
 	<upstream>
-		<remote-id type="gitlab">https://gitlab.gnome.org/World/deja-dup</remote-id>
 		<bugs-to>https://gitlab.gnome.org/World/deja-dup/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 8f5b26703617..5266ea04a072 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,7 +1,7 @@
-AUX duplicity-0.8.21-fix-docs-cmd.patch 628 BLAKE2B e43ce23bfa03a78e86a604487b2bc16fe924fcb4044283ea6fb6cc9afa87aa6cee52a4cbefa6a6918b7c98ee3bd914d753f85db6d74c86a615952d0fc2435256 SHA512 13fc15337b8e5bc6b3dff4954b8d0aabcad8b9f1a95c08c367c816fa762c528262427625f8b5ed3ef985e5577e5dea633ae8f78a2aa4f35a3778b2c6fe6f12fc
 AUX duplicity-0.8.22-fix-docs-cmd.patch 636 BLAKE2B b35c164689104cf545a0bdb4d103fbab33e7f3ca231523ccb12e672863f601b42ce3de7ee2ba10b3efb118f413bd295f1b7e436ae702624bfe1f4cff6587a4be SHA512 c13b000352e6241d2454ff5ae206cd7ccf9e2594caa3be60a2adb4894020d812dd3720d0fffe16ca3e8402e448b174ff7d9137349dfda77fd724545b058f59b6
-DIST duplicity-0.8.21.tar.gz 1375469 BLAKE2B 15da671b30305415dfafdef50f5f57eaea0d6504a3f35845bf4570bb0cd2d6d3c879e94dda5739f30acd54748ef7abb993405660d24cf96ab919cec08690e015 SHA512 573c79937e4b19e99d167fddaebfd7b747d3c5f240b14e575fecd45a225c6c279d5ce0132645bbefcddcbc688f9d67317a3ec3a0816fcb4ff303b217fe10b012
+AUX duplicity-0.8.23-fix-docs-cmd.patch 636 BLAKE2B 082e8c7ebc704550103b42dc04a03963018ddf99b5255016d68c9fc5eabaf8f7555c216820709e9e5b2881acac3739f13af32c57cf5d9a97cd32e20d73f77179 SHA512 9e1756de4d2c3ea83d070aacc101db5be92baa04ec997fedf3f2fcc3a26e9f74fa2cf1aac0749fc6c4b1ad141d8ddba86711f017ad41f3f2997b520209ef3ae6
 DIST duplicity-0.8.22.tar.gz 1408482 BLAKE2B 3a8b6eb79d5f67e8f274bdaaaf0bb5b6c9f0ebf91a3b6a849b876cdf2c9af0f5435946150b5db6ab5e524cedc5b98b40c456b1de0fe8c6e33c024fe3c7d881fa SHA512 474237e3ca9876fb124baf9871f781b8347c85e76b7b4191d6993a76fb4728500091c74ed0943c6c22d69651c08094b6d155eca742d1711bebe676734c84d12a
-EBUILD duplicity-0.8.21.ebuild 1202 BLAKE2B 0b72af8049dba29080a14379857d90be886faf570dc5c0333a7268b33978ce3ffc4a8d54fb6baa0e6f68d7185a8545355ad1802586cb30e488604facb435cc5f SHA512 e4119a8eb6c11787c76c3c01d40239d882b1fc21022de2221ff4240bbdf2e0e037441f338cdc0b585713328794c0d4adc33981ff33676c9aa2eabc86f0cf2101
-EBUILD duplicity-0.8.22.ebuild 1200 BLAKE2B a95276cba6394c1f0918e3abdce51f7ebfd40d50b901afa0b75c17388cdf2dd297e733db174c56688a7fc5d13642aa447bee5f0602765372a68baaf3c71e97c3 SHA512 a4da6337b28ec6bbc7d11c0eaedb2e944fd30ae88715a70af0be37a7ed6175f3d9f35f032d0230ddd40b9a45a7503bba8c3e76cb9376d165499e857694554e40
+DIST duplicity-0.8.23.tar.gz 1385252 BLAKE2B 63042486e6e17d2d93af72f617990c879763d5921e230302f406b4f9e7c57a67284130f9f57849b9ffc8638614b55f0f8abdf6bb20201155b33b72bef952ec9f SHA512 083cf0060a8c7a8472c6ee4ffbb87e85edf0fcdaba95862a9f272cc03d8ab3d18b584a8d256473e6cfab9eed6f993382b846b692a8c0dd46fd3a2d8215e54e45
+EBUILD duplicity-0.8.22.ebuild 1198 BLAKE2B 14b7f2881e24e0c6df0210106aed3bff676d5cc1ca3b6d94a9ba0244d116dbc062935da3ebd6f7cd9d76aff3d56a491f6dd29491b2cc037e1144066e0b5d73d4 SHA512 a969b0c486327c11fa6aa17416ef2e42f6ac379d8969a8da46d7a498dca12c0820740aee58dfd15b6b736f599eb07c2ba38869fd4b345605cba09feba234a1b0
+EBUILD duplicity-0.8.23-r1.ebuild 1201 BLAKE2B 023052ab3943bb3cd48a2d076703af57ab18512818bed7539fb0424ec1804465e7aa553841bc3cbc106e9a740b51b27ad5336121f140e9ccbd99c6ed3e8daba2 SHA512 ea57826bc39d8799ee60444b673426739df0b7ee2f24500e6ac574155b18cf3dc9b22d73966bade5af191894cd677ea9a9d5f2975b4d0762c2f895d78cbb4ded
 MISC metadata.xml 455 BLAKE2B cc38c235e02397d73b26aaddfdbbd872cb7dbe1a777302618e44769e1895b7d7c90e7de7d7cf8a63388e20283fe0f9937da3ed0ffec21d960543220c253fff33 SHA512 0fb009ecd0b771bc8e04980cb1aa49a872193cfa59a0e10966322a9764c1c08d859504afd78f839e7a98a6224e4d1fe20dd6dff549cadda5c7e31b74ed0a82b8
diff --git a/app-backup/duplicity/duplicity-0.8.22.ebuild b/app-backup/duplicity/duplicity-0.8.22.ebuild
index 05713d415754..327ae4f973f4 100644
--- a/app-backup/duplicity/duplicity-0.8.22.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"
 
 CDEPEND="
diff --git a/app-backup/duplicity/duplicity-0.8.21.ebuild b/app-backup/duplicity/duplicity-0.8.23-r1.ebuild
index 9f9af57a0a75..bf59fe56d88b 100644
--- a/app-backup/duplicity/duplicity-0.8.21.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.23-r1.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_COMPAT=( python3_8 python3_9 python3_10 )
 
 inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://www.nongnu.org/duplicity/"
+HOMEPAGE="https://duplicity.gitlab.io/"
 SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"
 
 CDEPEND="
@@ -32,7 +32,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto[${PYTHON_USEDEP}] )
+	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
 "
 
 RESTRICT="test"
diff --git a/app-backup/duplicity/files/duplicity-0.8.21-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.23-fix-docs-cmd.patch
index d97949058a28..2497beb25e01 100644
--- a/app-backup/duplicity/files/duplicity-0.8.21-fix-docs-cmd.patch
+++ b/app-backup/duplicity/files/duplicity-0.8.23-fix-docs-cmd.patch
@@ -1,13 +1,13 @@
---- duplicity-0.8.21/setup.py	2021-12-07 14:26:58.096082507 -0500
-+++ duplicity-0.8.21/setup.py	2021-12-07 14:27:44.915022471 -0500
+--- duplicity-0.8.23/setup.py	2022-03-19 15:08:36.755624771 -0400
++++ duplicity-0.8.23/setup.py	2022-03-19 15:09:38.332763172 -0400
 @@ -94,17 +94,6 @@
                  u'bin/rdiffdir.1'
                  ]
              ),
 -            (u'share/doc/duplicity-%s' % Version,
 -                [
--                u'AUTHORS',
 -                u'CHANGELOG.md',
+-                u'CONTRIBUTING.md',
 -                u'COPYING',
 -                u'README.md',
 -                u'README-LOG.md',
diff --git a/app-backup/mirdir/Manifest b/app-backup/mirdir/Manifest
index 77d8832ec4f7..f7489fa38dfc 100644
--- a/app-backup/mirdir/Manifest
+++ b/app-backup/mirdir/Manifest
@@ -1,3 +1,5 @@
+AUX mirdir-2.1-implicit-function-decl.patch 190 BLAKE2B 2071e5717bd4a5eed34ae2250f45a0760f41a01f23d79ab1bfe31434682e55a71b6429a3a0e7e5f44f13d58817220daf3ef750d4737e40c7f9d425a6b59f8ac6 SHA512 6c5302e4e9f306b354991233ec5f0dbd6b52efe524ebec0f1609f5266aa1896d6892e49b7a91d689a0ce45fc0e56d5f5f33028dd840bc0e1d2ae46a021a80e8c
 DIST mirdir-2.1-Unix.tar.gz 74002 BLAKE2B e9a22bbdae1e2502ffb3bff09f56aa546b79d1847d1e2081ebb262bc9601d1e1e3e48ded45db7e6adb657d2b491b9615974a740be630a277094a66bf4bcbfeaf SHA512 d99cbc04a5d99a739c16fea9198d92cd0209fb5fd4fc931eb2af2bb6c0c0ddcec3c34a27269bf108d7ffebcf760c9817088ea2091abbe9d3c4e932724e85c680
 EBUILD mirdir-2.1-r2.ebuild 532 BLAKE2B 786a3812122bc7be09799b9c2a3f0aef59e418bcec7afb9d75445cf4d02387aea8e5f2cf20521151a76c37d86c11e2f2609001917a435c74225835978cd7118f SHA512 42169eacbd465854f7ae69f0187b5bc1e6dd736d678fce77d2ae56bca1be6312e73fcc0c21e0763f75aa490d18f1139086dcd8c75e68afe8447cabf88d592736
+EBUILD mirdir-2.1-r3.ebuild 773 BLAKE2B c9d2efe6f813ce7dbaa2e103b89bfeb8c44b3b7a3bf04e2fbe8f4eb279822646ac0cbfe24925ec007b8869201f8ed5fabe8c2d7b2216ca78c7c4de3a129d4ef7 SHA512 b64b3249e64ed3af32e65902369ba5a03b926920059888e59d280920dcc438bf6bb57e087d6087dbdfeaf872ca679db3ba8b9b8390b716c7e447112434a1f9ea
 MISC metadata.xml 337 BLAKE2B a144ae0e49068aa9051e9aa7a847905025152ee12959532f6e286a86477e5a309d77d540295c7440037715d190b29f26fc174ec5e8536a51a57a5db543081992 SHA512 c1100f32b7f60981768b3f71c6314a5d2aa308ba6f61d346b9f46b15f95096bb8845b62c407754ee8073b7c2fa1dd8e26cb987698e98770b3afe561d0d0491e5
diff --git a/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch b/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch
new file mode 100644
index 000000000000..e9e824d9f019
--- /dev/null
+++ b/app-backup/mirdir/files/mirdir-2.1-implicit-function-decl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/854213
+--- a/mirdir.c
++++ b/mirdir.c
+@@ -88,6 +88,7 @@
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ /*
+ #include <sys/types.h>
diff --git a/app-backup/mirdir/mirdir-2.1-r3.ebuild b/app-backup/mirdir/mirdir-2.1-r3.ebuild
new file mode 100644
index 000000000000..ac0a24f319bd
--- /dev/null
+++ b/app-backup/mirdir/mirdir-2.1-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Synchronize two directory trees in a fast way"
+HOMEPAGE="https://sourceforge.net/projects/mirdir/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-Unix.tar.gz"
+S="${WORKDIR}/${P}-UNIX"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1-implicit-function-decl.patch
+)
+
+src_prepare() {
+	default
+
+	# Disable stripping, bug #239939
+	sed -i -e 's:strip .*::' Makefile.in || die
+}
+
+src_configure() {
+	# Old autoconf gets this test wrong with -flto(!) and there's
+	# no source configure.in/.ac in the tarball. bug #854213
+	export ac_cv_func_lutime=no
+
+	econf
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman ${PN}.1
+
+	einstalldocs
+}
diff --git a/app-backup/rsnapshot/Manifest b/app-backup/rsnapshot/Manifest
index c8fdabe75cea..e624de900155 100644
--- a/app-backup/rsnapshot/Manifest
+++ b/app-backup/rsnapshot/Manifest
@@ -3,5 +3,5 @@ DIST rsnapshot-1.4.3.tar.gz 370840 BLAKE2B 6a3acde4afd8d1f999cfb00f07a0547b6d877
 DIST rsnapshot-1.4.4.tar.gz 374269 BLAKE2B 1e4a0c99d12d48cf4dacd3817b621f7e6b0ba32e9d9de87b61252875ae0bf735e8ce2c7d8bb60edb2f7d6345a06b183a2616bf1ac3dd7d1b5d3a3ef22a0ede6f SHA512 da45039457b9f3feb53b823f6ee36e8f7447d0689281d1bc857c6fedd450db2fdf8a98e66ba6e135a86654666888f7744ad9ff0aabbd605e1fc09dd5f1f7b838
 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 1343 BLAKE2B 1af8e0b22cb09e074930a0dd5e7569353116053e834c808315ed82b111bbcbb13212e31772593f78b29e0e909e0e73fcd7616daf1be6d42c7cd2863a2f5773bf SHA512 a4994cad5bc22b1cb031e15331a2b65c8948668024582bd2f32c6b66eb0560be8aa090e51f7cb4fc16cf56bcced5efb1a97d195c352d3215abad9a67fca94074
+EBUILD rsnapshot-1.4.4.ebuild 1338 BLAKE2B 6239209405ed60e4aaedc8aed906509580a8b62f90f1d93f1e111598888597a1c78f085f67e42d8012ef21906fe3f3f3b2ca09c655fab9fd0d9e9d89d4076a9e SHA512 7399a1f7339ca86d2b5d05eba55d271803a63e5fc2cfc0df184f6a3a0c3f8b44da15d983a3818334f96af54de30547a32b1e484bc795637af16b127dda32c263
 MISC metadata.xml 416 BLAKE2B 87a6c0a31a2b91d72a3af397a31f6af0a5b50f0ab8a5c91c41e2453b1928ec29d46ea5668d3f1ee4dcfcee7c62301ff0ba57b1b7c58811015b56f44c2f4002e5 SHA512 94d7fae6147134a88c3874b0a84eb3b7d066629964aba8d5e7acd3be92a009f47f74bb75b720602ac0113a9947e0a29dda229c198e28fe8717cb62477bd9c6b0
diff --git a/app-backup/rsnapshot/rsnapshot-1.4.4.ebuild b/app-backup/rsnapshot/rsnapshot-1.4.4.ebuild
index 6a32d9244d3f..ae093a14dfed 100644
--- a/app-backup/rsnapshot/rsnapshot-1.4.4.ebuild
+++ b/app-backup/rsnapshot/rsnapshot-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://www.rsnapshot.org/downloads/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 
 RDEPEND=">=dev-lang/perl-5.8.2
 		dev-perl/Lchown
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 4901a106b49d..a9c2ccf86880 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -3,7 +3,9 @@ AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae
 AUX snapper-0.9.1-testsuite.patch 2613 BLAKE2B 6fd621d1cab8ee829ba07ee7fac0ca7de884becb6b3ca24e444de4de547866fe2ec1c108fcc6686c8adc78661324445c8f37e82110514b7a7d9b578ede70c7ef SHA512 e447c6062e85f587b084334a5565d02dd89c778985d121e7489f8059a647b22a2e3386992f107f589b60bbfd55036f71efe21651841592073b29981a1451df36
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
 DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0
+DIST snapper-0.10.2.tar.gz 407857 BLAKE2B f59ee95612a66397f9cb1bec4a3a20fec41f12324d1a778d5bbdac2bd3359b6719d16fba5c50b3753e416681e83780180fe8965757b810165bebef8c4bed6634 SHA512 bdda67908b054beee7285bb3ac97ce28276449d7719369135a7ffa74bce40000ebc89f4f059abe44f8cc7c3a09c46af446e812229290ddd10b2af053fefbc568
 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
 EBUILD snapper-0.10.1.ebuild 2003 BLAKE2B ba7081ebddda94e426a031a99063fa85e99fb53905f507ad40bd87fdb809fc4d6bfb9e553390e969f84ce60e2d7cb5255bb72cb7e8408c51415c229046c6fcf3 SHA512 5ea5a60365e210af54aca1df2a512f6df5815f5c765a07bbae19487b63226695dae0ad73453487a7e192ef8c9384b4c76c86d7acc27b8a77466a3646157c856f
+EBUILD snapper-0.10.2.ebuild 2011 BLAKE2B 31ded933dbf072fc8bbfdef0ea4cf77a934892ef74d59d8ac764e6961f3216098a2664de49cda1b064d5703b5b1239ff536419526113bff6bd480bdb65770b42 SHA512 779de9868224af494d7a4f53f7865477d25f4f2d5459040b7a9349fbda4223c5f270a935b8c614132bae7d64729297e3957e6474ac71f81f930cad55fe5ecb52
 EBUILD snapper-0.9.1.ebuild 2064 BLAKE2B ba272ba78aed3980832775c8318671ef38781785b530d8322dfbaa2751b46f3772a324135f57dbb9fa21ac81f5e5d4be3756dd311de54992fa66a20c5368179d SHA512 e074e324915122c9e4ac42a7c6e27719b90ea32fe91bacc3f7e0ced18164100988f3d9309e2e95697a8668e5ad2f754ada9325e6e7d95bbcbad91354f4017f17
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/snapper-0.10.2.ebuild b/app-backup/snapper/snapper-0.10.2.ebuild
new file mode 100644
index 000000000000..a9bdd7be0315
--- /dev/null
+++ b/app-backup/snapper/snapper-0.10.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc lvm pam test systemd xattr"
+RESTRICT="test"
+
+RDEPEND="dev-libs/boost:=[threads(+)]
+	dev-libs/json-c:=
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+	eautoreconf
+}
+
+src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
+	local myeconfargs=(
+		--disable-silent-rules
+		--with-conf="/etc/conf.d"
+		--enable-zypp
+		--enable-rollback
+		--enable-btrfs-quota
+		--disable-ext4
+		--enable-btrfs
+		$(use_enable doc)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable test tests)
+		$(use_enable systemd)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}
diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest
index 04252bc2d1ef..f9c460445b41 100644
--- a/app-backup/tarsnap/Manifest
+++ b/app-backup/tarsnap/Manifest
@@ -1,4 +1,4 @@
 AUX tarsnap-1.0.39-respect-AR.patch 302 BLAKE2B e03e8b6787697bfab6ef2974cfc248f38eb398512d2e516c8089c676f78c83b390f117a338cacd4d7ef01a2ec13a52bb73210f8b9300b97d9e2ef82391d3bbf1 SHA512 0f35e836abc7e376e9a5fd5e618064667b3ba4415e8280e09b6a9a894ec531bed6ce301d89a6d55dfa14dfb27e98f7d5c53e5b3a7b7cd84fbe9807229c0d5ff1
 DIST tarsnap-autoconf-1.0.39.tgz 641089 BLAKE2B 4da7fa75c2a6df3186fac4f39a511532ae866c287a2bdc8dcc22049b53fcc903305f84fae9258793bc0c7a47b208d0bf2995143ee7b4296a35b4ca41d65d9a09 SHA512 dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4
 EBUILD tarsnap-1.0.39-r1.ebuild 974 BLAKE2B db7c509ba7e4a11481194ab2ac89136116f127c06f6f884d3e1e954df2c082e9e25388fd62460c1c92310ee5a13d47420774c28c163f89476ac8daa3942a81de SHA512 6a38edf81816e64bcb978e01362354f4bbae1b39f1733440576baa6e46a70bde954adeb2f48624362f4271dca59c24c4eac8e6341bafa2648314fe7f9a569abc
-MISC metadata.xml 270 BLAKE2B 51c69a0447f6c26c46d9b1224a0685296455f0a36969977f541be7dd7073527b6ae546cd71e8295e0c96fe6cb5f60c658fca6054226719e720756cb8fa9ebd46 SHA512 ac11a8cf4c8f9ec94d5a7cb772a877b5720e1f142c87aff6b4aead24373a5150b2cf5e789988919f5e43c1880bceea39abe2575847ff6f98fc029fa40d2156c0
+MISC metadata.xml 171 BLAKE2B 4d68baf0e7acc5ef563cb2feeb7bc0b2d4f0bdf03780b62d338361b1da05acdbf29c94a108fe200daccc9f60bed0aa1a1be81908f36b9258d8d19d16b5e2fe36 SHA512 ef6ad959681e435a0c4fdda56f12e41a8cf24063413bcf61544c095f31eb91c30b85b1f032f2416bfac7c97ebfbe9ce1abba96805540b1568843d0ab238117d5
diff --git a/app-backup/tarsnap/metadata.xml b/app-backup/tarsnap/metadata.xml
index 674392884e60..e5c4248bc00f 100644
--- a/app-backup/tarsnap/metadata.xml
+++ b/app-backup/tarsnap/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>whissi@gentoo.org</email>
-        <name>Thomas Deutschmann</name>
-    </maintainer>
+    <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index 9b634345b78a..e7832e749c73 100644
--- a/app-backup/tsm/Manifest
+++ b/app-backup/tsm/Manifest
@@ -5,5 +5,5 @@ AUX dsmcad.init.d-r1 531 BLAKE2B 840b6431f083df2da7f42d79a1b28a87ed3b90d497e54a1
 AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed61564fd45380ac792c89c20da1f8296f617467c411605f86a5cc2190d2135be771348c1d58b7c56c SHA512 e3572098abf5b2831d10a3b649337b5c9f1cd9fda4ed58844408b6fe31fdc68a3bbc197eab227f9808bc9ab4b4a7488c766aaa472e801d88631b6b8ec398eb45
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
 DIST 8.1.13.3-TIV-TSMBAC-LinuxX86.tar 593264640 BLAKE2B 0dec77e87403f86aaf98b3dbc61c4dcf7a107d2dbdb1733ad97294669b122a202034928b6c83df931877c6cd08272f7920250fbd6262ec9f565afdc06dd42c2b SHA512 dac6b7f701e7fb8af49988da8df952c93879b57ea57daa88d4fff3c531423c73b24e89995894c041601faf1c33f115e5153461e2672254d9f29b65dd30c8ab8e
-EBUILD tsm-8.1.13.3.ebuild 7482 BLAKE2B 30e53b911e6413240a9b7541ef1899ea56c38a5eeaf172c138db11c53b25418dff0736ce3ad75ea3d242d7e112fd85c9dbc2952bc6a8e5751062b65f5455925d SHA512 51c51183f56769e62e800c1067045786c9661130bceb6bcb1cfd8bc7f3a151a04d828e2c0c50ec1d8551809f00fea38e7a7bfefe612332715109f4bfadb2f862
+EBUILD tsm-8.1.13.3.ebuild 7492 BLAKE2B 1d0f834cb55185a89ffd0077d05124a675af1a109db971a85d2790f1cace017ea32d2c840c984feff1cb9800b186333981e3b020d1a8c5a388b262d0ddfd73d2 SHA512 f49f0510c705450854a0fe4804c608ac1174af92eea99600cfeec5b0c066141c63e8ad809f667ce55a29173675088d10844e1a5e050586187bbe25f4209af16f
 MISC metadata.xml 399 BLAKE2B 286d9d8e3c94ff45959b763044b769441b4cca5bfc85640f364da79726288578c270c0f52027465eb94f7358fb702b04a69f0996af90efe0e10bc4b90df9d2e5 SHA512 564b638560a6d38bb606b06731a6e5790daf5c91498015cc30000192d588fcec56c18c688955eaf09072108d31c28446c3c73c12165fb7cb8989592681cfbec5
diff --git a/app-backup/tsm/tsm-8.1.13.3.ebuild b/app-backup/tsm/tsm-8.1.13.3.ebuild
index 0a2ef217d050..a7fb3824f621 100644
--- a/app-backup/tsm/tsm-8.1.13.3.ebuild
+++ b/app-backup/tsm/tsm-8.1.13.3.ebuild
@@ -181,13 +181,13 @@ src_install() {
 	keepdir /etc/tivoli
 
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
-	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordDir "/etc/tivoli/"' >> "${D}"/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> "${D}"/etc/tivoli/dsm.sys
 
 	# Added the hostname to be more friendly, the admin will need to edit this file anyway
-	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
-	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
-	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 NodeName' `hostname` >> "${D}"/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> "${D}"/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> "${D}"/etc/tivoli/dsm.sys
 	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
 
 	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-backup
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)