From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1668267-garchives=archives.gentoo.org@lists.gentoo.org>
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 5A391158083
for <garchives@archives.gentoo.org>; Sat, 7 Sep 2024 09:15:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6F519E2A16;
Sat, 7 Sep 2024 09:15:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 54E7BE2A0D
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Sep 2024 09:15:51 +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 61FF833C4EE
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Sep 2024 09:15:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C23C614D3
for <gentoo-commits@lists.gentoo.org>; Sat, 7 Sep 2024 09:15:48 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1725700512.147183f1c2ca93eaf6db4f308c94e9aa226ea7b4.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/vtk/vtk-9.2.5-r1.ebuild sci-libs/vtk/vtk-9.2.5-r2.ebuild sci-libs/vtk/vtk-9.2.6-r2.ebuild sci-libs/vtk/vtk-9.2.6-r3.ebuild sci-libs/vtk/vtk-9.3.0-r1.ebuild sci-libs/vtk/vtk-9.3.0-r2.ebuild
X-VCS-Directories: sci-libs/vtk/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 147183f1c2ca93eaf6db4f308c94e9aa226ea7b4
X-VCS-Branch: master
Date: Sat, 7 Sep 2024 09:15:48 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 689eb837-e32e-42e1-9371-508cd4aea935
X-Archives-Hash: 0eb7543c6c40ed1af95b08edca66d373
commit: 147183f1c2ca93eaf6db4f308c94e9aa226ea7b4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 7 09:13:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 09:15:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147183f1
sci-libs/vtk: don't cap expat version
This reverts commit 546ead3103af153d5e869730fe0ad642019a9c67 and
d767aab3f077c05916d47ffdc38a09927b04298d as a consequence.
As I explained on the bug:
"""
This really isn't going to work either way.
If Python depends on >= expat to avoid things like bug 939045, you
soon get to a point where VTK is uninstallable if VTK has a < dep.
If it doesn't, you get runtime breakage with VTK if it has a < dep.
If VTK doesn't have a < dep, you get runtime breakage in Python as it
gets downgraded when you emerge VTK.
We should drop the < and leave VTK broken as it's the lesser evil,
and then try pull in the patch if it applies cleanlyish.
"""
So, let's do the lesser evil bit now to avoid runtime breakge
in CPython from it being downgraded.
Bug: https://bugs.gentoo.org/930032
Closes: https://bugs.gentoo.org/939211
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/vtk/{vtk-9.2.5-r1.ebuild => vtk-9.2.5-r2.ebuild} | 2 +-
sci-libs/vtk/{vtk-9.2.6-r2.ebuild => vtk-9.2.6-r3.ebuild} | 2 +-
sci-libs/vtk/{vtk-9.3.0-r1.ebuild => vtk-9.3.0-r2.ebuild} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/vtk/vtk-9.2.5-r1.ebuild b/sci-libs/vtk/vtk-9.2.5-r2.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.2.5-r1.ebuild
rename to sci-libs/vtk/vtk-9.2.5-r2.ebuild
index 37bb25cf01d7..4af7d8df0261 100644
--- a/sci-libs/vtk/vtk-9.2.5-r1.ebuild
+++ b/sci-libs/vtk/vtk-9.2.5-r2.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
dev-cpp/nlohmann_json
dev-db/sqlite:3
dev-libs/double-conversion:=
- <dev-libs/expat-2.6.0
+ dev-libs/expat
dev-libs/icu:=
dev-libs/jsoncpp:=
>=dev-libs/libfmt-8.1.1:=
diff --git a/sci-libs/vtk/vtk-9.2.6-r2.ebuild b/sci-libs/vtk/vtk-9.2.6-r3.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.2.6-r2.ebuild
rename to sci-libs/vtk/vtk-9.2.6-r3.ebuild
index eaad31f63e4f..9520c47ec4fd 100644
--- a/sci-libs/vtk/vtk-9.2.6-r2.ebuild
+++ b/sci-libs/vtk/vtk-9.2.6-r3.ebuild
@@ -71,7 +71,7 @@ RDEPEND="
dev-cpp/nlohmann_json
dev-db/sqlite:3
dev-libs/double-conversion:=
- <dev-libs/expat-2.6.0
+ dev-libs/expat
dev-libs/icu:=
dev-libs/jsoncpp:=
>=dev-libs/libfmt-8.1.1:=
diff --git a/sci-libs/vtk/vtk-9.3.0-r1.ebuild b/sci-libs/vtk/vtk-9.3.0-r2.ebuild
similarity index 99%
rename from sci-libs/vtk/vtk-9.3.0-r1.ebuild
rename to sci-libs/vtk/vtk-9.3.0-r2.ebuild
index 1c8cd93297da..cc7a1a438652 100644
--- a/sci-libs/vtk/vtk-9.3.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-9.3.0-r2.ebuild
@@ -70,7 +70,7 @@ RDEPEND="
app-arch/xz-utils
dev-db/sqlite:3
dev-libs/double-conversion:=
- <dev-libs/expat-2.6.0
+ dev-libs/expat
dev-libs/icu:=
dev-libs/jsoncpp:=
>=dev-libs/libfmt-8.1.1:=