From 1cbdb3e1b18f0ecf513ab90433a32eb0f2d4689b Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 2 Jun 2022 13:39:28 +0500 Subject: [PATCH] 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 --- app-backup/timeshift/Manifest | 2 +- .../files/timeshift-22.06.1-makefile.patch | 53 ++++++++++++++++ app-backup/timeshift/metadata.xml | 2 +- .../timeshift/timeshift-22.06.1-r1.ebuild | 61 +++++++++++++++++++ app-backup/timeshift/timeshift-22.06.1.ebuild | 42 ------------- 5 files changed, 116 insertions(+), 44 deletions(-) create mode 100644 app-backup/timeshift/files/timeshift-22.06.1-makefile.patch create mode 100644 app-backup/timeshift/timeshift-22.06.1-r1.ebuild delete mode 100644 app-backup/timeshift/timeshift-22.06.1.ebuild diff --git a/app-backup/timeshift/Manifest b/app-backup/timeshift/Manifest index ff7788dd30..b883bc2eb7 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 0000000000..3343bc24d9 --- /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 78eb91da6b..6347b06626 100644 --- a/app-backup/timeshift/metadata.xml +++ b/app-backup/timeshift/metadata.xml @@ -6,7 +6,7 @@ Ross Charles Campbell - teejee2008/timeshift + linuxmint/timeshift 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 0000000000..5bcd648db0 --- /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 97f794686b..0000000000 --- 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 -}