[gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     fd07a5e2e3e735d74d182c3fd614ca72c4db5891
Author:     Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
AuthorDate: Mon Feb  8 00:51:15 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Feb  8 00:52:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd07a5e2

app-backup/timeshift: new package

Closes: https://github.com/gentoo/gentoo/pull/12530
Closes: https://bugs.gentoo.org/690258
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>

 app-backup/timeshift/Manifest                      |   1 +
 .../files/timeshift-20.11.1-fix-xapp-2.0.patch     | 275 +++++++++++++++++++++
 app-backup/timeshift/metadata.xml                  |  19 ++
 app-backup/timeshift/timeshift-20.11.1.ebuild      |  44 ++++
 4 files changed, 339 insertions(+)

diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
new file mode 100644
index 00000000..d059f3dd
--- /dev/null
+++ b/app-backup/timeshift/Manifest
@@ -0,0 +1 @@
+DIST timeshift-20.11.1.tar.gz 1401165 BLAKE2B dd51a352d030a2fb8fff2d430365d18f9dcf45c3ebdc3e367849c37b98140da7618426ecd9c268a87e3cd916822446fed861305c99a7b760539f32dd6be9402f SHA512 f16de664a052e15a60da5efdc925097cd09081f9a9983ef1e092674a3fee14681271d2053a04250736a4e33d4a65d30ce5a9454b45a96f0dd05d38465f967862

diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
new file mode 100644
index 00000000..4cfa91f6
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
@@ -0,0 +1,275 @@
+diff --git a/src/Gtk/BackupBox.vala b/src/Gtk/BackupBox.vala
+old mode 100644
+new mode 100755
+index 3b0a855..4926503
+--- a/src/Gtk/BackupBox.vala
++++ b/src/Gtk/BackupBox.vala
+@@ -64,7 +64,7 @@ class BackupBox : Gtk.Box{
+ 		log_debug("BackupBox: BackupBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 		
+diff --git a/src/Gtk/BackupDeviceBox.vala b/src/Gtk/BackupDeviceBox.vala
+index 1bdde5a..ead9371 100644
+--- a/src/Gtk/BackupDeviceBox.vala
++++ b/src/Gtk/BackupDeviceBox.vala
+@@ -46,7 +46,7 @@ class BackupDeviceBox : Gtk.Box{
+ 		log_debug("BackupDeviceBox: BackupDeviceBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/BackupFinishBox.vala b/src/Gtk/BackupFinishBox.vala
+index 1b57759..0343be5 100644
+--- a/src/Gtk/BackupFinishBox.vala
++++ b/src/Gtk/BackupFinishBox.vala
+@@ -42,7 +42,7 @@ class BackupFinishBox : Gtk.Box{
+ 		log_debug("BackupFinishBox: BackupFinishBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/BootOptionsBox.vala b/src/Gtk/BootOptionsBox.vala
+index 5c96443..6e66372 100644
+--- a/src/Gtk/BootOptionsBox.vala
++++ b/src/Gtk/BootOptionsBox.vala
+@@ -47,7 +47,7 @@ class BootOptionsBox : Gtk.Box{
+ 		log_debug("BootOptionsBox: BootOptionsBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/DeleteBox.vala b/src/Gtk/DeleteBox.vala
+index 7cbc7d4..c824bbd 100644
+--- a/src/Gtk/DeleteBox.vala
++++ b/src/Gtk/DeleteBox.vala
+@@ -50,7 +50,7 @@ class DeleteBox : Gtk.Box{
+ 		log_debug("DeleteBox: DeleteBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 		
+diff --git a/src/Gtk/DeleteFinishBox.vala b/src/Gtk/DeleteFinishBox.vala
+index ab9a6d0..db99034 100644
+--- a/src/Gtk/DeleteFinishBox.vala
++++ b/src/Gtk/DeleteFinishBox.vala
+@@ -42,7 +42,7 @@ class DeleteFinishBox : Gtk.Box{
+ 		log_debug("DeleteFinishBox: DeleteFinishBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/EstimateBox.vala b/src/Gtk/EstimateBox.vala
+index 858545b..efdfaf7 100644
+--- a/src/Gtk/EstimateBox.vala
++++ b/src/Gtk/EstimateBox.vala
+@@ -48,7 +48,7 @@ class EstimateBox : Gtk.Box{
+ 		log_debug("EstimateBox: EstimateBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 		
+diff --git a/src/Gtk/ExcludeAppsBox.vala b/src/Gtk/ExcludeAppsBox.vala
+index 6d96fcb..2d26f74 100644
+--- a/src/Gtk/ExcludeAppsBox.vala
++++ b/src/Gtk/ExcludeAppsBox.vala
+@@ -41,7 +41,7 @@ class ExcludeAppsBox : Gtk.Box{
+ 		log_debug("ExcludeAppsBox: ExcludeAppsBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/ExcludeBox.vala b/src/Gtk/ExcludeBox.vala
+index ac70bcf..0cdddbf 100644
+--- a/src/Gtk/ExcludeBox.vala
++++ b/src/Gtk/ExcludeBox.vala
+@@ -44,7 +44,7 @@ class ExcludeBox : Gtk.Box{
+ 		log_debug("ExcludeBox: ExcludeBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/FinishBox.vala b/src/Gtk/FinishBox.vala
+index be10612..10a2d5e 100644
+--- a/src/Gtk/FinishBox.vala
++++ b/src/Gtk/FinishBox.vala
+@@ -45,7 +45,7 @@ class FinishBox : Gtk.Box{
+ 		log_debug("FinishBox: FinishBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 		show_notes = _show_notes;
+diff --git a/src/Gtk/MiscBox.vala b/src/Gtk/MiscBox.vala
+index 91295ca..4f48f83 100644
+--- a/src/Gtk/MiscBox.vala
++++ b/src/Gtk/MiscBox.vala
+@@ -46,7 +46,7 @@ class MiscBox : Gtk.Box{
+ 		log_debug("MiscBox: MiscBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/RestoreBox.vala b/src/Gtk/RestoreBox.vala
+index 3d9289d..4d483b0 100644
+--- a/src/Gtk/RestoreBox.vala
++++ b/src/Gtk/RestoreBox.vala
+@@ -65,7 +65,7 @@ class RestoreBox : Gtk.Box{
+ 		log_debug("RestoreBox: RestoreBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/RestoreDeviceBox.vala b/src/Gtk/RestoreDeviceBox.vala
+index 3a21930..431cb07 100644
+--- a/src/Gtk/RestoreDeviceBox.vala
++++ b/src/Gtk/RestoreDeviceBox.vala
+@@ -51,7 +51,7 @@ class RestoreDeviceBox : Gtk.Box{
+ 		log_debug("RestoreDeviceBox: RestoreDeviceBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/RestoreExcludeBox.vala b/src/Gtk/RestoreExcludeBox.vala
+index 67e781a..65cc655 100644
+--- a/src/Gtk/RestoreExcludeBox.vala
++++ b/src/Gtk/RestoreExcludeBox.vala
+@@ -46,7 +46,7 @@ class RestoreExcludeBox : Gtk.Box{
+ 		log_debug("RestoreExcludeBox: RestoreExcludeBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/RestoreFinishBox.vala b/src/Gtk/RestoreFinishBox.vala
+index 30d5690..1bb0bac 100644
+--- a/src/Gtk/RestoreFinishBox.vala
++++ b/src/Gtk/RestoreFinishBox.vala
+@@ -42,7 +42,7 @@ class RestoreFinishBox : Gtk.Box{
+ 		log_debug("RestoreFinishBox: RestoreFinishBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/RestoreSummaryBox.vala b/src/Gtk/RestoreSummaryBox.vala
+index 6cf87c7..ca25b3c 100644
+--- a/src/Gtk/RestoreSummaryBox.vala
++++ b/src/Gtk/RestoreSummaryBox.vala
+@@ -44,7 +44,7 @@ class RestoreSummaryBox : Gtk.Box{
+ 		log_debug("RestoreSummaryBox: RestoreSummaryBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/RsyncLogBox.vala b/src/Gtk/RsyncLogBox.vala
+index 2d1394e..4006a04 100644
+--- a/src/Gtk/RsyncLogBox.vala
++++ b/src/Gtk/RsyncLogBox.vala
+@@ -69,7 +69,7 @@ public class RsyncLogBox : Gtk.Box {
+ 
+ 	public RsyncLogBox(Gtk.Window _window) {
+ 		
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 
+ 		this.margin = 6;
+ 		
+diff --git a/src/Gtk/ScheduleBox.vala b/src/Gtk/ScheduleBox.vala
+index b59cfbb..39f33fc 100644
+--- a/src/Gtk/ScheduleBox.vala
++++ b/src/Gtk/ScheduleBox.vala
+@@ -50,7 +50,7 @@ class ScheduleBox : Gtk.Box{
+ 		log_debug("ScheduleBox: ScheduleBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 		
+diff --git a/src/Gtk/SnapshotBackendBox.vala b/src/Gtk/SnapshotBackendBox.vala
+index c725ad7..09bbd0f 100755
+--- a/src/Gtk/SnapshotBackendBox.vala
++++ b/src/Gtk/SnapshotBackendBox.vala
+@@ -46,7 +46,7 @@ class SnapshotBackendBox : Gtk.Box{
+ 		log_debug("SnapshotBackendBox: SnapshotBackendBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 
+diff --git a/src/Gtk/SnapshotListBox.vala b/src/Gtk/SnapshotListBox.vala
+index 4d6e9f1..4cef400 100644
+--- a/src/Gtk/SnapshotListBox.vala
++++ b/src/Gtk/SnapshotListBox.vala
+@@ -63,7 +63,7 @@ class SnapshotListBox : Gtk.Box{
+ 		log_debug("SnapshotListBox: SnapshotListBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 6;
+ 
+diff --git a/src/Gtk/UsersBox.vala b/src/Gtk/UsersBox.vala
+index 2d2a63e..dbcc719 100644
+--- a/src/Gtk/UsersBox.vala
++++ b/src/Gtk/UsersBox.vala
+@@ -49,7 +49,7 @@ class UsersBox : Gtk.Box{
+ 		log_debug("UsersBox: UsersBox()");
+ 		
+ 		//base(Gtk.Orientation.VERTICAL, 6); // issue with vala
+-		Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
++		GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
+ 		parent_window = _parent_window;
+ 		margin = 12;
+ 

diff --git a/app-backup/timeshift/metadata.xml b/app-backup/timeshift/metadata.xml
new file mode 100644
index 00000000..78eb91da
--- /dev/null
+++ b/app-backup/timeshift/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rossbridger.cc@gmail.com</email>
+		<name>Ross Charles Campbell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">teejee2008/timeshift</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Timeshift for Linux is an application that provides functionality similar to
+		the System Restore feature in Windows and the Time Machine tool in Mac OS.
+
+		Timeshift protects your system by taking incremental snapshots of the file
+		system at regular intervals. These snapshots can be restored at a later date
+		to undo all changes to the system.
+	</longdescription>
+</pkgmetadata>

diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild
new file mode 100644
index 00000000..b5b563c7
--- /dev/null
+++ b/app-backup/timeshift/timeshift-20.11.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.40"
+inherit vala xdg
+
+DESCRIPTION="A system restore utility for Linux"
+HOMEPAGE="https://github.com/teejee2008/timeshift"
+SRC_URI="https://github.com/teejee2008/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" )
+
+DEPEND="
+	dev-libs/json-glib
+	dev-libs/libgee
+	dev-util/desktop-file-utils
+	net-libs/libsoup
+	net-misc/rsync
+	sys-process/cronie
+	x11-libs/gtk+:3
+	x11-libs/xapps
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	$(vala_depend)
+	net-misc/rsync
+	sys-apps/diffutils
+	sys-apps/coreutils
+	sys-fs/btrfs-progs
+	>=x11-libs/vte-0.60.3[vala]
+"
+
+src_prepare() {
+#	sed -i -e "s:--thread:& Core/AppExcludeEntry.vala:" "src/makefile"
+	sed -i -e "s:valac:valac-$(vala_best_api_version):" "src/makefile"
+	vala_src_prepare
+	default
+}