commit: faaf0f65c0f7048b3acea1b375a7bd10b68240a5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 26 19:29:14 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 26 21:00:59 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faaf0f65
sci-mathematics/cadabra: destabilise by dropping 2.4.5.4, 2.4.5.6 Stalled stabilisation since 2024-09-30, broken in ~arch since 2024-12-12, stable broken since 2025-06-19. Bug: https://bugs.gentoo.org/940556 Bug: https://bugs.gentoo.org/963050 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-mathematics/cadabra/Manifest | 2 - sci-mathematics/cadabra/cadabra-2.4.5.4.ebuild | 111 -------------------- sci-mathematics/cadabra/cadabra-2.4.5.6.ebuild | 112 --------------------- sci-mathematics/cadabra/files/cadabra2-CMake.patch | 69 ------------- 4 files changed, 294 deletions(-) diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest index 8f83abddd8a5..134a55608050 100644 --- a/sci-mathematics/cadabra/Manifest +++ b/sci-mathematics/cadabra/Manifest @@ -1,3 +1 @@ -DIST cadabra-2.4.5.4.tar.gz 26825874 BLAKE2B 90562e4ddb08a99a38f32d5cf3fe237b2ca5ece80e4bf70caa8db23a2b6af246b289eb41e7d366c5a242e6e06a680ab0917deb43f29efcf7d6703338c7e97d00 SHA512 907e291880aac84a4f5695f77dd34512c13dba320b38fee59c765b070235c9ef777f6e188c675c8247f56144624edb84459d8b500e4c074731633a2b9cf9ee74 -DIST cadabra-2.4.5.6.tar.gz 26827151 BLAKE2B ee08687c55a29582787ce66d2596ec182eca7f9d8eafde7c68477f316baf41f8e798fcdf3d307e0d9d3b68f5c66cd0805686bdd8a41f1d33ef09c11009808e91 SHA512 e0e9af7d492077137e6edba334b74b36905bfec633096a714158881c3bdd424d174b4a1f9053cd570f6652f53aa445a22220f44b396cf3c0fb69860d6d4aecc7 DIST cadabra-2.4.5.7.tar.gz 26833908 BLAKE2B 3f44ba9035f8181e475232da7bf81c8baf6b19b37651c438ebb656867e54fc213cd4f547a512a1be270a0449ea4b390bd777a4e38ad174e151723c2e2a90c4ae SHA512 860e166ba965fdd6e8afa4265d62ae388f33b8468912e63f7575a819419b9ee90a93e058e7aa4a9c44c80afef9fcce96c7b9d3fd1d35b3059a82548e54804328 diff --git a/sci-mathematics/cadabra/cadabra-2.4.5.4.ebuild b/sci-mathematics/cadabra/cadabra-2.4.5.4.ebuild deleted file mode 100644 index 3c810acdcb8c..000000000000 --- a/sci-mathematics/cadabra/cadabra-2.4.5.4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MAJOR="$(ver_cut 1)" -CADABRA="${PN}${MAJOR}" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit xdg-utils python-single-r1 cmake - -DESCRIPTION="Field-theory motivated approach to computer algebra" -HOMEPAGE="https://cadabra.science/ - https://github.com/kpeeters/cadabra2/"; - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"; -else - SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${CADABRA}-${PV}" - - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${MAJOR}" -IUSE="gui +jupyter test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - app-text/dvipng - dev-cpp/glibmm:2 - dev-db/sqlite:3= - dev-libs/boost:= - dev-libs/gmp:=[cxx] - dev-libs/jsoncpp:= - dev-libs/libsigc++:2 - dev-texlive/texlive-basic - $(python_gen_cond_dep ' - dev-python/gmpy2:2[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] ) - ') - gui? ( - dev-cpp/gtkmm:3.0 - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') -" - -PATCHES=( "${FILESDIR}/${CADABRA}-CMake.patch" ) - -DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst ) - -xdg_update() { - if use gui ; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -src_prepare() { - # Clean postinst script which calls libtool and icon-cache update - echo '#!/bin/sh' > "${S}/config/postinst.in" || die - - # Fix "PYTHON_EXECUTABLE" in Jupyter kernel - sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|" \ - "${S}/jupyterkernel/kernelspec/kernel.json.in" || die - - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs=( - -DENABLE_SYSTEM_JSONCPP=ON - -DPACKAGING_MODE=ON - -DUSE_PYTHON_3=ON - -DBUILD_AS_CPP_LIBRARY=OFF - -DENABLE_JUPYTER=OFF # special Xeus Jupyter kernel (uses xtl) - -DENABLE_MATHEMATICA=OFF - -DINSTALL_TARGETS_ONLY=OFF - -DBUILD_TESTS="$(usex test)" - -DENABLE_FRONTEND="$(usex gui)" - -DENABLE_PY_JUPYTER="$(usex jupyter)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize -} - -pkg_postinst() { - xdg_update -} - -pkg_postrm() { - xdg_update -} diff --git a/sci-mathematics/cadabra/cadabra-2.4.5.6.ebuild b/sci-mathematics/cadabra/cadabra-2.4.5.6.ebuild deleted file mode 100644 index 6ed212c823b4..000000000000 --- a/sci-mathematics/cadabra/cadabra-2.4.5.6.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MAJOR="$(ver_cut 1)" -CADABRA="${PN}${MAJOR}" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit xdg-utils python-single-r1 cmake - -DESCRIPTION="Field-theory motivated approach to computer algebra" -HOMEPAGE="https://cadabra.science/ - https://github.com/kpeeters/cadabra2/"; - -if [[ "${PV}" == *9999* ]] ; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"; -else - SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz - -> ${P}.tar.gz" - S="${WORKDIR}/${CADABRA}-${PV}" - - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${MAJOR}" -IUSE="gui +jupyter test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - app-text/dvipng - dev-cpp/glibmm:2 - dev-db/sqlite:3= - dev-libs/boost:= - dev-libs/gmp:=[cxx] - dev-libs/jsoncpp:= - dev-libs/libsigc++:2 - dev-texlive/texlive-basic - $(python_gen_cond_dep ' - dev-python/gmpy2:2[${PYTHON_USEDEP}] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/sympy[${PYTHON_USEDEP}] - jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] ) - ') - gui? ( - dev-cpp/gtkmm:3.0 - ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') -" - -PATCHES=( "${FILESDIR}/${CADABRA}-CMake.patch" ) - -DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst ) - -xdg_update() { - if use gui ; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -src_prepare() { - # Clean postinst script which calls libtool and icon-cache update - echo '#!/bin/sh' > "${S}/config/postinst.in" || die - - # Fix "PYTHON_EXECUTABLE" in Jupyter kernel - sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|" \ - "${S}/jupyterkernel/kernelspec/kernel.json.in" || die - - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs=( - -DENABLE_SYSTEM_JSONCPP=ON - -DPACKAGING_MODE=ON - -DUSE_PYTHON_3=ON - -DBUILD_AS_CPP_LIBRARY=OFF - -DENABLE_JUPYTER=OFF # special Xeus Jupyter kernel (uses xtl) - -DENABLE_MATHEMATICA=OFF - -DINSTALL_TARGETS_ONLY=OFF - -DBUILD_TESTS="$(usex test)" - -DENABLE_FRONTEND="$(usex gui)" - -DENABLE_PY_JUPYTER="$(usex jupyter)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize -} - -pkg_postinst() { - xdg_update -} - -pkg_postrm() { - xdg_update -} diff --git a/sci-mathematics/cadabra/files/cadabra2-CMake.patch b/sci-mathematics/cadabra/files/cadabra2-CMake.patch deleted file mode 100644 index 9000cd321db9..000000000000 --- a/sci-mathematics/cadabra/files/cadabra2-CMake.patch +++ /dev/null @@ -1,69 +0,0 @@ -index 0f2ba31..7e6ace8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,7 +166,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) - message(FATAL_ERROR "GCC version must be at least 4.9 for regex support! See http://askubuntu.com/questions/428198/getting-installing-gcc-g-4-9-on-ubuntu and then set the environment variables CXX to g++-4.9 and CC to gcc-4.9. You may have to erase the build directory before re-running cmake.") - endif() - endif() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -fvisibility=hidden -Wno-unused-but-set-variable") - endif() - - # Clang -@@ -175,7 +174,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) - message(FATAL_ERROR "Clang version must be at least 3.5 to avoid known bugs.") - endif() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -fvisibility=hidden -Wall -Wextra -Wunused") - endif() - - # Visual Studio -index d21069e..69f4f52 100644 ---- a/c++lib/CMakeLists.txt -+++ b/c++lib/CMakeLists.txt -@@ -48,14 +48,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) - add_definitions("-Wall -g -Wno-unused-but-set-variable") - endif() - --if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") --endif() -- --if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") --endif() -- - if(MSVC) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - set(MSVC_FLAGS -index b7869a9..91567ec 100644 ---- a/frontend/gtkmm/CMakeLists.txt -+++ b/frontend/gtkmm/CMakeLists.txt -@@ -160,9 +160,6 @@ if (NOT INSTALL_TARGETS_ONLY) - install(FILES ${CADABRA_IMAGES_DIR}/256x256/cadabra2-gtk.png DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps) - install(FILES ${CADABRA_IMAGES_DIR}/cadabra2-gtk.svg DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps) - install(FILES ${CADABRA_ROOT_DIR}/config/cadabra2-gtk.desktop DESTINATION ${ICON_PREFIX}/share/applications) -- install(CODE "execute_process(COMMAND touch ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)") -- install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 {ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor)") -- install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX_WITH_DESTDIR}/share/icons/hicolor/icon-theme.cache)") - - # Install shared libraries on Windows. - # https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows -index 071bf11..bdfde1c 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -404,15 +404,6 @@ add_subdirectory(packages) - # - # https://stackoverflow.com/questions/21198030/installfiles-cmake-cfg-intdir-abc-win-dll-destination-bin - --if(NOT WIN32) -- # Remove any old cadabra2.so files in the global site-wide path which may have been -- # left there from a previous install. -- remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}") -- remove_file("${OLD_PYTHON_SITE_PATH}/cadabra2_defaults.py") -- remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2.${PYTHON_MOD_EXT}") -- remove_file("${OLDER_PYTHON_SITE_PATH}/cadabra2_defaults.py") --endif() -- - install_directory_permissions(${PYTHON_SITE_PATH}) - - if (MSVC)
