gentoo resync : 15.12.2019

36 files changed, 189 insertions, 226 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index bb6834cf29b7..b6951fffc809 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index d7e4a0108492..faf980ecd9c0 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -23,12 +23,12 @@ DIST amanda-3.4.4.tar.gz 5363929 BLAKE2B a3da69f63c43ba4821a28d380262b99444c45db
 DIST amanda-3.4.5.tar.gz 5365381 BLAKE2B 61c18603d48c4e9c647cfc7e185292e8764d62bd1ea9212da04958029cc87472872fa2e4a45ec52bb15f6342d2f3e41e486a6618024f775dbedffcc762190ae4 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
 DIST amanda-3.5.tar.gz 5386719 BLAKE2B 93a382a9091ec7cfc5f21fe7131a6bf0c1aceb169a2274ce66c1f77a08b594beeca430687a6a28403d8cc35e85beecce99fde9c2d7d34c8460999a3ca63937f1 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c
-EBUILD amanda-3.3.9.ebuild 16110 BLAKE2B a35ec544433978b786f4f5a0889f9d68fa8ef1e5993d3ab881adeaf3860fa94b1558b93021013b98539463e584990d240f3740fdfb4bac5e87143db4a5aeb0d7 SHA512 d3d0523405799ea6c07df9a794c8f79fef780c0e367b595d61d25ed6a76a402fa85586268bfc490116e4363238f8d6c330614c252a02000d859c63d67a2220de
-EBUILD amanda-3.4.1.ebuild 16572 BLAKE2B ccb66acf67b1b1586c2f08c68ef30dcf6913846ac2d41e99ed86d166a7e70a15de86775e4902c68acb158b1b20c9987ceeaa4f5c632e4b85d65a3b6958858ce1 SHA512 f23b802ce76b9f91295921747fd0985e3befed5ec7743feffba4f9d96346c2fb6b4010af27598fd07d3a7e97bbe5fa615a8f65ca0b83851e905e09077f8d9372
-EBUILD amanda-3.4.2.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
-EBUILD amanda-3.4.3.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
-EBUILD amanda-3.4.4.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
-EBUILD amanda-3.4.5.ebuild 16478 BLAKE2B b13edc4eca457ceb5a60141ed0956e1465dc0e634ab84e6df53cae85c9fb278a0372bd6d3af13f8d4b8dbdcd79bdc5aac806392dc6019f88ac76f98e4dfdce03 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f
+EBUILD amanda-3.3.9.ebuild 16103 BLAKE2B 95678c707b0189cb0d598bab7cd157c807a65949376988a2f33b09f0e7c7454d37de721c9d8a3ce9549e7a7a165bb92cb7c487af1e2ea104d8a5282936945be0 SHA512 41c0249462cd98382f4930fcb3379c7bd1642fbf1e7bcbf22a748b1dcf125a95b1f41b0e14c9b2eccd6b3784f0a7daeef076adcbeb7626c824eb3feca406ffc0
+EBUILD amanda-3.4.1.ebuild 16565 BLAKE2B c5473d249a3a4fbe366dd979e2aee5ee6deef8ab9b3bdb696dbef8667c58d0ff7ff2f6a92d27e7a9241259e5b28267747057d5c43551234d490a2fbcc41fd61c SHA512 63cc27d0603ae815689ac83e8126838718119749191c083b3f4e09f46751633d5dc75e1a2c283134923ad680c63edfacfa0790067f804d492a96169fe0835a32
+EBUILD amanda-3.4.2.ebuild 16471 BLAKE2B 01612fe22d704bfd6c44119f4714944f4d1b215823205bcae89667717962a13360a064e53a4184b69d4255ec33ebe2c54fbbb49663f2036dd415d91d4794189c SHA512 214a57d0326d3c949687ef8419d12aebee909809f5ad4cd969e0cfa9d6187771bf92eb3b698efd3ea9b3afd8737da8bc6d0fe08c16b5f9f53f7c85db1c7a64c4
+EBUILD amanda-3.4.3.ebuild 16471 BLAKE2B 01612fe22d704bfd6c44119f4714944f4d1b215823205bcae89667717962a13360a064e53a4184b69d4255ec33ebe2c54fbbb49663f2036dd415d91d4794189c SHA512 214a57d0326d3c949687ef8419d12aebee909809f5ad4cd969e0cfa9d6187771bf92eb3b698efd3ea9b3afd8737da8bc6d0fe08c16b5f9f53f7c85db1c7a64c4
+EBUILD amanda-3.4.4.ebuild 16471 BLAKE2B 01612fe22d704bfd6c44119f4714944f4d1b215823205bcae89667717962a13360a064e53a4184b69d4255ec33ebe2c54fbbb49663f2036dd415d91d4794189c SHA512 214a57d0326d3c949687ef8419d12aebee909809f5ad4cd969e0cfa9d6187771bf92eb3b698efd3ea9b3afd8737da8bc6d0fe08c16b5f9f53f7c85db1c7a64c4
+EBUILD amanda-3.4.5.ebuild 16471 BLAKE2B 01612fe22d704bfd6c44119f4714944f4d1b215823205bcae89667717962a13360a064e53a4184b69d4255ec33ebe2c54fbbb49663f2036dd415d91d4794189c SHA512 214a57d0326d3c949687ef8419d12aebee909809f5ad4cd969e0cfa9d6187771bf92eb3b698efd3ea9b3afd8737da8bc6d0fe08c16b5f9f53f7c85db1c7a64c4
 EBUILD amanda-3.5-r1.ebuild 16938 BLAKE2B 8f3babd9023dcde42c315e4f37429ac880dfc5741796fec65cb8d66c92a3ea2dd1285efba960320d7809dc3cf17b5493a806ee18edcc8b7724daaa27363a2127 SHA512 a59b3f14fec406868d2f9ff1de19e3f8ed3eda4348675f084ae6cd8b92f52108788a1527e6772463b98a61dfbd89cacd06fd40d721f5e23eb8ffe9a5c770c07d
 EBUILD amanda-3.5.1-r1.ebuild 16885 BLAKE2B 25046097ecb3c74e6a5232985af728345f95da95ed27d78a4eaf9220a05ff4db9e464ae6537ee0e56ca9e7b68eef3f716fbbd42d2c042844d02bbe68fac58b7d SHA512 c456f5a1b97a949fd6b2ed9e31cb519b6f4e45b3ab963b9dd3342612c444b9fc60b64ed6a9a8c07ed38fe3c8d04fb2f9edf466dc8c14f761c89f92ce93070730
 MISC metadata.xml 951 BLAKE2B 8d3f922a8e395fab343e60d31525a3faa386aebdc2b0548e37037855aab88df4b27f639672e290540bc4746024f43e2da7db853b1d9446d13744c3161a293848 SHA512 0485a881c4592e201c4130ca9bc62499a8933f77a4a4431148c647b420c022404b218896c525ab062cc40f4c386082eed25f2d38ee5bcb5cdeacc0b21c1f8230
diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
index 968e236abaa5..b1bc94655eb9 100644
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -302,7 +302,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..
diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild
index aa6f63879983..98a1da3e02bc 100644
--- a/app-backup/amanda/amanda-3.4.1.ebuild
+++ b/app-backup/amanda/amanda-3.4.1.ebuild
@@ -309,7 +309,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..
diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild
index aec64fedec3e..b96bbf4ea76d 100644
--- a/app-backup/amanda/amanda-3.4.2.ebuild
+++ b/app-backup/amanda/amanda-3.4.2.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..
diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild
index aec64fedec3e..b96bbf4ea76d 100644
--- a/app-backup/amanda/amanda-3.4.3.ebuild
+++ b/app-backup/amanda/amanda-3.4.3.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..
diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild
index aec64fedec3e..b96bbf4ea76d 100644
--- a/app-backup/amanda/amanda-3.4.4.ebuild
+++ b/app-backup/amanda/amanda-3.4.4.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..
diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
index aec64fedec3e..b96bbf4ea76d 100644
--- a/app-backup/amanda/amanda-3.4.5.ebuild
+++ b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -306,7 +306,7 @@ src_install() {
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Build the envdir file
 	# Don't forget this..
diff --git a/app-backup/backup-manager/Manifest b/app-backup/backup-manager/Manifest
index c3979a788793..580ddfb8f846 100644
--- a/app-backup/backup-manager/Manifest
+++ b/app-backup/backup-manager/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..6142fd7c265c
--- /dev/null
+++ b/app-backup/backup-manager/backup-manager-0.7.14-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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"
+HOMEPAGE="https://github.com/sukria/Backup-Manager"
+SRC_URI="https://github.com/sukria/Backup-Manager/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="s3"
+
+DEPEND="dev-lang/perl:=
+	sys-devel/gettext"
+
+RDEPEND="${DEPEND}
+	s3? ( dev-perl/Net-Amazon-S3
+		dev-perl/File-Slurp )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix_purge.patch )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e "/^PERL5DIR/s/sitelib/vendorlib/" \
+		-e "/sed/s:=\$(DESTDIR)/:=:" \
+		-i Makefile || die
+
+	default
+}
+
+src_compile() {
+	default
+	emake -C po
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	insinto /etc
+	newins backup-manager.conf.tpl backup-manager.conf
+	fperms 0600 /etc/backup-manager.conf
+}
diff --git a/app-backup/backup-manager/files/backup-manager-0.7.14-fix_purge.patch b/app-backup/backup-manager/files/backup-manager-0.7.14-fix_purge.patch
new file mode 100644
index 000000000000..c3e2cbf0ce7b
--- /dev/null
+++ b/app-backup/backup-manager/files/backup-manager-0.7.14-fix_purge.patch
@@ -0,0 +1,23 @@
+From 90b5f71f3803747a788c693d4bcb7e3b60bb4911 Mon Sep 17 00:00:00 2001
+From: Thomas Parmelan <36071478+tompar28@users.noreply.github.com>
+Date: Sat, 3 Aug 2019 20:02:34 +0200
+Subject: [PATCH] Fix issue #91 (See
+ https://github.com/sukria/Backup-Manager/issues/91#issuecomment-381925277)
+ (#120)
+
+---
+ backup-manager | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/backup-manager b/backup-manager
+index 331cfa9..53e622a 100755
+--- a/backup-manager
++++ b/backup-manager
+@@ -34,7 +34,6 @@ vardir="/var/lib/backup-manager"
+ bindir="/usr/bin"
+ bmu="$bindir/backup-manager-upload"
+ bmp="$bindir/backup-manager-purge"
+-export BM_BMP_PATH=$bmp
+ 
+ # Find which lockfile to use
+ # If we are called by an unprivileged user, use a lockfile inside the user's home;
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 6857c98a631a..778aa9f2de61 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,9 +1,4 @@
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
-DIST borgbackup-1.1.8.tar.gz 3456058 BLAKE2B cad55216f92025418e1a427f4b578d6b7eafa03f6b3e9c4fccb148dd3856c4f6649928fb4227249c534add125f9b3a2a0b6ed808ae12c5e60a28f9df4fb0031a SHA512 1455e68bcedab8f35f9426dc73958c6a6565ad1f1cc274ce59d34a12e3a7bfa1d12fa2b8e8dd3e71824e1cd0927babf79f4e99d4e516454ed12dbd3970d0e921
-DIST borgbackup-1.1.9.tar.gz 3468259 BLAKE2B 91c89304cf22328a0bd74583c22370343915209a204f52c65290dbec0cb688392c2e80b946a55317f8c58ef23099e710c16a34c6bfbbfb547a3e4b38c3c81c37 SHA512 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
-EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B 57526ef5bed691aacab640d6df502a8ed647f440104519cdc0a0c8e4deea805e52a4958d7474efa795d6532dfd149ee0b4928d667e7b2a86bd578f8f857d2a7d SHA512 5b2c73d4c8aa1df5420c14b3e4f2b01b9585ad2cd8416d49c57331bc6b647e3f9b87eb61152c6b49ee8de4ae6eeac2a9835b980820799b1a1a3dbb3153794c20
-EBUILD borgbackup-1.1.10.ebuild 1105 BLAKE2B f44a4ce67b66d92c93f292076300033a68f9eb7cac4b22ee8f73926d366cc503283bac05423d4b0f6bbfd4773af66cc85105bc4f30171e37145ae02962dfe25d SHA512 29542266432fc3a13e0df8845a177ee8773f422320a2f030fb812eb067d0c8d16456104ae43df1ba7ed959213aa668dc8bd14f1afeda5562d9691f5067c00901
-EBUILD borgbackup-1.1.8.ebuild 1103 BLAKE2B e190ec23ed8f61a795c48a5754b33b01b31afe3e12f90dedd757476e0364a12dcea9968e84c69c206680767364c74eef4ae0da795098fa823589d2bae17787d5 SHA512 2283bbd7d91e5caf2e46d935c7f5caa4dac432a722516954224987129182ebdecdcd53fb7504c5f6f35d84acfea9eefb01912d6bb13d2c7ddf523c5e8f47c78e
-EBUILD borgbackup-1.1.9.ebuild 1103 BLAKE2B bde3f74d6c6005f31f2d62263233501a124e0ded9231c3d555a9a99558333df17080bd72190bfbf1c167cb08b2500ebbf7ba873f52c502283aa243ba59f3f09f SHA512 d2dc1e3f4a72f18641754e634a4ec9d9dcda2c9852694b7fe5afa7d913ecadaf077899e467ee6155e7ca4df0305b8a795ddc753314fabea00fe6a1c16ba3c20b
+EBUILD borgbackup-1.1.10-r1.ebuild 1168 BLAKE2B 1039b80ecb145cdba8a44893820622871942cd5d27df8190f076302b73bd2c99a416d947214da207bd9a86426334baf66896b3c3910097bc9bea01f018fc2a35 SHA512 cf3fcf5e14ba60e08ca46b844978bffd7a41ee3977003e42e1658888e3526cd759a10dd0a99e812ec5e69ab4bf82fae87c2f83ff6ccdc8575ed5d004b67fa5d2
 EBUILD borgbackup-9999.ebuild 1193 BLAKE2B dd45787526507ca7970f4ea756ae61e52a1eb83ef99ddff50dab51447520676cb7f1e571036437bcdce109f6a38fa3f3d4dbf469e6d5cee919eeed86c8d6fde6 SHA512 2b5019a7d1d08bb8e54de01922c42307ae4e22ac33f0fa1493a098f306e2048a9dd4ee8b33ef33fd29696d60290afa5c80723b7ff90f1e2e14961e96d6b2836e
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
index 01bf2c50bda1..97980ccba4e0 100644
--- a/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
diff --git a/app-backup/borgbackup/borgbackup-1.1.10.ebuild b/app-backup/borgbackup/borgbackup-1.1.10.ebuild
deleted file mode 100644
index 0afaf4e45937..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-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}]
-	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${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}
-"
-
-python_prepare_all() {
-	# allow use of new (renamed) msgpack
-	sed -i "s|'msgpack-python.*',||g" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/borgbackup/borgbackup-1.1.8.ebuild b/app-backup/borgbackup/borgbackup-1.1.8.ebuild
deleted file mode 100644
index bd9fe6cc8197..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-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}]
-	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${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}
-"
-
-python_prepare_all() {
-	# allow use of new (renamed) msgpack
-	sed -i "s|'msgpack-python.*',||g" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/borgbackup/borgbackup-1.1.9.ebuild b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
deleted file mode 100644
index 3f7bb54989c6..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-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}]
-	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${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}
-"
-
-python_prepare_all() {
-	# allow use of new (renamed) msgpack
-	sed -i "s|'msgpack-python.*',||g" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/ccollect/Manifest b/app-backup/ccollect/Manifest
index 2464513cc5e3..4bc0724530ca 100644
--- a/app-backup/ccollect/Manifest
+++ b/app-backup/ccollect/Manifest
@@ -1,3 +1,3 @@
 DIST ccollect-0.8.tar.bz2 60376 BLAKE2B e3580aa6d1438b106c372e5b4abc77b9e19a8e057b93cfbd5882b3e9a899d5fa02c31c030c933c6e3e254687423cc51d0d86787365d40e4f5635aab3aa6dd954 SHA512 dc4b2a8687c636938154f8a4a4048c3f0ef13f6d6e3f6e66d8dcc8f544f3a390a98a8dbfb3ba2ba9019decbec5d628f07461dd3f803e14b2203972936ebf96f3
 EBUILD ccollect-0.8.ebuild 2211 BLAKE2B eee5eddafcac2ca0e74fe8afb936cd9ee578c8e22959ecfb579f97a42e287eb40a2274e795a4ca3cb468fcbe1ac2c626342de7781621cd582339ee0811ff9cbd SHA512 8b40955d9a3d76dddc8bda3b6267b4df351cd32350a95a14e013a0a38d68c422ca5be476c51b3116b4b5ed6190c8e7b9f80f8d1045d01a29d4c4e06d95680e7f
-MISC metadata.xml 219 BLAKE2B 3c2cd05bc68548ac484a4867fe08096d464a904a994babae6b67e953b25fcd50e14a38ea3a45b8a29b8542bf84f31455742f4cff34c491c07d2dfe732c0c6868 SHA512 deccbe684f92cee0cda5253fd564994d5718143e047d6ce61fea68c3f061dc566e88288e13d98df5e68769ea347724bc39b7a466d3f1028498b4b66bc545ca9e
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-backup/ccollect/metadata.xml b/app-backup/ccollect/metadata.xml
index 8626ee05464b..7a38bb900964 100644
--- a/app-backup/ccollect/metadata.xml
+++ b/app-backup/ccollect/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 54f74b24b794..fa2771fac191 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -5,4 +5,4 @@ DIST duplicity-0.7.19.tar.gz 1727321 BLAKE2B 6441a2ce777b3b08c52ede8602a73080be3
 EBUILD duplicity-0.7.10.ebuild 1267 BLAKE2B cdd85dc1c3e0aa64c95f74f24ff7001856b455505ae51e1fa6f2a3abcc22ee1fabcabc28c9b3295f8aab1b710e9c4562e6014614a335c71971920ca4f83b70d6 SHA512 0d54e0a7573eb24f9a5d687605dea86db8ea341a64a3a1c3b9c6e633ea41e126d9ca73709e49f6c40b73aef1cea27b8ba964194010fd0ed28b0204c1ff658355
 EBUILD duplicity-0.7.12.ebuild 1273 BLAKE2B a50c92e242971f614628e35f7a5aae330da3135b90cef0f6c9aea6a757b25754786b2d77b5ef1fce553b23a73a3a53b537250ede4dc5efd6dcf5c60fd9dc0a45 SHA512 ed81b75b9f407f33dd75450bcde00b94a5dc17ab6cb51808fef872d4d4d19b29f676aef440ba69b24835e1eab5e2b69196b8d8deb983f36916863be12b099cc7
 EBUILD duplicity-0.7.19.ebuild 1268 BLAKE2B dc3546c00b5d333b9675d8d75bdfdb7ed5043f7909bc814be17b3f49328facd92d75aa30aaddcd50a6630327a85e0d5d1c5434282dafd3aa0045279130272d28 SHA512 e7b5ce1870df96a4a0a5fe0e4a78057afdea70966a478d5156a48254d6b6fbe2ff77b770919e870e0bb36984e724b97548d78a58ddf1bf8e7c01a86a5aebb1d6
-MISC metadata.xml 331 BLAKE2B 16d79a36ff3ea61821cee414d23ffd529912bb5d983e1c4229cc476077023c2cc672916fe87655d776bb4ee7c7133b47c1e6d9b378eb31b4f3ba33b8a49e43c1 SHA512 01bd526169862afeb5c7cfdbcce5f990c7eb35b29280e9e01de76b06b557645065bb7a40d1994ec8ef601443a21ac40446881f684961e335c26b26698718c813
+MISC metadata.xml 539 BLAKE2B d83188c2a48a4ef03912a7fe8ca40700797a0d46a3f646292b03b328104b7bb6669729ce82330c40cb4935df26f8171c460630029e41b4013b6eaefeeb258fd5 SHA512 4d82d8f4096c2791e79a1dbb6652783d3a773d7a96c1e8726e00fc8c570c011908ba24370c4c751c30a16bf8e977e3d6fe26d011950cf9d5bd8277c4a0471b76
diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml
index 6efa6d440510..82d5a255de7a 100644
--- a/app-backup/duplicity/metadata.xml
+++ b/app-backup/duplicity/metadata.xml
@@ -5,6 +5,11 @@
 		<email>rich0@gentoo.org</email>
 		<name>Rich Freeman</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gentoo@seichter.de</email>
+		<name>Ralph Seichter</name>
+	</maintainer>
+	<longdescription>Encrypted bandwidth-efficient backup using the rsync algorithm</longdescription>
 	<use>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
 	</use>
diff --git a/app-backup/flexbackup/Manifest b/app-backup/flexbackup/Manifest
index 63695e9c0266..117247021bc3 100644
--- a/app-backup/flexbackup/Manifest
+++ b/app-backup/flexbackup/Manifest
@@ -11,5 +11,5 @@ AUX flexbackup-1.2.1-secure-tempfile.patch 2563 BLAKE2B 34ce762db2abaf426e165ab2
 AUX flexbackup-1.2.1-spaces-in-filenames.patch 11037 BLAKE2B d0ac4cef902d5d63a099bd64c89c6ed050d3d791d4d7093ff269e21badc04b3634d5839623641ee087a48559f57db6684c6b405294b7f2671bfb0118575be30e SHA512 58fdb4fbc59eaeefaf5a552abab0adf8a4d4e258cc737a1b310c00bef6ebf61c9fa55f3b3b7c68553ed224e12c082d03a9c16fdacfa2a44a70349bd882cfe987
 AUX flexbackup-1.2.1-tar-1.29.patch 514 BLAKE2B c5ff11dd0527d376a596b09781ab57c1f5f8a0a3d1b07390a97228b4a11e7ebb95aff896187b007b065a2e3ae82f2596596a367097e9b085c44f62a529d1ee8d SHA512 b8a28c93db2b8f04bcf7c56406fd0457b837e9afea30a5a1cf37bdd64554bbb4ee665b5c15af24701eeab10a1b1c2d31371b7c0ce32cbfb29223ac34956cc962
 DIST flexbackup-1.2.1.tar.gz 80158 BLAKE2B 0e54c275ddd218184195bb5bc873db10ab144409eed9d87410e5b7ba5ed09297fbdb58f3eb69b5d55c1ec727fe79f51b376914542ba5eae70ab4f87351b6dd4c SHA512 17630bc46657becdf5d5bde4852fd6cebe189fe54d381bda6471aa2e1db1ff082ba24461e2c22ba5805c2d93ac7f9805ffbdc4904da017f1b163cc21b5a3974b
-EBUILD flexbackup-1.2.1-r13.ebuild 2791 BLAKE2B 5eb4c59ef05a125252945f8739fcbd63fabc295b4adee19830c32d8885a13ef558a04af230a97f3741aee2ee4dc3b58d9cd99b6c153698981dc38488abf36847 SHA512 f33313f8842f8bd66e26ee3e1bb336c65b9cbbeba1b1d35603a7b07e487d9f5688dba5dcf58c87e929dd12b2b01966f226be5074c0ab7ddf1c44ff8bf518e0f9
+EBUILD flexbackup-1.2.1-r13.ebuild 2757 BLAKE2B 3454cf254983373450ddbb3efed9aa146f226e42214884abc793ee035537b4c2ecf11d206940aa95b3a91b4ffcc9e5fb845bf14b3997d0d1efd44e5cdbf40466 SHA512 8986eefcec1444b5a3f36eec7faed8c2538c98a3f38f9df1574fa1942c3abd45459baa6efa0ef7fcacc41eecc77a9108eda41190d549e5cdc49eab17922213b6
 MISC metadata.xml 297 BLAKE2B f0205ea431c1b919654d761a82af8cee33ba2280a5c920242a8588edc7fd857166c07c4cfecfb28f621a7c3e77fc8ff6d21e84b7b20c0db1512129e8ed15a252 SHA512 a2fd29aba380cb3b9322131f97beed0d432569ab612118bf1a9a428a93602c859014face05fc8582c8dfdf6858296a36ae6754fdc45a78715058d779df3f7e0a
diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
index 528b303d318b..32d3b9f6aaee 100644
--- a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
+++ b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild
@@ -76,8 +76,7 @@ src_install() {
 	dodir /etc /usr/bin /usr/share/man/man{1,5}
 	emake install \
 		PREFIX="${D}"/usr \
-		CONFFILE="${D}"/etc/flexbackup.conf \
-		|| die "emake install failed"
+		CONFFILE="${D}"/etc/flexbackup.conf
 
 	einstalldocs
 }
diff --git a/app-backup/furball/Manifest b/app-backup/furball/Manifest
deleted file mode 100644
index 493522acbd19..000000000000
--- a/app-backup/furball/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST furball-0.5.tgz 10112 BLAKE2B 2d88bda98bf187f4eb5af07c06000a4370ca4258669b0dee13b956350fde99642c1e20b8b47b160440f485a8e4aff6b44858d9774cd1ef4d3d45f767296632e7 SHA512 e5bf9857de8b391dbedfe14e6f84021447c5c0e7d7e9bed021a4cdf28e93de72c8a8fb82afad64b2863c80b0a983a986a2a00bb2b5319e9b4595781dac18e3b6
-EBUILD furball-0.5.ebuild 456 BLAKE2B a195f0c31e6d45c9fa8a57e4f5beb41f71ed59685de6ee482179996b073a5ae40b4e3d20201454fad5494adb276d903047ee351278074d83e3ef2d63a824b4aa SHA512 45f5a4d306c3460fc96b0df87a418e57a7e9c812daf4c16ff72c998355ba7719e19ad0d570f7d5bfbc39aed6385b70ba80a3552a7296021f627a368aed76d716
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-backup/furball/furball-0.5.ebuild b/app-backup/furball/furball-0.5.ebuild
deleted file mode 100644
index 230d48aaae0e..000000000000
--- a/app-backup/furball/furball-0.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A small perl script utilizing tar"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://www.claws-and-paws.com/software/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-RDEPEND="dev-lang/perl
-	app-arch/tar"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc README NEWS THANKS
-}
diff --git a/app-backup/furball/metadata.xml b/app-backup/furball/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-backup/furball/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-backup/kfoldersync/Manifest b/app-backup/kfoldersync/Manifest
index af9ecf49e9a6..bb74ffc136c1 100644
--- a/app-backup/kfoldersync/Manifest
+++ b/app-backup/kfoldersync/Manifest
@@ -1,3 +1,3 @@
 DIST kfoldersync-3.4.1.tar.xz 49308 BLAKE2B b2d928d7b4111d69f9fdf28efcddb72da715b6bc143d94cc6d37fd8e5888f5ebd70d11e57a1cdce046ced7f55b6ba4a3da9d64947928d60ddb560b593af9a996 SHA512 b51c005942f0627f8ab3428e860c5f336df0282fd3dc184cac6897755a740ca873241e63828b1af7704b373e0a92de1a4bd9dbe8db3b7a35fbbafc2a509603d0
