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 24F2E158015 for ; Sat, 23 Dec 2023 17:31:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 132062BC01C; Sat, 23 Dec 2023 17:31:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 C83A22BC01C for ; Sat, 23 Dec 2023 17:31:24 +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 05F49340813 for ; Sat, 23 Dec 2023 17:31:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47FA51256 for ; Sat, 23 Dec 2023 17:31:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1703352625.32235eb79dd29af102e4c5a654a928013ece57b1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild dev-vcs/git-cola/git-cola-4.2.1.ebuild X-VCS-Directories: dev-vcs/git-cola/files/ dev-vcs/git-cola/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 32235eb79dd29af102e4c5a654a928013ece57b1 X-VCS-Branch: master Date: Sat, 23 Dec 2023 17:31:22 +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: e274192f-7140-4fd4-a624-a529e4b64054 X-Archives-Hash: 9f3239ef9c70addd98ad4117e28817e7 commit: 32235eb79dd29af102e4c5a654a928013ece57b1 Author: Martin Gysel bearsh org> AuthorDate: Sat Dec 23 15:08:16 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 23 17:30:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32235eb7 dev-vcs/git-cola: 4.2.1: fix setuptools-69 breakage See also: https://github.com/git-cola/git-cola/commit/b53983c7fa7d29dd6f474177015fcb6f2ee0e6d1 Bug: https://bugs.gentoo.org/920534 Signed-off-by: Martin Gysel bearsh.org> Signed-off-by: Sam James gentoo.org> .../files/git-cola-4.2.1-fix-setuptools.patch | 24 ++++++++++++++++++++++ ...-cola-4.2.1.ebuild => git-cola-4.2.1-r1.ebuild} | 2 ++ 2 files changed, 26 insertions(+) diff --git a/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch b/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch new file mode 100644 index 000000000000..d1453c3f163e --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-4.2.1-fix-setuptools.patch @@ -0,0 +1,24 @@ +From b53983c7fa7d29dd6f474177015fcb6f2ee0e6d1 Mon Sep 17 00:00:00 2001 +From: David Aguilar +Date: Thu, 2 Nov 2023 01:33:16 -0700 +Subject: [PATCH] pyproject.toml: list dependencies and optional-dependencies + as dynamic + +Signed-off-by: David Aguilar +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 20b3008e0..97cdf79b4 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -13,7 +13,7 @@ classifiers = [ + "Topic :: Software Development :: Version Control :: Git", + ] + description = "A sleek and powerful Git GUI" +-dynamic = ["version"] ++dynamic = ["dependencies", "optional-dependencies", "version"] + license = {file = "COPYING"} + readme = "README.md" + diff --git a/dev-vcs/git-cola/git-cola-4.2.1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild similarity index 94% rename from dev-vcs/git-cola/git-cola-4.2.1.ebuild rename to dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild index 79239901785f..14d1a8b01c21 100644 --- a/dev-vcs/git-cola/git-cola-4.2.1.ebuild +++ b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild @@ -38,6 +38,8 @@ BDEPEND="sys-devel/gettext ) ") " +# https://bugs.gentoo.org/920534 +PATCHES=( "${FILESDIR}/${P}-fix-setuptools.patch" ) distutils_enable_sphinx docs \ 'dev-python/rst-linker'