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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/, app-backup/timeshift/files/
@ 2022-06-02  9:20 Anna Vyalkova
  0 siblings, 0 replies; 3+ messages in thread
From: Anna Vyalkova @ 2022-06-02  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     1cbdb3e1b18f0ecf513ab90433a32eb0f2d4689b
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Jun  2 08:39:28 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Jun  2 09:20:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1cbdb3e1

app-backup/timeshift: fix deps

Closes: https://bugs.gentoo.org/780606
Closes: https://bugs.gentoo.org/780603
Closes: https://bugs.gentoo.org/784788
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-backup/timeshift/Manifest                      |  2 +-
 .../files/timeshift-22.06.1-makefile.patch         | 53 +++++++++++++++++++
 app-backup/timeshift/metadata.xml                  |  2 +-
 app-backup/timeshift/timeshift-22.06.1-r1.ebuild   | 61 ++++++++++++++++++++++
 app-backup/timeshift/timeshift-22.06.1.ebuild      | 42 ---------------
 5 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest
index ff7788dd3..b883bc2eb 100644
--- a/app-backup/timeshift/Manifest
+++ b/app-backup/timeshift/Manifest
@@ -1,2 +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
+DIST timeshift-22.06.1-r1.tar.gz 1429399 BLAKE2B 90dcfa50bccedcca07044b6e42cb41773aa9d53f42855e3bfdb28140b8fd4359283225928e1c598116feab301baa6b42aebade2bb4f107eed1d82412d52a9639 SHA512 eb245c358ff2ba8e3b3c367dd0ebe69a3b450ca7bd31f5bd2fd9d5b2281f39ce90e3086c1649f73a8b240c7a05cd308534abc88085653d5bc7b244ba2d9a2ef7

diff --git a/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch b/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch
new file mode 100644
index 000000000..3343bc24d
--- /dev/null
+++ b/app-backup/timeshift/files/timeshift-22.06.1-makefile.patch
@@ -0,0 +1,53 @@
+--- 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/metadata.xml b/app-backup/timeshift/metadata.xml
index 78eb91da6..6347b0662 100644
--- a/app-backup/timeshift/metadata.xml
+++ b/app-backup/timeshift/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Ross Charles Campbell</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">teejee2008/timeshift</remote-id>
+		<remote-id type="github">linuxmint/timeshift</remote-id>
 	</upstream>
 	<longdescription lang="en">
 		Timeshift for Linux is an application that provides functionality similar to

diff --git a/app-backup/timeshift/timeshift-22.06.1-r1.ebuild b/app-backup/timeshift/timeshift-22.06.1-r1.ebuild
new file mode 100644
index 000000000..5bcd648db
--- /dev/null
+++ b/app-backup/timeshift/timeshift-22.06.1-r1.ebuild
@@ -0,0 +1,61 @@
+# 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
+}

diff --git a/app-backup/timeshift/timeshift-22.06.1.ebuild b/app-backup/timeshift/timeshift-22.06.1.ebuild
deleted file mode 100644
index 97f794686..000000000
--- a/app-backup/timeshift/timeshift-22.06.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/, app-backup/timeshift/files/
@ 2022-10-13  9:21 Pascal Jäger
  0 siblings, 0 replies; 3+ messages in thread