-EBUILD kfoldersync-3.4.1.ebuild 850 BLAKE2B 2c13ccae858d1aa6169d4790a2fc457df718073d2999c3083109ad24cc0e7061b0065212f0cea84f6b60f0273b11b27443c2da3b23fead3fe37692c7fcc993f4 SHA512 183dbe06e2a6ee5a7deabb0184a7f0c04f1fe7a236337feac03e24ff64825354e75320ed681117a3d180ca414e7274c6a1c35154b72a1473b2ffa065086f240f
+EBUILD kfoldersync-3.4.1.ebuild 962 BLAKE2B 3beb77087a0ff57f27aa0287cdc5adbafa7fb221fd6950516708276d98b8a8a6ce48bb72fc3de862fdc6355d910f1f303f006557ddb811b5bd8e5bbcfc901f5c SHA512 229d62df5c4f0357d834523ff63b52f966d6d2c65e1a052a1fdf96b21e5febe26122936f2cf5acd608ff4ee390be8965dacf59fd451f4535e6c6fd9abdfbbfd7
 MISC metadata.xml 521 BLAKE2B c1b348ed6b4d0ec451a6da0508000c2f67a56f41e7c85c80535fdcd87e7fcc16b91efa957052e82f4cde5e44a5147410b0c5a7b22a51a09a893d6eb887682de2 SHA512 23ce04633c404da4e581a1931230ccff3069093280a0e049b2612f881005296c358f4c01d8ab9fcc344a176d143b9dbd87b5218204a7eace67fc2ea55f8b7d61
