gentoo resync : 04.07.2020

11 files changed, 74 insertions, 168 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 6ab9e6e725c7..54d998ea7f95 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 03ebb6f8cf4a..e24780201040 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -2,6 +2,8 @@ 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
 DIST borgmatic-1.5.6.tar.gz 70075 BLAKE2B 23e233c7457c25ae5b83571436dcfac4e70bf4c9a9bf9af95b8722533b48fdd82089152da220b7d61a01569233f2aedddf300c3a5ad2c69c631060f0b08e6b59 SHA512 e314fa1f20516dd52f4435c782bf634821a034925c0f11553483a1e55eef5d588e54e7abb1a88d239c1619f291548a5058a8f636d16dd829680089c20c601a79
-EBUILD borgmatic-1.5.1-r2.ebuild 2141 BLAKE2B b0aca4c281f46466b2ab6f6ecf3f94adfd51460097e4db346c1f7d5f5461cad820e6cd16ea5ba195af041117df2dbf5c5085ef1079d449e65ce7d97a183ac3be SHA512 d238d0b9b81e5acbc790063c7d6bef904733eee70bb704ac8156593814d941b9b18191586800348f70110269e25c32648f47649e0e59faa507a2e31ed1ecd3ed
-EBUILD borgmatic-1.5.6.ebuild 2141 BLAKE2B b0aca4c281f46466b2ab6f6ecf3f94adfd51460097e4db346c1f7d5f5461cad820e6cd16ea5ba195af041117df2dbf5c5085ef1079d449e65ce7d97a183ac3be SHA512 d238d0b9b81e5acbc790063c7d6bef904733eee70bb704ac8156593814d941b9b18191586800348f70110269e25c32648f47649e0e59faa507a2e31ed1ecd3ed
+DIST borgmatic-1.5.7.tar.gz 71084 BLAKE2B b6ab2f80af47ba49e8f584b555b910bf94dbfb72da8a55433f147410059948fa844846bea007b317f10cb76811c5da6bd1c22f7fefb5c062213670fadb326cd9 SHA512 26fa9ee1b158c05cdb3ed60faa16b4eac431691ced454149091c302876550277f622cd67e45ef42a3070896e76b94d8a39f1604a08f604bada5bab1ec6691902
+EBUILD borgmatic-1.5.1-r2.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
+EBUILD borgmatic-1.5.6.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
+EBUILD borgmatic-1.5.7.ebuild 2024 BLAKE2B 3629401fb19f46a5079ed26c014d1f5507e8379bfa4cc6ae2fe40d98e1a3dfc124a964fb5deca43479cd9c0503c2beabcc85c4e3bf9bf01b1c24f04320d74cc6 SHA512 a59525b8c1ddcc2c34eee378650e9a4aba92ae5da248600fc18b66a290024ad8bf80300061790389d6b1d555601ad7af5cea977e9fb7da266b8b3ec70324c97f
 MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1
diff --git a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild b/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
index a287fddbef27..040e887e7ced 100644
--- a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild
@@ -62,9 +62,6 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "To generate a sample configuration file, run:"
 		elog "    generate-borgmatic-config"
-	else
-		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/borgmatic/borgmatic-1.5.6.ebuild b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
index a287fddbef27..040e887e7ced 100644
--- a/app-backup/borgmatic/borgmatic-1.5.6.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
@@ -62,9 +62,6 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "To generate a sample configuration file, run:"
 		elog "    generate-borgmatic-config"
