gentoo resync : 11.08.2021

3 files changed, 81 insertions, 2 deletions

diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index d29f2e7c4f51..1906c7964ea5 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,6 +1,8 @@
 DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
 DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0
+DIST btrbk-0.31.3.tar.xz 109884 BLAKE2B 7f78d00815259e42bb3fd16ee48272717fe57913b7af83ca8a98f1dfd0de715cbf8b07177ea60b5b8bdcb9793ee0d5829b90b8327cd4810f6275611276a6e707 SHA512 62dee5430635b6a31edcdc9bed1829f549b60074ea09bb6f1fcd56d242d4215339846c8c2dbcd4bee05cd2a0cb32c1237ce7311d2b887885373c13fa15a6f476
 EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
-EBUILD btrbk-0.31.2.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
+EBUILD btrbk-0.31.2.ebuild 2382 BLAKE2B 945a7860b3f75785359ca00dd69e0d6afff6526c9cd325a5e3cf02ce001a0c563ed331fd61a61c8239f64c14bc62097f45fcaed55572d092cc5245574e7732c3 SHA512 d470de8046f9dea35cff8e505844b0860bdb72032b34b3af595bd6a3c22138fa63c241d1e33a3c57c33416694138e51cb394b4a3e652c2e154d3233dd6f55b05
+EBUILD btrbk-0.31.3.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 MISC metadata.xml 1063 BLAKE2B 3006f83965b390c29b40f43aa1e325d64982be982d80f5ac52d8e0c6bb52e595f36d3a623545a4710e53390e3a14acf170c00d8a37ce2fa092e869edfe3ed615 SHA512 aad705481fe86deb2434f4d36634d34301451c5508a5628c49cf17139d195caa938036f421479f0f89aaa3577c838af88e26be2ef0ac491bd4430b3610746db7
diff --git a/app-backup/btrbk/btrbk-0.31.2.ebuild b/app-backup/btrbk/btrbk-0.31.2.ebuild
index f301c70cd559..d849b41fb4e9 100644
--- a/app-backup/btrbk/btrbk-0.31.2.ebuild
+++ b/app-backup/btrbk/btrbk-0.31.2.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"
diff --git a/app-backup/btrbk/btrbk-0.31.3.ebuild b/app-backup/btrbk/btrbk-0.31.3.ebuild
new file mode 100644
index 000000000000..f301c70cd559
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.31.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 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 ~arm64 ~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 +lsbtr"
+
+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"
+	use lsbtr && targets="${targets} install-bin-links"
+	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
+}