diff --git a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
index 82b1fd840e6f..252fea2b53ce 100644
--- a/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
+++ b/app-backup/kfoldersync/kfoldersync-3.4.1.ebuild
@@ -3,31 +3,34 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm
 
 DESCRIPTION="Folder synchronization and backup tool based on KDE Frameworks"
 HOMEPAGE="https://www.linux-apps.com/p/1127677/"
 SRC_URI="https://dl.opendesktop.org/api/files/download/id/1485353737/${P}.tar.xz"
 
 LICENSE="GPL-3"
+SLOT="5"
 KEYWORDS="amd64 ~arm x86"
 
 BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/app-backup/rdedup/Manifest b/app-backup/rdedup/Manifest
index 9482c2ed7788..20eeb80aaf1c 100644
--- a/app-backup/rdedup/Manifest
+++ b/app-backup/rdedup/Manifest
@@ -30,5 +30,5 @@ DIST time-0.1.36.crate 28333 BLAKE2B b87de9c713346b55eea1b738236608e7d9e14d619fb
 DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD rdedup-1.0.2.ebuild 1145 BLAKE2B cc7dd7c85c548f9afd4d25f152619fc2aacc485e1258efcf1c3636c0c3fa65ef981e719c11c7091b3f04745a96a73edcdee888d58051de4cbbd6cc4278fd1d10 SHA512 16dbfcb2e03f9ccef7ed5648287c5af511e4f8928d2f9ce403f58bc3991440487908ab6d87f9cef1c75d14520636c96805d28a9a85074bc6c5db6e68bee09db1
