Merge branch 'edge' into next

33 files changed, 214 insertions, 450 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a1e2d4f2d740..2aeaa14a3958 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 3ba7e5461fe6..435391425dc4 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -2,7 +2,6 @@ AUX borgbackup-1.1.11-unbundle-msgpack.patch 4540 BLAKE2B 7b1da72db127c03f8ab780
 DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
 DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573
 EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B ae27cdf2189b79b8f92b81fae737864cf1060760794309bdd8b2b7e58b8145f543540018846c2389fe67da3a8f2dc03358c58643883547e0a095a9dc57183156 SHA512 b73ff4cb83104d0b1f262ec6c663d7282f9508538d901e8956705326419fb5eba2019ad914015f15b9fa228885f42409aa8a11a1f22fe214eb847839d73f8364
-EBUILD borgbackup-1.1.11-r1.ebuild 1165 BLAKE2B 3f60fbeb5a6f9006ab18e289ec4a3ff93d97260d9e17aea0dbf50f23a30392d67f47ad4c287199750de76ab8148ea8b78817668b5374f6c6c2f82e330d2f03f4 SHA512 a986e0948aae26c29f11548bb6791c19f8688ad7d30b6ba7c6b1b1d467c9d9aabc10e3cf7f6a81ed3324d8eaf47326e18ef39d194410e8c5be6cd4cf55eb4616
-EBUILD borgbackup-1.1.11-r2.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2
+EBUILD borgbackup-1.1.11-r2.ebuild 973 BLAKE2B e8dd617f96ff6873902be290ac5a215339dc9c5f6ccb988ee4eddd907bb77c6aee1b0f3bb03a0f31359d7f2e6d4c7bd6e1121fd1b130dc2acaf266a1eb907104 SHA512 8c91ebd25c8f7318d049337f1dec71da3a2f7c69e38c6d0d8ab6ff14d9b4aff95710d5e2a595e008ab9d85b7e4c8b11bbbf7c2d26894b161ddb993ea6fbcb322
 EBUILD borgbackup-9999.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2
 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17
diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild
deleted file mode 100644
index 822bb8bafab7..000000000000
--- a/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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}]
-	~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() {
-	rm -rf src/borg/algorithms/msgpack
-	eapply "${FILESDIR}"/${P}-unbundle-msgpack.patch
-	distutils-r1_python_prepare_all
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/*
-}
diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
index 3b9d5248820c..139e72aac09a 100644
--- a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.11-r2.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 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index eb887c25b095..49317bdae8ad 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,5 +2,5 @@ AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0
 AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718
 DIST borgmatic-1.5.1.tar.gz 67401 BLAKE2B c11f4b9f9acc7d7bf4e482953968dbaabc33f1513ec8f20868518bca22ffcafee90569c06ec603be919d47d724dd4a3a904e44fbb40c2309d8cb78e9277b5cc7 SHA512 9ded9bd5d6db866d196fedee88737f3d3eef6cb0e61c5f55ac543602c4429adcb57608d7f6c798edfd6ac1ecd14aadd9a88fdf94ef1f0eab4c26a9d2a29c5e38
 EBUILD borgmatic-1.5.1-r1.ebuild 1873 BLAKE2B f55f268e70e90a7ccdedfd03ff4a3577adbca5a61ad60db4a4f40089dbfc35b2b56581b042609f7a9c662d8c7ad31b4bf8426aa2a83deefeb6028db491bd7146 SHA512 e20d608e96ea7e04567d680a1332842b21361833f206a7cac5c352861c02d96a84505d302f0c17c40a28ba4dead9b1e1cb7b9e7248bed9543c88e6dda9a4cae1
-EBUILD borgmatic-1.5.1.ebuild 1715 BLAKE2B b192f98ec20435f2d9e6e4e2dee76d5f2819b2aba661cebde5fb2223e092e22082a32925336d023ff6460edcb891e128c5117a1770c305ce430d0c727d9f570e SHA512 76b841403a2ca739ec65952e0974962f12d0e912e9b8e417ff7a5c27519827ebf154a09cfc5ec15fbc6133a25454e555a11cadc07c0be15d8b86aa00ccc307e2
+EBUILD borgmatic-1.5.1-r2.ebuild 2139 BLAKE2B e24c54b69913fda078ca2c1233e92307d72c254168e1dc47075a23bd38902c53e6330ff848d5be403522944dee313c0d8754ebb1ae22f707e7b455acc21549b7 SHA512 758dfe7f7d9de9fbdb30839ff170716f4f4a30f10801027c4bc7bca12bfa79eecdaf7eb4fdbc0ca6a1d512fd6731d62e27a8bbe6de6ed878fe61992b731ed3e9
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.1.ebuild b/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
index 754e0f063c96..02359afde23e 100644
--- a/app-backup/borgmatic/borgmatic-1.5.1.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
@@ -4,9 +4,10 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-
+DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS="rdepend"
-inherit distutils-r1
+
+inherit distutils-r1 systemd
 
 DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
 HOMEPAGE="https://torsion.org/borgmatic/"
@@ -16,19 +17,23 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="${PYTHON_DEPS}
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-python/ruamel-yaml-0.17.0"[${PYTHON_USEDEP}]
-RDEPEND="${DEPEND}
-	app-backup/borgbackup"
-BDEPEND="test? (
-		${DEPEND}
-		dev-python/flexmock[${PYTHON_USEDEP}]
+# 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.17.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
 )
 
@@ -39,16 +44,18 @@ 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 has not even been created by now.
-	# Seeing as the only test run from this file as of 2020-03-25 is the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. distutils_install_for_testing 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.1 is the
 	# parsing of contents of 'borgmatic --version', just skip it for now.
 	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
-	# TODO: install systemd units (and explain them in postinst); need patching
 }
 
 pkg_postinst() {
@@ -59,4 +66,6 @@ pkg_postinst() {
 		elog "To upgrade your configuration file to the current version, run:"
 		elog "    upgrade-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/borgweb/Manifest b/app-backup/borgweb/Manifest
index f09a9b415222..a82d8151c486 100644
--- a/app-backup/borgweb/Manifest
+++ b/app-backup/borgweb/Manifest
@@ -1,5 +1,5 @@
 DIST borgweb-0.2.0.tar.gz 503852 BLAKE2B 6d37eeca4893f825486d46e03d8212fc3597a8704cee976429a7c55f7ab98b405038948ce7e407fa7c78a2a9f6c2b0ca4307144ffae3bf68ad6e582921989bfb SHA512 7898caf803b82e910eaa1672b892657038da6606777ecefd97c27698c14524094f0c1741621ad4ff9a230d66454de419558644ba185488b0fdb5e1aa604010a0
 DIST borgweb-0.3.0.tar.gz 512052 BLAKE2B a783a4d0528b0d501918b958facbfbee131e95a8219bf9608572e402f6e6e3010f6716c64e76ef72858e949b505ef8c4eefd5f6512dd1b0ef767a32d2c493fc5 SHA512 90867338f3678732ade97f9b595579cc5aabf6ee824b0bd4dec986ae04db94304dee1d8ae1275331d93a2b3a89916ed11e834ace8a92cf196f4050178bf96625
-EBUILD borgweb-0.2.0-r2.ebuild 510 BLAKE2B 17562565ace3e5219fe064ce4a5acd4dcff41db45c00166fedb56c21c086df9dee7956fe9def966ce14eaa7cc466c394c5df49584233b7bdfa57eee502c597a4 SHA512 4b145cac8a7e3adc26d900805199e923a5b2688966258c61fabe716c0eb09a1da8afc123e3eaf7767223290fce855450a27ab9e6f3507cf5e0d5782d8cb661f3
-EBUILD borgweb-0.3.0.ebuild 510 BLAKE2B 17562565ace3e5219fe064ce4a5acd4dcff41db45c00166fedb56c21c086df9dee7956fe9def966ce14eaa7cc466c394c5df49584233b7bdfa57eee502c597a4 SHA512 4b145cac8a7e3adc26d900805199e923a5b2688966258c61fabe716c0eb09a1da8afc123e3eaf7767223290fce855450a27ab9e6f3507cf5e0d5782d8cb661f3
+EBUILD borgweb-0.2.0-r2.ebuild 514 BLAKE2B 020537820c0a1443fe21ccc4cd3ddfa24adc9f7dbc9b69ef1029f8f4fe291f3f20420359de64f453fc5c9300279c046d86b26212978c6ed22310346fe252eb80 SHA512 36937efa57a39334e5c2730eb531b6783b64a1fcc4a332426f333bdc7ea3f2dd264d56707722431558dc8e4c3e0d0f3cf481458a5bd0df9eef5537876d670d22
+EBUILD borgweb-0.3.0.ebuild 514 BLAKE2B 020537820c0a1443fe21ccc4cd3ddfa24adc9f7dbc9b69ef1029f8f4fe291f3f20420359de64f453fc5c9300279c046d86b26212978c6ed22310346fe252eb80 SHA512 36937efa57a39334e5c2730eb531b6783b64a1fcc4a332426f333bdc7ea3f2dd264d56707722431558dc8e4c3e0d0f3cf481458a5bd0df9eef5537876d670d22
 MISC metadata.xml 332 BLAKE2B 92f900ce23301edc58aa8e3ddee5d733b060c16e8783721bedc6c7972deafde64f6aff446789f60e08ddae44135b2cae05950c4781a9502fc8cc475c9f6e43a3 SHA512 4a8daf7ccdafc221264a6fce41f8fca702ca101cfbfd113ea9f300b31c53bc1be89b89f5fa1b54b16af5c3e0f36e720cd862829fc3eabf4f27c0c80e7235347b
diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
index deba80138e33..6568b820ce15 100644
--- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
+++ b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-backup/borgweb/borgweb-0.3.0.ebuild b/app-backup/borgweb/borgweb-0.3.0.ebuild
index deba80138e33..6568b820ce15 100644
--- a/app-backup/borgweb/borgweb-0.3.0.ebuild
+++ b/app-backup/borgweb/borgweb-0.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-backup/buttersink/Manifest b/app-backup/buttersink/Manifest
deleted file mode 100644
index e295de17d08f..000000000000
--- a/app-backup/buttersink/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST buttersink-0.6.8.tar.gz 51784 BLAKE2B 3f18716bcc55aee99bbb73e8a1928c29cb28a782966aded60b019673e0336f342e4d76aff827f9bd7f39713fe9cadcd89f5f81438a86d8867a8b1ac0a57f3957 SHA512 52898140d983bcc6776497504191f0c1c727b24fa9543f5a5997a54ced26301ca492518094ca8770fce8064bc99dc6d3f6760e986eb66f08a758985a7a85ffff
-EBUILD buttersink-0.6.8.ebuild 1176 BLAKE2B 077b1152cb5a76bcdb47af389d111b26e891bce4ce04555baa8089ddb94dadfa2c6d97d48192d1224a97c8e066ce4209bc8842b67ad9d19a48ccf51e59f1ec9e SHA512 bff705b33354831a6651f0f896d678f149513eaa1df573a86a8bc31da985c1103a2e9dca2056d412b8f02f16036c25f34915a109fa6642a3ffa298a067a36797
-EBUILD buttersink-9999.ebuild 1176 BLAKE2B 077b1152cb5a76bcdb47af389d111b26e891bce4ce04555baa8089ddb94dadfa2c6d97d48192d1224a97c8e066ce4209bc8842b67ad9d19a48ccf51e59f1ec9e SHA512 bff705b33354831a6651f0f896d678f149513eaa1df573a86a8bc31da985c1103a2e9dca2056d412b8f02f16036c25f34915a109fa6642a3ffa298a067a36797
-MISC metadata.xml 309 BLAKE2B 456da08d3049e264e34bf2d501682da0832532645b20e1f2e99cf2af7ff7bd83fd9896f14bbdd92c6cbd086ec9d14d5bdf44fee2ccb754ad06d424ee56f369c7 SHA512 ebce2896caed92f85977588965fb29a4fa27a209ddf72d5944815f43c8d0b32ceb227c3e5401abf219c16e8bef768130ebc89f362acec57499911a091dfcf9e8
diff --git a/app-backup/buttersink/buttersink-0.6.8.ebuild b/app-backup/buttersink/buttersink-0.6.8.ebuild
deleted file mode 100644
index 03a17692e5da..000000000000
--- a/app-backup/buttersink/buttersink-0.6.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="rsync-like utility for btrfs snapshots"
-HOMEPAGE="https://github.com/AmesCornish/buttersink"
-
-LICENSE="GPL-3"
-SLOT=0
-
-# local tests would require root and cause sandbox issues with btrfs subvolume
-# operations, and network tests would require an SSH server with root login to
-# test the SSH backend, or remote S3 for that backend
-RESTRICT="test"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/crcmod[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	sys-fs/btrfs-progs"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	if [[ ${PV} == 9999 ]] ; then
-		emake makestamps buttersink/version.py
-	else
-		mkdir makestamps || die
-		echo "version = \"${PV}\"" > buttersink/version.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/buttersink/buttersink-9999.ebuild b/app-backup/buttersink/buttersink-9999.ebuild
deleted file mode 100644
index 03a17692e5da..000000000000
--- a/app-backup/buttersink/buttersink-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="rsync-like utility for btrfs snapshots"
-HOMEPAGE="https://github.com/AmesCornish/buttersink"
-
-LICENSE="GPL-3"
-SLOT=0
-
-# local tests would require root and cause sandbox issues with btrfs subvolume
-# operations, and network tests would require an SSH server with root login to
-# test the SSH backend, or remote S3 for that backend
-RESTRICT="test"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/crcmod[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	sys-fs/btrfs-progs"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	if [[ ${PV} == 9999 ]] ; then
-		emake makestamps buttersink/version.py
-	else
-		mkdir makestamps || die
-		echo "version = \"${PV}\"" > buttersink/version.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
diff --git a/app-backup/buttersink/metadata.xml b/app-backup/buttersink/metadata.xml
deleted file mode 100644
index 84753a2bfbad..000000000000
--- a/app-backup/buttersink/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>adebeus@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
deleted file mode 100644
index 4d04726d3509..000000000000
--- a/app-backup/deja-dup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deja-dup-34.3.tar.xz 702708 BLAKE2B 219bb3796f3b97b240f9ac353dfb3c206c6423e8b8c8d4e5a97c89d832226ad70cfb1116bbd900bac1fc1bf03608aad47c67af0441fda7bc8fe950313fa14ebf SHA512 0e703c18041fa5ca6d2f272f5b0e65ad31ff1094147432107834d1cd25e2ec14b87bdfac6faf727c97339d20d1681f3251c5f74b6edbee4368014839b1f04f06
-EBUILD deja-dup-34.3.ebuild 1506 BLAKE2B 405f40e607d24907ce90550c57993bcd33f8df0d954749a6e6fa9f812e367d9e8e4fa7f611419321a07afb5305d01e9c1ecadc8b1cebc123207e45ed0ce81f61 SHA512 6e7bcf6d398cac7f917deb8612b0a66dd366f5cf1fbd8874bd21f34ca25911e1d06a4606b4ad34f4add1ca9adaa7b6e953da6c90aa34242cb1b0ca35f65df35f
-MISC metadata.xml 425 BLAKE2B 8973d6823641d5c69a21ba4d5862dd9a361ce5771537f42b50f2b54b36ad1d9217b358f7289c5981586330c1ad0673ca421caa30db2259f6c92a479735f46c15 SHA512 ba6a6a6530d8a6f582be2c3029dfc221c8cdad945486017820b1e8ba6dc144de27469f7093db5b565ed8b9e28652f9a553362687ada5105ff55f0c6be103ba47
diff --git a/app-backup/deja-dup/deja-dup-34.3.ebuild b/app-backup/deja-dup/deja-dup-34.3.ebuild
deleted file mode 100644
index e076e6ed9065..000000000000
--- a/app-backup/deja-dup/deja-dup-34.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MAX_API_VERSION="0.42"
-
-inherit cmake-utils eutils gnome2 vala
-
-DESCRIPTION="Simple backup tool using duplicity back-end"
-HOMEPAGE="https://launchpad.net/deja-dup/"
-SRC_URI="https://launchpad.net/${PN}/34/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus test"
-RESTRICT="test" # bug#????
-
-COMMON_DEPEND="
-	app-admin/packagekit-base
-	app-crypt/libsecret[vala]
-	>=dev-libs/glib-2.34:2[dbus]
-	>=dev-libs/libpeas-1.0
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/libnotify-0.7
-
-	>=app-backup/duplicity-0.6.23
-	dev-libs/dbus-glib
-
-	nautilus? ( gnome-base/nautilus )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	gnome-base/gvfs[fuse]
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-perl/Locale-gettext
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-src_prepare() {
-	sed \
-		-e '/RPATH/s:PKG_LIBEXECDIR:PKG_LIBDIR:g' \
-		-i CMakeLists.txt || die
-	vala_src_prepare
-	gnome2_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DENABLE_CCPANEL=OFF
-		-DENABLE_PK=OFF
-		-DENABLE_UNITY=OFF
-		-DENABLE_UNITY_CCPANEL=OFF
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-		-DENABLE_NAUTILUS="$(usex nautilus)"
-		-DENABLE_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml
deleted file mode 100644
index e0a16e6f1240..000000000000
--- a/app-backup/deja-dup/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <use>
-    <flag name="nautilus">Build gnome-base/nautilus extension</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">deja-dup</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 6323d4b7f0ff..2df2fc5d4c76 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -11,4 +11,4 @@ EBUILD duply-1.9.2.ebuild 515 BLAKE2B f684ee48cb886dc61947ff27bd4d22f14be12fa70e
 EBUILD duply-2.0.1.ebuild 588 BLAKE2B caa38a62e139fecdadbda7bca01d1c1cc2ae998a09dca27c18015b28e907a6a2d603f6b6437cc7e766f378d93733ee9cd98c4a3be502d3f1622ddd4ae900da38 SHA512 aff7359b9c6b4c48b6902cb3c16a18581c01e68a83b7eab89ecb091d31021c8353425ae5be197ed9034914381f884927a75b7d8386cf32e3744efbc3528ca50d
 EBUILD duply-2.0.2.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
 EBUILD duply-2.0.3.ebuild 588 BLAKE2B 8f02d145fb3874a9ff0b5357eb0cf8dd1f937409402fda13ef58c64c2144bbd13045760ce196fc763d2112835488334bc0ad58b632657fa65fd49ad699c6f2aa SHA512 a07e0159b0a4ccbf343964f211667f073da12772e1fff2d760453f6560746b9f6d1bc746064b73e6dc0d6e3f5b17fb9b2a1b3bd5372336e8ca7353ca796bba49
-MISC metadata.xml 463 BLAKE2B d797b2c9d46e9da7a7c0656fbd1b7b64fed89e1000e07958eb39f3126906a4bd82952d75cb6daf6d6940257a7f415daa40577cc0ac4bc7cfcef954864371588f SHA512 1918ce659c0ee644de3647eb45eac23cd38da8c22e5fe0f271d1f2f894b7bacd654ac63e6f71eb87e078bd2995aeaae2bf400cd5a114aebcca39e3e9e3a15ac1
+MISC metadata.xml 251 BLAKE2B 047dd5866af91af4be51a48a590d9a3d464494b4c0bc2705610464b91aa4ba600b3599780d597ad9ecf8d033911514c2cae5ee95013ef33fdd7391732e1b078a SHA512 a0a5c1972abfc47c2f46712a9d26e5f4f6df8899c4cc19896abaafe71d6f18268c0a969fbf34b7eecc5eced74da7e2d09aa7e1fc799b636b7981cfe1dedce7f7
diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml
index 5ed910627eca..928760c70b3e 100644
--- a/app-backup/duply/metadata.xml
+++ b/app-backup/duply/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>gentoo@pennewiss.de</email>
-    <name>Marcel Pennewiß</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">ftplicity</remote-id>
   </upstream>
diff --git a/app-backup/kup/Manifest b/app-backup/kup/Manifest
index 48ccb94bd826..96b0802c25ce 100644
--- a/app-backup/kup/Manifest
+++ b/app-backup/kup/Manifest
@@ -1,3 +1,4 @@
+AUX kup-0.7.3-libgit2.patch 4160 BLAKE2B 5b71ed1308108432148ab4fd69e3228f07bb7afb78d8cffb47ff7e0045119e8ac7494d770ec7354fc7655a4eb5c021e3c396152114bb85a7d9a2169dbf54761c SHA512 39052b65077f5a30afcf6c9234920d4f9a04ce2478a0b64c54b8320212bc246bbe07401f5242b6d1bdc2bf03be1af764192a020b7fe52716d33916d28605cab4
 DIST kup-0.7.3.tar.gz 1024916 BLAKE2B aab2a1c58bc7feb6cc734a61385841b9c9b47995ba0c7e66b0596ddd7ae77b2a2b750f23f452e591c609f4a59a894815f8cfcb82c8bc266769b6e908463c009c SHA512 62609eb3c9a873045a9f02d22be5413f73f909e77d82f287ff5b2f816d2d6930a8d8ca77537a52189a98fe11441eb10f5530dfdab02ed0c09b53a2c4b5b4be80
-EBUILD kup-0.7.3.ebuild 1416 BLAKE2B ae35f888716b8da423f03097a94a218a0c99ee4d5df71ca5a2144edc9e959169a94df323d2997852a951c77ced2790ffdacf747e54eecbb9f841707806c2bcac SHA512 0e2a7decd6439cded9c6b4441584333fde84ccf33be731fa03a5b047f9ffdb6e1158161b611e3694154296068c2d86ce7847bdf735da3e7ca89be0faf8d3ad09
+EBUILD kup-0.7.3.ebuild 1479 BLAKE2B 32576c5fff58c4a4b9226e91666b6c3f6f2bf47dbfa8ef2b2bd9a44334151f829c4bcd7976a1452196732bf80b6034760aa7ac194d829338119d46f016d5d289 SHA512 df770219c2c3f844df70bd1ed3d6a568d82f1c2d88eebd6320a2d9401a010c2c12692982156fb560b333f7a378fe83a8cf77b73ca8cf543bcaa06adc75a47599
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-backup/kup/files/kup-0.7.3-libgit2.patch b/app-backup/kup/files/kup-0.7.3-libgit2.patch
new file mode 100644
index 000000000000..a6b1c536afc1
--- /dev/null
+++ b/app-backup/kup/files/kup-0.7.3-libgit2.patch
@@ -0,0 +1,140 @@
+From 2ca19e917f895e24a5379be669b9ad77ff5692f5 Mon Sep 17 00:00:00 2001
+From: Simon Persson <simon.persson@mykolab.com>
+Date: Mon, 16 Mar 2020 17:03:33 +0800
+Subject: Remove copy of libgit2
+
+API seems to have stabilized a lot, such that different distros can be
+expected to have a compatible version.
+---
+ CMakeLists.txt                                     |   13 +-
+ filedigger/CMakeLists.txt                          |    2 +-
+ filedigger/main.cpp                                |   12 -
+ kioslave/CMakeLists.txt                            |    2 +-
+ kioslave/bupslave.cpp                              |    8 -
+
+From ee720980113162c019eecabc01dfa5763cfb7585 Mon Sep 17 00:00:00 2001
+From: Adriaan de Groot <groot@kde.org>
+Date: Mon, 6 Apr 2020 23:06:53 +0200
+Subject: Link to libgit2 via imported target
+
+---
+ filedigger/CMakeLists.txt | 2 +-
+ kioslave/CMakeLists.txt   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2118193..76a1367 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,18 +6,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ 
+ project(kup)
+ 
+-# Use this option if you want to use the system LibGit2 library.
+-# This is not recommended unless you know what you are doing.
+-option(USE_SYSTEM_LIBGIT2 "Don't set this option unless your are sure that your system version of LibGit2 library is fully compatible with Kup." OFF)
+-if (USE_SYSTEM_LIBGIT2)
+-  find_package(LibGit2 REQUIRED)
+-  set(libgit_link_name git2)
+-else (USE_SYSTEM_LIBGIT2)
+-  set(BUILD_SHARED_LIBS ON)
+-  add_subdirectory(libgit2-0.19.0)
+-  include_directories(${CMAKE_SOURCE_DIR}/libgit2-0.19.0/include)
+-  set(libgit_link_name git24kup)
+-endif (USE_SYSTEM_LIBGIT2)
++find_package(LibGit2 REQUIRED)
+ 
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "DebugFull")
+   message(WARNING "enabling debug output!")
+diff --git a/filedigger/CMakeLists.txt b/filedigger/CMakeLists.txt
+index 2fcdd82..fd6a3a0 100644
+--- a/filedigger/CMakeLists.txt
++++ b/filedigger/CMakeLists.txt
+@@ -37,7 +37,7 @@ KF5::I18n
+ KF5::I18n
+ KF5::IconThemes
+ KF5::JobWidgets
+-${libgit_link_name}
++LibGit2::LibGit2
+ )
+ 
+ ########### install files ###############
+diff --git a/filedigger/main.cpp b/filedigger/main.cpp
+index 6682985..43fe9ae 100644
+--- a/filedigger/main.cpp
++++ b/filedigger/main.cpp
+@@ -21,11 +21,7 @@
+ #include "filedigger.h"
+ #include "mergedvfs.h"
+ 
+-#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
+ #include <git2/global.h>
+-#else
+-#include <git2/threads.h>
+-#endif
+ 
+ #include <KAboutData>
+ #include <KLocalizedString>
+@@ -66,19 +62,11 @@ int main(int pArgCount, char **pArgArray) {
+ 	}
+ 
+ 	// This needs to be called first thing, before any other calls to libgit2.
+-	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
+ 	git_libgit2_init();
+-	#else
+-	git_threads_init();
+-	#endif
+ 
+ 	FileDigger *lFileDigger = new FileDigger(lRepoPath, lParser.value(QStringLiteral("branch")));
+ 	lFileDigger->show();
+ 	int lRetVal = lApp.exec();
+-	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
+ 	git_libgit2_shutdown();
+-	#else
+-	git_threads_shutdown();
+-	#endif
+ 	return lRetVal;
+ }
+diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt
+index 7187f33..83e6122 100644
+--- a/kioslave/CMakeLists.txt
++++ b/kioslave/CMakeLists.txt
+@@ -17,7 +17,7 @@ target_link_libraries(kio_bup
+ Qt5::Core
+ KF5::KIOCore
+ KF5::I18n
+-${libgit_link_name}
++LibGit2::LibGit2
+ )
+ 
+ install(TARGETS kio_bup DESTINATION ${PLUGIN_INSTALL_DIR})
+diff --git a/kioslave/bupslave.cpp b/kioslave/bupslave.cpp
+index 1a7e1a3..0812658 100644
+--- a/kioslave/bupslave.cpp
++++ b/kioslave/bupslave.cpp
+@@ -64,22 +64,14 @@ BupSlave::BupSlave(const QByteArray &pPoolSocket, const QByteArray &pAppSocket)
+ {
+ 	mRepository = nullptr;
+ 	mOpenFile = nullptr;
+-	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
+ 	git_libgit2_init();
+-	#else
+-	git_threads_init();
+-	#endif
+ }
+ 
+ BupSlave::~BupSlave() {
+ 	if(mRepository != nullptr) {
+ 		delete mRepository;
+ 	}
+-	#if LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 24
+ 	git_libgit2_shutdown();
+-	#else
+-	git_threads_shutdown();
+-	#endif
+ }
+ 
+ void BupSlave::close() {
+-- 
+cgit v1.1
+
diff --git a/app-backup/kup/kup-0.7.3.ebuild b/app-backup/kup/kup-0.7.3.ebuild
index d479069e1b3f..8af41a81c73b 100644
--- a/app-backup/kup/kup-0.7.3.ebuild
+++ b/app-backup/kup/kup-0.7.3.ebuild
@@ -49,9 +49,9 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${PN^}-${P}"
 
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBGIT2=ON
-	)
-	ecm_src_configure
+PATCHES=( "${FILESDIR}/${P}-libgit2.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	rm -r libgit2-0.19.0 || die "Failed to remove bundled libgit2-0.19.0"
 }
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index ec20e7337171..0d091524131b 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -1,8 +1,4 @@
-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-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebabcf5683d7dce16a149db67bcdc7307bd2efe8c65668ca2bf2fd5b8dc3f6712bad874c0f4e6e47cd39e0374cb9972fd0317 SHA512 b5e453bdec77602e242436770fa610b85426939bd1625f560ebaee20bfd20b788ab54eefd2461fae62190d72c708487866ae06a1524ec1bbd7327c52522c921b
-DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280
 DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec
-EBUILD rdiff-backup-1.3.3-r3.ebuild 879 BLAKE2B 80a2b02bd30860e07010f7fdfa44587045cf980c9f16950212117e1791d86e70a22f7c1bf6da9aecfecd61a2895f7ddbd07607666c2dcb595899cd593fe85fac SHA512 b104e0bc85fd1eae58e0b06c4793d1ad694baa202c5ade3d0a70874dad773fa76693608b5d7d26808abbeae6f63a6f3e670c82a57ba2fe73213d0f36ba91becf
-EBUILD rdiff-backup-2.0.0.ebuild 891 BLAKE2B 7990c253df50f530f515252116b1d72806134631c687dad76785babaabc2fef750cb9ec1ff124179d03f3f04b1965d28dcce193b30395ba23da9295e370ac8b1 SHA512 52dc74292414c8c9e9217fb2ba5acf23dc85f345a1265ab35608169a2abc2d0e439382aa96fec7e4b5226db6fbd7451af964ffaf9e63ae2361b216f24893308b
+EBUILD rdiff-backup-2.0.0.ebuild 889 BLAKE2B 0708e964f2800cd15bebc1bf24955f7734ac0a691a08ace915e048fca68a3c929053240eb7145ca677eafc7d2cb0f393695183e7846e7196331cd921fce20af0 SHA512 6e82c511c23355b00b912b65df12c73b3a91ac0541d781d0e746b745b25dea1a127e5dcb80a8cab8d57da1967fa496ca0f9fafce9318e19f9b2c0471e630bcb9
 MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
deleted file mode 100644
index 16b97ab1c011..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-librsync-1.0.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rdiff-backup-1.2.8/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
-@@ -59,8 +59,13 @@
-   if (sm == NULL) return NULL;
-   sm->x_attr = NULL;
- 
-+#ifdef RS_DEFAULT_STRONG_LEN
-   sm->sig_job = rs_sig_begin((size_t)blocklen,
- 							 (size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+  sm->sig_job = rs_sig_begin((size_t)blocklen,
-+							 (size_t)8, RS_MD4_SIG_MAGIC);
-+#endif
-   return (PyObject*)sm;
- }
- 
diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
deleted file mode 100644
index 9d69bba9ea2e..000000000000
--- a/app-backup/rdiff-backup/files/rdiff-backup-1.3.3-no-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/setup.py	2009-03-16 15:45:54.000000000 +0100
-+++ b/setup.py	2018-06-16 18:23:29.689677175 +0200
-@@ -73,9 +73,6 @@
- 							   libraries=libname,
- 							   extra_link_args=lflags_arg)],
- 	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
--	  data_files = [('share/man/man1', ['rdiff-backup.1',
--										'rdiff-backup-statistics.1']),
--					('share/doc/rdiff-backup-%s' % (version_string,),
--					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
-+	  data_files = [('share/man/man1', ['rdiff-backup.1','rdiff-backup-statistics.1'])],
- 					**extra_options)
- 
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
deleted file mode 100644
index 07a46592840d..000000000000
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-UPSTREAM_PV=$(ver_rs 0 '-')
-
-DESCRIPTION="Local/remote mirroring+incremental backup"
-HOMEPAGE="https://github.com/sol1/rdiff-backup"
-SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	net-libs/librsync:0=
-"
-RDEPEND="${DEPEND}
-	dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-librsync-1.0.0.patch"
-	"${FILESDIR}/${P}-no-docs.patch"
-)
-
-python_install_all() {
-	local HTML_DOCS=( FAQ.html )
-	use examples && HTML_DOCS+=( examples.html )
-	distutils-r1_python_install_all
-}
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
index 43f0e6566f9c..bde2048ab84e 100644
--- a/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index 4683a788d2bc..e455ed14333c 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -7,4 +7,4 @@ EBUILD rear-1.15-r1.ebuild 1269 BLAKE2B 230b0c105085cf6f66aeb8f1f5ba300cd410e9cd
 EBUILD rear-1.17.0.ebuild 1250 BLAKE2B 2606e7c56f30df23bf71fc2be5e5bb501b112c3eb6508a783eac63fe1d0cfd2ba90d8f49565641c5d635cafd9de377fb13c62b0e031dbb203779a86ee66ad1af SHA512 6bbb7135eb4894e44733e98e62547dd383344b3dd52bab478e531c13f3172ded0e17dd4dd4142dffd17b71ffd3a4e172c7db69e1b8eab5360d477d120f7dbf22
 EBUILD rear-1.17.1.ebuild 1250 BLAKE2B 2606e7c56f30df23bf71fc2be5e5bb501b112c3eb6508a783eac63fe1d0cfd2ba90d8f49565641c5d635cafd9de377fb13c62b0e031dbb203779a86ee66ad1af SHA512 6bbb7135eb4894e44733e98e62547dd383344b3dd52bab478e531c13f3172ded0e17dd4dd4142dffd17b71ffd3a4e172c7db69e1b8eab5360d477d120f7dbf22
 EBUILD rear-2.4.ebuild 848 BLAKE2B cb6d62e0984c11bbde7f61cea72f16b10119c98047341100b2c6e8dcdb25a02551f5f8683df2b4efc65727ba9777b057f388e28dd2a6df95bde3cc37606a960d SHA512 78a8fd39ea5df4f65362a33c5d18dc16e52cea47b0aeaaf10ada27eb0ed01679b0254c55bba318ff1464f9ca55c3dd606b99a4cb71c37956eb961e64dba099b7
-MISC metadata.xml 959 BLAKE2B 7e442e9959630922fdac4720c014d7e989c59739486180c5435375c5e88611a439ca4520f2cbc929e1c190b2624ae9b4eed1955d49b6a52c8c2594983389ffaa SHA512 eace4c6f5b1a3afdfa0beaa989daeaafe21ddb48a3539cfe9eb5575827a32e9a391289703fc4ed395ff2439d450af58fde6b302b4e0a62821b4cc4e1b401c69a
+MISC metadata.xml 765 BLAKE2B e50aae371c5b339a75e4b234c2202eb10513d37e29b2de3b4364b644f54019b4674100ac2906ed94b9625df35611206bdb9e6f3e252c5fa9669468762c9d9f82 SHA512 e3c84e1ac8cb0520150777a34b6dd5d4143f566900f42f7ef9b19f1af6629ef77701feed2d632205a446cc1972c2956c0de1a2a1c8c53b9979004cb18abd5830
diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml
index a120589d37c4..5d24f38283d0 100644
--- a/app-backup/rear/metadata.xml
+++ b/app-backup/rear/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>morlix@morlix.de</email>
-		<name>Timo Eissler</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
 	</longdescription>
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index aaa76b0498ce..1bfde8ce36ea 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -2,11 +2,9 @@ AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec9
 AUX snapper-0.5.6-swap.patch 852 BLAKE2B 89b05a268d3fed009665c9db6e43d5552023940b14c5afb58521582ba10c9ce332cf2aa07dcb336dd8cb825e5063a553aa6fcb84f597e380831bf0d507b7a96b SHA512 7ec3a471ece6e24c6e225f45401635317197a8d4daebb32817df64b035df3a7df02f0af85677a37d7a2b69af1afc785d70bcfe42252cc7453bc7eb2f7aa2740b
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
 DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
-DIST snapper-0.8.4.tar.bz2 594555 BLAKE2B b176420be06dea2dca73fafbebb362bb27d9b793868f84466dae020cea9d1c61c7a3896de6e0701d1e924eed8c13b1b11a7bbc3047ca41c9aaee260a438ddce3 SHA512 9e3708a2b015470798731e105ab843f21c5273f0f2f4e183afde538ad4998892c4d79996e1963e74d0a09d10b9b3057faed5e2f501a1d9a5a4b1fa36ba88bb7e
-DIST snapper-0.8.5.tar.bz2 595516 BLAKE2B 4cf59fa5098f91281bae98476b30c21532df5035ee7ed66fd07e279174bd5da902e1e5af845ab92f217146a6c420620ff464c9705fd06b430bbf3566aa9ae484 SHA512 496b09f4878cbc82c791f35467735e321fdcbd2bc478fac918394b9f6718b7de5cf719567a317b09e88e9af43f2b8791c4d691b2db33343dfecb01544b809590
 DIST snapper-0.8.6.tar.bz2 607016 BLAKE2B 3e496fa22b1ecce2079d79caeb530ca1538febcc6bdf04aa0256e5b43bb546ea66436e60eeaae6722bc869c60579bc47c556671c5878dd671c266102516f04bb SHA512 f01a309a8dcfff455bf480ff297108e8ec3603d469d50f08740176e22bc2b8dd211de678fa8ce12c1ccd828348a35c6d347ca51b829d7b8c30b3fbaba4e9e2d9
+DIST snapper-0.8.7.tar.bz2 622381 BLAKE2B 82d1a9c91beb309e87acfa914b55b2ff5900edc023a5ecd6f2bee6b1a15adb1336656f3f1fffea4a9971aa449b7825750e6c680806d4574faada5bba0a6d14f1 SHA512 6fa63c2453f93a724f0ac23d84ff2c5aafc654463e84a4f767bb8a75a0d4fb7ca7314811179d5fefddddce0df4441298c67b473596aa720d86eeefa43011b727
 EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
-EBUILD snapper-0.8.4.ebuild 1720 BLAKE2B b1539038deeb427fc6ca79f713d49f7122b6e1b7e795e0e96473bcdda98752f85a415e4f94f2413d1028e10786e569649122465f6d15addfc1e64ae6eca22d47 SHA512 87875741264b9e309629bff0da167c83f178b3914096ce6a6f6d91045af8d716643e0430a8a93b5c6cdbceb1e92b9df5cf6b8c21f56ea48967491cbd70a304c1
-EBUILD snapper-0.8.5.ebuild 1720 BLAKE2B b1539038deeb427fc6ca79f713d49f7122b6e1b7e795e0e96473bcdda98752f85a415e4f94f2413d1028e10786e569649122465f6d15addfc1e64ae6eca22d47 SHA512 87875741264b9e309629bff0da167c83f178b3914096ce6a6f6d91045af8d716643e0430a8a93b5c6cdbceb1e92b9df5cf6b8c21f56ea48967491cbd70a304c1
 EBUILD snapper-0.8.6.ebuild 1720 BLAKE2B b1539038deeb427fc6ca79f713d49f7122b6e1b7e795e0e96473bcdda98752f85a415e4f94f2413d1028e10786e569649122465f6d15addfc1e64ae6eca22d47 SHA512 87875741264b9e309629bff0da167c83f178b3914096ce6a6f6d91045af8d716643e0430a8a93b5c6cdbceb1e92b9df5cf6b8c21f56ea48967491cbd70a304c1
+EBUILD snapper-0.8.7.ebuild 1750 BLAKE2B db18e3f269127500ad265344f338969f385f69bd0143b1c73e61f1345e6e3acd184a15f0e21735fe53839f2f3c29547b3024ac85708bcf4212a2f0002466d898 SHA512 a7418aeb4f7666a38ee46a74d5ad1fba91a05ee16bd25d067f850e78cf9a99e9bef3ec876c45b22b1c009b0eb8ea53089f714f28f826b2d937e1e26158982f1d
 MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
diff --git a/app-backup/snapper/snapper-0.8.5.ebuild b/app-backup/snapper/snapper-0.8.5.ebuild
deleted file mode 100644
index 1fcb91d42362..000000000000
--- a/app-backup/snapper/snapper-0.8.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd bash-completion-r1
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lvm pam xattr"
-
-RDEPEND="dev-libs/boost:=[threads]
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--with-conf="/etc/conf.d"
-		--disable-zypp
-		--enable-rollback
-		--disable-ext4
-		--enable-btrfs
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.8.4.ebuild b/app-backup/snapper/snapper-0.8.7.ebuild
index 1fcb91d42362..bcefeb713f17 100644
--- a/app-backup/snapper/snapper-0.8.4.ebuild
+++ b/app-backup/snapper/snapper-0.8.7.ebuild
@@ -63,6 +63,7 @@ src_configure() {
 src_install() {
 	default
 	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
 	newconfd data/sysconfig.snapper snapper
 	find "${D}" -name '*.la' -delete || die
 	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index f89db43c266b..341ea9628bc6 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,3 +1,4 @@
 DIST untangle-https-backup-0.0.10.tar.gz 16377 BLAKE2B 1c6233383e3e986bb63177b5b9f47d57631f2128da822775e0daf8a8bf6fb175f7cd1518ef18d6db116d6a12b2c697fe40e145fe41d2c98a4e12eaf76760b92a SHA512 0bd13fb0b7133bfce1c582317b4e0904e976e07f943a2dedf5f03729baebb5cd8f9aa38cc30c55f953692ed88f358d08b693bc40e89c24e329af2f5167e9247c
+EBUILD untangle-https-backup-0.0.10-r1.ebuild 598 BLAKE2B 4f9e7379f072d77210f636285e342c55fc732a453f6d1f91e73d13c8d3ecb63465b655a04c84a0c44e10b3032a01d0e91dd686aa5b8c456381c632834875e873 SHA512 e78fe268ff4641b6fa99177ead4eede639924216eea419320d7f10eb0eb41afa52671367c9339240bebdad2b038158852f5019410f73678bea6e0b31b90fb3bd
 EBUILD untangle-https-backup-0.0.10.ebuild 571 BLAKE2B 0b4ff0cc69978b1f6c6969eddffe33e2a79e6f24988d0129a9964a67090bbd3572f75e91dfd7f9418fd3fd5fdb0ceb55f5353fe0bd8cdf43c1787b2388ab9323 SHA512 63ad5f7da4abd8386e7d168bdc7eaa626dfdb250bf151ac503f8d78057b6b6cfab61f45b13cd8fb91826ef5d7e13a45eac13bf283e22624d9305cc6970fbf268
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild
new file mode 100644
index 000000000000..16ff114854ef
--- /dev/null
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+PYTHON_REQ_USE="ssl(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Back up Untangle configurations via the web admin UI"
+HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	distutils-r1_src_install
+	doman "doc/man8/${PN}.8"
+	dodoc "doc/${PN}.example.ini"
+}