7 files changed, 142 insertions, 3 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index bfe772d5fd1f..a7be07cfb84d 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 3575ebda40d6..09e5160ccdce 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -3,7 +3,7 @@ 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
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
-EBUILD btrbk-0.25.1-r1.ebuild 744 BLAKE2B 3f80137840ebc65fd833a6c87607c1fffb944d35bb33510d4eb65f27094684fa47b54ec05e5b2f7c148df1e6afe4684541e46af45e008d803d902a45c0da59eb SHA512 09cf887aa0abbfb5f3cf9888139a4639b58f7bd61499d9b5a70328b2538964f02715cc2f87f6a86cee1413f19b0bc86b0cc56e2cfed9e81203f06ac5116e0d34
+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-9999.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e
diff --git a/app-backup/btrbk/btrbk-0.25.1-r1.ebuild b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
index b8f702a1d9f0..8b302fd3e61f 100644
--- a/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
+++ b/app-backup/btrbk/btrbk-0.25.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 x86"
 fi
 
 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
diff --git a/app-backup/restic/Manifest b/app-backup/restic/Manifest
index e5bc2b28157c..9999f4462bb2 100644
--- a/app-backup/restic/Manifest
+++ b/app-backup/restic/Manifest
@@ -1,7 +1,9 @@
 DIST restic-0.7.3.tar.gz 37062625 BLAKE2B 0a50c1c6c1ffc8f5d5c0698341bfd1715faee0ab3392ddb065b75143babb45dcfee355f2a369771b4c256cafcb839dc401ad827e194b52d27a1c7582b9c3a1c3 SHA512 2d44b4fc363c7f6389c1f06469cf30ebeff4d6ade0bd4fcae1d7d9def3922936b45043b04f4072284b773df2c6487c58db6aea41c7de5c8184ca33ca3c44d44a
 DIST restic-0.8.0.tar.gz 37309494 BLAKE2B 0c50ccbdabca2057a5d1f8a7326a3e143101daed7cf9eabf0deb2d4452bbd63fd57c3edc8be106c0123f3c4e01195e8042a8f70477c999b00069ffe3d4fcb1d5 SHA512 5f2205ac5caf91f119f1705dc1f8340c481fd27d809cdadbd8ff39ebbc910d98452626c2a9564300935746550a2604ed59aa095f3137788bd0dce87c0dcb14f9
 DIST restic-0.8.1.tar.gz 40330154 BLAKE2B 6758ae4cd7b3caf1bb58b9b95ddd9b99422f2a5997f37317381ec2714a4bc369331e1ba5accb791a2733eddcebdb056256a25b837cad6926f86ec61265d95324 SHA512 02d45b70b94514d3491297dcd34f26db854b6153a1aa297aaa9c938e09d65429fbe0dedb3c028ad38c769049f814c7a923481adfe9962a35dc39a7477a80fdab
+DIST restic-0.8.3.tar.gz 48746281 BLAKE2B 4161326068165b5ba19e9ee0e6386aa1df29a961a42509a2cb7924958100b9412abd1dd27d299d1eef76fdd4731d4a56f0a68e796a46071229a3e6767d3a6bb7 SHA512 758b2c69af8aad6bb62dc750141d5f5a1954ca2b51350ef59c35fd10afefaddc4d8d0cdd5914f249594946db6138124a48fba531b8a24353f022ccea773a240c
 EBUILD restic-0.7.3.ebuild 1276 BLAKE2B 13a79b91735acd188bee1f60303d3237b69fa85af4f37de021b60ca942b0fe2ae06a695720e268f2076eb3c860336a163cb9279d037fbe6a597b621028866531 SHA512 d7bfd4df6620cba9400e6b6c484864a0a5fae4953744cef7e1979f234a3c7d40a53e8750a572d414c98090f99734bc8243aac6353493c845b710190915f52cfe
 EBUILD restic-0.8.0.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
 EBUILD restic-0.8.1.ebuild 1589 BLAKE2B 9ecc5384646c5227e7557e0a0f4ece8928e70e6491ff90549162223d6aea1b56e57271666491251122ebce01c274a80208010a9647e74a3f33e54ac91f28623e SHA512 3232fcffcf1ced52759125c00f3380f90e263e0e84d1a5da24f3f225ad49c1476e2d979cad85781a7c66bdb89460fa59e7d3b04b7b08bed29b59ea8e008c79f6