-	else
-		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/borgmatic/borgmatic-1.5.7.ebuild b/app-backup/borgmatic/borgmatic-1.5.7.ebuild
new file mode 100644
index 000000000000..040e887e7ced
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.5.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# 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
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Unlike the other two test files in integration/commands, which use the
+	# relevant modules' respective APIs, test_borgmatic.py tries to call the
+	# 'borgmatic' executable - which by the time we execute src_test will
+	# not have been created yet. 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
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index dab9802f3258..6dd84f1a5e1b 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,7 +1,3 @@
-DIST btrbk-0.24.0.tar.xz 72308 BLAKE2B 425811455087a5aec4443d8a7bc7ed23cd49813d839a17c818f3e61f4b162518f282da69aa0b1c100b24c47684a7c6d83765332cfbf1893496dbf7e0aeabff87 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267
-DIST btrbk-0.25.1.tar.xz 74904 BLAKE2B 12f0a1e9c383b1c736cba190bae6f948df5db608a689e2469af05716d2ed15f0206c9336148af1a09f29da44c44314d4d153c8d2e5eea8f7e425a185c9040d6d SHA512 6802e379f49c5433a811f6f844cf2663c752b23d8d678f001bb8cba9b099c7527983e23169814c7469ab8682b95fa0f742d1088415747ebebfe0fcc36425cd05
-DIST btrbk-0.26.0.tar.xz 82472 BLAKE2B 06effda16b2173e6d3dc3ea896ed9729d6f2840a29aebc0d271935a88fd54fbbc08bf0b257c8424976a2668907c74f1b34fe46465ba6457d60cacf0b15316052 SHA512 a08ec4e2e0d164b9a9a17b3d4b8417eb3890994c8aa2233ecda9d616659fce917311a94fdfd6762acacb40dc25a60fe8f6880703c980ccd4a176b14e24a2bb00
-DIST btrbk-0.26.1.tar.xz 83624 BLAKE2B a99c66dc16432edb1da38ac51e68ed939207ad8553108258346d4261c243a1a478a3e1dca1cf6d39d03e10a8a5c44e45a7784aec131246e060aded4fc24d708e SHA512 ee0043f468e11545ca28b5bd456aa9dab1b994ed6d8899ab0f53d455f78bb44f83bcf493e32fdecfec82b3029d5dabc2db72a2f32de80b709a12930df6d53b22
 DIST btrbk-0.27.0.tar.xz 86648 BLAKE2B bebb1c56b5c08e588829697df1d00e89366582d7c501ffc7c72baf8136ec62ac1f9b7aea300f1ba20c6060646e80916a52e2b83a85b383cb04289867d82b2a53 SHA512 2d65d32cecdd8598d5028a78a449559563bf38a172849e0a13ccfa8129189a044cb2d007561b5c7e611c8bbbe069fd9c1177085dca519c88d40233fb0d49db36
 DIST btrbk-0.27.1.tar.xz 86764 BLAKE2B a46514a94e6f49f83f92bba6f545738fe6a0b274a7eb39a132a41e1f89e0e6428ee8e29164ca2ba249bf98d2c7a5f682a81bb5c113a9cd5af12e4abf98669684 SHA512 b30be9fa2459d34d33ed0c2ef1b4f2e7010d1d7f9dc6e6e3236550307b7e2f2f517a61d21bcd2aca3ed0750ef64259bb51c32ff26abcc70008db92e1a66212bd
 DIST btrbk-0.27.2.tar.xz 87012 BLAKE2B 7b25ce04e088b9c3df1f5d4f41ec3e6aef7e48bebb8fcd4c4a8365bb73d26dd09afdf1814985362b28958a93df2797dd62444475024f66bd027303955a160604 SHA512 497d1dd1d2de712d4de80d0bfcdf6995590fd5308b81d7198af7cebe81c45fd53c8940265c1451eb95339636cf0e4c2a9162befb7cdd48cc8d4142b4e9ca75f1
@@ -11,10 +7,6 @@ DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b8
 DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849
 DIST btrbk-0.29.0.tar.xz 97632 BLAKE2B dc7b63804a2a4ff99ae33e2247363402cfa683bad852c1b70bbb8fc3571730a690589cff1184a3c6e63b66b385430027b55da959e7dca96b7eca6eff900be109 SHA512 e3b0fd45bcaafa4fe53e230bb66cc23ae950dd91251d5e4d19a576021f2dcc52b219cd348b1b747224c2da803b47554266f4fc91c092a62decedc74ac59b9b28
 DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
