app-backup/snapper: Add non-live ebuild and a timeline cronjob fix for snapper

5 files changed, 101 insertions, 8 deletions

diff --git a/app-backup/snapper/ChangeLog b/app-backup/snapper/ChangeLog
index 2f71707e6..7af2375fe 100644
--- a/app-backup/snapper/ChangeLog
+++ b/app-backup/snapper/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-backup/snapper
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*snapper-0.2.1 (23 Feb 2014)
+
+  23 Feb 2014; Dainius Masiliūnas (GreatEmerald) <pastas4@gmail.com>
+  +snapper-0.2.1.ebuild, snapper-9999.ebuild, +files/cron-confd.patch:
+  Add non-live ebuild and a timeline cronjob fix for snapper
+
   11 Mar 2013; Dainius Masiliūnas (GreatEmerald) <pastas4@gmail.com>
   metadata.xml:
   New Ebuild for bug #446680
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index e042ae81b..7ebf73199 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,3 +1,6 @@
-EBUILD snapper-9999.ebuild 1423 SHA256 4362e75bfe6d7bd67f728556c9360f9790c9d37eccdce4e2816ec486e68ec581 SHA512 7b4b9cfe6b681226b430a489092d7fff5993557c5dcc4369308cf8b965c7ca00e590b9adfd89286996882687319f8023f7f6894aa87a780291e4d173c71ba41a WHIRLPOOL bbc628f2f10df289000373c7bb75045756e723a48bd840a969e49ca194ade4026d15441d15629ff03b9a2db7eaa0073a578c015d7d694c0def4e4c7cc038b5f1
-MISC ChangeLog 403 SHA256 34008f34f87484307c6cdf4a1bbd9b34bbe9de754d1279c4ccf925d7b3d00fa9 SHA512 2c15e9901a318d86ea5a2a6ceb101360225ba8579476be9b23b7f99c1212fdfb8a49e9a0780db9ce293c0277f7bfa0ae69e68b3014fb11332f9adfd99d05f06c WHIRLPOOL 270d1024325af8cc58cb2965d5d6c3155dc9dab6917b6ad1821c486b8ff9d5434095d4eeb5dfe6458052a9fc101164d23b00793bb50357b8acd8b0135b9b47e5
+AUX cron-confd.patch 916 SHA256 720b6842f0d6e61269156ee3405bf7db35788cd5c14fe8d00132ee5f6680ef6e SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7 WHIRLPOOL cf3af5c39fcfbc9aa69cc223000487b765fc09d46b50e6f4e3c08d5351869772c462392fa4b730e8aa8513aa0c5f4c72b9a14e671986a5591b462a401e5698b6
+DIST snapper-0.2.1.tar.bz2 436627 SHA256 37f4aa1712be2cd561d1bc062c27f30b7bd4d470fd57c95f53b90fba522352f5 SHA512 59b374df63eab107114978a1feee2d3044304563d07c8d7b29d25e8beaf859a0546bfc108cb5f6602b17ab30ec4c2ca27aee8cb8fca543efb81c933ff1e0a1dd WHIRLPOOL 28a89f1a9d941e2d745f50fdd39262184265f935b83da8bd5b58c34538db45046755de6eee6323dab56ed47ab6e31d56b148eb601de1d4cf3f961db4d938c5f4
+EBUILD snapper-0.2.1.ebuild 1363 SHA256 eb788a3bcb1d3a93d94684edcdf4c6e866d6a865cd75d67c59bd1f5e8cf2d7c2 SHA512 88facd73490c29b8a8fbc34b4469664730d60f85afe8d44a1483b65341a0011fd3e01ca94203e1179d742031a75b7620054af08b692704bad0eb8df526dbd6f3 WHIRLPOOL 5ad61e0b5044236935ea303a07995e21a2b1d10c61ee6f44eeda26e9be9537e075d1d8f49443f559f6980a57271542062fe9f4a509b0b4eb98406a2a63f1f661
+EBUILD snapper-9999.ebuild 1410 SHA256 0166be29514cc5a4f15aff277005ca09108ac73c74e9b269466ddba4dfd4e188 SHA512 2a32f05aea3e25b76b73d4beecc1d8d947c5e67fef5e43e36d853f43e48ca980fc141372c1b20144c8b6298060fdcbc9f958f03903e45c14896937bbb919c615 WHIRLPOOL 504548a9d66bcbe106decb54c9fe7baac667cea415774d4c244d7c6fbbc49220fc28eb435bd0bcaaa59da6cb85c86a77544b7d6ccb7880acba2c4998feb44193
+MISC ChangeLog 636 SHA256 88d425fd39b867ae167682fd02aad72339058d2d817107f558706c223e590bff SHA512 702720412eb8650679b6dbb46bc9d388197a52e156eb0f2de43b65c111582bd8cfacb57465bb5c92eccf97cbdd7e6c7ea293507b6d5d4c738eb6edc516f17c51 WHIRLPOOL 1a845f9df605cd4d7405410a5cb25057fe4ff53b2e77510c58f925a776ba0206305f1811543ad94ac88a56961c276673b570d1e1b9e0890385ceb1fe7f41fcdd
 MISC metadata.xml 787 SHA256 0d962f3281a69512ef5102c7d0f3655239a104cd3307f8f0166e512c0bdf773e SHA512 340ef4333a610fb7b4fa82a187cccb21e4454d3a2660c3bfb0a5f1e3ef270a673965084107bdb046ababa5e8511408c514bd6126ce8902cd1a62fea798bbf1e0 WHIRLPOOL 3b0fe4efe5d58b1ba0fd2af0992ec0aaf1630d86603b8628380e796df491cb97dce5b3e8de4d6f747846bb35935be2f7a15623593fc5ef9cbe01cb3cd63af59b
