[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: d58bf8c102c94757ac66c05444f52f917a134bd6 Author: Takuya Wakazono gmail com> AuthorDate: Sun Sep 22 08:25:56 2024 + Commit: Takuya Wakazono gmail com> CommitDate: Sun Sep 22 08:25:56 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d58bf8c1 app-backup/timeshift: fix DEPEND Signed-off-by: Takuya Wakazono gmail.com> app-backup/timeshift/timeshift-23.07.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-backup/timeshift/timeshift-23.07.1.ebuild b/app-backup/timeshift/timeshift-23.07.1.ebuild index 17e219177..7732a9f92 100644 --- a/app-backup/timeshift/timeshift-23.07.1.ebuild +++ b/app-backup/timeshift/timeshift-23.07.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ DEPEND=" dev-libs/json-glib x11-libs/vte:2.91[vala] >=dev-libs/libgee-0.18.0:= - >=x11-libs/xapp-1.0.4 + >=x11-libs/xapp-1.0.4[vala(+)] x11-libs/cairo x11-libs/gdk-pixbuf:2 "
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/, app-backup/timeshift/files/
commit: f9e01793429131d49cd6cedacc6299dcaffd0a96 Author: Takuya Wakazono gmail com> AuthorDate: Sun Sep 22 08:25:56 2024 + Commit: Takuya Wakazono gmail com> CommitDate: Sun Sep 22 08:25:56 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f9e01793 app-backup/timeshift: drop 21.09.1-r3, 22.06.5-r2, 22.11.1-r1 Closes: https://bugs.gentoo.org/881801 (obsolete) Signed-off-by: Takuya Wakazono gmail.com> app-backup/timeshift/Manifest | 3 - .../files/timeshift-22.06.1-makefile.patch | 53 -- .../files/timeshift-22.06.5-build-system.patch | 75 --- .../files/timeshift-22.11.1-build-system.patch | 73 --- app-backup/timeshift/timeshift-21.09.1-r3.ebuild | 58 --- app-backup/timeshift/timeshift-22.06.5-r2.ebuild | 84 -- app-backup/timeshift/timeshift-22.11.1-r1.ebuild | 84 -- 7 files changed, 430 deletions(-) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 995af98b7..69e439e7c 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,4 +1 @@ -DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b -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 DIST timeshift-23.07.1.tar.gz 1583725 BLAKE2B 7887f10d69a49231da57499b6287b82698a8d2053d7c18ea29863a48c4a8bf23145fa7dad306088d2e5f0bca840212daf27dc761d652408484bf7ee42fb67c4c SHA512 b5d9adde872f562f2af582e75dcfdee32e8b8d3a7ffc9c9592416d47ee9370603dd2140e9fb3d4970bbf1ddbe87c459c4cb041349a34c14865d38492289828d4 diff --git a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch b/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch deleted file mode 100644 index 3343bc24d..0 --- a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch +++ /dev/null @@ -1,53 +0,0 @@ a/src/makefile -+++ b/src/makefile -@@ -1,6 +1,6 @@ - SHELL=/bin/bash --CFLAGS=--std=c99 --EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac -+CFLAGS += --std=c99 -+EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod $(VALAC) - CHECKEXECS := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),,$(error No $(exec) found, install it))) - - prefix=/usr -@@ -50,8 +50,8 @@ all: app-gtk app-console - app-gtk: - - #timeshift-gtk -- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -- --Xcc="-lm" --Xcc="-O3" ${symbols} \ -+ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ --cc=$(CC) $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ - Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ - -o ${app_name}-gtk \ - --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ -@@ -61,8 +61,8 @@ app-gtk: - app-console: - - #timeshift -- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -- --Xcc="-lm" --Xcc="-O3" ${symbols} \ -+ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ - Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ - -o ${app_name} \ - --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ -@@ -71,7 +71,6 @@ app-console: - - manpage: - ./${app_name} --help > ../man/${app_name}.1 -- gzip -f ../man/${app_name}.1 - - clean: - rm -rfv ../release/{source,i386,amd64,armel,armhf} -@@ -115,7 +114,7 @@ install: - install -m 0644 ../files/${app_name}.json "$(DESTDIR)$(appconfdir)/default.json" - - # man page -- install -m 0644 ../man/${app_name}.1.gz "$(DESTDIR)$(man1dir)/${app_name}.1.gz" -+ install -m 0644 ../man/${app_name}.1 "$(DESTDIR)$(man1dir)/${app_name}.1" - - # app icons - cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/icons" ./share/icons/* --- -2.35.1 - diff --git a/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch b/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch deleted file mode 1006
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/
commit: 10e643c31b2df2c5d9a53068c1f9eba8ec315103 Author: Vitaly Zdanevich ya ru> AuthorDate: Thu Jul 18 17:25:00 2024 + Commit: Vitaly Zdanevich ya ru> CommitDate: Thu Jul 18 17:25:00 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10e643c3 app-backup/timeshift-autosnap: ExcessiveLineLength fix Signed-off-by: Vitaly Zdanevich ya.ru> .../timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild| 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild index 36a6cbead..5f0c5c0f4 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild @@ -17,11 +17,17 @@ RDEPEND="app-backup/timeshift" PATCHES=( "${FILESDIR}/${PN}-remove-arch-specific.patch" ) +bashrc=/etc/portage/bashrc DISABLE_AUTOFORMATTING=1 -DOC_CONTENTS='to run timeshift-autosnap everytime you emerge a package run: -$ touch /etc/portage/bashrc -$ grep -q "#!/bin/" /etc/portage/bashrc || awk -i inplace "BEGINFILE{print "#!/bin/sh"}{print}" /etc/portage/bashrc -$ grep -q timeshift-autosnap /etc/portage/bashrc || echo "function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }" >> /etc/portage/bashrc' +DOC_CONTENTS="to run timeshift-autosnap everytime you emerge a package run: +# touch ${bashrc} + +# grep -q '#!/bin/' ${bashrc} || awk -i inplace 'BEGINFILE{print '#!/bin/sh'}{print}' ${bashrc} + +# grep -q timeshift-autosnap ${bashrc} || echo ' +function pre_pkg_setup() { + /usr/bin/timeshift-autosnap ; +}' >> ${bashrc}" src_install(){ dobin timeshift-autosnap
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/
commit: 5f55e3b882108448ad1d0a2100ebc3535a2a8375 Author: Lucio Sauer posteo net> AuthorDate: Thu Jun 6 12:27:51 2024 + Commit: Lucio Sauer posteo net> CommitDate: Thu Jun 6 12:54:37 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f55e3b8 app-backup/timeshift-autosnap: fix src_unpack phase Remove redundant src_compile Closes: https://bugs.gentoo.org/933685 Signed-off-by: Lucio Sauer posteo.net> app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild index 673c91a9a..4209aebe5 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,15 +27,6 @@ $ touch /etc/portage/bashrc $ grep -q "#!/bin/" /etc/portage/bashrc || awk -i inplace "BEGINFILE{print "#!/bin/sh"}{print}" /etc/portage/bashrc $ grep -q timeshift-autosnap /etc/portage/bashrc || echo "function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }" >> /etc/portage/bashrc' -src_unpack() { - default - mv "${WORKDIR}"/timeshift-autosnap-${PV}* "${WORKDIR}"/timeshift-autosnap-${PV} || die -} - -src_compile(){ - : -} - src_install(){ dobin timeshift-autosnap insinto /etc
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/, app-backup/timeshift-autosnap/files/
commit: 5edf4429c3ac157826349eab9a9333ab67cfa171 Author: Lucio Sauer posteo net> AuthorDate: Thu Jun 6 12:50:55 2024 + Commit: Lucio Sauer posteo net> CommitDate: Thu Jun 6 12:54:40 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5edf4429 app-backup/timeshift-autosnap: Fix dependencies No build-time deps needed Fix patch that erroneously removed optional runtime dep detection altogether Fix runtime deps Signed-off-by: Lucio Sauer posteo.net> .../timeshift-autosnap-remove-arch-specific.patch | 21 + ...-0.9.ebuild => timeshift-autosnap-0.9-r1.ebuild} | 9 +++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch b/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch index a778006bf..127f880bb 100644 --- a/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch +++ b/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch @@ -1,10 +1,23 @@ +Partially backport 0f933eb5966848d96477b5148e40ac1c3e750e22 for distro-agnostic +detection of grub-btrfs snapshot functionality. + +Author: Lucio Sauer --- a/timeshift-autosnap +++ b/timeshift-autosnap -@@ -53,7 +53,7 @@ if $(get_property "deleteSnapshots" "boolean" "true") ; then +@@ -53,8 +53,12 @@ if $(get_property "deleteSnapshots" "boolean" "true") ; then fi fi; -if $(get_property "updateGrub" "boolean" "true") && [ "$(pacman -Qs ^grub-btrfs$)" ]; then -+if $(get_property "updateGrub" "boolean" "true") ; then - grub-mkconfig -o /boot/grub/grub.cfg - fi; +-grub-mkconfig -o /boot/grub/grub.cfg +-fi; +- ++if $(get_property "updateGrub" "boolean" "true") && [ -f /etc/grub.d/41_snapshots-btrfs ]; then ++ . /etc/default/grub-btrfs/config ++ if [ -s "${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub-btrfs.cfg" ]; then ++ /etc/grub.d/41_snapshots-btrfs ++ else ++ ${GRUB_BTRFS_MKCONFIG:-grub-mkconfig} -o ${GRUB_BTRFS_GRUB_DIRNAME:-/boot/grub}/grub.cfg ++ fi ++fi + exit 0 diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild similarity index 88% rename from app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild rename to app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild index 4209aebe5..36a6cbead 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit readme.gentoo-r1 +inherit optfeature readme.gentoo-r1 DESCRIPTION="Automatically creates a timeshift-snapshot when executed" HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"; @@ -13,11 +13,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND=" - app-backup/timeshift - >=sys-apps/portage-2.1 -" -RDEPEND="${DEPEND}" +RDEPEND="app-backup/timeshift" PATCHES=( "${FILESDIR}/${PN}-remove-arch-specific.patch" ) @@ -36,4 +32,5 @@ src_install(){ pkg_postinst() { readme.gentoo_print_elog + optfeature "grub-btrfs snapshot support" app-backup/grub-btrfs }
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/
commit: c0c19bf7dd49589a9955d9904b894528e9677491 Author: Lucio Sauer posteo net> AuthorDate: Wed Jun 5 19:42:34 2024 + Commit: Lucio Sauer posteo net> CommitDate: Thu Jun 6 09:07:23 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c0c19bf7 app-backup/timeshift-autosnap: update malformed variable in SRC_URI Fix BetterCompressionCheck Signed-off-by: Lucio Sauer posteo.net> app-backup/timeshift-autosnap/Manifest | 2 +- app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-backup/timeshift-autosnap/Manifest b/app-backup/timeshift-autosnap/Manifest index 632a41ef2..77fc67a3c 100644 --- a/app-backup/timeshift-autosnap/Manifest +++ b/app-backup/timeshift-autosnap/Manifest @@ -1 +1 @@ -DIST timeshift-autosnap-0.9.tar.gz 2876 BLAKE2B 03063b1cedd18eee56681b9af10954f7c26a0dfdd08eb51ba0dc56c5b86eed1dac3024cd5b790ed2f00f30a9c09988d2c2785dad4041e931e3af2301f7159491 SHA512 15dbe97ef26954c33aa0a9dccb62a93da81b98d7194423111536d5ef7c832b8432c75b58b9edbbfaa669a333692bd71624a221928ca8e186cdf833d7ebd63c9c +DIST timeshift-autosnap-0.9.tar.bz2 2916 BLAKE2B 7489596c3ce65bc1e5efb718118ab6a9b4913a988728c90f15403d72ff015017727a7c61691cad2f430c539f491e930dd035fdd743808caecac3d5db21b8aa7c SHA512 c24ba50ddd2f30ae375a12f485f8e61fdb628bfc4245cb9c1632b786ad4de0655b57c829451b3b093b88f5e2dcbe055131d21c9020491a7931da3b0812277700 diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild index 604b487cd..673c91a9a 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -7,7 +7,7 @@ inherit readme.gentoo-r1 DESCRIPTION="Automatically creates a timeshift-snapshot when executed" HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"; -SRC_URI="https://gitlab.com/gobonja/timeshift-autosnap/-/archive/${PV}/{$P}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://gitlab.com/gobonja/timeshift-autosnap/-/archive/${PV}/${P}.tar.bz2"; LICENSE="MIT" SLOT="0"
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: c02541e7f07bcf3acb8d0caebfe1515f888555a1 Author: Pascal Jäger leimstift de> AuthorDate: Wed Sep 20 11:44:23 2023 + Commit: Pascal Jäger leimstift de> CommitDate: Wed Sep 20 11:44:23 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c02541e7 app-backup/timeshift: add 23.07.1 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 1 + app-backup/timeshift/timeshift-23.07.1.ebuild | 50 +++ 2 files changed, 51 insertions(+) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 0421a49876..995af98b7e 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,3 +1,4 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b 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 +DIST timeshift-23.07.1.tar.gz 1583725 BLAKE2B 7887f10d69a49231da57499b6287b82698a8d2053d7c18ea29863a48c4a8bf23145fa7dad306088d2e5f0bca840212daf27dc761d652408484bf7ee42fb67c4c SHA512 b5d9adde872f562f2af582e75dcfdee32e8b8d3a7ffc9c9592416d47ee9370603dd2140e9fb3d4970bbf1ddbe87c459c4cb041349a34c14865d38492289828d4 diff --git a/app-backup/timeshift/timeshift-23.07.1.ebuild b/app-backup/timeshift/timeshift-23.07.1.ebuild new file mode 100644 index 00..60904aa188 --- /dev/null +++ b/app-backup/timeshift/timeshift-23.07.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature meson vala xdg + +DESCRIPTION="A system restore utility for Linux" +HOMEPAGE="https://github.com/linuxmint/timeshift"; +SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gobject-introspection + x11-libs/gtk+:3 + dev-libs/json-glib + x11-libs/vte:2.91[vala] + >=dev-libs/libgee-0.18.0:= + >=x11-libs/xapp-1.0.4 + x11-libs/cairo + x11-libs/gdk-pixbuf:2 +" +RDEPEND="${DEPEND} + virtual/cron +" +BDEPEND=" + $(vala_depend) + virtual/pkgconfig + sys-apps/help2man +" + +src_prepare() { + default + vala_setup +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "btrfs support" sys-fs/btrfs-progs + optfeature "rsync support" net-misc/rsync +} + +pkg_postrm() { + xdg_pkg_postrm +}
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: 2f3819234495661e8746bef037fd6aa87b404dbb Author: Pascal Jäger leimstift de> AuthorDate: Tue Nov 29 13:28:04 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Tue Nov 29 13:28:04 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f381923 app-backup/timeshift: use emake -j1 Closes: https://bugs.gentoo.org/883157 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 4 ++-- .../{timeshift-21.09.1-r2.ebuild => timeshift-21.09.1-r3.ebuild}| 6 +++--- .../{timeshift-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(-) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index ad6c06463..0421a4987 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 09ac8c406..fadf5fb1e 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 b4e15c50f..71cc75778 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 710c3f586..d3aa93cf4 100644 --- a/app-backup/timeshift/times
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: a95694c9b5830545df309caa0681392dc9e772b7 Author: Pascal Jäger leimstift de> AuthorDate: Sat Nov 26 15:05:28 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Sat Nov 26 15:18:06 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a95694c9 app-backup/timeshift: drop 22.06.1-r1 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest| 1 - app-backup/timeshift/timeshift-22.06.1-r1.ebuild | 61 2 files changed, 62 deletions(-) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 5e2e02cb9..3662b0f5c 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,4 +1,3 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b -DIST timeshift-22.06.1-r1.tar.gz 1429399 BLAKE2B 90dcfa50bccedcca07044b6e42cb41773aa9d53f42855e3bfdb28140b8fd4359283225928e1c598116feab301baa6b42aebade2bb4f107eed1d82412d52a9639 SHA512 eb245c358ff2ba8e3b3c367dd0ebe69a3b450ca7bd31f5bd2fd9d5b2281f39ce90e3086c1649f73a8b240c7a05cd308534abc88085653d5bc7b244ba2d9a2ef7 DIST timeshift-22.06.5.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756 DIST timeshift-22.11.1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967 diff --git a/app-backup/timeshift/timeshift-22.06.1-r1.ebuild b/app-backup/timeshift/timeshift-22.06.1-r1.ebuild deleted file mode 100644 index 5bcd648db..0 --- a/app-backup/timeshift/timeshift-22.06.1-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature toolchain-funcs vala xdg - -DESCRIPTION="A system restore utility for Linux" -HOMEPAGE="https://github.com/linuxmint/timeshift"; -SRC_URI="https://github.com/linuxmint/${PN}/archive/v${PV}.tar.gz -> ${PF}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-libs/atk - dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:= - net-libs/libsoup:2.4 - media-libs/harfbuzz:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - x11-libs/xapp - x11-libs/vte:2.91[vala] -" -RDEPEND="${DEPEND} - net-misc/rsync - virtual/cron -" -BDEPEND=" - $(vala_depend) - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) - -src_prepare() { - default - vala_setup -} - -src_compile() { - tc-export CC - emake all - emake manpage -} - -src_install() { - emake prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}" - einstalldocs -} - -pkg_postinst() { - optfeature "btrfs support" sys-fs/btrfs-progs -}
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: 707031ef7c74098969e56df60ca56f23547fee1a Author: Pascal Jäger leimstift de> AuthorDate: Sat Nov 26 15:08:28 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Sat Nov 26 15:18:06 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=707031ef app-backup/timeshift-22.06.5: revbump, use make instead of emake - update xdg icon cache after install Closes: https://bugs.gentoo.org/849626 Closes: https://bugs.gentoo.org/849629 Bug: https://bugs.gentoo.org/883157 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 2 +- ...timeshift-22.06.5.ebuild => timeshift-22.06.5-r1.ebuild} | 13 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 3662b0f5c..ad6c06463 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.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756 +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 diff --git a/app-backup/timeshift/timeshift-22.06.5.ebuild b/app-backup/timeshift/timeshift-22.06.5-r1.ebuild similarity index 81% rename from app-backup/timeshift/timeshift-22.06.5.ebuild rename to app-backup/timeshift/timeshift-22.06.5-r1.ebuild index 4055bcb37..b4e15c50f 100644 --- a/app-backup/timeshift/timeshift-22.06.5.ebuild +++ b/app-backup/timeshift/timeshift-22.06.5-r1.ebuild @@ -48,9 +48,13 @@ src_prepare() { src_compile() { tc-export CC if use gtk; then - emake all + # can't use emake 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 else - emake app-console + make app-console || die fi emake manpage } @@ -65,6 +69,7 @@ src_install() { } pkg_postinst() { + xdg_pkg_postinst if ! use gtk; then elog "" elog "Installed timeshift without gtk GUI." @@ -73,3 +78,7 @@ pkg_postinst() { fi optfeature "btrfs support" sys-fs/btrfs-progs } + +pkg_postrm() { + xdg_pkg_postrm +}
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: 2ce474cacfcfcf2e0d3ba724f28c6b5872244f21 Author: Pascal Jäger leimstift de> AuthorDate: Sat Nov 26 15:15:37 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Sat Nov 26 15:18:06 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ce474ca app-backup/timeshift-21.09.1: revbump, use make instead of emake - update xdg icon cache after install Bug: https://bugs.gentoo.org/849626 Bug: https://bugs.gentoo.org/849629 Bug: https://bugs.gentoo.org/883157 Signed-off-by: Pascal Jäger leimstift.de> 09.1-r1.ebuild => timeshift-21.09.1-r2.ebuild} | 23 +++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app-backup/timeshift/timeshift-21.09.1-r1.ebuild b/app-backup/timeshift/timeshift-21.09.1-r2.ebuild similarity index 65% rename from app-backup/timeshift/timeshift-21.09.1-r1.ebuild rename to app-backup/timeshift/timeshift-21.09.1-r2.ebuild index 97f794686..09ac8c406 100644 --- a/app-backup/timeshift/timeshift-21.09.1-r1.ebuild +++ b/app-backup/timeshift/timeshift-21.09.1-r2.ebuild @@ -1,9 +1,8 @@ # Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VALA_MIN_API_VERSION="0.44" -inherit vala xdg +EAPI=8 +inherit optfeature toolchain-funcs vala xdg DESCRIPTION="A system restore utility for Linux" HOMEPAGE="https://github.com/teejee2008/timeshift"; @@ -40,3 +39,21 @@ src_prepare() { vala_src_prepare default } + +src_compile() { + tc-export CC + # can't use emake 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 +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "btrfs support" sys-fs/btrfs-progs +} + +pkg_postrm() { + xdg_pkg_postrm +}
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/files/, app-backup/timeshift/
commit: 5f15680bc05095a7aa15413a294402ed4c62df78 Author: Pascal Jäger leimstift de> AuthorDate: Sat Nov 26 15:03:39 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Sat Nov 26 15:18:05 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5f15680b app-backup/timeshift: add 22.11.1 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 1 + .../files/timeshift-22.11.1-build-system.patch | 73 +++ app-backup/timeshift/timeshift-22.11.1.ebuild | 84 ++ 3 files changed, 158 insertions(+) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 0e051a4ab..5e2e02cb9 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,3 +1,4 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b DIST timeshift-22.06.1-r1.tar.gz 1429399 BLAKE2B 90dcfa50bccedcca07044b6e42cb41773aa9d53f42855e3bfdb28140b8fd4359283225928e1c598116feab301baa6b42aebade2bb4f107eed1d82412d52a9639 SHA512 eb245c358ff2ba8e3b3c367dd0ebe69a3b450ca7bd31f5bd2fd9d5b2281f39ce90e3086c1649f73a8b240c7a05cd308534abc88085653d5bc7b244ba2d9a2ef7 DIST timeshift-22.06.5.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756 +DIST timeshift-22.11.1.tar.gz 1490993 BLAKE2B ddee86cada8cb9982725c754977f96d260b161a15a12086fcd325d9da9789b6600a3d99d44d8c6fbe60ed39187c93f3bfde62dc889c2217219a44121d831f58f SHA512 cd5226e2400743ce0c1da077103caeb61f320c73e5fb409f57c0f10bba5c06893bcc0e5e588fb03b397ffbd76bb43498f18e70e5964947ad950d4edfe1dd6967 diff --git a/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch b/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch new file mode 100644 index 0..cac54b288 --- /dev/null +++ b/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch @@ -0,0 +1,73 @@ +diff --git a/src/makefile b/src/makefile +index 0f61c35..add4dc2 100644 +--- a/src/makefile b/src/makefile +@@ -1,8 +1,11 @@ + SHELL=/bin/bash +-CFLAGS=--std=c99 +-EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac ++CFLAGS+= --std=c99 ++EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod $(VALAC) + CHECKEXECS := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),,$(error No $(exec) found, install it))) + ++INSTALL_GTK ?= true ++INSTALL_CONSOLE ?= true ++ + prefix=/usr + sysconfdir=/etc + appconfdir=$(sysconfdir)/timeshift +@@ -50,8 +53,8 @@ all: app-gtk app-console + app-gtk: + + #timeshift-gtk +- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" --Xcc="-Os" ${symbols} \ ++ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ ++ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ + Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ + -o ${app_name}-gtk \ + --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ +@@ -61,8 +64,8 @@ app-gtk: + app-console: + + #timeshift +- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" --Xcc="-Os" ${symbols} \ ++ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ ++ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ + Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ + -o ${app_name} \ + --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ +@@ -71,7 +74,6 @@ app-console: + + manpage: + ./${app_name} --help > ../man/${app_name}.1 +- gzip -f ../man/${app_name}.1 + + clean: + rm -rfv ../release/{source,i386,amd64,armel,armhf} +@@ -96,10 +98,12 @@ install: + + # binary + install -m 0755 ${app_name} "$(DESTDIR)$(bindir)" +- install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)" ++ @if test "$(INSTALL_GTK)" = true; then \ ++ install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)"; \ ++ install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)"; \ ++ fi + #install -m 0755 ${app_name}-uninstall "$(DESTDIR)$(bindir)" +- install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)" +- ++ + # shared files + cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/* + find $(DESTDIR)$(sharedir)/${app_name} -type d -exec chmod 755 {} \+ +@@ -115,7 +119,7 @@ install: + install -m 0644 ../files/
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/, app-backup/timeshift/files/
commit: 3570dabdbd5bd7ae274bce0734724de758930453 Author: Pascal Jäger leimstift de> AuthorDate: Thu Oct 13 09:20:57 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Thu Oct 13 09:21:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3570dabd app-backup/timeshift: version bump to 22.06.5 added IUSE="gtk" and patched make-file. Without USE="gtk" only console app is built and installed. Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 1 + .../files/timeshift-22.06.5-build-system.patch | 75 ++ app-backup/timeshift/timeshift-22.06.5.ebuild | 75 ++ 3 files changed, 151 insertions(+) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index b883bc2eb..0e051a4ab 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1,2 +1,3 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b DIST timeshift-22.06.1-r1.tar.gz 1429399 BLAKE2B 90dcfa50bccedcca07044b6e42cb41773aa9d53f42855e3bfdb28140b8fd4359283225928e1c598116feab301baa6b42aebade2bb4f107eed1d82412d52a9639 SHA512 eb245c358ff2ba8e3b3c367dd0ebe69a3b450ca7bd31f5bd2fd9d5b2281f39ce90e3086c1649f73a8b240c7a05cd308534abc88085653d5bc7b244ba2d9a2ef7 +DIST timeshift-22.06.5.tar.gz 1494015 BLAKE2B 915bfabf78a6ad8b7212dc1c47b9a31467a3f38b7890e5a958d007e2ac8e5b6f226cffe693bc618fce56fb2dbbb951df1bd4e988052320b1dd98bb1953ce85c7 SHA512 6a24b7164f522e443bd1cc0646b867eeebf7ecb4bfb2948701a7b72571bd1f83fc8f372d82b7422ed86fd246291b76cf7061e347dc61132cc809163cd38e7756 diff --git a/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch b/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch new file mode 100644 index 0..14ae2ea3b --- /dev/null +++ b/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch @@ -0,0 +1,75 @@ +diff --git a/src/makefile b/src/makefile +index 5a35a7a..985b16f 100644 +--- a/src/makefile b/src/makefile +@@ -1,8 +1,11 @@ + SHELL=/bin/bash +-CFLAGS=--std=c99 +-EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac ++CFLAGS+= --std=c99 ++EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod $(VALAC) + CHECKEXECS := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),,$(error No $(exec) found, install it))) + ++INSTALL_GTK ?= true ++INSTALL_CONSOLE ?= true ++ + prefix=/usr + sysconfdir=/etc + appconfdir=$(sysconfdir)/timeshift +@@ -50,8 +53,8 @@ all: app-gtk app-console + app-gtk: + + #timeshift-gtk +- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" --Xcc="-O3" ${symbols} \ ++ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ ++ --cc=$(CC) $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ + Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ + -o ${app_name}-gtk \ + --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ +@@ -61,8 +64,8 @@ app-gtk: + app-console: + + #timeshift +- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ +- --Xcc="-lm" --Xcc="-O3" ${symbols} \ ++ $(VALAC) -v -X -D'GETTEXT_PACKAGE="${app_name}"' \ ++ --cc="$(CC)" $(foreach flag, $(CFLAGS) $(LDFLAGS), -X $(flag)) --Xcc="-lm" ${symbols} \ + Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ + -o ${app_name} \ + --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ +@@ -71,7 +74,6 @@ app-console: + + manpage: + ./${app_name} --help > ../man/${app_name}.1 +- gzip -f ../man/${app_name}.1 + + clean: + rm -rfv ../release/{source,i386,amd64,armel,armhf} +@@ -95,11 +97,13 @@ install: + mkdir -p "$(DESTDIR)$(sharedir)/pixmaps" + + # binary +- install -m 0755 ${app_name} "$(DESTDIR)$(bindir)" +- install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)" ++ install -m 0755 ${app_name} "$(DESTDIR)$(bindir)" ++ @if test "$(INSTALL_GTK)" = true; then \ ++ install -m 0755 ${app_name}-gtk "$(DESTDIR)$(bindir)"; \ ++ install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)"; \ ++ fi + #install -m 0755 ${app_name}-uninstall "$(DESTDIR)$(bindir)" +- install -m 0755 ${app_name}-launcher "$(DESTDIR)$(bindir)" +- ++ + # shared files + cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/* + find $(DESTDIR)$(sharedir)/${app_name} -type d -exec chmod 755 {} \+ +@@ -115,7 +119,7 @@ install: + install -m 0644 ../files/${app_name}.json "$(DESTDIR)$(appconfdir)/default.json" + + # man page +-
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: 135dacff6536a7e81caddccdf194f61b1b52d083 Author: Pascal Jäger leimstift de> AuthorDate: Sat May 28 14:45:36 2022 + Commit: Pascal Jäger leimstift de> CommitDate: Sat May 28 15:50:36 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=135dacff app-backup/timeshift: add 22.06.1 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 1 + app-backup/timeshift/timeshift-22.06.1.ebuild | 42 +++ 2 files changed, 43 insertions(+) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index 82532a5c6..ff7788dd3 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1 +1,2 @@ DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b +DIST timeshift-22.06.1.tar.gz 1425559 BLAKE2B 78cf47f65b0bda6bb9bbdb8e3abe250b3b8b4d1c5e651a7b40d8c1d5eab4802930a97520721616eda44f2dbe8a7f06bde097d0ffe24c3a251ddef78b04b8c0d5 SHA512 ee35d7270e7625ae51398392c24aa80b85494c524bb12de4b6c0d5e5ee47d496031feb058fbd6905360b40d63d1088d48faebccabac04020f226b5d05608a9a7 diff --git a/app-backup/timeshift/timeshift-22.06.1.ebuild b/app-backup/timeshift/timeshift-22.06.1.ebuild new file mode 100644 index 0..97f794686 --- /dev/null +++ b/app-backup/timeshift/timeshift-22.06.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_MIN_API_VERSION="0.44" +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="" + +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/xapp +" +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 +}
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/
commit: 10eccecfd100f87131399a2e615856e07a8fd14f Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Nov 3 11:27:07 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Nov 3 11:28:00 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10eccecf app-backup/timeshift-autosnap: quote unqouted variable, and || die Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild index 2ead2e4c1..604b487cd 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -29,7 +29,7 @@ $ grep -q timeshift-autosnap /etc/portage/bashrc || echo "function pre_pkg_setup src_unpack() { default - mv ${WORKDIR}/timeshift-autosnap-${PV}* ${WORKDIR}/timeshift-autosnap-${PV} + mv "${WORKDIR}"/timeshift-autosnap-${PV}* "${WORKDIR}"/timeshift-autosnap-${PV} || die } src_compile(){
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/files/, app-backup/timeshift/
commit: 77750b4a40fa93b7db7fb576e4fbc26545e3c41b Author: Pascal Jäger leimstift de> AuthorDate: Thu Oct 7 20:46:57 2021 + Commit: Pascal Jäger leimstift de> CommitDate: Thu Oct 7 20:53:47 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77750b4a app-backup/timeshift: bump to 21.09.1 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/Manifest | 2 +- .../timeshift-20.11.1-fix-util-linux-update.patch | 15 -- .../files/timeshift-20.11.1-fix-xapp-2.0.patch | 275 - ...ift-20.11.1.ebuild => timeshift-21.09.1.ebuild} | 2 +- 4 files changed, 2 insertions(+), 292 deletions(-) diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index d059f3dd8..82532a5c6 100644 --- a/app-backup/timeshift/Manifest +++ b/app-backup/timeshift/Manifest @@ -1 +1 @@ -DIST timeshift-20.11.1.tar.gz 1401165 BLAKE2B dd51a352d030a2fb8fff2d430365d18f9dcf45c3ebdc3e367849c37b98140da7618426ecd9c268a87e3cd916822446fed861305c99a7b760539f32dd6be9402f SHA512 f16de664a052e15a60da5efdc925097cd09081f9a9983ef1e092674a3fee14681271d2053a04250736a4e33d4a65d30ce5a9454b45a96f0dd05d38465f967862 +DIST timeshift-21.09.1.tar.gz 1401994 BLAKE2B 5b1b3650fadb02745150d8996b46b53be473c66c73d4f5209c4f8634f58c4019905524516089b9f2a77b3bf1dcc49ee4db5ac9cbd2c1419683ead01e2e36b4e7 SHA512 0e79b41861c1eb041e0592508636f87f77ca240001b238e9e70239898d9a66bcf367380e830682fb8671ade7c1cbdb10ca8c89585f2cb30de35c7480a0fa792b diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch deleted file mode 100644 index 0206b9096..0 --- a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch +++ /dev/null @@ -1,15 +0,0 @@ a/src/Utility/Device.vala -+++ b/src/Utility/Device.vala -@@ -428,10 +428,10 @@ public class Device : GLib.Object{ - - try{ - if (lsblk_is_ancient){ -- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)); -+ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)); - } - else{ -- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)); -+ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)); - } - - if (rex.match (line, 0, out match)){ 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 deleted file mode 100644 index 4cfa91f6b..0 --- a/app-backup/timeshift/files/timeshift-20.11.1-fix-xapp-2.0.patch +++ /dev/null @@ -1,275 +0,0 @@ -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;
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: 3ec4a8dc10d2c6b7ef5ccb2994bdd825b5d79c9c Author: Pascal Jäger leimstift de> AuthorDate: Thu Oct 7 20:51:38 2021 + Commit: Pascal Jäger leimstift de> CommitDate: Thu Oct 7 20:53:47 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3ec4a8dc app-backup/timeshift: Bump to new vesion 21.09.1 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift/timeshift-21.09.1.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-backup/timeshift/timeshift-21.09.1.ebuild b/app-backup/timeshift/timeshift-21.09.1.ebuild index 867c24750..582a26daf 100644 --- a/app-backup/timeshift/timeshift-21.09.1.ebuild +++ b/app-backup/timeshift/timeshift-21.09.1.ebuild @@ -14,8 +14,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -#PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" ) - DEPEND=" dev-libs/json-glib dev-libs/libgee
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/
commit: 2779cde02fa82e5138ce9b3ebcc9d7bc9668c077 Author: Pascal Jäger leimstift de> AuthorDate: Tue Oct 5 19:20:20 2021 + Commit: Pascal Jäger leimstift de> CommitDate: Tue Oct 5 19:24:24 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2779cde0 app-backup/timeshift-autosnap: changed massage to the user from echo to elog Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild index 00aa5efc9..a2c30bdb7 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -37,7 +37,7 @@ src_install(){ } pkg_postinst() { - echo "to run timeshift-autosnap everytime you emerge a package run: + elog "to run timeshift-autosnap everytime you emerge a package run: 'touch /etc/portage/bashrc' 'grep -q '#!/bin/' /etc/portage/bashrc || awk -i inplace 'BEGINFILE{print "#!/bin/sh"}{print}' /etc/portage/bashrc 'grep -q 'timeshift-autosnap' /etc/portage/bashrc || echo 'function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }' >> /etc/portage/bashrc'"
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/
commit: be32350c37465d1c618a0acdee200cbe950e5ad9 Author: Pascal Jäger leimstift de> AuthorDate: Mon Oct 4 19:53:54 2021 + Commit: Pascal Jäger leimstift de> CommitDate: Mon Oct 4 20:01:56 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be32350c app-backup/timeshift-autosnap: changed postinst to a massage to the user Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild index 2f2de478e..00aa5efc9 100644 --- a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -3,7 +3,7 @@ EAPI=8 -DESCRIPTION="Automatically creats a snapshot everytime before portage installs a package" +DESCRIPTION="Automatically creates a timeshift-snapshot when executed" HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"; SRC_URI="https://gitlab.com/gobonja/timeshift-autosnap/-/archive/${PV}/{$P}.tar.gz -> ${P}.tar.gz" @@ -37,7 +37,8 @@ src_install(){ } pkg_postinst() { - touch /etc/portage/bashrc -grep -q '#!/bin/' /etc/portage/bashrc || awk -i inplace 'BEGINFILE{print "#!/bin/sh"}{print}' /etc/portage/bashrc -grep -q 'timeshift-autosnap' /etc/portage/bashrc || echo 'function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }' >> /etc/portage/bashrc + echo "to run timeshift-autosnap everytime you emerge a package run: +'touch /etc/portage/bashrc' +'grep -q '#!/bin/' /etc/portage/bashrc || awk -i inplace 'BEGINFILE{print "#!/bin/sh"}{print}' /etc/portage/bashrc +'grep -q 'timeshift-autosnap' /etc/portage/bashrc || echo 'function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }' >> /etc/portage/bashrc'" }
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift-autosnap/, app-backup/timeshift-autosnap/files/
commit: 3d12ed1eefcd3243728d7ad24b4b3f4a6d6c1266 Author: Pascal Jäger leimstift de> AuthorDate: Sun Oct 3 20:16:19 2021 + Commit: Pascal Jäger leimstift de> CommitDate: Sun Oct 3 20:16:19 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3d12ed1e app-backup/timeshift-autosnap: new package Automatically make timeshift snapshots every time emerge installs a package Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> app-backup/timeshift-autosnap/Manifest | 1 + .../timeshift-autosnap-remove-arch-specific.patch | 10 + app-backup/timeshift-autosnap/metadata.xml | 17 + .../timeshift-autosnap-0.9.ebuild | 43 ++ 4 files changed, 71 insertions(+) diff --git a/app-backup/timeshift-autosnap/Manifest b/app-backup/timeshift-autosnap/Manifest new file mode 100644 index 0..632a41ef2 --- /dev/null +++ b/app-backup/timeshift-autosnap/Manifest @@ -0,0 +1 @@ +DIST timeshift-autosnap-0.9.tar.gz 2876 BLAKE2B 03063b1cedd18eee56681b9af10954f7c26a0dfdd08eb51ba0dc56c5b86eed1dac3024cd5b790ed2f00f30a9c09988d2c2785dad4041e931e3af2301f7159491 SHA512 15dbe97ef26954c33aa0a9dccb62a93da81b98d7194423111536d5ef7c832b8432c75b58b9edbbfaa669a333692bd71624a221928ca8e186cdf833d7ebd63c9c diff --git a/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch b/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch new file mode 100644 index 0..a778006bf --- /dev/null +++ b/app-backup/timeshift-autosnap/files/timeshift-autosnap-remove-arch-specific.patch @@ -0,0 +1,10 @@ +--- a/timeshift-autosnap b/timeshift-autosnap +@@ -53,7 +53,7 @@ if $(get_property "deleteSnapshots" "boolean" "true") ; then + fi + fi; + +-if $(get_property "updateGrub" "boolean" "true") && [ "$(pacman -Qs ^grub-btrfs$)" ]; then ++if $(get_property "updateGrub" "boolean" "true") ; then + grub-mkconfig -o /boot/grub/grub.cfg + fi; diff --git a/app-backup/timeshift-autosnap/metadata.xml b/app-backup/timeshift-autosnap/metadata.xml new file mode 100644 index 0..bccd8dadb --- /dev/null +++ b/app-backup/timeshift-autosnap/metadata.xml @@ -0,0 +1,17 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + pascal.jae...@leimstift.de + Pascal Jäger + + + Antynea/grub-btrfs + + + Improves Grub by adding "btrfs snapshots" to the Grub menu. + + You can boot your system on a "snapshot" from the Grub menu. + Supports manual snapshots, snapper, timeshift ... + + diff --git a/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild new file mode 100644 index 0..2f2de478e --- /dev/null +++ b/app-backup/timeshift-autosnap/timeshift-autosnap-0.9.ebuild @@ -0,0 +1,43 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Automatically creats a snapshot everytime before portage installs a package" +HOMEPAGE="https://gitlab.com/gobonja/timeshift-autosnap"; +SRC_URI="https://gitlab.com/gobonja/timeshift-autosnap/-/archive/${PV}/{$P}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" +app-backup/timeshift +>=sys-apps/portage-2.1 +" +RDEPEND="${DEPEND}" +BDEPEND="" + +PATCHES=( "${FILESDIR}/${PN}-remove-arch-specific.patch" ) + +src_unpack() { +default + mv ${WORKDIR}/timeshift-autosnap-${PV}* ${WORKDIR}/timeshift-autosnap-${PV} +} + +src_compile(){ + true +} + +src_install(){ + dobin timeshift-autosnap + insinto /etc + doins timeshift-autosnap.conf +} + +pkg_postinst() { + touch /etc/portage/bashrc +grep -q '#!/bin/' /etc/portage/bashrc || awk -i inplace 'BEGINFILE{print "#!/bin/sh"}{print}' /etc/portage/bashrc +grep -q 'timeshift-autosnap' /etc/portage/bashrc || echo 'function pre_pkg_setup() { /usr/bin/timeshift-autosnap ; }' >> /etc/portage/bashrc +}
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/files/, app-backup/timeshift/
commit: 954ab4ad5ccb7f579176d22066f5a540d0059f05 Author: Pascal Jäger leimstift de> AuthorDate: Thu Sep 30 18:44:53 2021 + Commit: Pascal Jäger leimstift de> CommitDate: Thu Sep 30 18:51:15 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=954ab4ad app-backup/timeshift: fixed https://bugs.gentoo.org/794637 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Pascal Jäger leimstift.de> .../files/timeshift-20.11.1-fix-util-linux-update.patch | 15 +++ app-backup/timeshift/timeshift-20.11.1.ebuild | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch new file mode 100644 index 0..0206b9096 --- /dev/null +++ b/app-backup/timeshift/files/timeshift-20.11.1-fix-util-linux-update.patch @@ -0,0 +1,15 @@ +--- a/src/Utility/Device.vala b/src/Utility/Device.vala +@@ -428,10 +428,10 @@ public class Device : GLib.Object{ + + try{ + if (lsblk_is_ancient){ +- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ:MIN="([0-9:]+)); ++ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" RM="([0-9]+)" MAJ[_:]MIN="([0-9:]+)); + } + else{ +- rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ:MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)); ++ rex = new Regex("""NAME="(.*)" KNAME="(.*)" LABEL="(.*)" UUID="(.*)" TYPE="(.*)" FSTYPE="(.*)" SIZE="(.*)" MOUNTPOINT="(.*)" MODEL="(.*)" RO="([0-9]+)" HOTPLUG="([0-9]+)" MAJ[_:]MIN="([0-9:]+)" PARTLABEL="(.*)" PARTUUID="(.*)" PKNAME="(.*)" VENDOR="(.*)" SERIAL="(.*)" REV="(.*)); + } + + if (rex.match (line, 0, out match)){ diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild index 4e65c8893..5d88a64b2 100644 --- a/app-backup/timeshift/timeshift-20.11.1.ebuild +++ b/app-backup/timeshift/timeshift-20.11.1.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" ) +PATCHES=( "${FILESDIR}/${P}-fix-xapp-2.0.patch" "${FILESDIR}/${P}-fix-util-linux-update.patch" ) DEPEND=" dev-libs/json-glib
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/
commit: fc946b8bd8a64c098eec2f468de3453912cca196 Author: Andrew Ammerlaan riseup net> AuthorDate: Tue May 4 08:36:50 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Tue May 4 08:36:50 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fc946b8b app-backup/timeshift: bump min vala version Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan riseup.net> app-backup/timeshift/timeshift-20.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-backup/timeshift/timeshift-20.11.1.ebuild b/app-backup/timeshift/timeshift-20.11.1.ebuild index b5b563c73..4e65c8893 100644 --- a/app-backup/timeshift/timeshift-20.11.1.ebuild +++ b/app-backup/timeshift/timeshift-20.11.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -VALA_MIN_API_VERSION="0.40" +VALA_MIN_API_VERSION="0.44" inherit vala xdg DESCRIPTION="A system restore utility for Linux"
[gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/files/, app-backup/timeshift/
commit: fd07a5e2e3e735d74d182c3fd614ca72c4db5891 Author: Ross Charles Campbell gmail com> AuthorDate: Mon Feb 8 00:51:15 2021 + Commit: Ross Charles Campbell gmail com> CommitDate: Mon Feb 8 00:52:55 2021 + 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 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 ..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 ..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/D