-EBUILD btrbk-0.24.0-r1.ebuild 739 BLAKE2B d63dea2bd5fddb06dcfbe2f7383a5750ccf96f0f934225ae6154bb6c6c9a0d2f8d2f1bcfe59cee7a75653da9e1c516c9f9555a337604722990707c8d5fde8f1d SHA512 591d73f80ef9c4996175daca46d04ddd010530e0d810dfde0c0935f9ec46f3695389812743a8c19067eca2d6fb791b689658ae5e6b1507462c76966b191ae936
-EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
-EBUILD btrbk-0.26.0.ebuild 1062 BLAKE2B a5d7786a5d00d17f4e5b251b7b291077f276ab30617ca557b75e4dbb5a35da5396056d5f319dc09903d00f95997407ad5eaab7eb7e7ffbac47eee05f40a39eaf SHA512 644aa71c2822e4484bc62243a47ad1f415042df2b555f915e076c325b13c64fbda97bc0c3b4d098efeebd81b826f12fe1c235ba85e6b8e56d1c78c375715c247
-EBUILD btrbk-0.26.1.ebuild 1070 BLAKE2B eba4e6e20f0d00e04e743f654804c1fc0baad5cd7a0af5cd3cf4be8b146426048bd66b2c8446edbdfea08b0d7fef66ea646a28ba96691fed2d987e6e2d240c2d SHA512 f91184be03d86b94ac1205762c2cd498f7fe86919f802c8f50c75172858183a2c10b5dc9c9f4ce77aa54667baac42f7b491e21c34622fd42a95b8b25fbeee2fa
 EBUILD btrbk-0.27.0.ebuild 2086 BLAKE2B 6c0b94e96b695df63a57f044cf2238ab24ea5e11849fd69cd68592c300274d4d52e0e44c22a9fd4e9663c90378c591cb44ab2bd70932e68832134989c22a0e37 SHA512 94c88b77bbf0c831e7f2aedf3e0706b98e29ee505b4ab1470a81cbc4f597ccdf46e0c27f9ace51c0659c5e3f73baf70a1d1f2cc7dc944db28770c385b7078523
 EBUILD btrbk-0.27.1-r1.ebuild 2264 BLAKE2B c91380d9f5fa7c192e2bb4bbef659737b0c2016de78cb31034fbb9dc01fad3665d903dc453398a36e28ab271b4eed454a7eb6145655801af7e1db1ea20c8969c SHA512 6342b8889162d8bb2871f66709ccc710f68da9f56ac829755b1a7085f63252fc6a1c4b7ff6c67add47994e09d1128399688f48819c774751e4b64249cc557849
 EBUILD btrbk-0.27.1.ebuild 2089 BLAKE2B 069c9bf2b1dc5789b2867fc07b47640c6689cb926d101926b77e0a1160a93d8cd3c978fefb8d1a28bca52a0dc8c0a36e26d2db4229c78238d054e8735c221674 SHA512 12cf213f9c05e14b73d213bb7294080ae363d766eb41427d6da36f796688a20abe461d15d42cf4b41785116659cd7bcedf337d564e6e6a625dd3376dd4ade5f1
@@ -24,6 +16,6 @@ EBUILD btrbk-0.28.1.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9dac
 EBUILD btrbk-0.28.2.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
 EBUILD btrbk-0.28.3.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
 EBUILD btrbk-0.29.0.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
-EBUILD btrbk-0.29.1.ebuild 2323 BLAKE2B b870e78ae76405cd2ed225d186bdefae05d622ab5c7a0cbbd3b8c6af5503c9277f3070d54e171f6b37681bccb767de98840946197410ff3afe69b7ad8047716b SHA512 d2a41cbff5a145db6e8473f71dad6d1d984d885d2867145afe8d2772033d90d7b2013cdaf4e25984de3779621e12c6d532f3640677a9bc9d0a9a31afff8e1699
+EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
 EBUILD btrbk-9999.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
 MISC metadata.xml 1194 BLAKE2B 9fd7bc80e3334d38cc30df17375b709fea9af5b31ff48c74d3ccb65bb8b58940a1c0c0640c977f476bb13dffa357db3d6f2672b11b9ab658b67c46ce1ca8c788 SHA512 1949a2a9b14669ab67a53b3aa86dd1838c0ad4ef924a2f6729bf7a0b17c67f1db9e6094e746b710988440905b713c8938af36caffe9b9f4440c65ba72e4779ec
diff --git a/app-backup/btrbk/btrbk-0.24.0-r1.ebuild b/app-backup/btrbk/btrbk-0.24.0-r1.ebuild
deleted file mode 100644
index 93502cbb34d8..000000000000
--- a/app-backup/btrbk/btrbk-0.24.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2 <sys-fs/btrfs-progs-4.8.3"
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
-}
diff --git a/app-backup/btrbk/btrbk-0.25.1-r1.ebuild b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
deleted file mode 100644
index 8b302fd3e61f..000000000000
--- a/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2 <sys-fs/btrfs-progs-4.13.2"
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
-}
diff --git a/app-backup/btrbk/btrbk-0.26.0.ebuild b/app-backup/btrbk/btrbk-0.26.0.ebuild
deleted file mode 100644
index 06f23db240ff..000000000000
--- a/app-backup/btrbk/btrbk-0.26.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv"
-
-DEPEND=">=app-text/asciidoc-8.6.0
-	app-text/xmlto"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.26.1.ebuild b/app-backup/btrbk/btrbk-0.26.1.ebuild
deleted file mode 100644
index 8638d66c3081..000000000000
--- a/app-backup/btrbk/btrbk-0.26.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv"
-
-DEPEND=">=app-text/asciidoc-8.6.0
-	app-text/xmlto"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.29.1.ebuild
index 23596e82881e..d824116df3a1 100644
--- a/app-backup/btrbk/btrbk-0.29.1.ebuild
+++ b/app-backup/btrbk/btrbk-0.29.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"