gentoo resync : 13.10.2017

4 files changed, 67 insertions, 7 deletions

diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index e0a483f2aa10..c3a29f723a3a 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,7 +1,9 @@
 DIST btrbk-0.24.0.tar.xz 72308 SHA256 032671c2905005d91a87b85acf8daec05df09bfad9e191092610094fb9a65906 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267 WHIRLPOOL 19052093dcec40d4a8bd5593538f6ec44ea2bbaf6a846f966cebb1f1ff76b9c94700a0bad6f16f33258f92fa05180efc2ba770f02db5553e755beb21b6761ed9
 DIST btrbk-0.25.1.tar.xz 74904 SHA256 25bbfe9352b833761c2ec929d744faa2b33670dac0dc00b6e51ed0d2d64e0c0b SHA512 6802e379f49c5433a811f6f844cf2663c752b23d8d678f001bb8cba9b099c7527983e23169814c7469ab8682b95fa0f742d1088415747ebebfe0fcc36425cd05 WHIRLPOOL 05850216548c01d86b0ec508e11d8085dec597b41bad491cbf65aa9f41432a09b2a0f79ec821bf16c0e7f24271bcb4cce1f9b52352d7d6cd67ef2ac9850a19e0
+DIST btrbk-0.26.0.tar.xz 82472 SHA256 608c49fa0cdb204d8ef818924d49f520a68a80557bfc8cf6902135377a8136af SHA512 a08ec4e2e0d164b9a9a17b3d4b8417eb3890994c8aa2233ecda9d616659fce917311a94fdfd6762acacb40dc25a60fe8f6880703c980ccd4a176b14e24a2bb00 WHIRLPOOL 183d9f91b9c310921ca2a1e7c6c05946a6b0db0885ff1013d81355170c019d7090fb91a400d62fc1ab3f2ca27fd1f2cf04c4794a88d85684fbbe1d6e8a6cdf67
 EBUILD btrbk-0.24.0-r1.ebuild 755 SHA256 c02912cf0119b0b09309ffc1739e379b2953c317dbcfe09738e2b4178ef71014 SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5 WHIRLPOOL 30efc9e0d7200452ca9f067fa7117b9beea0ca50b85f82da1468feacfb4cb9044c7356206b8f5ae7a1b60e4c75b00856e1bed35073624ce0bf8e2f2735ca441a
-EBUILD btrbk-0.25.1.ebuild 732 SHA256 d41a25ee959050278035cb0efd0a04ea178aea07e5dbea12a383395709ba2954 SHA512 5824ad725fc0b348a4535440d09334373232b00d56c2780a7cd09e4e55393493b0e50769109e559a17fd97b92f87f142fec06a99df54dec0bafc70bca35f3763 WHIRLPOOL d06b1ea0d54bf191dbceb4a36970811a7685ed74b087ef6fd50bd58e2595e9d303f95ec661b248f645b9d6c48a33060ed9d25b7f89b1ac3549c51acda194a51a
-EBUILD btrbk-9999.ebuild 727 SHA256 f5c82444910c395ded7ac84d4d35ff133b386deed5a885bc53088656b5f01a10 SHA512 069e00f67c7297878d4402c8d0cadaed5a66bd3c82b57943183f09699ea490363fa3fa5f59a496a598fd2b1271458b39086bd7b86d63dd48f573915e452b4dd9 WHIRLPOOL 781ebfe5e2460d7e1e6da8d722f2e4d5875635f29442c34481dfc94f2c8a81da83eeeab5df99efda841f7f9a77445b271171fdc6432364397b4276f5ed7c8f5d
+EBUILD btrbk-0.25.1-r1.ebuild 759 SHA256 592fd54f801476127f7fde4da21c923434c410f351fcfbf4ab9b86bdbb6a0220 SHA512 ac7358535448603b83fd98b42e1f30c3b2c7bccb499f7eaf8d3c2759821145ebb437220fc0cb4996155197328b8c9eaec3bc5473a4d984041b1255bc794a399c WHIRLPOOL b9f4b22e3f6ff836c2a1871350d0c2da853f01a7e8a97a8309da20454366b2e15689e5db5b829765593f37da3b057cbd7ddb09b402c1dfa20581ced8fd58e992
+EBUILD btrbk-0.26.0.ebuild 1078 SHA256 83ef735c6dd527770fafba733c020f922406363f510d9a7991d4648fe88346bf SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58 WHIRLPOOL 31b7fd84ac7236dc61d83336a50271a2c0e3d7865b3b78fea18c4ed3e05575327ff722af7ae3f34a18bc87515ab0335fc7beea06a8755b17a98a95efe846e8a9
+EBUILD btrbk-9999.ebuild 1086 SHA256 fc16728fa8bd6d02ed98d836d52ddc77d5b065d14ea8405f2a761922b3ed6f81 SHA512 59f6448613e0b1feec558a5a13329e5a0dfb5a1fa06b43c7749bd1ff5db17ba0db620479389f38006362bd9ac90180d99a1b14db0ddc0672882bef7efd5e854b WHIRLPOOL eef58590099ca00a9ec0176f0fe27c30fc49a8d5474d59bb5606b95f9c6875bec7019dbd9703306e086e2ab72a051022052df7bc2f4d44dd672625c3d9533457
 MISC ChangeLog 1286 SHA256 5604921fc169564d3cf64b6019264bed359be6b8386e61848c71b046ea1a781b SHA512 1604ea86d959c589918165ca9dcb3dae1d02022136fa4104476019a001acf9d96c5378de99be37935c829abc6163c20f8728ec6e2b0e4e5cf06cb0ab89084e6a WHIRLPOOL 7fd405e092d1d1694569641b37cd50aef6c5ff54e8c9d42ff3cef339fd02251be4f090bcd0042bf44212886f7e046767812464fabad3f224991719b35aaea2a9
 MISC metadata.xml 1076 SHA256 23200092d49b40efafb544650030b4c6ee55c29d1cd6dfcf87465f7d3ae38fa8 SHA512 20141d3aeba7ebe743ed3101af70c3f6515f11aaed4d43a73d507c18a933d30e778d10cfc17b98e33c616e80c79edd157d64fb0f54e35ad64a7e3114b3fd667f WHIRLPOOL 467546a7acf94ad5dd478267798850071b9b3613dfbce9172073d7a88b53dc37f000c0fcf2afa06add16992ed2198f14da515332f40c08fa39ab7c9acaaa8fbf
diff --git a/app-backup/btrbk/btrbk-0.25.1.ebuild b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
index 11d760f7b36d..10a44f3e7138 100644
--- a/app-backup/btrbk/btrbk-0.25.1.ebuild
+++ b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND=""
 RDEPEND="dev-lang/perl
 	net-misc/openssh
 	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
+	>=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
new file mode 100644
index 000000000000..8588eb6d0e34
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.26.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 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=""
+	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
+}
+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-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index 8718b6220261..78df68d02414 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,13 @@ EAPI=6
 inherit systemd
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
+	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 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
@@ -21,7 +21,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+pv"
 
-DEPEND=""
+DEPEND=">=app-text/asciidoc-8.6.0
+	app-text/xmlto"
+
 RDEPEND="dev-lang/perl
 	net-misc/openssh
 	pv? ( sys-apps/pv )
@@ -30,3 +32,14 @@ RDEPEND="dev-lang/perl
 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
+}