gentoo resync : 28.04.2021

39 files changed, 206 insertions, 220 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 65eaf7f28a87..3b08c25b9e7c 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backup-manager/Manifest b/app-backup/backup-manager/Manifest
index 580ddfb8f846..1b1b529e80f6 100644
--- a/app-backup/backup-manager/Manifest
+++ b/app-backup/backup-manager/Manifest
@@ -1,5 +1,5 @@
 AUX backup-manager-0.7.14-fix_purge.patch 755 BLAKE2B afc198635ac623f266dbd0dd7ebfbc8dc82f5a02e7327b5fe51f501fd43b3198c06bf50e3d2354e440722822994e3151c2e9a0c8d87441ea961f0be4a8c21551 SHA512 006b1f94a5d0d9289c4ccd47880f80b4af0a514fe551151bc459efcf721f526a51bcd72a64c2b89c726b201ffafd0b1154b39ec3c58689f6b4b12ff14de299b6
 DIST backup-manager-0.7.14.tar.gz 144568 BLAKE2B 55447e3132996146935a0a46ce2786633a78ca4cc5db780348c1c0a34d429bf232c26685d660a60eca2b7ee6a2329f4b008b7ba995c9e0c16deaa9d85e642d3b SHA512 7956f39446ffcd39ec2baff0f5599f15e549abac570806905768bac09d431a88a9826a8e30e02e6f5c6186f19b02d50d5101ce5c22a91a43e6d0772e4db57f2f
-EBUILD backup-manager-0.7.14-r1.ebuild 949 BLAKE2B 812294138b885d5f67a2342507d7d5584fe7f0117511f1c55cbfc5d7b013e93f8b3d1a15b08269cda7ba7a8c8c8936cad9e3c6998b237c45742b981248181c33 SHA512 e61c34bead21bbd29efb8a3c2d9f27531468994bceded28d178b8f6b3302c84c030612b7b96137f30fa7d48ac05304b0b347ca621379db191ef39729d369a47a
-EBUILD backup-manager-0.7.14.ebuild 961 BLAKE2B 7f6becc16c797a72d242a09a4a5132f21ea7017489ef55a8b52288aaec0da3f6754cd696a61a65e1b65af7e21a63d204f80849330090832a040ce7d07a2da642 SHA512 795a27a6a3aee684e14f232ee52beb8d1d0c2bf6df6f0bc418f79879a1bcbeb844f193ae5ac88e76a99cce567188fe12ccec55d3969a87085752a1f091e6939c
+EBUILD backup-manager-0.7.14-r1.ebuild 934 BLAKE2B 03267869eb54d948231f2624366c71a8f612d3afcea9812b01416444b96ecb99819a1a8c4be4abe0f651c9258131e569db2e2e1a6742b032194011a264f93153 SHA512 5b340931e7af579ef146a491057022d884e54daf1fbb4eb0ab33e50b1b4b8ed5773f347eb1a266c83c95f2c69c1fea3d985009366c834dd1f077f2db6690abc8
+EBUILD backup-manager-0.7.14.ebuild 943 BLAKE2B 90b9c251244bb11ed2275bdd2d8eecfc6013304df41ac5ec5bcc85d2d087062a8347134160411e84665dc6782ddaabd937e598c8695ddf855a2c9ca52eb9d22a SHA512 24b9c41521c79696f85d6a3143de6d08d250185342971576b2a1a76934072c859548ca772bed0d0b689f1d0a95db85585f5d88e8d68c3efda25204051ddb550d
 MISC metadata.xml 712 BLAKE2B 4cc19a2ccd6ad653a99aa14d101cb0ca3ecbb35eaef29383853750b6e54ad930b47f26022a88f77cc639d584e7994948f074d52401e74c872511a41954639477 SHA512 1b3d8f5cdfd07addebff36b791717228cedfa17fba5f00d142a0ce702c02644b98cfb9bfc04f3795758d91539ad645dd1fa376c54f95ebe42b5cd971cc5a669c
diff --git a/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild
index 6142fd7c265c..48c5d9b684c4 100644
--- a/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild
+++ b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils
 
 MY_P=Backup-Manager-${PV}
 DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux"
diff --git a/app-backup/backup-manager/backup-manager-0.7.14.ebuild b/app-backup/backup-manager/backup-manager-0.7.14.ebuild
index c6fc90f2cb0e..cb51340428b8 100644
--- a/app-backup/backup-manager/backup-manager-0.7.14.ebuild
+++ b/app-backup/backup-manager/backup-manager-0.7.14.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 MY_P=Backup-Manager-${PV}
 DESCRIPTION="Backup Manager is a command line backup tool for GNU/Linux"
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index c20220c71692..58db55b71a36 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1,12 +1,12 @@
-AUX 3.2.0/04-add-docdir-marker.patch 470 BLAKE2B 29376a3f028411f3bb85f6f717de30c9dfe7efb6819ac7a513d1cf75dd0606f1a6fda3e1c262ee2dca1d9176428e4aa4a50732433cfe43c7babd43b09e9e4847 SHA512 82b3fbb9c86405f2d8ab12f0a8de21d4b793ec012bfb1cd0fb3a51b769c3d29cfda1adf1b701826fd3e36e0a8aaf10b84b75643620b6512bd2351bbe768fc636
-AUX 3.2.0/05-nicelevel.patch 756 BLAKE2B b689fd8ffd8ec7821f0922832f7ac06186d4d18a6bc55cbdb1bc6c339d0f962ac750b92aac3f93e96c454054c8e91129d14664cbdd332c3a3978f2540037d702 SHA512 b33fe04ba54c8d28c51a3c2d85b13e204db9a7f4f193d25888c168234f6fbe6f02a49403b7097f056d7ab8495cddaf457f1776d64bcc84188d2d67e8ea77c1f6
-AUX 3.3.0/01-fix-configure.pl.patch 1098 BLAKE2B 28ff909a8d2b002648912d97a02ba4a1d2b6fac58075c9c5f21f14e79a426d3f38a10a4c416f221d8aae20a4adc2bfdba0993f6064ac5eca67f1a6a4cfb0c579 SHA512 532b88689e50c0a399b42a3264975e1fc71a97b9edfd60faf5e94d0bfad972717c380b8925ca4d7df1e402b13f7104082a57bbecd3fbf74113c6f0e4d0990584
-AUX 3.3.0/02-fix-config.pl-formatting.patch 3900 BLAKE2B 7fdd0f12f9929bc7a54c04290f8f3bde73025a9108a2d0e1e887ceb1dd39502be4270e5a3a03b489211162f02b9bdd11e297e20afda53f1c9ea23254cdc02aa8 SHA512 e61e0bd445c57e1726411a5dec3a21f0d0f6ab6d394cc1882f0de467f9515d6299f3bf4955fbfaafd049097f0814665114e8453d750db19a063202af1378f394
-AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1904 BLAKE2B 0a7ee19f20d4105a86ab612194f827a6da102512e5dcedd55ca1bf5d959ebd9797c281c8fe9b6d6cd6f4e8887d906a1d12024268bd3cb8070897a4961ed5e9ea SHA512 19033dfefa135cba82d7fef50e619916af710d40c46c214e508cd83cf9cbcf032b8fa54e960e5c685e428b3646777b1040c6d067e0d642d8ba9623ade0fb6d11
+AUX 3.2.0/04-add-docdir-marker.patch 474 BLAKE2B 9c0f6ff031a7121dcaab70c5526c633ab9697d7d3cd9c995de17f398bca4c36be5014fd058493bfd0c3aafc09fd909bbcfafcce61fdaf8a2701f446d980cbe26 SHA512 95a6c1e248e2187823576b46b76ef71a096b2dc3b164586b1fdfdf763b1f1451a36df3bab70b10cab6188886d404c6b3a17c76be0aaf67ce9866fdda59a3120a
+AUX 3.2.0/05-nicelevel.patch 764 BLAKE2B 2b5a98754ab1f35f5174273fa6374a917458c0f285cb8cddd6447f9b2c79d7c96ec5755595fe184b5e6e20599dfa2907ea76fc8b7e43b6e9a2f54c94351e6e68 SHA512 29263b313a29ec3d64f4af6fec7eb8400c1c89713c244c4507c9808b5e0c0ec09aa3097243a9a6cd22556a06cb3300052028db092de6631478e7efbe024047c4
+AUX 3.3.0/01-fix-configure.pl.patch 1102 BLAKE2B 681cc2e69464dc7bf11f4a6d2e2c8b87912c35aad2d598752aeb0df53c47e95245bd04ea866bb93c631730bdb4a9455f6cd33474798bef6f87c887e8550a109e SHA512 fc3150771986abccb18733a649f6c39f4ebbd19d342df5bc9f45939786af7b6b6c5e2caf9020ff91d8553a4e986749de6f167628ec0826ea69928bcba401267a
+AUX 3.3.0/02-fix-config.pl-formatting.patch 3904 BLAKE2B 27e5d220124bb5ca1a909d3d6a3c30e717e97ad97d121a9a00adbd31f9a729e00006b9cb1333138f2ab99ac7e3cc15ea3fdb9b785a317f2ffa95b896b65ad478 SHA512 d334d1327d08c834894a7fc8ace3bac232e36087b3c21c8d7c98acc5aa84d70e83c9293833262b7e77f7a06f901e0f7ac6e8bd02c9abbe4cdfc1e44d7e4e7f61
+AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1908 BLAKE2B e26b4c9dcda7416f09516dc5b2e4ea7b6a690d00ef60f5a8bd34090d8178074e560a486b00435593a9da832db0d70bedf6d48f2f8c93928b55b96dd2041deebe SHA512 d9fe509d59b3c0f0fab265dd1eab2da7d499fd5e9838e04f413b56d4e116337f8781815e3ac9c2ab0dd8e103ce49fa78a398ebf7e1b2475d0b7c869d468ddf2e
 AUX 99_backuppc.conf 718 BLAKE2B 3075731b3bd580e9e9f864391d8a65716f43826d801bdf95082dc2168120419346b09322292eecf9de0bac6708dcba606347142238a65f11676ec553ca278b75 SHA512 cb68dfbb635564740428850ea3f026ebc0b8e22b2bca52640b2f367e5487fa205b00ec82e4e192b311e2886686b81f9ea52de54886994c6cce1cd154937fa0ee
