gentoo resync : 30.09.2020

13 files changed, 8 insertions, 684 deletions

diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 8c3f93b7b9b1..3b8963e7ff94 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,23 +1,6 @@
-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
-DIST btrbk-0.28.0.tar.xz 99336 BLAKE2B 4becaac5a34029e57345baa3c8bb787032ddfdc523882f6334e7a0985a53194956342f792dd9022cb151aacbd64497b87aafee838b5811f716de4efc7eb54a10 SHA512 f4f3118daf55a80604dafec77087851860cfab8720d3f193ac4eec804ca39e60e3bb31d7feb45dd10c8b35b2844c680462a16f2ac0bdbd71731907f511bdc358
-DIST btrbk-0.28.1.tar.xz 94740 BLAKE2B 75313aabab7208083e06a2d4bb607950c7d5d0e87188a9a8f8c97cba1549cc2d3bcfff14b2bc2d20898c44bcc0fe50d74db2e16b213dde852d89704704b70ece SHA512 0e24908b3162b2ab67e0482a38fb966bf33b3c3ee5b2f62259673af14e9309bc4707bd049403579240ec416efae6643a8b5da73f4763e3dc01b3893047e92581
-DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b855cbc0451ff59a3e9aea66de4110587f786fee8f21acfb8a7e496f80a21a91a0e0756d37130bd49a76bb26f SHA512 43e9e0dfe48b0b0c8d1b64e2ce447b9dde9c494b2ad233d68e6ad0648d746d1e950751199f72affe77e06b0c94567912b399bd0b6aa8ebc31dd8fb87ef9ae0ae
-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
 DIST btrbk-0.30.0.tar.xz 101104 BLAKE2B f963fa64a409810552f1232e42d2d7ed740cbcf498098307ebff31a6e4db06d43a2c4fd5df6120847a009fd606ea4453ca93eaa6cf7a18744d557f94722876f8 SHA512 127d184fda13cb036c737f2cad428ef8313af46ceac0b6d273d670656f874d0e096bcd2daf96a2b6e7087a9985e47a99a905515376a9270171575166ca5d6449
