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 01D0515802F for ; Thu, 9 Mar 2023 07:06:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 372DDE08F6; Thu, 9 Mar 2023 07:06:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 EEC18E08F6 for ; Thu, 9 Mar 2023 07:06:27 +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 E3A5F335D55 for ; Thu, 9 Mar 2023 07:06:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56C2A82 for ; Thu, 9 Mar 2023 07:06:25 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1678345573.b93c51bc46ea5ab203444b0b90dce8d6801a1537.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch media-sound/guitarix/guitarix-0.44.1.ebuild media-sound/guitarix/guitarix-9999.ebuild media-sound/guitarix/metadata.xml X-VCS-Directories: media-sound/guitarix/ media-sound/guitarix/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: b93c51bc46ea5ab203444b0b90dce8d6801a1537 X-VCS-Branch: master Date: Thu, 9 Mar 2023 07:06:25 +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: 5bf6d526-79fd-4ca0-97ad-b98589a45d3d X-Archives-Hash: d723db2ce3e46163281da56e9b12b1dd commit: b93c51bc46ea5ab203444b0b90dce8d6801a1537 Author: Alexander Tsoy tsoy me> AuthorDate: Sun Mar 5 20:00:10 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Mar 9 07:06:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b93c51bc media-sound/guitarix: EAPI 8 and py3.11 Also switch to github repo. SourceForge repo is outdated. Closes: https://bugs.gentoo.org/897030 Signed-off-by: Alexander Tsoy tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/29944 Signed-off-by: Miroslav Šulc gentoo.org> .../guitarix/files/guitarix-0.41.0-py3.11.patch | 26 ++++++++++++++++++++++ media-sound/guitarix/guitarix-0.44.1.ebuild | 9 ++++---- media-sound/guitarix/guitarix-9999.ebuild | 8 +++---- media-sound/guitarix/metadata.xml | 3 +++ 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch new file mode 100644 index 000000000000..34a8bc68c824 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch @@ -0,0 +1,26 @@ +From 39d7c21c4173eb0f121b1bbff439d9cf43331a00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Wed, 11 Jan 2023 18:55:36 -0500 +Subject: [PATCH] waf: python 3.11 removed the 'U' open mode + +Python3 deprecated it already by making this the default behaviour. +--- + trunk/wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/trunk/wscript b/trunk/wscript +index 947fd3d1..3f1f5cf3 100644 +--- a/wscript ++++ b/wscript +@@ -537,7 +537,7 @@ def sub_file(task): + dst_fname = task.outputs[0].abspath() + lst = task.generator.sub_list + +- with open(src_fname, 'rU') as f: ++ with open(src_fname, 'r') as f: + txt = f.read() + for (key, val) in lst: + re_pat = re.compile(key, re.M) +-- +2.39.2 + diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild index 05d31784013b..04e6a893b200 100644 --- a/media-sound/guitarix/guitarix-0.44.1.ebuild +++ b/media-sound/guitarix/guitarix-0.44.1.ebuild @@ -1,18 +1,16 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE='threads(+)' inherit python-any-r1 waf-utils xdg -MY_P="${PN}2-${PV}" - DESCRIPTION="Virtual guitar amplifier for Linux" HOMEPAGE="https://guitarix.org/" -SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz" +SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-${PV}.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -65,6 +63,7 @@ DOCS=( changelog README ) PATCHES=( "${FILESDIR}"/${PN}-0.41.0-nostrip.patch + "${FILESDIR}"/${PN}-0.41.0-py3.11.patch ) src_configure() { diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild index 80afc539188d..0f1305ac3816 100644 --- a/media-sound/guitarix/guitarix-9999.ebuild +++ b/media-sound/guitarix/guitarix-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE='threads(+)' EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git" @@ -11,11 +11,9 @@ EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master" inherit python-any-r1 waf-utils xdg git-r3 -MY_P="${PN}2-${PV}" - DESCRIPTION="Virtual guitar amplifier for Linux" HOMEPAGE="https://guitarix.org/" -EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git" +EGIT_REPO_URI="https://github.com/brummer10/${PN}.git" S="${WORKDIR}/${P}/trunk" LICENSE="GPL-2" diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml index 34ccfab7be05..e08a9c3c4ba8 100644 --- a/media-sound/guitarix/metadata.xml +++ b/media-sound/guitarix/metadata.xml @@ -18,4 +18,7 @@ Build NSM (Non Session Manager) support Build standalone application + + brummer10/guitarix +