From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C07AB158040 for ; Wed, 3 Jan 2024 04:47:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56BFD2BC02D; Wed, 3 Jan 2024 04:47:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FD752BC02D for ; Wed, 3 Jan 2024 04:47:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E41634076D for ; Wed, 3 Jan 2024 04:47:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 746F71339 for ; Wed, 3 Jan 2024 04:47:45 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1704255921.f7620146fd5d87e7d0fa803b07e4fd3a3513c499.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-backup/pika-backup/, app-backup/pika-backup/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-backup/pika-backup/files/meson-fixes.patch app-backup/pika-backup/pika-backup-0.6.2.ebuild X-VCS-Directories: app-backup/pika-backup/ app-backup/pika-backup/files/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: f7620146fd5d87e7d0fa803b07e4fd3a3513c499 X-VCS-Branch: dev Date: Wed, 3 Jan 2024 04:47:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 308f092f-63a9-4144-a9ff-ce853b010fea X-Archives-Hash: 474643017e0c2e1ce5847dced6698892 commit: f7620146fd5d87e7d0fa803b07e4fd3a3513c499 Author: Julien Roy jroy ca> AuthorDate: Wed Jan 3 04:24:04 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Wed Jan 3 04:25:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f7620146 app-backup/pika-backup: fix build with dev-lang/python[-native-symlinks] Closes: https://bugs.gentoo.org/903526 Signed-off-by: Julien Roy jroy.ca> app-backup/pika-backup/files/meson-fixes.patch | 14 ++++++++++++-- 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 6657e06153..bb7a5cb587 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 0e08114679..daf4fcefc8 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