+EBUILD rdedup-1.0.2.ebuild 1088 BLAKE2B faaa8bffeba08e070369aa52ce0cdbf6697582b052e75b6caed6483531e58da1de930b64ccfc6b4084eda6b8aa19884ac2a5f6a05d36015ad2c229d0231713c4 SHA512 aeccc7e1bcc764b045cf3e5d50c10ff67ef4998e09e34f65d34c9f0790406397c34ea4c91bdf0669112cbaae5f03f930a9a27578f440aed648b476db4d4aae7c
 MISC metadata.xml 325 BLAKE2B b29288cacf9d5fd366085fd4849aa23fdd6cb8fa243d90936ce568254d78f25bdffebdca162fe43c3e3df1ee75e6456dfc8b46bbd812a78d348e44bad2642da3 SHA512 d929b91d79451edd8facd161376146c37c0036782f8525eddeffb29e16f4a63d55ce84a2b35a52df8f4a5a89f6a95b8a7b1c0eafd2a279d4e680196fec196653
diff --git a/app-backup/rdedup/rdedup-1.0.2.ebuild b/app-backup/rdedup/rdedup-1.0.2.ebuild
index 378d63f771d7..aa991f439d71 100644
--- a/app-backup/rdedup/rdedup-1.0.2.ebuild
+++ b/app-backup/rdedup/rdedup-1.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CRATES="
 aho-corasick-0.5.3
