Gentoo Archives: gentoo-commits

From: "Pascal Jäger" <pascal.jaeger@×××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
Date: Tue, 29 Nov 2022 13:31:15
Message-Id: 1669728484.2f3819234495661e8746bef037fd6aa87b404dbb.pascal.jaeger@gentoo
1 commit: 2f3819234495661e8746bef037fd6aa87b404dbb
2 Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
3 AuthorDate: Tue Nov 29 13:28:04 2022 +0000
4 Commit: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
5 CommitDate: Tue Nov 29 13:28:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f381923
7
8 app-backup/timeshift: use emake -j1
9
10 Closes: https://bugs.gentoo.org/883157
11
12 Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
13
14 app-backup/timeshift/Manifest | 4 ++--
15 .../{timeshift-21.09.1-r2.ebuild => timeshift-21.09.1-r3.ebuild} | 6 +++---
16 .../{timeshift-22.06.5-r1.ebuild => timeshift-22.06.5-r2.ebuild} | 6 +++---
17 .../{timeshift-22.11.1.ebuild => timeshift-22.11.1-r1.ebuild} | 6 +++---
18 4 files changed, 11 insertions(+), 11 deletions(-)
19
20 diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
21 index ad6c06463..0421a4987 100644
22 --- a/app-backup/timeshift/Manifest
23 +++ b/app-backup/timeshift/Manifest
24 @@ -1,3 +1,3 @@
25 DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b
26 -DIST timeshift-22.06.5-r1.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756
27 -DIST timeshift-22.11.1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967
28 +DIST timeshift-22.06.5-r2.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756
29 +DIST timeshift-22.11.1-r1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967
30
31 diff --git a/app-backup/timeshift/timeshift-21.09.1-r2.ebuild b/app-backup/timeshift/timeshift-21.09.1-r3.ebuild
32 similarity index 91%
33 rename from app-backup/timeshift/timeshift-21.09.1-r2.ebuild
34 rename to app-backup/timeshift/timeshift-21.09.1-r3.ebuild
35 index 09ac8c406..fadf5fb1e 100644
36 --- a/app-backup/timeshift/timeshift-21.09.1-r2.ebuild
37 +++ b/app-backup/timeshift/timeshift-21.09.1-r3.ebuild
38 @@ -36,17 +36,17 @@ BDEPEND="
39 src_prepare() {
40 # sed -i -e "s:--thread:& Core/AppExcludeEntry.vala:" "src/makefile"
41 sed -i -e "s:valac:valac-$(vala_best_api_version):" "src/makefile"
42 - vala_src_prepare
43 + vala_setup
44 default
45 }
46
47 src_compile() {
48 tc-export CC
49 - # can't use emake here, fails to compile because some files getting removed
50 + # can't use all jobs here, fails to compile because some files getting removed
51 # during compilation, which are missing afterwards.
52 # https://bugs.gentoo.org/883157
53 # Pascal Jäger <pascal.jaeger@×××××××××.de> (2022-11-26)
54 - make all || die
55 + emake -j1
56 }
57
58 pkg_postinst() {
59
60 diff --git a/app-backup/timeshift/timeshift-22.06.5-r1.ebuild b/app-backup/timeshift/timeshift-22.06.5-r2.ebuild
61 similarity index 93%
62 rename from app-backup/timeshift/timeshift-22.06.5-r1.ebuild
63 rename to app-backup/timeshift/timeshift-22.06.5-r2.ebuild
64 index b4e15c50f..71cc75778 100644
65 --- a/app-backup/timeshift/timeshift-22.06.5-r1.ebuild
66 +++ b/app-backup/timeshift/timeshift-22.06.5-r2.ebuild
67 @@ -48,13 +48,13 @@ src_prepare() {
68 src_compile() {
69 tc-export CC
70 if use gtk; then
71 - # can't use emake here, fails to compile because some files getting removed
72 + # can't use all jobs here, fails to compile because some files getting removed
73 # during compilation, which are missing afterwards.
74 # https://bugs.gentoo.org/883157
75 # Pascal Jäger <pascal.jaeger@×××××××××.de> (2022-11-26)
76 - make all || die
77 + emake -j1
78 else
79 - make app-console || die
80 + emake app-console -j1
81 fi
82 emake manpage
83 }
84
85 diff --git a/app-backup/timeshift/timeshift-22.11.1.ebuild b/app-backup/timeshift/timeshift-22.11.1-r1.ebuild
86 similarity index 93%
87 rename from app-backup/timeshift/timeshift-22.11.1.ebuild
88 rename to app-backup/timeshift/timeshift-22.11.1-r1.ebuild
89 index 710c3f586..d3aa93cf4 100644
90 --- a/app-backup/timeshift/timeshift-22.11.1.ebuild
91 +++ b/app-backup/timeshift/timeshift-22.11.1-r1.ebuild
92 @@ -48,13 +48,13 @@ src_prepare() {
93 src_compile() {
94 tc-export CC
95 if use gtk; then
96 - # can't use emake here, fails to compile because some files getting removed
97 + # can't use all jobs here, fails to compile because some files getting removed
98 # during compilation, which are missing afterwards.
99 # https://bugs.gentoo.org/883157
100 # Pascal Jäger <pascal.jaeger@×××××××××.de> (2022-11-26)
101 - make all || die
102 + emake -j1
103 else
104 - make app-console || die
105 + emake app-console -j1
106 fi
107 emake manpage
108 }