-AUX backuppc-3.3.1-perl522.patch 607 BLAKE2B 98c35bbcbe76cd5f7bbc04722f9d8f840c61a8a713cf147db84934702ca754dbd3e0b88e83fa12ecfd45a2aa4974600d21f5cc8bd87fb0fb802f97b2a0c36ae0 SHA512 4d33fff4df53ee885676d58f78984616bb413fcbfd16fdacff0656d70a7c70c012c25f2fd685b360d878ebd407e76fab23103617f2bde0007ad9fc6bf34128c0
-AUX backuppc-3.3.1-perl526.patch 969 BLAKE2B 0b56c1535d8993a71ed2d3330db2cc1d22c42c3c9ed92bc00294c7d2769fc7277546c74844d592086d0b782a4cc482945a20f9ce9cec3daca174e297d80368cc SHA512 da626131a3253bbc6fe46a06f74462a2d356a71ae369e8de88acca2d85376be0d6ad16c8c566f7c80b93e794808f8b1c09a75707d5031dc64b93ab0f698faced
+AUX backuppc-3.3.1-perl522.patch 611 BLAKE2B a363952b76c8514ceeb31ae71b134ad37004422eeb905bf243aa86dc85795782066d9ee3aca266b7bbe62308bf421f7e6c5c006f2cff2182f4d56dba8eb3c063 SHA512 c7425c9eec316049b02226be02bcaefc6204016a7d0da876cab2094a5f1572ba42195dc0395ad42755b7dfbe11e28bcef59c04e85821e3b8e7ce428966f418bd
+AUX backuppc-3.3.1-perl526.patch 973 BLAKE2B 5853a89c016406d7202bc9f3ab20b9af9466b0081f958126cec2890bd6bde60d8134629a61929fa7e16b8056bb590f0bd973a62a7862e2432ec2d73862e5687b SHA512 ce5a9fc93656c6759c3afb900f68f7482b11916860a16c8e05db9432585618e942a092274a1dcdfde4cee94d39fe72f614443107e233ce1fb702c8a2fc2d999e
 AUX backuppc.service 231 BLAKE2B 948543a9fc9accff40868e930680c4eb9c0ff89c291254091c8f48b788b1eacf6ba6aba317fd39d2958e8af2efd7194cbe26d3674ee055e8401c591ac27e2fa5 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969
 DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160 SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6
-EBUILD backuppc-3.3.1-r5.ebuild 5526 BLAKE2B 121793c6d0209b99a3104042181c3e85adec507aef4a69587c77329aa3d6822c6994b601b8b0c6302b33d3c0f1a84e4dd08f109b3b2f9a31f400d9da3bfac919 SHA512 c1c16a3cbb91dbd990165719591fd48fc6bdddc54c86e6d977f6e7cc3302b3e5e49ce1992f79b70e5c8edbde0b85919fcf4e8dcb2811af7dd725a5a1ab0d0ff6
+EBUILD backuppc-3.3.1-r6.ebuild 5433 BLAKE2B 5dcb07f3f8b57f9b7db9992a21cffb61f4ef96ca176bbd8183c18b5c3082db17445962766fbba8adae1c7a2040d20e21d511ac1b72cef885b676a4c76c32c75d SHA512 62a43139f30493eccc164d63ff9304acca9539b314e9f100fac73ada0b4568d63c6d3d5de647ff09659cd5735fe0150110f94f79b025a7600d2a67621d84f1b8
 MISC metadata.xml 245 BLAKE2B 60b89e1b22df8b9bf236255a9563dea8017b658ba02811b0826ec33790245fbba9332bcfef37cfe1a0dfc5c15de494f7b6eab4b6fbc0f92c6b3c9bec34c2f5c3 SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877
diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index 932f8a9640d5..97bacafc0e0d 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -1,20 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit depend.apache eutils user systemd
+EAPI=7
 
 MY_P="BackupPC-${PV}"
 
+inherit depend.apache systemd
+
 DESCRIPTION="High-performance backups to a server's disk"
 HOMEPAGE="http://backuppc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="rss samba"
 
+DEPEND="
+	acct-group/backuppc
+	acct-user/backuppc
+	app-admin/apache-tools
+	app-admin/makepasswd
+	dev-lang/perl
+"
+
 # The CGI modules are handled in $RDEPEND.
 APACHE_MODULES="apache2_modules_alias," # RedirectMatch
 APACHE_MODULES+="apache2_modules_authn_core," # AuthType
@@ -22,63 +32,52 @@ APACHE_MODULES+="apache2_modules_authz_core," # Require
 APACHE_MODULES+="apache2_modules_authz_host," # Require host
 APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
 
-DEPEND="dev-lang/perl
-	app-admin/apache-tools
-	app-admin/makepasswd"
-
 # Older versions of mod_perl think they're compatibile with apache-2.4,
 # so we require the new one explicitly.
-RDEPEND="${DEPEND}
-	virtual/perl-IO-Compress
+RDEPEND="
+	${DEPEND}
+	app-arch/par2cmdline
 	dev-perl/Archive-Zip
 	dev-perl/CGI
+	dev-perl/File-RsyncP
 	dev-perl/libwww-perl
-	app-arch/tar
-	app-arch/par2cmdline
-	app-arch/gzip
-	app-arch/bzip2
 	virtual/mta
-	>=www-apache/mod_perl-2.0.9
+	virtual/perl-IO-Compress
+	www-apache/mod_perl
 	www-apache/mpm_itk
-	|| ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-		 >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-	net-misc/rsync
-	dev-perl/File-RsyncP
+	|| (
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
+		>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid]
+	)
 	rss? ( dev-perl/XML-RSS )
 	samba? ( net-fs/samba )"
 
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+	"${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+	"${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
+	"${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
+	"${FILESDIR}/3.2.0/05-nicelevel.patch"
+	"${FILESDIR}"/${P}-perl522.patch #580254
+	"${FILESDIR}"/${P}-perl526.patch #594128
+)
 
 CGIDIR="/usr/lib/backuppc/htdocs"
 CONFDIR="/etc/BackupPC"
 DATADIR="/var/lib/backuppc"
 DOCDIR="/usr/share/doc/${PF}"
 LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-	enewgroup backuppc
-	enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
+need_apache2_4
 
 src_prepare() {
-	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-	epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
+	default
 
-	epatch "${FILESDIR}"/${P}-perl522.patch #580254
-	epatch "${FILESDIR}"/${P}-perl526.patch #594128
+	# Fix initscript
+	sed -e 's/runscript/openrc-run/g' -i init.d/src/gentoo-backuppc || die
 
 	# Fix docs location using the marker that we've patched in.
-	sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-		|| die "failed to sed the documentation location"
+	sed "s+__DOCDIR__+${DOCDIR}+" -i "lib/BackupPC/CGI/View.pm" || die
 }
 
 src_install() {
@@ -106,7 +105,7 @@ src_install() {
 		--data-dir "${DATADIR}" \
 		--hostname 127.0.0.1 \
 		--uid-ignore \
-		--dest-dir "${D%/}" \
+		--dest-dir "${D}" \
 		--html-dir "${CGIDIR}"/image \
 		--html-dir-url /image \
 		--cgi-dir "${CGIDIR}" \
@@ -163,13 +162,13 @@ pkg_postinst() {
 	elog
 	elog "    # /etc/init.d/backuppc start"
 	elog
-	elog "- To enable the GUI, first edit ${ROOT}etc/conf.d/apache2 and add,"
+	elog "- To enable the GUI, first edit ${ROOT}/etc/conf.d/apache2 and add,"
 	elog
 	elog "    \"-D BACKUPPC -D PERL -D MPM_ITK\""
 	elog
 	elog "  to the APACHE2_OPTS line."
 	elog
-	elog "  Then you must edit ${ROOT}etc/apache2/modules.d/00_mpm_itk.conf"
+	elog "  Then you must edit ${ROOT}/etc/apache2/modules.d/00_mpm_itk.conf"
 	elog "  and adjust the values of LimitUIDRange/LimitGIDRange to include"
 	elog "  the UID and GID of the backuppc user."
 	elog
diff --git a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
index 0355aedf04b7..d6a5a1c42991 100644
--- a/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
+++ b/app-backup/backuppc/files/3.2.0/04-add-docdir-marker.patch
@@ -1,5 +1,5 @@
---- lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
-+++ lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
+--- a/lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
++++ b/lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
 @@ -86,7 +86,7 @@
          $file = $bpc->ConfDir() . "/hosts";
          $linkHosts = 1;
diff --git a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
index 50938f60bcdc..f6ecce98a7a8 100644
--- a/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
+++ b/app-backup/backuppc/files/3.2.0/05-nicelevel.patch
@@ -1,5 +1,5 @@
---- init.d/src/gentoo-backuppc.orig	2009-10-18 00:14:44.125346723 +0300
-+++ init.d/src/gentoo-backuppc	2009-10-18 00:15:37.101346981 +0300
+--- a/init.d/src/gentoo-backuppc.orig	2009-10-18 00:14:44.125346723 +0300
++++ b/init.d/src/gentoo-backuppc	2009-10-18 00:15:37.101346981 +0300
 @@ -21,7 +21,7 @@
  start() {
  	checkconfig || return 1
@@ -9,8 +9,8 @@
  	eend $?
  }
  
---- init.d/src/gentoo-backuppc.conf.orig	2009-10-18 00:14:52.513347638 +0300
-+++ init.d/src/gentoo-backuppc.conf	2009-10-18 00:16:03.457346630 +0300
+--- a/init.d/src/gentoo-backuppc.conf.orig	2009-10-18 00:14:52.513347638 +0300
++++ b/init.d/src/gentoo-backuppc.conf	2009-10-18 00:16:03.457346630 +0300
 @@ -3,3 +3,4 @@
  PID_FILE=__LOGDIR__/BackupPC.pid
  EXEC=__INSTALLDIR__/bin/BackupPC
diff --git a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
index c943fdce68b1..f27fccc154fe 100644
--- a/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
+++ b/app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch
@@ -1,5 +1,5 @@
---- configure.pl.dist	2013-09-23 23:01:19.524743747 +0300
-+++ configure.pl	2013-09-23 23:01:37.344567459 +0300
+--- a/configure.pl.dist	2013-09-23 23:01:19.524743747 +0300
++++ b/configure.pl	2013-09-23 23:01:37.344567459 +0300
 @@ -158,7 +158,7 @@
  # config file to get all the defaults.
  #
diff --git a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
index 79ad6547fa6f..14a9600536d7 100644
--- a/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
+++ b/app-backup/backuppc/files/3.3.0/02-fix-config.pl-formatting.patch
@@ -1,5 +1,5 @@
---- conf/config.pl.dist	2013-09-23 23:05:50.332064754 +0300
-+++ conf/config.pl	2013-09-23 23:07:44.110943607 +0300
+--- a/conf/config.pl.dist	2013-09-23 23:05:50.332064754 +0300
++++ b/conf/config.pl	2013-09-23 23:07:44.110943607 +0300
 @@ -355,7 +355,7 @@
  # needs to be a full path and you can't include shell syntax like
  # redirection and pipes; put that in a script if you need it.
diff --git a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
index 8b54fc87b050..0dd85d3acad1 100644
--- a/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
+++ b/app-backup/backuppc/files/3.3.0/03-reasonable-config.pl-defaults.patch
@@ -1,5 +1,5 @@
---- conf/config.pl.formatted	2013-09-23 23:12:30.708129365 +0300
-+++ conf/config.pl	2013-09-23 23:12:39.448043656 +0300
+--- a/conf/config.pl.formatted	2013-09-23 23:12:30.708129365 +0300
++++ b/conf/config.pl	2013-09-23 23:12:39.448043656 +0300
 @@ -1305,7 +1305,7 @@
              '--times',
              '--block-size=2048',
diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
index fb7eeeef1e02..cb29e890d347 100644
--- a/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl522.patch
@@ -1,5 +1,5 @@
---- lib/BackupPC/CGI/Browse.pm	2016-11-22 20:52:03.622509160 +0100
-+++ lib/BackupPC/CGI/Browse.pm	2016-11-22 20:50:35.871018400 +0100
+--- a/lib/BackupPC/CGI/Browse.pm	2016-11-22 20:52:03.622509160 +0100
++++ b/lib/BackupPC/CGI/Browse.pm	2016-11-22 20:50:35.871018400 +0100
 @@ -62,13 +62,13 @@ fix bug https://bugzilla.redhat.com/attachment.cgi?id=1104083
      #
      my @Backups = $bpc->BackupInfoRead($host);
diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
index 3a04f94835c3..ec7b9a63d06f 100644
--- a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
+++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch
@@ -1,6 +1,6 @@
 diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm
---- BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm	2015-01-12 01:19:53.000000000 +0100
-+++ BackupPC-3.3.1/lib/BackupPC/Lib.pm	2017-07-08 00:31:52.100003197 +0200
+--- a/BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm	2015-01-12 01:19:53.000000000 +0100
++++ b/BackupPC-3.3.1/lib/BackupPC/Lib.pm	2017-07-08 00:31:52.100003197 +0200
 @@ -1261,7 +1261,7 @@
          #
          # Replace scalar variables first
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index bd0cbddcb857..c186816c5a69 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,10 +1,6 @@
-DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
-DIST borgbackup-1.1.13.tar.gz 3754457 BLAKE2B 3d3dce66ad685fbde53cb78e288b4edc53af449ed54379e5f0b9ab3b10d8cf43ae983de5abeccb1874fbf1283f3e2796ac35ff9de349905d03d0b0c560f4fa93 SHA512 2480dba6c842659a248361b35b478120e50df3525b8f07d89dac4e78369bb1dad2679b9efa6a4d6f38637759666095dc2dcbb7750edccd97972e2c8980a51b84
-DIST borgbackup-1.1.14.tar.gz 3769460 BLAKE2B b5a7025d9f7f0764d6532e9e0fd867b3e4c8bac3c584f7a83331a5e7ec39fda14f3f82465e9bf483596453b7cd96bffac3f273ba6171ed109e8a83fb4a1d766e SHA512 2aae851d38ec2431cd09f9390b3afa41ec44c2891a3698b01f036cebc5b64d7b7f328d7c95bf30fc29016b4bd2d2ada2613f895091e22148f3d4861f4facd35f
 DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa1c95d08418a43c176146243d83cf07b3033707ab5423eeb097e92bb31cf016f65fc3738ebff1bb8c704a54c6e8dd12 SHA512 db2f06a96897c07a71e9c4531d4f219ef5451009c08ae933348b1a02b7d6c95b4e814a25b4cf465c0021ff670fdd46076c486c2a466d056dd931cb7eee8b1ef3
-EBUILD borgbackup-1.1.11-r2.ebuild 933 BLAKE2B d91496fa7f293bb96dadd180b70cb2dfd4642d11a9a216f9628401d9feb4266927c0e30bad7daa84f1a06438ce6af1687b8cecdada685b6ff94fee9ef4d50714 SHA512 e850dfd769f89368e20f62ea902cdb75a9c1e96e4743034da2ee27692445cf35f2210f9135bc78c76340d8649ee943f91465bf58ffb25fa38577f0ec42a2ccb7
-EBUILD borgbackup-1.1.13.ebuild 944 BLAKE2B 97a6e152d9051779457f5082d38a0239f67f953ecd73f6d9f4617275554e4c277df2054db1adbeb9806d7a02ba2f9919111bb336fe60dc326edc5b459dacf8ba SHA512 61a7d466234e65b89000f29c78d93bfdaa3fa566a54929b4d60ab44e7e7b9504689e712275839f74b59c8ee6539453626289e967061cc6888aca91795c2eeb0a
-EBUILD borgbackup-1.1.14.ebuild 944 BLAKE2B 1522f4450a67775a614e597ebdc2b3e010edd3110e0e2499558fa68488ccfc2f40cbfaabc9c8f6b93496adb7a23972baba6085607425dddec7fe3a21cf005c90 SHA512 3fd8db8e4f1ab1c8797362acc27f2102e55dca3d9dad1a44151da3665ddf9c2643feaadf42222719683b101fb21665f63572d849898aa18a9b6e54e56928a51e
+DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d89d025b1b3434c5d270539d1fc4aec92b52a750ab1079911e53478411f91c92be4f053c09289b1e38285caa03453f17 SHA512 9cdfe794329821c784461382633fd29f7f9b3cc6ef9e7fa2463ed178efd64ea367e56d49128d88b86bd516d36971282207ec173735ecb4eabc4ec7b4604ed773
 EBUILD borgbackup-1.1.15.ebuild 956 BLAKE2B a79d33cea40d25c63eb62b7bbba0f27b16d229e5caa45f164c9f605923d453f0e670fa9c9c2523ff389ba987f2b45053999922de0a50a9542ac2af7734be3805 SHA512 0a2d8610382a4a34b5a21a24738ff8a48c282b78cd19f6397ff705cea3b5c9f450d58ace334451275572e222bf2aec57d6e0860c946edfcf5d8b8e8f0cdcd853
+EBUILD borgbackup-1.1.16.ebuild 958 BLAKE2B 48d84aa0219bb67035d9901104d5b71ee62249ef739605f5835a6f7751bff64fa76bb3fc3ef86f23edd4fd66afcb5fee8c25ba2ce70843099822595cba8a861e SHA512 34eeef4485f6b646aedff16e2b6a676e9c8795b0069dcd361644a8254b83c1d847c8a289fa8d6942431ac079deb507da9c6eea695e5aeab05fbb2868a0c7a18b
 EBUILD borgbackup-9999.ebuild 946 BLAKE2B 6173e891ff31cf2682aaf813daab17485b0017c8585c029cc96a229b4085683021baf05d7fe46b47737f71dac8b30e7b0523b5cda3c6d2150acfbb44012aa7a7 SHA512 14e55850b506e5357c0ea423f94125355d560ed107f40d4e6fbc796cba412dfc4195582649250458b2ade2d9257ecb6ff2e2f2a0f94b7cca2b1a9c0246596c2e
 MISC metadata.xml 493 BLAKE2B 7c8c3f7dafce95377347ff7392fd80580f0bc9afb05654795ba86ab20bc54054395a46eaa172cd61ef1084a023cc26bfa9c835e9d73f921f842c03e668bcb6a6 SHA512 00aa284252b1ce793b4176f7eb1255984670924b3dc6ee75867d5a947761a3db7d3b917f412629edbe146b3d22050a4383afa8af4f017ebe68728d1b5575a473
diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
deleted file mode 100644
index 50f98e5f6523..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-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 x86"
-fi
-
-DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
-HOMEPAGE="https://borgbackup.readthedocs.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="libressl"
-
-# 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}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl: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.13.ebuild b/app-backup/borgbackup/borgbackup-1.1.13.ebuild
deleted file mode 100644
index 838d98cbe431..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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 ~ppc64 x86"
-fi
-
-DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
-HOMEPAGE="https://borgbackup.readthedocs.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="libressl"
-
-# 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}]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl: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.14.ebuild b/app-backup/borgbackup/borgbackup-1.1.16.ebuild
index 8e559ba974e6..a85b2a0012cf 100644
--- a/app-backup/borgbackup/borgbackup-1.1.14.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.16.ebuild
@@ -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 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 6b9a96663e3f..04f5771ce259 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,5 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 DIST borgmatic-1.5.12.tar.gz 72964 BLAKE2B d71537eed019b10c3257d4b068c31aff63919e0cdb068b49c2ed92d2e97d37b8735f30b1225fb453e79372aeab49817e9200770aac4cc0f80c0bac14e84678d1 SHA512 67c7c7683e9fb7dd0321b3db6887212b040596f1d7e767cceeae6fa4cc02bb0a46344befbbc7a33b454a4692b04ae88d9031f71867788a94f771999d885112d5
+DIST borgmatic-1.5.13.tar.gz 72469 BLAKE2B 3a71be201143a96968bb1ea6008b62e11f6ab199f44f38d0d66f31f24827a8f32cc7b8f50cc5d33a8bbd7046e6697afe509525be90dd9519f4c686b8737f64c5 SHA512 60bcbcc825db3f93a423ab8e44e0b0809ff4937d8e41bc56ec6226e4865c3a66fae8b6749d33cdb0692ea9dd07cfff56750ff2feee68c96791b83c9dd5f35433
 EBUILD borgmatic-1.5.12.ebuild 2131 BLAKE2B 3e655f16122c80e4caf19c03927f804136dc76b8ad7fdcbf2b2dc6e5c1587007989a9708093d9ae5b8cb1150b739d0d938b9af9c901ef335100fc214eb4ee617 SHA512 d72b6f41c03625a9238791a6d1991c327fd26ac031b394631237e84914e09491c5e10e239a24e631fde9d1c318aeead1c8b091018996f63f2fdb99893f9f10bb
+EBUILD borgmatic-1.5.13.ebuild 2137 BLAKE2B efdd1242292e60bf5c1bf85913b4958db1a995caddeff0059cb0995049e3c1938117be1c3e3e9f4bbe16bf2ff8f5b62b37b325ae1085b4dc519ab832274106d1 SHA512 60673b7f47c3451e0a97b2e739fc80e5065c212e5260cae281fc66cc42245a1c4f9ca587a8a413b9691ca932645f569521be195d8b9d16c8ab77e2e1d260320a
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.13.ebuild b/app-backup/borgmatic/borgmatic-1.5.13.ebuild
new file mode 100644
index 000000000000..06c3a588685e
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.13.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Fails due to problems with dev-python/flexmock-0.10.4; see Bug #740128
+RESTRICT="test"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+	')"
+#BDEPEND="
+#	test? (
+#		$(python_gen_cond_dep '
+#			dev-python/flexmock[${PYTHON_USEDEP}]
+#		')
+#	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. Adding --install to distutils_enable_tests would
+	# likely take care of this - but between the aforementioned behaviour
+	# inconsistency and the fact the only test run from this file as of version
+	# 1.5.13 is the parsing of contents of 'borgmatic --version', just skip it.
+	rm -f "${S}"/tests/integration/commands/test_borgmatic.py
+}
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 1a4d84c66e06..72c766d3a5d7 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,4 +1,5 @@
 DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
-EBUILD dar-2.6.13-r1.ebuild 2146 BLAKE2B 5095a9a2518b778578cd188db5dbd7ec3aa721da28742241e7b1688bd241ab63aead52082492ae4c6a60999f8f6235245204c66c3ac1dfbd6e8bca60528a09d1 SHA512 ae419297e74e0e5580905c6466e0506086c6b32c571c1b8541e5c894dc1aa3dd637308a00c859f8877ce5d04d0084410b6932370c9bc480175d3a6d72e2293cd
+DIST dar-2.6.14.tar.gz 2148023 BLAKE2B 36653d798d1da9cd87e84d2301b9f1fd657e92d1eee91ec1efadb54e94638860103c5e509479a2da846d432328e0a93ae92e1a4d23b6956ca55341ef767fe9a8 SHA512 2b116929fcc192ffee0c266959902b45dc9982ba77e017b3217715e0c63d1574d64083ca55a63e0bb6390e8955c41ca8b09da63934826fe4f0471a63ea739550
 EBUILD dar-2.6.13.ebuild 2421 BLAKE2B a16560b5fa34dafd05fcfe917b6739ffd8910d5284cba9dc28c343ba6e92f43704d2ac4e290f03be7426cd0896d371cd2ab7c648a85a5e05327800cb5f8edf99 SHA512 76dff2090770e07c49171176d149b42e5cd331e729fc054e4509598f5b5d26745de3a727d65af103cc72ed94abf103fe7be61b1c60ebab58f94688371588f525
+EBUILD dar-2.6.14.ebuild 2146 BLAKE2B 5095a9a2518b778578cd188db5dbd7ec3aa721da28742241e7b1688bd241ab63aead52082492ae4c6a60999f8f6235245204c66c3ac1dfbd6e8bca60528a09d1 SHA512 ae419297e74e0e5580905c6466e0506086c6b32c571c1b8541e5c894dc1aa3dd637308a00c859f8877ce5d04d0084410b6932370c9bc480175d3a6d72e2293cd
 MISC metadata.xml 1187 BLAKE2B 63ef76c44a9792d83529247af4afb722f9d5de63ab29344ecf55c827dd4e4c20b4dbcc02a6e2e71b6aa33c14cd03f2b14d9cb90000ae47dbde89479b67c1e8a0 SHA512 39eb6ec5774043f23c68916cfeed74d0c2dcf4a6471b70610e5896687a866624dcebd2b0e2050d9850057d2844eae687b7c30338bd82c9acf63ab297e7473c5e
diff --git a/app-backup/dar/dar-2.6.13-r1.ebuild b/app-backup/dar/dar-2.6.14.ebuild
index 414cefd61db1..414cefd61db1 100644
--- a/app-backup/dar/dar-2.6.13-r1.ebuild
+++ b/app-backup/dar/dar-2.6.14.ebuild
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index a20784070c4c..6b815bc935ab 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,5 +1,5 @@
 DIST duply_2.2.2.tgz 50848 BLAKE2B d24c88c57a1a1da83827fbda3ba73249bea96de3b9503b842357182e871ac519b609d6d05d5972cd9a268354fd4d9db87d57680d478714e5f19256b70f23fa42 SHA512 2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358
 DIST duply_2.3.1.tgz 51531 BLAKE2B b351d57621cc24cdacf9c0b54c107e4b9caad5da31401534f8add0ae320e5d0534fff9f97fa685f76efcc90b9e6b3a18e87a1d11b90285410cdd3375aa8b5c56 SHA512 90f6172e196667c1bf35d4b0acd5759ccfa34a1b7cacdbcf502a67689b7698fca4e4a9ce419b42b70eb57fb784a7c789e2283a8ac366bade9aec25c393548ef8
 EBUILD duply-2.2.2.ebuild 522 BLAKE2B b8e653ad4fb5a3f8eb479e4702feb27ac408719a3588d060b738cb119ccf17155fc7c7108454e694c93309d785461b27212abaee09a4f485f7c82a33e0110e82 SHA512 5fdea7287f4ff925b2f49a604ff350b0da42b134c1aad53fb43cd5dee65ecac17ae1edc7faeaf67cf346ee665cd74030bc2e7ba94e9d012947c7feabd2837e06
-EBUILD duply-2.3.1.ebuild 542 BLAKE2B d3cf86920042f487c9d0b1c4c10305009d89647edf0cc52bd1aea31e2187c849ef46f0b016832cebde46256f051fb08b9189c2acbacd125e7832e19c9ce4133f SHA512 f1fa98b7c17dd94371ee2e327ee6b1fabe4bc6a59bf0f6921728440132cfa621efc06f92d5158d263fb24c382418fe2e0039e97c0706c30434a6938faf0a19bd
+EBUILD duply-2.3.1.ebuild 540 BLAKE2B ce16e342ddf3c9f30c9803f59cb9e981e6481c79e3f223d73af37ecf57fc36643124ab84d076667b1b769e8688bdba64b57c2bf53da854263d348c75ad26eda9 SHA512 681bd875e939295b2df0ecd3da8e84a7707c0f7b89e97a63c8ed63d6688f0f4182e45f93a267fae5ee4b3062a6209b28be5faabd7c81276e53edb86b33c6da7d
 MISC metadata.xml 474 BLAKE2B a4ac0dbf3e29853bc40b8c718a01409def4f6a956f4bb6cfe1657e79c71f09e11258dc2cc0b7443375af70cafcb31211200837d188b3833ea136b25e54234e03 SHA512 1f89f05c042d63ce2851246e68039293ddfc85de6a3a16b36c6de54abe7297326b03d9668dfbd7666ea0d5091975b83abb01a077254f279d76f4739760392e86
diff --git a/app-backup/duply/duply-2.3.1.ebuild b/app-backup/duply/duply-2.3.1.ebuild
index b6505eb38052..68e3ae211d57 100644
--- a/app-backup/duply/duply-2.3.1.ebuild
+++ b/app-backup/duply/duply-2.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jztkft.dl.sourceforge.net/project/ftplicity/${PN}%20%28simple%2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-text/txt2man"
 RDEPEND="app-backup/duplicity"
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index 39b73336b3dd..c585d0be65b6 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1,5 +1,5 @@
 DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff
 DIST fsarchiver-0.8.6.tar.gz 273652 BLAKE2B 2f8d11bb721c4e5452f0bc62661bd254226d3d62b5d7bee0a8ccfd227bdc39dd0dd544e831888bbf39010341aaa0d74b2805ab580c79cc90e96a43be1676d86c SHA512 26a2d7a68d162aabb778b14f29c52cf8fbadb8147cf5eae592352a36fbf93cc45c08c241253bd8dfe8cd0b77d0f156afcc8d89e8d24a238fd4427cb479827f14
 EBUILD fsarchiver-0.8.5-r1.ebuild 1135 BLAKE2B fcfa6ddeee0d975f57a7adc5c957f80365a1b50408729bb13dc39f447df4e3f8386b157a743e011eaf0dc23336b270210f9c64e70a92789ff137b7615759e8e6 SHA512 b1e0febbdae240580c75a8138ece1997fdd561e26c321545d98a4a526314f348c766f9bdffdad3a5ad8f2e03f8bb16866eb33194f8aafdd74fb6a64e679ec31b
-EBUILD fsarchiver-0.8.6.ebuild 1386 BLAKE2B b1b5da78228c43abd25010f534cd149614df05fb7889116de046cd2a45f6cab37bff3a8adaa4f39caced30a250ad36068cda457046629a025ce74061c859d014 SHA512 6c757b66d6a3e96dec987c82831195b71b6306874025bf0873ff4da94c11163240eef935d6b3d147a7d036f3d489b9f4348fee2500a3887d7963e1945c2d0c5b
+EBUILD fsarchiver-0.8.6.ebuild 1384 BLAKE2B 1f842f6c2352712dfbd3e2545f6b304af1b65a12fa5b5c9c70500a495fcb26b164b9dd0c266508c6ac839c3fda0e8e1ac17bc6a49cecf382dd3cc7d5072079f8 SHA512 f66fb5975e4333ebdd5598848bc4d2810a5e6c62a34bd3395d2960a531e01e18c4cd093d2070c4619e0a4c31dbb0ec4e1558f39e8049a624ac8bb9d0764418fa
 MISC metadata.xml 382 BLAKE2B 891eee8fe94ac34a54fea42dbfe6ae6f136fce28cfd45e400d16d7aac3c163e41d92100d035657cc0ca3d2f3d4698a457a28f515af56cfbcb3cc06c33782060e SHA512 b7ec7dabd9c51139e7d669bac569eefcd460b880db50247f888c14be332d679fbd680c093dd7a04a3e91f75385772552af7d0f4398106ca753ca8e261154bb41
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild
index efdfa0a1b320..2ce82a38e77f 100644
--- a/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild
+++ b/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug lz4 lzma lzo static +zstd"
 
 CDEPEND="dev-libs/libgcrypt:0=
diff --git a/app-backup/pdumpfs/Manifest b/app-backup/pdumpfs/Manifest
index 08e1edf305c6..4c1ff4112cbd 100644
--- a/app-backup/pdumpfs/Manifest
+++ b/app-backup/pdumpfs/Manifest
@@ -1,5 +1,5 @@
 AUX pdumpfs-in.patch 977 BLAKE2B 5be9f88f6af0dc051c856da71c4cb4fc3d52f610ec0cedb0364b0d59d01925bcda9ab7c5872c0fe87e8aa9ba07a4d284adb90b382d6b92b480aa64cce1a4b00f SHA512 3d45d5ecbf2e3af71ae80de28c8cedc46b5ea2f7d0e9f6ea58c4154e477db8375f21587ebc4cade04b353e5a0552620790a0f8ea13d9f8151b4236e8e2489ee9
 AUX pdumpfs-test.patch 392 BLAKE2B 99b04a1f9667e5996afc294de54eca4d45d51ca36103f661a9c576a823faa85b1fd215e27ae6d1f2d9c02e696f55fceb9b00e55778d56bad0e5560d40aa18a00 SHA512 b7647f51acb30cfc86e80cf5eb5e6d7fa84c6b3ba3c1e6246468baca7835bd08a6d3f3e70dbb55a2c6ef0ffe67b4d10dd78b5a4673ff636c8da74e64f7b827fa
 DIST pdumpfs-1.3.tar.gz 68210 BLAKE2B ab5428c0f12ac289ef6efb5ae1b1ebcb047ce48183a36423d6f4b80d2d55da07b6e346e8ebd0ccd6eb85ae132c4367bd806c8106abeb681a9fa6ebffbaef1075 SHA512 1299676982f1981aa55f0601f361ec24ac119067f5ecbbeebcf9f41ccd69df2f18a07ae5a6e77f30ca7606ee49ecfa516d6066a07c1edbb4d4796f34f02508c3
-EBUILD pdumpfs-1.3-r2.ebuild 886 BLAKE2B 0f8e1b67227771c8cb377468cef7141f726dfa9c69422d04dc3fc968f800b15f66b2c6810a1ea9eb0ab2f1894f35aad84b0269c92bf2001ac188098f28c6c626 SHA512 dccd98ec4b5524c5a960ec5d38d4669f0e15346e0bb65bb3e14fde696b43f45cbbe1882fbda5922edd241a8f7b0c49161f362c2e6435ecec9fc6fffe127ee52d
+EBUILD pdumpfs-1.3-r2.ebuild 883 BLAKE2B 1ad7eba98fb1247c887999b1988382aea0aa6744229ce3478b345f5c3d6a59245668108ed2984dbbbe3a2e965eff04d5e75635e085513b4b2228623507df1d01 SHA512 e495b40b45900cabea51ee8320a1fc3b231076a414e22691427687595507a71c358d7a2a56abb17bdd98aa295d9d77c11d5d01530d94c5ceb7690894d9fd29a6
 MISC metadata.xml 689 BLAKE2B 6148c289f11bc85f6c8578911868a4a01bb9a44cc75ba809a90cac0fe59a6781e0dce3283f57db310dc3687e123723421e5b543d7ed4407dd58b6d338c95dc6f SHA512 827036f90dd063c262470c27ff1be2efa50c3d9602a579b20cffb8ba1ed3573be0e3e894062dc8cef29cae5696c5e02d5e05153f33a36ffabd9499f38e54614e
diff --git a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
index 527828394d33..224e6c596e42 100644
--- a/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
+++ b/app-backup/pdumpfs/pdumpfs-1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 
 DESCRIPTION="A daily backup system similar to Plan9's dumpfs"
 HOMEPAGE="http://0xcc.net/pdumpfs/"
diff --git a/app-backup/rdup/Manifest b/app-backup/rdup/Manifest
index 2fe36e398923..579c86ce29aa 100644
--- a/app-backup/rdup/Manifest
+++ b/app-backup/rdup/Manifest
@@ -1,3 +1,3 @@
 DIST rdup-1.1.15.tar.gz 333646 BLAKE2B 452cf4a4e6393ae56ffee4ebd3086af0606b03125f9af84590314516fa643fd4122d64a34e17d6a5b4bd7ac5921bb9f1fe3c312694015b90b91a85f9c48cd851 SHA512 e377ec29e0dacae306ee58c935c9738f32d177e1c2575e4fa3618d2753d248f2898633dde46da81410271205458ccf0d3d885e3eebc5f1948afc5cd9e99ce7c3
-EBUILD rdup-1.1.15.ebuild 880 BLAKE2B 43433c1dfb06f9bc61f3fcd27f6160f2b486fa1bc81633eb039271e02a2f6f5e1949223a1758015e697cf122c8e4db9da6fc7cd4939757f863c55d538c711fda SHA512 78ccbcb9864fa0cfa625ff9c37ca2ebca0e96c4ba79b0ec0cb2785ad16f565676523a01a94fd6cb83b60e39a32710bf8c00b7a5b893371e12a1b4f02aaa8408f
+EBUILD rdup-1.1.15.ebuild 873 BLAKE2B 7a3ffabe47f710dfc01770dd025e05d2e15b3ae815799832b929e6b2e239f84a556f0c55c3fc48f9c2b17c303235e1432349038e03f2466e794295eb33f8b7ef SHA512 327248bb132543fbadc98a6fa8f8cb4c33e3d42375b9716632dbddf4d18a52ce484fbb6092a7df31e1462710ea923a813edfbfe5530abc54129225ea8ca773b9
 MISC metadata.xml 325 BLAKE2B 884b9307d33bc2a05e23db61a7f39c620df3147241b851254747e19bd5362c9bed0c3db8d5b4e7da483374acc6ad28e7128a7c093da677d4ce94f5d24921bdbd SHA512 73d0a20ad97d9e9c26f10252fb7d50c93b2c5d07df8eceb8f97796758341c884bdd75ea7707f5f0645d430348af6669595612c662dd019d355fa9f366f6d44fd
diff --git a/app-backup/rdup/rdup-1.1.15.ebuild b/app-backup/rdup/rdup-1.1.15.ebuild
index ee7bf949b508..76a094776639 100644
--- a/app-backup/rdup/rdup-1.1.15.ebuild
+++ b/app-backup/rdup/rdup-1.1.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Generate a file list suitable for full or incremental backups"
 HOMEPAGE="https://github.com/miekg/rdup/releases"
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index 73ddd2b5c8f3..2283082fa598 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -2,5 +2,5 @@ AUX rear-2.6-Makefile.patch 879 BLAKE2B 60db156e4ac420f6d370b65c4a32b503f0ad958f
 DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
 DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c
 EBUILD rear-2.4.ebuild 845 BLAKE2B 4b0b46b7e0bac21849b77d41da8a442377a006fbebe868a53dcf2aaca4dde192ad5b95700112b800a3b55cb631901ffa32522be4dd094db87c8702f68ee4bbe3 SHA512 bd11af749e16c4c65ccf87a0f059c9c5b389b23b74ae6792b07b7667ad38198b3904357b4fa6597b18fce7405c43435b1c646e03111654fe7c474b7d32f5b68c
-EBUILD rear-2.6.ebuild 1384 BLAKE2B db9f7f3bebb2f3727bd0880432b8ae3735dfc94d310276e4ed1469869546f6d76f9c3aa1bd96140b6fd196497bdc7018a0dfcc6e4e3b1965ab53cad70997b88e SHA512 4f9d2114d74414b1679f3f3b01e2beb8fa7301935955f53ff41245415e23148311c7dd681811b136ff4d90d8cff651eb7f295e9a33fba70489eba92f4ff79769
+EBUILD rear-2.6.ebuild 1359 BLAKE2B 630d1ba04da06a1352cda7bfc5eb8027ad5655bd03b9d3f5451eb7f447fb7ba4c77fac455523cb5af66c0edc2184e0f422815a63c4f007df6e30558a0514d447 SHA512 8c98558d1469b76c077558a06bd725ef26a098dc1ee2b92d0b0f0217af6c4c46b02d4ca2e5b259d6f27ab974cff034bea82d53bd073b78f7b692a3fc3a1f5b31
 MISC metadata.xml 1044 BLAKE2B a7156b29cf1f9d05fdad1241e28e3df0c1c0a1f2a1711e9be7bc5bbaa47c2f2609c8ab4e011923b448c26694d4d8e873f348e25a2956df2a4668150e99f018e2 SHA512 179009d5a749f9acb028b11339ce825592faaddc65441591a37f9fde202042199e6e557f0c7110332c87835e80f64f22a6b5d4e0282b9cf164e02e2a99c81864
diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild
index 79da6fa23dec..f01f863c512f 100644
--- a/app-backup/rear/rear-2.6.ebuild
+++ b/app-backup/rear/rear-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,6 +55,6 @@ pkg_postinst() {
 		udev_reload
 	fi
 
-	optfeature "if you want to save backups on smb/cifs servers" net-fs/cifs-utils
-	optfeature "if you want to encrypt your backups" dev-libs/openssl dev-libs/libressl
+	optfeature "saving backups on smb/cifs servers" net-fs/cifs-utils
+	optfeature "encrypting backups" dev-libs/openssl dev-libs/libressl
 }
diff --git a/app-backup/reoback/Manifest b/app-backup/reoback/Manifest
index 6eef99ff8570..ce3f7f4722fd 100644
--- a/app-backup/reoback/Manifest
+++ b/app-backup/reoback/Manifest
@@ -1,3 +1,3 @@
 DIST reoback-1.0_r3.tar.gz 27396 BLAKE2B 65fa4324d1160a240fc2c229d9429eb2f6f535714fe59a1c74ebacf32a349fcb17205e5f22914cd7caddd7218374a1978f43e0295b6d035091362aacc84851ac SHA512 fcec19f284d96c4be96ac4d5bae4a689f777261ae08032da58b7d9c38a3bb1f6ade3825895b93e2b7ad285e0d1371d12f3cf25a7ffe46639ef9e80611941cd2a
-EBUILD reoback-1.0_p3-r1.ebuild 984 BLAKE2B cf709921d77150c5abbd158e9418d3902562bc3b33b000178459cdfa0bdff168b16d6ce9b529d59fe955f4c3396037b7036d4d66a788bacad097b92114799cb6 SHA512 7b2da9a800e923d4de397e7f7899298fcca953e1adb73ad1051d7a4a58637bfdb35e84cac1b497d21f1f9cb9f585e18be2bf79b70ee162e146a7179adefd981c
+EBUILD reoback-1.0_p3-r1.ebuild 1000 BLAKE2B ee364af24c835372e828a63d30c7c5c2daaa94513130481ff70ff8eb6793925f4f05f0776482ba8a5230a8f6835000df0b155bd00499250af3eccbd6afdb5db8 SHA512 23781cce97fff0b3b603dea99e946f06ad478fdbe52419e61f148829a832b485a14cfb81eedce8ce04d54e589b500d0fed3d1061f4e7dc015db4b18b79b96190
 MISC metadata.xml 249 BLAKE2B 9189a92c3cef2b8661b9244720b25c6672f271cd370ec5e2edea32ed00e14906c04990d4bb849a9ed55b03b00490e3b7c88f1da2b89fb36fc540635c426aaa51 SHA512 90f66a23a5c76b064963aa17fcf2c68f48c894e7b95e9214315696d7bbe4f70f0517f2188d15eab391caa8ea0844866e2660edf1087f74959d25c09219e8e993
diff --git a/app-backup/reoback/reoback-1.0_p3-r1.ebuild b/app-backup/reoback/reoback-1.0_p3-r1.ebuild
index 27b4e4caed43..67a63e15698e 100644
--- a/app-backup/reoback/reoback-1.0_p3-r1.ebuild
+++ b/app-backup/reoback/reoback-1.0_p3-r1.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils vcs-clean
+inherit vcs-clean
 
 DESCRIPTION="Reoback Backup Solution"
 HOMEPAGE="http://reoback.sourceforge.net/"
 SRC_URI="mirror://sourceforge/reoback/reoback-${PV/_p/_r}.tar.gz"
+S="${WORKDIR}"/${PN}-${PV/_*}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.1"
 DEPEND=">=app-arch/tar-1.13"
 
-S=${WORKDIR}/${PN}-${PV/_*}
-
 src_prepare() {
+	default
+
 	ecvs_clean
+
 	sed \
 		-e '/^config=/s:=.*:=/etc/reoback/settings.conf:' \
 		-e '/^reoback=/s:=.*:=/usr/sbin/reoback.pl:' \
@@ -29,15 +30,18 @@ src_prepare() {
 
 src_install() {
 	dosbin reoback.pl
+
 	insinto /etc/reoback
 	doins conf/*
 	fperms o-x /usr/sbin/reoback.pl
+
 	insinto /etc/cron.daily
 	newins run_reoback.sh reoback
+
 	dodoc docs/{BUGS,CHANGES,INSTALL,MANUALS,README,TODO}
 }
 
 pkg_postinst() {
 	elog "Reoback can now be activated by simply configuring the files in"
-	elog "/etc/reoback and then doing: chmod +x /etc/cron.daily/reoback"
+	elog "${EROOT}/etc/reoback and then doing: chmod +x ${EROOT}/etc/cron.daily/reoback"
 }
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 7c4b3de5effc..472865fc4af6 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -595,5 +595,5 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 EBUILD restic-0.11.0.ebuild 32428 BLAKE2B 9547c7ce3116e92e034880bae157c1f82430e8b0740d1a5dfcb43898c6b68b300a518b973f6fe70306cba0d64a143fbfed08c8223ad08a6e94f2c3fee8775324 SHA512 9b6170323810b0b94ce6c5664276e2fc5bb6d2517e0e73ef9b086eaf90337a533c775b943e603a91f54f4e2128991a8f1d99fdc3bad269a7d4e7ecea4a429d96
-EBUILD restic-0.12.0.ebuild 32336 BLAKE2B b8b8313b36d84cabdc27c3a73afe7da27a92c62fb2c2ef4540e851108a904b98c55edfa09cf4aa5c239d43ab12e968ca45103714037975c38ab1542fb8246528 SHA512 687325847b768e3741ca63aa836534fc81139607115c55bb6fded0de34b1d115c65f0749691206c295e1ec765938908b61673ee028a722294d4e2706370e2527
+EBUILD restic-0.12.0.ebuild 32340 BLAKE2B 7c314c0ad25d3152a30f2e9c456ddcd2be539a0cea0a76eb29cc9c9e9a595a13a5a3998884ec2aff98f043707abed8526ad6ef8a8d58e6bfd36417d10ec83895 SHA512 7e98d06858110c4d45a2aeeb2be64f9e994db186f9de6c33e971071364e1dad75b7c2eb62f56d74541a82b697d4e55255efbdeea5b8bcf7d6db751a04e8b54ef
 MISC metadata.xml 474 BLAKE2B 1b2acd92a1ff87ae82add1c26a0624296502c45f8f82abb1fc7a07e5b5320933ab93d56f1d10bbba63b804f7720202c6959f655d220366a4cdd2fe55c8b57844 SHA512 c5fe6467d6d74f94afc85d184355fa9933698d2c55e7b35f923ecbc377ed118f7c101bbe8eabf22feb3ead48f5be00728955b7e1a25772b7e49a4f430bd72a91
diff --git a/app-backup/restic/restic-0.12.0.ebuild b/app-backup/restic/restic-0.12.0.ebuild
index 61cb4d80def5..2f9ae4252353 100644
--- a/app-backup/restic/restic-0.12.0.ebuild
+++ b/app-backup/restic/restic-0.12.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A backup program that is fast, efficient and secure"
 HOMEPAGE="https://restic.github.io/"
 
 EGO_SUM=(
-    "bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512"
+	"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512"
 	"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod"
 	"cloud.google.com/go v0.26.0/go.mod"
 	"cloud.google.com/go v0.34.0/go.mod"
@@ -606,7 +606,7 @@ SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="sys-fs/fuse:0"
diff --git a/app-backup/spideroak-bin/Manifest b/app-backup/spideroak-bin/Manifest
index a94807265958..846d10c8f4a5 100644
--- a/app-backup/spideroak-bin/Manifest
+++ b/app-backup/spideroak-bin/Manifest
@@ -1,4 +1,4 @@
 DIST spideroak-bin-7.5.0_amd64.deb 20758038 BLAKE2B ecd549ee0d479f576e8d50b44f4f7a13c4d24445af32f460d34081e5b654586f314399b34cff1c937e157582a143fee6b98641a68655552bb6d3609e532ceba4 SHA512 4af9f6b57d8748c03bccb0ab843cf27f70eac8e8cc5f11bb494c597d5fd29f475bf9c68bce8971d3cc1550a6def7bac6beed78fdfb31961b09be61ee14116ddd
 DIST spideroak-bin-7.5.0_x86.deb 24779422 BLAKE2B 8cdae243794e5de6a8326e335b539d004c0ba0f1121b85067acbffffbef67f4a0c785f3b794abb62a5eedfd459c8e4d5e48cf8848b005ba637150b286b13db22 SHA512 32504b6e6931f1e923d4202f0b3201c93190128d30767ec41ac11cf7c8c751b87094bdedcf44dda3ae8089543418366c5a78093b9236fee5f95e7f89a29141fc
-EBUILD spideroak-bin-7.5.0-r1.ebuild 2668 BLAKE2B 32c56a7d6397d39a95d0de93c30f5fd3518d072e538a514144c573f03bfbfd4401df315f0d38915d552e5bc6e0e245b11365fe16349028fb81b71a5f577100d8 SHA512 dcc39e3ff959651bf9e3db5841beccdff348c206307810ce31c99e44a5ebdd303870bdd809ece124bfcc269fce50d8ccc07dbededb0786c73cb589247b890417
+EBUILD spideroak-bin-7.5.0-r1.ebuild 2734 BLAKE2B edded335d4b603ba6a4e27a21e17f5589630a3b04900e046daca2d15cb0164a82bd400e18f538b79eabb94a55e1a7dd0a9710211bfe03563455240f7ae58a688 SHA512 3c0a3016dd35889d0873429810846f810a1aaa29e53dfdb0beb905fb88e07141475d4fffbf7543477f6048ec17292401f1ee4993ee337ea5ee935f1c92ae421c
 MISC metadata.xml 366 BLAKE2B 6e319c339d3d88f78db4ea80cb4a3cd185e86f108ee34d0df7101c6a57b2eefc43b1ebb3985d8d8517d28f0359f29a5535cc79c5a19d2b7a96f2d1333dff95e6 SHA512 20ef3b773ef34ff3936408fb034c73d4e2a5bedc5e0bd2deaa9802e208e17b73dbff8e15b03bc82a56f4d70c32b3d980f542dfa4370a7f88f3759f8573de0763
diff --git a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
index bd12c7b9d6fd..9b91aa577c3c 100644
--- a/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-7.5.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit eutils unpacker
+inherit desktop unpacker
 
 DESCRIPTION="Secure free online backup, storage, and sharing system"
 HOMEPAGE="https://spideroak.com"
@@ -46,47 +46,50 @@ src_prepare() {
 	# Set RPATH for preserve-libs handling (bug #400979).
 	cd "${S}/opt/SpiderOakONE/lib" || die
 	local x
-	for x in `find` ; do
+	for x in $(find) ; do
 		# Use \x7fELF header to separate ELF executables and libraries
 		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
 		patchelf --set-rpath '$ORIGIN' "${x}" || \
 			die "patchelf failed on ${x}"
 	done
 
-	#Remove the libraries that break compatibility in modern systems
-	#SpiderOak will use the system libs instead
-	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6"
-	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
-	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
-	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
+	# Remove the libraries that break compatibility in modern systems
+	# SpiderOak will use the system libs instead
+	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6" || die
+	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1" || die
+	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0" || die
+	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1" || die
 
 	eapply_user
 }
 
 src_install() {
-	#install the wrapper script
+	# Install the wrapper script
 	exeinto /usr/bin
 	doexe usr/bin/SpiderOakONE
 
 	# inotify_dir_watcher needs to be marked executable, bug #453266
 	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
 
-	#install the executable
+	# Install the executable
 	exeinto /opt/SpiderOakONE/lib
 	doexe opt/SpiderOakONE/lib/SpiderOakONE
 	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
-	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
+	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher} || die
 
-	#install the prebundled libraries
+	# Install the prebundled libraries
 	insinto /opt/SpiderOakONE
 	doins -r opt/SpiderOakONE/lib
 
-	#install the config files
-	use dbus || rm -rf etc/dbus-1
+	# Install the config files
+	if ! use dbus; then
+		rm -rf etc/dbus-1 || die
+	fi
+
 	insinto /
 	doins -r etc
 
-	#install the manpage
+	# Install the manpage
 	doman usr/share/man/man1/SpiderOakONE.1.gz
 
 	if use X; then
diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest
index 2fcf819bcd23..8e7172bd4144 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.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
-EBUILD tsm-8.1.6.0-r1.ebuild 7428 BLAKE2B f22643906e9699b33f2d91f8145928db1226883ff4297c3a12dd5ec7d330c847a70d59e3f5ce384925f1f55dfb8610f0e7a27a6db1511060ac3a6b59c58df5f8 SHA512 9d4f43f867c59f72183ac97560e9121d4c8390f4a40b5d392aed6b9377b816258164acbe671149b694632db3e8d12e07bfbc68ceca56b7ecc899683e5a5b0bad
+EBUILD tsm-8.1.6.0-r1.ebuild 7424 BLAKE2B 2f65100e69dee5f7f1ae4d558de12f2e2ee554629f58b25565abbf2b97e43bb4223122ba36b9919dca4155fa4999ac210d0d9805daf641a364fed9dea066a6ce SHA512 1dc17a93cf1e034fa7511d9b8c021c5c74c2c5c8a605179212120dd7d640218f5e5b2912751763dc8686aea33d090bdf1256c2335fb8dc34eb0ad2d4c437603c
 MISC metadata.xml 398 BLAKE2B 78fb8e9d30a09caddcc2006326db44bbb2c12b83e174f8af3263d738a1ae958922297d910225137a0f9056f50f76086aeb5ee37e342a1302fb060159f1c50c99 SHA512 d232b0705cc9e5ec35eca0f5c2492b5211cc083db2f825268055b1097017f60967d2e12d61083173593a3c9387f6879584abc2cbe58da69c32fb2ff6d2e83903
diff --git a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
index cab9db6b1d19..8e4c399042d6 100644
--- a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
+++ b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
+inherit versionator readme.gentoo-r1 rpm systemd pax-utils
 
 DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
 HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
@@ -126,7 +126,7 @@ src_install() {
 	# We don't deal with SELinux compliance (yet), though.
 	local RPM_INSTALL_PREFIX CLIENTDIR i
 	RPM_INSTALL_PREFIX=/opt
-	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+	CLIENTDIR=${RPM_INSTALL_PREFIX}/tivoli/tsm/client
 
 	# Create links for messages; this is spread over several postin scripts.
 	#for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
@@ -136,7 +136,7 @@ src_install() {
 
 	# Mimic TIVsm-API64 postinstall script
 	for i in libgpfs.so libdmapi.so; do
-		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+		dosym ../..${CLIENTDIR}/api/bin64/${i} /usr/lib64/${i}
 	done
 
 	# The TIVsm-BA postinstall script only does messages and ancient upgrades
@@ -217,10 +217,10 @@ src_install() {
 pkg_postinst() {
 	local i dirs
 	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
-		if [[ ! -e $i ]]; then
-			touch $i || die
-			chown :tsm $i || die
-			chmod 0660 $i || die
+		if [[ ! -e ${i} ]]; then
+			touch ${i} || die
+			chown :tsm ${i} || die
+			chmod 0660 ${i} || die
 		fi
 	done