@@ -44,21 +44,20 @@ inherit cargo
 DESCRIPTION="data deduplication with compression and public key encryption"
 HOMEPAGE="https://github.com/dpc/rdedup"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
-RESTRICT=""
+
 LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-DEPEND="${DEPEND} >=dev-libs/libsodium-1.0.11"
-RDEPEND="${DEPEND}"
-DOCS=( README.md CHANGELOG.md )
+
+RDEPEND=">=dev-libs/libsodium-1.0.11:="
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	default_src_prepare
-	ln -sf "${WORKDIR}/cargo_home/gentoo/rdedup-lib-${PV}" "${S}/lib"
+	default
+	ln -sf "${WORKDIR}/cargo_home/gentoo/rdedup-lib-${PV}" lib || die
 }
 
 src_install() {
 	cargo_src_install
-	einstalldocs
+	dodoc {CHANGELOG,README}.md
 }
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index b22dd16afe9d..358d3e77873d 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,5 +1,8 @@
 AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f21fcb047c213c442f211570602f7cb3dbc8bc30d29a877bcb99a95c500257fd838ea3514b5cd985ab8d94e2ebc4b453adb8587d9 SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f
 AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f
+AUX rdiff-backup-1.4.0-no-docs.patch 906 BLAKE2B 7acb8dbcc99302e9b473efed71460c3032ca025f27e97f64cc8bc2564166f4f966650ef8c84bd63a91ca8c6a0a83288d6dbb1d2dbaa5c920fb8c6136bc5dfd44 SHA512 9607cf169b8ea7126662ef330911df216bc53a0efcfc2b21f4c8efd1c89db64cab1f51b205d7a51067dd682539a2bc33d890b70ee8ab0537387ff8adb0c246ea
 DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
