From 5f55e3b882108448ad1d0a2100ebc3535a2a8375 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Thu, 6 Jun 2024 14:27:51 +0200 Subject: [PATCH 1/3] app-backup/timeshift-autosnap: fix src_unpack phase Remove redundant src_compile Closes: https://bugs.gentoo.org/933685 Signed-off-by: Lucio Sauer --- .../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 673c91a9ad..4209aebe55 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 From 5edf4429c3ac157826349eab9a9333ab67cfa171 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Thu, 6 Jun 2024 14:50:55 +0200 Subject: [PATCH 2/3] 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 --- ...eshift-autosnap-remove-arch-specific.patch | 21 +++++++++++++++---- ...build => timeshift-autosnap-0.9-r1.ebuild} | 9 +++----- 2 files changed, 20 insertions(+), 10 deletions(-) rename app-backup/timeshift-autosnap/{timeshift-autosnap-0.9.ebuild => timeshift-autosnap-0.9-r1.ebuild} (88%) 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 a778006bf2..127f880bbf 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 4209aebe55..36a6cbead7 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 } From 33b594c71b21334abdec325005cfdae0f3038455 Mon Sep 17 00:00:00 2001 From: Piotr Kubaj Date: Thu, 6 Jun 2024 15:39:07 +0200 Subject: [PATCH 3/3] gui-apps/yambar: keyword 1.10.0 for ~ppc64 Signed-off-by: Piotr Kubaj --- gui-apps/yambar/yambar-1.10.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-apps/yambar/yambar-1.10.0.ebuild b/gui-apps/yambar/yambar-1.10.0.ebuild index 13784e42c9..32e6c7a2e1 100644 --- a/gui-apps/yambar/yambar-1.10.0.ebuild +++ b/gui-apps/yambar/yambar-1.10.0.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}" - KEYWORDS="~amd64 ~arm64" + KEYWORDS="~amd64 ~arm64 ~ppc64" fi DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"