-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
-EBUILD btrbk-0.27.2.ebuild 2306 BLAKE2B 3f90c5446166ec67d46be13824b18b549d55af9cb4c952c2a27c12757acd617dd57944b73c78b85252a16a3fac67b7907835e0f2a6c4178539371e693780e25e SHA512 13f79e67d3cbd4e36adf55be72ca7e131fbe9e7c20326bc31453db418b91b0324b4365ea814ffd556cc51bd8781f3aa4c518b80a853208e2a8da9dc0cb08a74e
-EBUILD btrbk-0.28.0.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
-EBUILD btrbk-0.28.1.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
-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 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
-EBUILD btrbk-0.30.0.ebuild 2325 BLAKE2B e3191fe3f7029d38291d531733e6ee2250aa0dcc930763ca27f1e58bee6c1d3a4e9b7d5b38b002989be72756451f86395982b5cf1388db38617e2ac3a527b20d SHA512 fcb454f017725d182d5df4fee63d7fb4e3e20f03553b4673c1c0414e4badc1c4650b9d2f969eda628c8acfea9dbe934e9d7af93263c5d84be7451353ea52ca8b
-EBUILD btrbk-9999.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
-MISC metadata.xml 1064 BLAKE2B eb19e75607e19d3bca7caebbf8b6a393ea4113b17ced56dc858d12967a800336a8057bfb93aa660db15a76d516b02e031abb36a0b183a37cd06754e4d64efa2b SHA512 5aba440ded91bd42d2dc991a09065d016d3c2b42efdc25a69184c21b27ac1ef41784f7d66f94fcd11cb3624aa8535201c40f0680ea26dc59842efd2b217a4fe9
+EBUILD btrbk-0.30.0.ebuild 2385 BLAKE2B 7733659ac5eb9e49a734802b9627726fa4367caef762d370df19f4ee3eecf166bac35e306f304becf112cdbeb8b89e9202fbd0d3f1f02b9f7a6e5e0e3e2d0795 SHA512 c80a94617c0b11519eca8165a696454cac9a8bdbbff75950b000329c546225e50d28256670f93b03123f66504cab5fd0f56da8e0ecd12294d2eb371401888cd0
+EBUILD btrbk-9999.ebuild 2378 BLAKE2B f09a3bc3cb7eebebeffd590f0cb0309e9c260c596bf6b7c3af19fca240a61233446bfa9c689a6c5ec27a8727f9977111dd1f63d76ed38973393491cd1b7e6f21 SHA512 b17e9102bda13b106bac86da01d012d49af6971932314b253966fd8ceb0953cd19da7043cdc60ec950830a36f5b91f73f2ff9110e55ef9db3a87153375e7f93c
+MISC metadata.xml 1049 BLAKE2B e47ff64c01332ae21819c07797a50835327aa113662bed85043abb179c30ede2a96fa944ecba889622190e441a5d1e5eb49724194643b026446fc6288a8140d3 SHA512 e8d0fcbf7baee25c842f284f72c8894cafe246ef3925a2e40754add811fc1bcd34e5358d39ccf2977f9f3d4515c98750b1d45e80b1fd447e47e13cb2bdae4d89
diff --git a/app-backup/btrbk/btrbk-0.27.0.ebuild b/app-backup/btrbk/btrbk-0.27.0.ebuild
deleted file mode 100644
index a9edd2bb91d7..000000000000
--- a/app-backup/btrbk/btrbk-0.27.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild b/app-backup/btrbk/btrbk-0.27.1-r1.ebuild
deleted file mode 100644
index 57a9fcb682a9..000000000000
--- a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
-
-src_compile() {
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" ${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.27.1.ebuild b/app-backup/btrbk/btrbk-0.27.1.ebuild
deleted file mode 100644
index 5781a69d01fc..000000000000
--- a/app-backup/btrbk/btrbk-0.27.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.27.2.ebuild b/app-backup/btrbk/btrbk-0.27.2.ebuild
deleted file mode 100644
index 327ff48d7a8d..000000000000
--- a/app-backup/btrbk/btrbk-0.27.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	use doc && emake -C doc COMPRESS=no
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		COMPRESS=no \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.0.ebuild b/app-backup/btrbk/btrbk-0.28.0.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.1.ebuild b/app-backup/btrbk/btrbk-0.28.1.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.2.ebuild b/app-backup/btrbk/btrbk-0.28.2.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.3.ebuild b/app-backup/btrbk/btrbk-0.28.3.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.29.0.ebuild b/app-backup/btrbk/btrbk-0.29.0.ebuild
deleted file mode 100644
index f82156e37d50..000000000000
--- a/app-backup/btrbk/btrbk-0.29.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="+mbuffer +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.30.0.ebuild b/app-backup/btrbk/btrbk-0.30.0.ebuild
index 73afd3da3703..11509324b00e 100644
--- a/app-backup/btrbk/btrbk-0.30.0.ebuild
+++ b/app-backup/btrbk/btrbk-0.30.0.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
 HOMEPAGE="https://digint.ch/btrbk/"
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+mbuffer +doc"
+IUSE="+mbuffer +doc +lsbtr"
 
 DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
 
@@ -34,6 +34,7 @@ src_compile() {
 src_install() {
 	local targets="install-bin install-etc install-share install-systemd"
 	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
 	emake \
 		DESTDIR="${D}" \
 		DOCDIR="/usr/share/doc/${PF}" \
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index f82156e37d50..9406cd634c9b 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
 HOMEPAGE="https://digint.ch/btrbk/"
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+mbuffer +doc"
+IUSE="+mbuffer +doc +lsbtr"
 
 DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
 
@@ -34,6 +34,7 @@ src_compile() {
 src_install() {
 	local targets="install-bin install-etc install-share install-systemd"
 	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
 	emake \
 		DESTDIR="${D}" \
 		DOCDIR="/usr/share/doc/${PF}" \
diff --git a/app-backup/btrbk/metadata.xml b/app-backup/btrbk/metadata.xml
index c8d33bb141b4..b066b9973551 100644
--- a/app-backup/btrbk/metadata.xml
+++ b/app-backup/btrbk/metadata.xml
@@ -20,7 +20,7 @@
         <remote-id type="github">digint/btrbk</remote-id>
     </upstream>
     <use>
-        <flag name="pv">Use sys-apps/pv to enable progress bar functionality</flag>
         <flag name="mbuffer">Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality</flag>
+        <flag name="lsbtr">Enable the lsbtr command-line tool</flag>
     </use>
 </pkgmetadata>