Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-backup/timeshift/, app-backup/timeshift/files/
Date: Tue, 09 Feb 2021 14:46:24
Message-Id: 1612745575.fd07a5e2e3e735d74d182c3fd614ca72c4db5891.andrewammerlaan@gentoo
1 commit: fd07a5e2e3e735d74d182c3fd614ca72c4db5891
2 Author: Ross Charles Campbell <rossbridger.cc <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 8 00:51:15 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
5 CommitDate: Mon Feb 8 00:52:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd07a5e2
7
8 app-backup/timeshift: new package
9
10 Closes: https://github.com/gentoo/gentoo/pull/12530
11 Closes: https://bugs.gentoo.org/690258
12 Package-Manager: Portage-3.0.14, Repoman-3.0.2
13 Signed-off-by: Ross Charles Campbell <rossbridger.cc <AT> gmail.com>
14
15 app-backup/timeshift/Manifest | 1 +
16 .../files/timeshift-20.11.1-fix-xapp-2.0.patch | 275 +++++++++++++++++++++
17 app-backup/timeshift/metadata.xml | 19 ++
18 app-backup/timeshift/timeshift-20.11.1.ebuild | 44 ++++
19 4 files changed, 339 insertions(+)
20
21 diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
22 new file mode 100644
23 index 00000000..d059f3dd
24 --- /dev/null
25 +++ b/app-backup/timeshift/Manifest
26 @@ -0,0 +1 @@
27 +DIST timeshift-20.11.1.tar.gz 1401165 BLAKE2B dd51a352d030a2fb8fff2d430365d18f9dcf45c3ebdc3e367849c37b98140da7618426ecd9c268a87e3cd916822446fed861305c99a7b760539f32dd6be9402f SHA512 f16de664a052e15a60da5efdc925097cd09081f9a9983ef1e092674a3fee14681271d2053a04250736a4e33d4a65d30ce5a9454b45a96f0dd05d38465f967862
28
29 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
30 new file mode 100644
31 index 00000000..4cfa91f6
32 --- /dev/null
33 +++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch
34 @@ -0,0 +1,275 @@
35 +diff --git a/src/Gtk/BackupBox.vala b/src/Gtk/BackupBox.vala
36 +old mode 100644
37 +new mode 100755
38 +index 3b0a855..4926503
39 +--- a/src/Gtk/BackupBox.vala
40 ++++ b/src/Gtk/BackupBox.vala
41 +@@ -64,7 +64,7 @@ class BackupBox : Gtk.Box{
42 + log_debug("BackupBox: BackupBox()");
43 +
44 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
45 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
46 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
47 + parent_window = _parent_window;
48 + margin = 12;
49 +
50 +diff --git a/src/Gtk/BackupDeviceBox.vala b/src/Gtk/BackupDeviceBox.vala
51 +index 1bdde5a..ead9371 100644
52 +--- a/src/Gtk/BackupDeviceBox.vala
53 ++++ b/src/Gtk/BackupDeviceBox.vala
54 +@@ -46,7 +46,7 @@ class BackupDeviceBox : Gtk.Box{
55 + log_debug("BackupDeviceBox: BackupDeviceBox()");
56 +
57 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
58 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
59 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
60 + parent_window = _parent_window;
61 + margin = 12;
62 +
63 +diff --git a/src/Gtk/BackupFinishBox.vala b/src/Gtk/BackupFinishBox.vala
64 +index 1b57759..0343be5 100644
65 +--- a/src/Gtk/BackupFinishBox.vala
66 ++++ b/src/Gtk/BackupFinishBox.vala
67 +@@ -42,7 +42,7 @@ class BackupFinishBox : Gtk.Box{
68 + log_debug("BackupFinishBox: BackupFinishBox()");
69 +
70 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
71 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
72 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
73 + parent_window = _parent_window;
74 + margin = 12;
75 +
76 +diff --git a/src/Gtk/BootOptionsBox.vala b/src/Gtk/BootOptionsBox.vala
77 +index 5c96443..6e66372 100644
78 +--- a/src/Gtk/BootOptionsBox.vala
79 ++++ b/src/Gtk/BootOptionsBox.vala
80 +@@ -47,7 +47,7 @@ class BootOptionsBox : Gtk.Box{
81 + log_debug("BootOptionsBox: BootOptionsBox()");
82 +
83 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
84 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
85 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
86 + parent_window = _parent_window;
87 + margin = 12;
88 +
89 +diff --git a/src/Gtk/DeleteBox.vala b/src/Gtk/DeleteBox.vala
90 +index 7cbc7d4..c824bbd 100644
91 +--- a/src/Gtk/DeleteBox.vala
92 ++++ b/src/Gtk/DeleteBox.vala
93 +@@ -50,7 +50,7 @@ class DeleteBox : Gtk.Box{
94 + log_debug("DeleteBox: DeleteBox()");
95 +
96 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
97 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
98 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
99 + parent_window = _parent_window;
100 + margin = 12;
101 +
102 +diff --git a/src/Gtk/DeleteFinishBox.vala b/src/Gtk/DeleteFinishBox.vala
103 +index ab9a6d0..db99034 100644
104 +--- a/src/Gtk/DeleteFinishBox.vala
105 ++++ b/src/Gtk/DeleteFinishBox.vala
106 +@@ -42,7 +42,7 @@ class DeleteFinishBox : Gtk.Box{
107 + log_debug("DeleteFinishBox: DeleteFinishBox()");
108 +
109 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
110 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
111 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
112 + parent_window = _parent_window;
113 + margin = 12;
114 +
115 +diff --git a/src/Gtk/EstimateBox.vala b/src/Gtk/EstimateBox.vala
116 +index 858545b..efdfaf7 100644
117 +--- a/src/Gtk/EstimateBox.vala
118 ++++ b/src/Gtk/EstimateBox.vala
119 +@@ -48,7 +48,7 @@ class EstimateBox : Gtk.Box{
120 + log_debug("EstimateBox: EstimateBox()");
121 +
122 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
123 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
124 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
125 + parent_window = _parent_window;
126 + margin = 12;
127 +
128 +diff --git a/src/Gtk/ExcludeAppsBox.vala b/src/Gtk/ExcludeAppsBox.vala
129 +index 6d96fcb..2d26f74 100644
130 +--- a/src/Gtk/ExcludeAppsBox.vala
131 ++++ b/src/Gtk/ExcludeAppsBox.vala
132 +@@ -41,7 +41,7 @@ class ExcludeAppsBox : Gtk.Box{
133 + log_debug("ExcludeAppsBox: ExcludeAppsBox()");
134 +
135 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
136 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
137 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
138 + parent_window = _parent_window;
139 + margin = 12;
140 +
141 +diff --git a/src/Gtk/ExcludeBox.vala b/src/Gtk/ExcludeBox.vala
142 +index ac70bcf..0cdddbf 100644
143 +--- a/src/Gtk/ExcludeBox.vala
144 ++++ b/src/Gtk/ExcludeBox.vala
145 +@@ -44,7 +44,7 @@ class ExcludeBox : Gtk.Box{
146 + log_debug("ExcludeBox: ExcludeBox()");
147 +
148 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
149 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
150 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
151 + parent_window = _parent_window;
152 + margin = 12;
153 +
154 +diff --git a/src/Gtk/FinishBox.vala b/src/Gtk/FinishBox.vala
155 +index be10612..10a2d5e 100644
156 +--- a/src/Gtk/FinishBox.vala
157 ++++ b/src/Gtk/FinishBox.vala
158 +@@ -45,7 +45,7 @@ class FinishBox : Gtk.Box{
159 + log_debug("FinishBox: FinishBox()");
160 +
161 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
162 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
163 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
164 + parent_window = _parent_window;
165 + margin = 12;
166 + show_notes = _show_notes;
167 +diff --git a/src/Gtk/MiscBox.vala b/src/Gtk/MiscBox.vala
168 +index 91295ca..4f48f83 100644
169 +--- a/src/Gtk/MiscBox.vala
170 ++++ b/src/Gtk/MiscBox.vala
171 +@@ -46,7 +46,7 @@ class MiscBox : Gtk.Box{
172 + log_debug("MiscBox: MiscBox()");
173 +
174 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
175 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
176 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
177 + parent_window = _parent_window;
178 + margin = 12;
179 +
180 +diff --git a/src/Gtk/RestoreBox.vala b/src/Gtk/RestoreBox.vala
181 +index 3d9289d..4d483b0 100644
182 +--- a/src/Gtk/RestoreBox.vala
183 ++++ b/src/Gtk/RestoreBox.vala
184 +@@ -65,7 +65,7 @@ class RestoreBox : Gtk.Box{
185 + log_debug("RestoreBox: RestoreBox()");
186 +
187 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
188 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
189 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
190 + parent_window = _parent_window;
191 + margin = 12;
192 +
193 +diff --git a/src/Gtk/RestoreDeviceBox.vala b/src/Gtk/RestoreDeviceBox.vala
194 +index 3a21930..431cb07 100644
195 +--- a/src/Gtk/RestoreDeviceBox.vala
196 ++++ b/src/Gtk/RestoreDeviceBox.vala
197 +@@ -51,7 +51,7 @@ class RestoreDeviceBox : Gtk.Box{
198 + log_debug("RestoreDeviceBox: RestoreDeviceBox()");
199 +
200 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
201 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
202 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
203 + parent_window = _parent_window;
204 + margin = 12;
205 +
206 +diff --git a/src/Gtk/RestoreExcludeBox.vala b/src/Gtk/RestoreExcludeBox.vala
207 +index 67e781a..65cc655 100644
208 +--- a/src/Gtk/RestoreExcludeBox.vala
209 ++++ b/src/Gtk/RestoreExcludeBox.vala
210 +@@ -46,7 +46,7 @@ class RestoreExcludeBox : Gtk.Box{
211 + log_debug("RestoreExcludeBox: RestoreExcludeBox()");
212 +
213 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
214 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
215 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
216 + parent_window = _parent_window;
217 + margin = 12;
218 +
219 +diff --git a/src/Gtk/RestoreFinishBox.vala b/src/Gtk/RestoreFinishBox.vala
220 +index 30d5690..1bb0bac 100644
221 +--- a/src/Gtk/RestoreFinishBox.vala
222 ++++ b/src/Gtk/RestoreFinishBox.vala
223 +@@ -42,7 +42,7 @@ class RestoreFinishBox : Gtk.Box{
224 + log_debug("RestoreFinishBox: RestoreFinishBox()");
225 +
226 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
227 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
228 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
229 + parent_window = _parent_window;
230 + margin = 12;
231 +
232 +diff --git a/src/Gtk/RestoreSummaryBox.vala b/src/Gtk/RestoreSummaryBox.vala
233 +index 6cf87c7..ca25b3c 100644
234 +--- a/src/Gtk/RestoreSummaryBox.vala
235 ++++ b/src/Gtk/RestoreSummaryBox.vala
236 +@@ -44,7 +44,7 @@ class RestoreSummaryBox : Gtk.Box{
237 + log_debug("RestoreSummaryBox: RestoreSummaryBox()");
238 +
239 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
240 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
241 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
242 + parent_window = _parent_window;
243 + margin = 12;
244 +
245 +diff --git a/src/Gtk/RsyncLogBox.vala b/src/Gtk/RsyncLogBox.vala
246 +index 2d1394e..4006a04 100644
247 +--- a/src/Gtk/RsyncLogBox.vala
248 ++++ b/src/Gtk/RsyncLogBox.vala
249 +@@ -69,7 +69,7 @@ public class RsyncLogBox : Gtk.Box {
250 +
251 + public RsyncLogBox(Gtk.Window _window) {
252 +
253 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
254 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
255 +
256 + this.margin = 6;
257 +
258 +diff --git a/src/Gtk/ScheduleBox.vala b/src/Gtk/ScheduleBox.vala
259 +index b59cfbb..39f33fc 100644
260 +--- a/src/Gtk/ScheduleBox.vala
261 ++++ b/src/Gtk/ScheduleBox.vala
262 +@@ -50,7 +50,7 @@ class ScheduleBox : Gtk.Box{
263 + log_debug("ScheduleBox: ScheduleBox()");
264 +
265 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
266 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
267 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
268 + parent_window = _parent_window;
269 + margin = 12;
270 +
271 +diff --git a/src/Gtk/SnapshotBackendBox.vala b/src/Gtk/SnapshotBackendBox.vala
272 +index c725ad7..09bbd0f 100755
273 +--- a/src/Gtk/SnapshotBackendBox.vala
274 ++++ b/src/Gtk/SnapshotBackendBox.vala
275 +@@ -46,7 +46,7 @@ class SnapshotBackendBox : Gtk.Box{
276 + log_debug("SnapshotBackendBox: SnapshotBackendBox()");
277 +
278 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
279 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
280 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
281 + parent_window = _parent_window;
282 + margin = 12;
283 +
284 +diff --git a/src/Gtk/SnapshotListBox.vala b/src/Gtk/SnapshotListBox.vala
285 +index 4d6e9f1..4cef400 100644
286 +--- a/src/Gtk/SnapshotListBox.vala
287 ++++ b/src/Gtk/SnapshotListBox.vala
288 +@@ -63,7 +63,7 @@ class SnapshotListBox : Gtk.Box{
289 + log_debug("SnapshotListBox: SnapshotListBox()");
290 +
291 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
292 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
293 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
294 + parent_window = _parent_window;
295 + margin = 6;
296 +
297 +diff --git a/src/Gtk/UsersBox.vala b/src/Gtk/UsersBox.vala
298 +index 2d2a63e..dbcc719 100644
299 +--- a/src/Gtk/UsersBox.vala
300 ++++ b/src/Gtk/UsersBox.vala
301 +@@ -49,7 +49,7 @@ class UsersBox : Gtk.Box{
302 + log_debug("UsersBox: UsersBox()");
303 +
304 + //base(Gtk.Orientation.VERTICAL, 6); // issue with vala
305 +- Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
306 ++ GLib.Object(orientation: Gtk.Orientation.VERTICAL, spacing: 6); // work-around
307 + parent_window = _parent_window;
308 + margin = 12;
309 +
310
311 diff --git a/app-backup/timeshift/metadata.xml b/app-backup/timeshift/metadata.xml
312 new file mode 100644
313 index 00000000..78eb91da
314 --- /dev/null
315 +++ b/app-backup/timeshift/metadata.xml
316 @@ -0,0 +1,19 @@
317 +<?xml version="1.0" encoding="UTF-8"?>
318 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
319 +<pkgmetadata>
320 + <maintainer type="person">
321 + <email>rossbridger.cc@×××××.com</email>
322 + <name>Ross Charles Campbell</name>
323 + </maintainer>
324 + <upstream>
325 + <remote-id type="github">teejee2008/timeshift</remote-id>
326 + </upstream>
327 + <longdescription lang="en">
328 + Timeshift for Linux is an application that provides functionality similar to
329 + the System Restore feature in Windows and the Time Machine tool in Mac OS.
330 +
331 + Timeshift protects your system by taking incremental snapshots of the file
332 + system at regular intervals. These snapshots can be restored at a later date
333 + to undo all changes to the system.
334 + </longdescription>
335 +</pkgmetadata>
336
337 diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild
338 new file mode 100644
339 index 00000000..b5b563c7
340 --- /dev/null
341 +++ b/app-backup/timeshift/timeshift-20.11.1.ebuild
342 @@ -0,0 +1,44 @@
343 +# Copyright 2019-2021 Gentoo Authors
344 +# Distributed under the terms of the GNU General Public License v2
345 +
346 +EAPI=7
347 +VALA_MIN_API_VERSION="0.40"
348 +inherit vala xdg
349 +
350 +DESCRIPTION="A system restore utility for Linux"
351 +HOMEPAGE="https://github.com/teejee2008/timeshift"
352 +SRC_URI="https://github.com/teejee2008/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
353 +
354 +LICENSE="LGPL-3"
355 +SLOT="0"
356 +KEYWORDS="~amd64 ~x86"
357 +IUSE=""
358 +
359 +PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" )
360 +
361 +DEPEND="
362 + dev-libs/json-glib
363 + dev-libs/libgee
364 + dev-util/desktop-file-utils
365 + net-libs/libsoup
366 + net-misc/rsync
367 + sys-process/cronie
368 + x11-libs/gtk+:3
369 + x11-libs/xapps
370 +"
371 +RDEPEND="${DEPEND}"
372 +BDEPEND="
373 + $(vala_depend)
374 + net-misc/rsync
375 + sys-apps/diffutils
376 + sys-apps/coreutils
377 + sys-fs/btrfs-progs
378 + >=x11-libs/vte-0.60.3[vala]
379 +"
380 +
381 +src_prepare() {
382 +# sed -i -e "s:--thread:& Core/AppExcludeEntry.vala:" "src/makefile"
383 + sed -i -e "s:valac:valac-$(vala_best_api_version):" "src/makefile"
384 + vala_src_prepare
385 + default
386 +}