From: Pascal Jäger @ 2022-10-13  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3570dabdbd5bd7ae274bce0734724de758930453
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Thu Oct 13 09:20:57 2022 +0000
Commit:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
CommitDate: Thu Oct 13 09:21:17 2022 +0000
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 <pascal.jaeger <AT> 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 000000000..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
+-	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/*

diff --git a/app-backup/timeshift/timeshift-22.06.5.ebuild b/app-backup/timeshift/timeshift-22.06.5.ebuild
new file mode 100644
index 000000000..4055bcb37
--- /dev/null
+++ b/app-backup/timeshift/timeshift-22.06.5.ebuild
@@ -0,0 +1,75 @@
+# 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/${PV}.tar.gz -> ${PF}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+DEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/json-glib
+	>=dev-libs/libgee-0.18.0:=
+	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-1.0.4
+	x11-libs/vte:2.91[vala]
+"
+RDEPEND="${DEPEND}
+	net-misc/rsync
+	virtual/cron
+"
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-22.06.5-build-system.patch )
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+src_compile() {
+	tc-export CC
+	if use gtk; then
+		emake all
+	else
+		emake app-console
+	fi
+	emake manpage
+}
+
+src_install() {
+	if use gtk; then
+		emake INSTALL_GTK=true prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}"
+	else
+		emake INSTALL_GTK=false prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}"
+	fi
+	einstalldocs
+}
+
+pkg_postinst() {
+	if ! use gtk; then
+		elog ""
+		elog "Installed timeshift without gtk GUI."
+		elog "If you need the gtk GUI emerge timeshift"
+		elog "with USE=\"gtk\""
+	fi
+	optfeature "btrfs support" sys-fs/btrfs-progs
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/, app-backup/timeshift/files/
@ 2024-09-22  8:31 Takuya Wakazono
  0 siblings, 0 replies; 3+ messages in thread
From: Takuya Wakazono @ 2024-09-22  8:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f9e01793429131d49cd6cedacc6299dcaffd0a96
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 22 08:25:56 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sun Sep 22 08:25:56 2024 +0000
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 <pastalian46 <AT> 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..000000000
--- 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 100644
index 14ae2ea3b..000000000
--- a/app-backup/timeshift/files/timeshift-22.06.5-build-system.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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
--	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/*

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
deleted file mode 100644
index cac54b288..000000000
--- a/app-backup/timeshift/files/timeshift-22.11.1-build-system.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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/${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/*

diff --git a/app-backup/timeshift/timeshift-21.09.1-r3.ebuild b/app-backup/timeshift/timeshift-21.09.1-r3.ebuild
deleted file mode 100644
index 1c7887047..000000000
--- a/app-backup/timeshift/timeshift-21.09.1-r3.ebuild
+++ /dev/null
@@ -1,58 +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/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"
-
-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_setup
-	default
-}
-
-src_compile() {
-	tc-export CC
-	# 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 <pascal.jaeger@leimstift.de> (2022-11-26)
-	emake -j1
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "btrfs support" sys-fs/btrfs-progs
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}

diff --git a/app-backup/timeshift/timeshift-22.06.5-r2.ebuild b/app-backup/timeshift/timeshift-22.06.5-r2.ebuild
deleted file mode 100644
index 71cc75778..000000000
--- a/app-backup/timeshift/timeshift-22.06.5-r2.ebuild
+++ /dev/null
@@ -1,84 +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/${PV}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-DEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=dev-libs/libgee-0.18.0:=
-	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-1.0.4
-	x11-libs/vte:2.91[vala]
-"
-RDEPEND="${DEPEND}
-	net-misc/rsync
-	virtual/cron
-"
-BDEPEND="
-	$(vala_depend)
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-22.06.5-build-system.patch )
-
-src_prepare() {
-	default
-	vala_setup
-}
-
-src_compile() {
-	tc-export CC
-	if use gtk; then
-		# 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 <pascal.jaeger@leimstift.de> (2022-11-26)
-		emake -j1
-	else
-		emake app-console -j1
-	fi
-	emake manpage
-}
-
-src_install() {
-	if use gtk; then
-		emake INSTALL_GTK=true prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}"
-	else
-		emake INSTALL_GTK=false prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}"
-	fi
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use gtk; then
-		elog ""
-		elog "Installed timeshift without gtk GUI."
-		elog "If you need the gtk GUI emerge timeshift"
-		elog "with USE=\"gtk\""
-	fi
-	optfeature "btrfs support" sys-fs/btrfs-progs
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}

diff --git a/app-backup/timeshift/timeshift-22.11.1-r1.ebuild b/app-backup/timeshift/timeshift-22.11.1-r1.ebuild
deleted file mode 100644
index d3aa93cf4..000000000
--- a/app-backup/timeshift/timeshift-22.11.1-r1.ebuild
+++ /dev/null
@@ -1,84 +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/${PV}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-DEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/json-glib
-	>=dev-libs/libgee-0.18.0:=
-	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-1.0.4
-	x11-libs/vte:2.91[vala]
-"
-RDEPEND="${DEPEND}
-	net-misc/rsync
-	virtual/cron
-"
-BDEPEND="
-	$(vala_depend)
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-22.11.1-build-system.patch )
-
-src_prepare() {
-	default
-	vala_setup
-}
-
-src_compile() {
-	tc-export CC
-	if use gtk; then
-		# 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 <pascal.jaeger@leimstift.de> (2022-11-26)
-		emake -j1
-	else
-		emake app-console -j1
-	fi
-	emake manpage
-}
-
-src_install() {
-	if use gtk; then
-		emake INSTALL_GTK=true prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}"
-	else
-		emake INSTALL_GTK=false prefix="${EPREFIX}"/usr sysconfdir="${EPREFIX}"/etc install DESTDIR="${D}"
-	fi
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use gtk; then
-		elog ""
-		elog "Installed timeshift without gtk GUI."
-		elog "If you need the gtk GUI emerge timeshift"
-		elog "with USE=\"gtk\""
-	fi
-	optfeature "btrfs support" sys-fs/btrfs-progs
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-09-22  8:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-13  9:21 [gentoo-commits] repo/proj/guru:dev commit in: app-backup/timeshift/, app-backup/timeshift/files/ Pascal Jäger
  -- strict thread matches above, loose matches on Subject: below --
2024-09-22  8:31 Takuya Wakazono
2022-06-02  9:20 Anna Vyalkova

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox