From 2f3819234495661e8746bef037fd6aa87b404dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20J=C3=A4ger?= Date: Tue, 29 Nov 2022 14:28:04 +0100 Subject: [PATCH] app-backup/timeshift: use emake -j1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/883157 Signed-off-by: Pascal Jäger --- app-backup/timeshift/Manifest | 4 ++-- ...eshift-21.09.1-r2.ebuild => timeshift-21.09.1-r3.ebuild} | 6 +++--- ...eshift-22.06.5-r1.ebuild => timeshift-22.06.5-r2.ebuild} | 6 +++--- ...timeshift-22.11.1.ebuild => timeshift-22.11.1-r1.ebuild} | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename app-backup/timeshift/{timeshift-21.09.1-r2.ebuild => timeshift-21.09.1-r3.ebuild} (91%) rename app-backup/timeshift/{timeshift-22.06.5-r1.ebuild => timeshift-22.06.5-r2.ebuild} (93%) rename app-backup/timeshift/{timeshift-22.11.1.ebuild => timeshift-22.11.1-r1.ebuild} (93%) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index ad6c06463a..0421a49876 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,3 +1,3 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b -DIST timeshift-22.06.5-r1.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756 -DIST timeshift-22.11.1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967 +DIST timeshift-22.06.5-r2.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756 +DIST timeshift-22.11.1-r1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967 diff --git a/app-backup/timeshift/timeshift-21.09.1-r2.ebuild b/app-backup/timeshift/timeshift-21.09.1-r3.ebuild similarity index 91% rename from app-backup/timeshift/timeshift-21.09.1-r2.ebuild rename to app-backup/timeshift/timeshift-21.09.1-r3.ebuild index 09ac8c4069..fadf5fb1e7 100644 --- a/app-backup/timeshift/timeshift-21.09.1-r2.ebuild +++ b/app-backup/timeshift/timeshift-21.09.1-r3.ebuild @@ -36,17 +36,17 @@ BDEPEND=" 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 + vala_setup default } src_compile() { tc-export CC - # can't use emake here, fails to compile because some files getting removed + # can't use all jobs here, fails to compile because some files getting removed # during compilation, which are missing afterwards. # https://bugs.gentoo.org/883157 # Pascal Jäger (2022-11-26) - make all || die + emake -j1 } pkg_postinst() { diff --git a/app-backup/timeshift/timeshift-22.06.5-r1.ebuild b/app-backup/timeshift/timeshift-22.06.5-r2.ebuild similarity index 93% rename from app-backup/timeshift/timeshift-22.06.5-r1.ebuild rename to app-backup/timeshift/timeshift-22.06.5-r2.ebuild index b4e15c50fe..71cc75778d 100644 --- a/app-backup/timeshift/timeshift-22.06.5-r1.ebuild +++ b/app-backup/timeshift/timeshift-22.06.5-r2.ebuild @@ -48,13 +48,13 @@ src_prepare() { src_compile() { tc-export CC if use gtk; then - # can't use emake here, fails to compile because some files getting removed + # can't use all jobs here, fails to compile because some files getting removed # during compilation, which are missing afterwards. # https://bugs.gentoo.org/883157 # Pascal Jäger (2022-11-26) - make all || die + emake -j1 else - make app-console || die + emake app-console -j1 fi emake manpage } diff --git a/app-backup/timeshift/timeshift-22.11.1.ebuild b/app-backup/timeshift/timeshift-22.11.1-r1.ebuild similarity index 93% rename from app-backup/timeshift/timeshift-22.11.1.ebuild rename to app-backup/timeshift/timeshift-22.11.1-r1.ebuild index 710c3f586d..d3aa93cf46 100644 --- a/app-backup/timeshift/timeshift-22.11.1.ebuild +++ b/app-backup/timeshift/timeshift-22.11.1-r1.ebuild @@ -48,13 +48,13 @@ src_prepare() { src_compile() { tc-export CC if use gtk; then - # can't use emake here, fails to compile because some files getting removed + # can't use all jobs here, fails to compile because some files getting removed # during compilation, which are missing afterwards. # https://bugs.gentoo.org/883157 # Pascal Jäger (2022-11-26) - make all || die + emake -j1 else - make app-console || die + emake app-console -j1 fi emake manpage }