diff options
| author |   Julien Roy <julien@jroy.ca> | 2024-01-02 23:24:04 -0500 |
|---|---|---|
| committer | Julien Roy <julien@jroy.ca> | 2024-01-02 23:25:21 -0500 |
| commit | f7620146fd5d87e7d0fa803b07e4fd3a3513c499 (patch) | |
| tree | c7d65bed66aed8fc48794de917e82bbcb8a863e6 /app-backup | |
| parent | net-p2p/feather: version bump (diff) | |
| download | guru-f7620146fd5d87e7d0fa803b07e4fd3a3513c499.tar.gz guru-f7620146fd5d87e7d0fa803b07e4fd3a3513c499.tar.bz2 guru-f7620146fd5d87e7d0fa803b07e4fd3a3513c499.zip | |
app-backup/pika-backup: fix build with dev-lang/python[-native-symlinks]
Closes: https://bugs.gentoo.org/903526
Signed-off-by: Julien Roy <julien@jroy.ca>
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/pika-backup/files/meson-fixes.patch | 14 | ||||
| -rw-r--r-- | app-backup/pika-backup/pika-backup-0.6.2.ebuild | 13 |
2 files changed, 22 insertions, 5 deletions
diff --git a/app-backup/pika-backup/files/meson-fixes.patch b/app-backup/pika-backup/files/meson-fixes.patch index 6657e0615..bb7a5cb58 100644 --- a/app-backup/pika-backup/files/meson-fixes.patch +++ b/app-backup/pika-backup/files/meson-fixes.patch @@ -1,8 +1,18 @@ +diff --git a/build-aux/meson-cargo-manifest.py b/build-aux/meson-cargo-manifest.py +index 34028e2..3bf3376 100755 +--- a/build-aux/meson-cargo-manifest.py ++++ b/build-aux/meson-cargo-manifest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python3 + + try: + import tomllib diff --git a/meson.build b/meson.build -index 2f20ee8..95bd28e 100644 +index 932bdb2..8938862 100644 --- a/meson.build +++ b/meson.build -@@ -29,4 +29,3 @@ meson.add_dist_script('build-aux/meson-dist-vendor.sh') +@@ -28,4 +28,3 @@ meson.add_dist_script('build-aux/meson-dist-vendor.sh') subdir('data') subdir('help') subdir('po') diff --git a/app-backup/pika-backup/pika-backup-0.6.2.ebuild b/app-backup/pika-backup/pika-backup-0.6.2.ebuild index 0e0811467..daf4fcefc 100644 --- a/app-backup/pika-backup/pika-backup-0.6.2.ebuild +++ b/app-backup/pika-backup/pika-backup-0.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -298,8 +298,8 @@ CRATES=" zvariant_utils@1.0.0 zxcvbn@2.2.2 " - -inherit cargo gnome2-utils meson xdg +PYTHON_COMPAT=( python3_{9..12} ) +inherit cargo gnome2-utils meson python-any-r1 xdg DESCRIPTION="Keep your data safe" HOMEPAGE="https://gitlab.gnome.org/World/pika-backup" @@ -322,6 +322,7 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" + ${PYTHON_DEPS} dev-util/itstool sys-devel/gettext " @@ -332,6 +333,12 @@ PATCHES=( "${FILESDIR}/meson-fixes.patch" ) +# src_prepare() { +# default +# python-any-r1_pkg_setup +# sed -e 's/python3/${EPYTHON}/' "${S}/build-aux/meson-cargo-manifest.py" || die +# } + src_compile() { meson_src_compile cargo_src_compile |