+DIST rdiff-backup-1.4.0b0.tar.gz 280675 BLAKE2B f729d7c4db08e32ca02a303afd7b88028efaba50e7dc9da20bac1e94835cd929c7277a73fb1f614d6acdf3ff72c96698bf6ca1a36c64c426649230f3f917ffe0 SHA512 50d3ca8ea155c9c001bf0284d8142757f8d12c4b9ef99b4ace43978c625dd6ddb06b04d2f91d0804a445c5ffcfef0dc1e1742a45d51731a728bde054cf3642f9
 EBUILD rdiff-backup-1.3.3-r3.ebuild 885 BLAKE2B 7cec61669c41764cfcc41f96c8f7cf072bd85a8754fd302234e43ddb96713dbca3037a127c0efec71a8c4cca2d9ac95cab684c53435fee135ddaaadf3351f1fb SHA512 f6305f4e4d309559b68adabaf3219689edaa29bf7dfa8aea76dcc4e9da00c4cd977b04e1b1d90352e470515b80e88590c718090e92d17537a14407e8c79ff085
+EBUILD rdiff-backup-1.4.0_beta.ebuild 907 BLAKE2B 8f7315458325444471e9d1bdd548396dc8cc222cd5d32bbe69478073c97874d60cf762f55dfcc4dc05c4506a3b0d0aa676a3a7998be01836195ca29bff289616 SHA512 f0e49d1f530a091639a4ffae746e5802563c12fef166c355210f5692a9d25f7eff659b6db2fc02a2f4e6f7f89c9960bfcde4df8ed265b16e12a374d4689c3dfa
 MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch
new file mode 100644
index 000000000000..2d2ecb3ed0b0
--- /dev/null
+++ b/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch
@@ -0,0 +1,22 @@
+diff -Naur rdiff-backup-1.4.0b0.orig/setup.py rdiff-backup-1.4.0b0/setup.py
+--- rdiff-backup-1.4.0b0.orig/setup.py	2019-11-22 22:34:17.000000000 +0100
++++ rdiff-backup-1.4.0b0/setup.py	2019-11-29 18:24:40.251407907 +0100
+@@ -152,18 +152,6 @@
+     scripts=["src/rdiff-backup", "src/rdiff-backup-statistics"],
+     data_files=[
+         ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]),
+-        (
+-            "share/doc/rdiff-backup",
+-            [
+-                "CHANGELOG",
+-                "COPYING",
+-                "README.md",
+-                "docs/FAQ.md",
+-                "docs/examples.md",
+-                "docs/DEVELOP.md",
+-                "docs/Windows-README.md",
+-            ],
+-        ),
+         ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]),
+     ],
+     # options is a hash of hash with command -> option -> value
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild
new file mode 100644
index 000000000000..348bfb31430e
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+UPSTREAM_PV=$(ver_rs 3 '.')
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
+SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV/_/.}/${P/_beta/b0}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+DEPEND=">=net-libs/librsync-1.0:0="
+RDEPEND="${DEPEND}
+	dev-python/pylibacl[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.0-no-docs.patch"
+)
+
+S=${WORKDIR}/${P/_beta/b0}
+
+python_install_all() {
+	local DOCS=( docs/FAQ.md )
+	use examples && DOCS+=( docs/examples.md )
+	distutils-r1_python_install_all
+}
diff --git a/app-backup/rdup/Manifest b/app-backup/rdup/Manifest
index 13cb3ea1ee42..2fe36e398923 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 856 BLAKE2B 8d279dc4921220c67da27f08e81ff932f6c5eaf4096ea1ab17e83e45a12895a14b32c8f34e10d9bc531b5b5a02d4e0be5624f0361628bf394081a4a86f8fd77d SHA512 b17d5ceab2aa7ead80cd792473b90390922976b708f48ee747dd5b3d84578cb065e6e93851e277f4ab3cd1b39037a2d441a9949cdd73a71a86044e0a45e1acbd
+EBUILD rdup-1.1.15.ebuild 880 BLAKE2B 43433c1dfb06f9bc61f3fcd27f6160f2b486fa1bc81633eb039271e02a2f6f5e1949223a1758015e697cf122c8e4db9da6fc7cd4939757f863c55d538c711fda SHA512 78ccbcb9864fa0cfa625ff9c37ca2ebca0e96c4ba79b0ec0cb2785ad16f565676523a01a94fd6cb83b60e39a32710bf8c00b7a5b893371e12a1b4f02aaa8408f
 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 a0188659a094..ee7bf949b508 100644
--- a/app-backup/rdup/rdup-1.1.15.ebuild
+++ b/app-backup/rdup/rdup-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/libarchive
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index 7d6230902e5a..6ba449a6599c 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,5 +1,5 @@
 DIST restic-0.9.4.tar.gz 26211163 BLAKE2B 950a8da8217500a910f0e5966787b668417f1168e81365ecda70469ef42c24fed876e97b6a44ed9dda89c07760db4678d791960d78760d68c8f1846c827cf340 SHA512 8e75a1da6ee9a364c2bf53ce8f9b014549e7065eae349dc6baf68b0e8a8e9736f83c0495b822aac87480751f448bd42da34c440290b5f0967aea7becda5c448b
 DIST restic-0.9.5.tar.gz 26933971 BLAKE2B 7e6cb87c7ce0f860ed884a631b791d0dc44e770ffabf298f20c60197b32961a2a78380e2933ce3851215ec2e32bee95da67566bf7d2d30c3bb0dddda2c6ca804 SHA512 2541b4d70d23d28360c4398427d65ed08a5eea8c171b93be7b7d54baa7b06099f5473ff2fbe3d6b3d6691592300062ba1b240cc03772868d2a0adb1217c8a85f
-EBUILD restic-0.9.4.ebuild 1201 BLAKE2B a8d65edd9deac13f80b47fd30961fbb3b2fea66eb6f2cf32219e862672bc2099bcccaba2edc2e87941fef4e84b593ba19ebd63fdc280415111ef1a04c6b275e4 SHA512 c4b23afe13951ab29040bc85b2a4c5e080e6bc9856691b79b833f63ddea0ad8bd29a50c1e48ad6ce3c6659fea073e65ea330b9e8a4f897ccc7db2f2419c030c8
+EBUILD restic-0.9.4.ebuild 1230 BLAKE2B 29b8fe9c77bbb950cca765d86a020060ef091f48e4ad11d135955937041a1bb3a5ccca854d2f6869d181101cd040274e4f79143435edd53808838611e72b9154 SHA512 b9781a325fd40210b995f0d244e1c0c64febdb6e7147e1eac360000150281a80ed58f8e791ce75def867bc0906cbe6c8187c6b8f451558784c32415604c0836d
 EBUILD restic-0.9.5.ebuild 1229 BLAKE2B 65568ebd28d6493522ae60b5e45026e81479bfd3cc4a562f047ecad19fef5d8459ac558230e52cf2d6678da9e02066b686e221ab0251744ea3e90bf4552d90dc SHA512 b95d92d8a36b4aebefec3c1078120def3176bc74fb04a91e0e03826690913b5116e4354b596e2c9545924eb653091abf1d6a4d65cbd2f25f82c3507d51561201
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.9.4.ebuild b/app-backup/restic/restic-0.9.4.ebuild
index 7c7e7b735157..61ca3985ea6a 100644
--- a/app-backup/restic/restic-0.9.4.ebuild
+++ b/app-backup/restic/restic-0.9.4.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
+RESTRICT+=" !test? ( test )"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}"