gentoo resync : 24.12.2018

4 files changed, 97 insertions, 4 deletions

diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 3b0bed8be28e..5a3ebeec9a29 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -3,10 +3,12 @@ DIST btrbk-0.25.1.tar.xz 74904 BLAKE2B 12f0a1e9c383b1c736cba190bae6f948df5db608a
 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
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
 EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
 EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
 EBUILD btrbk-0.26.1.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
-EBUILD btrbk-0.27.0.ebuild 2102 BLAKE2B 1d7acf9fbc93907dbb559472f674b259a5c5fe2ec8371f8dc7bdca82e7546770a7d6f227fc8c1ecbdec3397bb8809ad7ff40e04d6235e10d9eef58a8166c16c0 SHA512 7839a057d377e4ac0fb3b7602ef2a307215329b7e4b97017c8d63543a83a30d1613f8869c66d76feb408f07b0dc89c362459befd86cb54b458ee1fb7452ad01b
-EBUILD btrbk-9999.ebuild 1083 BLAKE2B 72c00de8a1f8e8bb26abe7994572a5f03214a7b075059ab4f91253919288d16a63e7bba529112b003d76aa830bdde20ca3381e80467fa2cb00132c5454f05448 SHA512 7a4fe7f80111569a080d4e2c234148113cdfe5120b7fa4fa1899010670b7de86e84d8c82df2de95dcb09f5104aa8502d7eeb76a80c4f5923bdadb30d4dd247a8
+EBUILD btrbk-0.27.0.ebuild 2109 BLAKE2B 0219fbf854a1d85f454357dec4b2a0118787d640a52210c0b366a4c5540f5d5a08d69102955bcf591f46e10f8a4f2e0dc7a82759bf1457411e7f9db759b84a3e SHA512 c2263b9043a83b0147adf7b429a4623f5c981df2f2b258662f62a8e26796b8d142c88e1be1976d74a6dc1ee7c0bd0083332260532d2110af30d4125fa807fd9e
+EBUILD btrbk-0.27.1.ebuild 2102 BLAKE2B 1d7acf9fbc93907dbb559472f674b259a5c5fe2ec8371f8dc7bdca82e7546770a7d6f227fc8c1ecbdec3397bb8809ad7ff40e04d6235e10d9eef58a8166c16c0 SHA512 7839a057d377e4ac0fb3b7602ef2a307215329b7e4b97017c8d63543a83a30d1613f8869c66d76feb408f07b0dc89c362459befd86cb54b458ee1fb7452ad01b
+EBUILD btrbk-9999.ebuild 2102 BLAKE2B 1d7acf9fbc93907dbb559472f674b259a5c5fe2ec8371f8dc7bdca82e7546770a7d6f227fc8c1ecbdec3397bb8809ad7ff40e04d6235e10d9eef58a8166c16c0 SHA512 7839a057d377e4ac0fb3b7602ef2a307215329b7e4b97017c8d63543a83a30d1613f8869c66d76feb408f07b0dc89c362459befd86cb54b458ee1fb7452ad01b
 MISC metadata.xml 1076 BLAKE2B 38beb88fb33730c665430ce275d33b231a57f02c2644b3ff89974935f93d1f0cea8b53b908019eb7bcb0ad99dca49e69475d44a506e08719270c2f8524b5e096 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f
diff --git a/app-backup/btrbk/btrbk-0.27.0.ebuild b/app-backup/btrbk/btrbk-0.27.0.ebuild
index f364036c572c..169a41f77088 100644
--- a/app-backup/btrbk/btrbk-0.27.0.ebuild
+++ b/app-backup/btrbk/btrbk-0.27.0.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
 	inherit git-r3
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
diff --git a/app-backup/btrbk/btrbk-0.27.1.ebuild b/app-backup/btrbk/btrbk-0.27.1.ebuild
new file mode 100644
index 000000000000..f364036c572c
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.27.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 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=""
+	KEYWORDS=""
+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-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index 9be9d8c87f3e..f364036c572c 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -36,10 +36,33 @@ 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
 }