diff --git a/app-backup/snapper/files/cron-confd.patch b/app-backup/snapper/files/cron-confd.patch
new file mode 100644
index 000000000..473e749d0
--- /dev/null
+++ b/app-backup/snapper/files/cron-confd.patch
@@ -0,0 +1,32 @@
+diff -u old/scripts/snapper-daily new/scripts/snapper-daily
+--- old/scripts/snapper-daily   2014-01-29 17:48:30.000000000 +0200
++++ new/scripts/snapper-daily   2014-02-19 13:32:22.702734875 +0200
+@@ -9,10 +9,10 @@
+ 
+ 
+ #
+-# get information from /etc/sysconfig/snapper
++# get information from /etc/conf.d/snapper
+ #
+-if [ -f /etc/sysconfig/snapper ] ; then
+-    . /etc/sysconfig/snapper
++if [ -f /etc/conf.d/snapper ] ; then
++    . /etc/conf.d/snapper
+ fi
+ 
+ 
+diff -u old/scripts/snapper-hourly new/scripts/snapper-hourly
+--- old/scripts/snapper-hourly  2014-01-29 17:48:30.000000000 +0200
++++ new/scripts/snapper-hourly  2014-02-19 13:32:43.609166927 +0200
+@@ -9,10 +9,10 @@
+ 
+ 
+ #
+-# get information from /etc/sysconfig/snapper
++# get information from /etc/conf.d/snapper
+ #
+-if [ -f /etc/sysconfig/snapper ] ; then
+-    . /etc/sysconfig/snapper
++if [ -f /etc/conf.d/snapper ] ; then
++    . /etc/conf.d/snapper
+ fi
diff --git a/app-backup/snapper/snapper-0.2.1.ebuild b/app-backup/snapper/snapper-0.2.1.ebuild
new file mode 100644
index 000000000..2097e0d41
--- /dev/null
+++ b/app-backup/snapper/snapper-0.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+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"
+DOCS="AUTHORS README"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/boost
+	dev-libs/libxml2
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Replace sysconfig with conf.d
+	epatch "${FILESDIR}"/cron-confd.patch
+}
+
+src_configure() {
+	# No YaST in Gentoo
+	econf --disable-zypp --with-conf="/etc/conf.d"
+}
+
+src_install() {
+	default
+	# Existing configuration file required to function
+	newconfd data/sysconfig.snapper snapper
+}
+
+pkg_postinst() {
+	elog "In order to use Snapper, you need to set up at least one config"
+	elog "manually, or else the tool will get confused. Typically you should"
+	elog "create a '/.snapshots' directory, then copy the file"
+	elog "'/etc/snapper/config-templates/default' into '/etc/snapper/configs/',"
+	elog "rename the file to 'root', and add its name into '/etc/conf.d/snapper'."
+	elog "That will instruct Snapper to snapshot the root of the filesystem by"
+	elog "default. For more information, see the snapper(8) manual page."
+}
diff --git a/app-backup/snapper/snapper-9999.ebuild b/app-backup/snapper/snapper-9999.ebuild
index 4cd6c1588..bbf334a23 100644
--- a/app-backup/snapper/snapper-9999.ebuild
+++ b/app-backup/snapper/snapper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,6 +9,7 @@ inherit autotools eutils git-2
 DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
 HOMEPAGE="http://snapper.io/"
 EGIT_REPO_URI="git://github.com/openSUSE/snapper.git"
+DOCS="AUTHORS README package/snapper.changes"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +24,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	# No configure file provided at the moment
+	# Replace sysconfig with conf.d
+	epatch "${FILESDIR}"/cron-confd.patch
 	eautoreconf
 }
 
@@ -33,9 +35,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	nonfatal dodoc AUTHORS LIBVERSION VERSION package/snapper.changes
-	# Exising configuration file required to function
+	default
+	# Existing configuration file required to function
 	newconfd data/sysconfig.snapper snapper
 	prune_libtool_files
 }