gentoo resync : 22.01.2021

3 files changed, 82 insertions, 3 deletions

diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 4ee65fb2bf7a..e2e6891cc739 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,7 +1,9 @@
 AUX btrbk-0.30.0-make-install-race.patch 843 BLAKE2B d5e36a05c7f52a36265373800476538539463006da22b2904c1c60969ee8613c51c4fd1ba71522b4e3f25ebaee829febd49f6f5b10ce10713734d0816793e6c0 SHA512 094f08019dfcb7d6afd786a81c8ccc80ef69852f18fdba7008a16c04a9c4d855fa4e66973e37ac17f738959a07a96b267a952f1576cf0d492934cd533c6309e3
 DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
 DIST btrbk-0.30.0.tar.xz 101104 BLAKE2B f963fa64a409810552f1232e42d2d7ed740cbcf498098307ebff31a6e4db06d43a2c4fd5df6120847a009fd606ea4453ca93eaa6cf7a18744d557f94722876f8 SHA512 127d184fda13cb036c737f2cad428ef8313af46ceac0b6d273d670656f874d0e096bcd2daf96a2b6e7087a9985e47a99a905515376a9270171575166ca5d6449
+DIST btrbk-0.31.0.tar.xz 106064 BLAKE2B 4cac3502396debb97b6e842be75a643b6229209eb0a28a8fa8ee5ec9cb70621bd9e7f2ca5a06fda1e167d59ac1bbfef76ab00b6a2d041a5371b4286c76701df9 SHA512 df27c8e2785b1a49aae6031f1787a69d41b61cdab7e58b43bc87232c99e534b664b545121c909c0317fb9adfaee48085ba07be0a465dec05c4869ed620b8c94f
 EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
 EBUILD btrbk-0.30.0.ebuild 2442 BLAKE2B 3b344a7d8c0a9e93308a533bc43e7b43c3701867e7d3db56bba6624afb65a51b7fd11ff5106fe0154334d068daf6ae9172b12bc21df0726614c20b8ca4352698 SHA512 b6a28a071172001ce01a60600899453e72b00fb16aab3173bcc3b07d5878b05c28ce146408adf842426d60cec5a16259df43a1b1a861bc274ea6133253850b14
-EBUILD btrbk-9999.ebuild 2378 BLAKE2B f09a3bc3cb7eebebeffd590f0cb0309e9c260c596bf6b7c3af19fca240a61233446bfa9c689a6c5ec27a8727f9977111dd1f63d76ed38973393491cd1b7e6f21 SHA512 b17e9102bda13b106bac86da01d012d49af6971932314b253966fd8ceb0953cd19da7043cdc60ec950830a36f5b91f73f2ff9110e55ef9db3a87153375e7f93c
+EBUILD btrbk-0.31.0.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
+EBUILD btrbk-9999.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 MISC metadata.xml 1049 BLAKE2B e47ff64c01332ae21819c07797a50835327aa113662bed85043abb179c30ede2a96fa944ecba889622190e441a5d1e5eb49724194643b026446fc6288a8140d3 SHA512 e8d0fcbf7baee25c842f284f72c8894cafe246ef3925a2e40754add811fc1bcd34e5358d39ccf2977f9f3d4515c98750b1d45e80b1fd447e47e13cb2bdae4d89
diff --git a/app-backup/btrbk/btrbk-0.31.0.ebuild b/app-backup/btrbk/btrbk-0.31.0.ebuild
new file mode 100644
index 000000000000..f301c70cd559
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.31.0.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
+}
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index 9406cd634c9b..f301c70cd559 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"