+EBUILD restic-0.8.3.ebuild 1190 BLAKE2B b67c12c01ad4f69c281ffeeee90eff0dc1eaba5341ff18c519b2183ef1460843a50d7adb9ec518f8affbe3546328f9f488d274ae99071799e7e3d1ef5415fd3a SHA512 980f1040b4f6b2c46598dd6ba70bd3e9bff8d89274002dad12e497f82ff2c0eb362a43e91473da05f982c1b4aad3e19e1124c8fd753fc371eb5f73f7a43f7b17
 MISC metadata.xml 444 BLAKE2B f9cc0e8188fbd02a7bacc258eac4052b88fcd3d3b878ce336f7f4635bd4fa94abdfa5112b35bbf6913dcbbfb64833d5f3a4d372c202b2f2488d5d0c750ce2f52 SHA512 8dbd7df10769ff8d0271588be8c97402d5917a4c0dbafa5daad2090245ee4b022193a6c271f71c342540d7599b029998c91c10364eae7d55de0275276342c0f4
diff --git a/app-backup/restic/restic-0.8.3.ebuild b/app-backup/restic/restic-0.8.3.ebuild
new file mode 100644
index 000000000000..6654fb9c5cce
--- /dev/null
+++ b/app-backup/restic/restic-0.8.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot bash-completion-r1
+
+DESCRIPTION="A backup program that is fast, efficient and secure"
+HOMEPAGE="https://restic.github.io/"
+SRC_URI="https://github.com/restic/restic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+EGO_PN="github.com/restic/restic"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-lang/go
+	test? ( sys-fs/fuse:0 )"
+
+RDEPEND="sys-fs/fuse:0"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_compile() {
+	local mygoargs=(
+		-v
+		-work
+		-x
+		-tags release
+		-ldflags "-s -w -X main.version=${PV}"
+		-asmflags "-trimpath=${S}"
+		-gcflags "-trimpath=${S}"
+		-o restic ${EGO_PN}/cmd/restic
+	)
+
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go build "${mygoargs[@]}" || die
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go test -timeout 30m -v -work -x ${EGO_PN}/cmd/... ${EGO_PN}/internal/... || die
+}
+
+src_install() {
+	dobin restic
+
+	newbashcomp doc/bash-completion.sh "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins doc/zsh-completion.zsh _restic
+
+	doman doc/man/*
+	dodoc doc/*.rst
+}
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 7d2aa31a7c10..63c9d19d3bdb 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -4,9 +4,11 @@ DIST snapper-0.2.8.tar.bz2 475053 BLAKE2B f6e4046f572ce70bc811e99bfe53d043ab2ca3
 DIST snapper-0.3.3.tar.bz2 545800 BLAKE2B dca7b6912beb015335324144ca60e1f4667e96cb3d057ced4c68b7bc66a4895f2b3c068582137cd40fd5a267f3178e462029428154c860f67846163adba05c5d SHA512 f24f6d121f9a613549899b7bf3751f6d9c101db716d7bc3858a2add9f90e08861fc46927ce0130efc232240a91e24934820d0c2b1b65f206ac80d04cdaaec39d
 DIST snapper-0.4.1.tar.bz2 570673 BLAKE2B 7b36cac2bdb84d80817be496ba1aa0984ba48680468bfc04fa47a10f452da0dbe1a94fac70d6c7a8ba03f76047ebbba579924f35b4e86c2d30c28e222cba38ec SHA512 23d12a4685039ce629333854bc3e8a90a524bf1207590102ccfbc358473e7bef9ca6a723d2bc8a2f0f7466c4b34dce724b806d24762ae54b26292e730a10a70c
 DIST snapper-0.5.0.tar.bz2 571716 BLAKE2B 3eb1db265566d0129c3177dcf8d62848108df918eb705ae149672664e215a17b760279e35d1ac658b18bb6e6fa05f5102d05c3a00e45fbfe73093b073fc3f8f9 SHA512 37487a1230825dc5d533e5c864965d9d05c2a3f4e12e5ae910f2721ef2497be2dafedcd13148d7246896551eae11cbcb925e04b58f799ea3d644eea329d3da29
+DIST snapper-0.5.4.tar.bz2 579172 BLAKE2B ce23b56047b818946f1b885308abd21ce6df216b890f784c3b57d8bd44a0a26bebf992b4d2a8ff36e11e096b0d589197e81bf223dd018feb9dcbeaa04c03a904 SHA512 fed417ef817526ab8c2110a70f5e9750642d7f427619efa52c2ed2e3adb83ff47314cdd8843e6331ce1c37fca79367a0a5ff8c6ba394602b24399eb5e6b97cd0
 EBUILD snapper-0.2.8-r1.ebuild 1543 BLAKE2B 0ac296d81e513470b43725f11bf325e4eb0e8a1945898b6c6785fa49a57cd1e576e129541c9a6ecf80ca4b26c372957640ceaecce853883124efa94a378d9b49 SHA512 5dc08d9e9a85984e3bd8ba2c6797f7d37d385fd767498ccf6b44c18e75ef18d7c928b9501caa53e3b3e520426f59dfd345f0984e7e0c0b9ab0d081529ece3576
 EBUILD snapper-0.3.3.ebuild 1536 BLAKE2B 639a2e6893158981d8f405465aae73f51438ec424bc6cf8fafa75299667b4a36a4ba627b774651c53407474cd3571872f84261ba02bee9fcbe33d7a001dfe871 SHA512 11e40f5df3d6af95b4186493bd1b216b2354d2b1d0eb7b65d1002737c15ca651acd0ac7dd27a3a93a840d010b9dff223a7130270aab30f7e668df6669f237f42
 EBUILD snapper-0.4.1.ebuild 1536 BLAKE2B 639a2e6893158981d8f405465aae73f51438ec424bc6cf8fafa75299667b4a36a4ba627b774651c53407474cd3571872f84261ba02bee9fcbe33d7a001dfe871 SHA512 11e40f5df3d6af95b4186493bd1b216b2354d2b1d0eb7b65d1002737c15ca651acd0ac7dd27a3a93a840d010b9dff223a7130270aab30f7e668df6669f237f42
 EBUILD snapper-0.5.0.ebuild 1583 BLAKE2B b32c38f849fd77202d3557e8aae208bb2e9d304cd042d1f32f5760aa73365e8a7b694b83e9db860478eb4f0c14ac103367981219819106d5963205fd8a270c01 SHA512 052e15517c42a84ab74dec462ad2f3afc8a9498d8b94692cbb0e0672c19a47c06a2d0383b3e790dff33e08a807eb97405c346d92f2b3a5bbc09503be6157aced
+EBUILD snapper-0.5.4.ebuild 1718 BLAKE2B fd9b14e0ce1c0131106a0b80f0a9caa1d3ce8a2dfe6f4d88fb251f7788f13811eee6079b063f7a90e6adf8fc7ca44dd1f41a5b414ec2c7279a27c00fb17a234f SHA512 895323a79595f08a6c73e7ff193f06b3e5d3145c38ab18fe6ffb83681455adbb8b3a6b3855bfc9bb117fb0dc1102603fbaff8859a576fef64c93936595f96056
 EBUILD snapper-9999.ebuild 1615 BLAKE2B 01177dd4a732938924c25fe054e7a415856192a295f64a8ac0a753a2ec0aeebcf83d464f9c545b88cc3a2b6306c01dd648f91b45c70fceceeedde5b0776e0678 SHA512 e6d8980d625a32f9787e4f0bc25ad0390fd7f0b1b2a43845074abe5e585caf141eaceac5bde8bd0050c891828630c9e74827586167b3ec00f7c618694efe9c79
 MISC metadata.xml 1456 BLAKE2B 327ecba708769cd77e1cd785f178f124cdfa37bf3ba1a3e90161f673fdb10d823a3a1aa14b73877345ed39a71014c5cc51836fe7a539e2c62cc992f473deb31b SHA512 9954576d7d44f0f1a20a5bd5168a6b9c5968ad1a47708a198ae8b4a7054863c2de1c58d9d6108a3dcabf944fb5f266ffe6451be5c2b924636cc53380b2779976
diff --git a/app-backup/snapper/snapper-0.5.4.ebuild b/app-backup/snapper/snapper-0.5.4.ebuild
new file mode 100644
index 000000000000..08667a65c08b
--- /dev/null
+++ b/app-backup/snapper/snapper-0.5.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+btrfs ext4 lvm pam xattr"
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/libxml2
+	dev-libs/icu:=
+	sys-apps/acl
+	sys-apps/dbus
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libintl
+	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
+	ext4? ( sys-fs/e2fsprogs )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	xattr? ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( btrfs ext4 lvm )"
+
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-conf="/etc/conf.d"
+		--docdir="/usr/share/doc/${PF}"
+		--disable-zypp
+		--enable-rollback
+		$(use_enable btrfs)
+		$(use_enable ext4)
+		$(use_enable lvm)
+		$(use_enable pam)
+		$(use_enable xattr xattrs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}