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:=

Reply via email to