4 files changed, 9 insertions, 115 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index cde0fbc857fe..33cfe7955fa3 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index 0bc9e4162539..219683d44faa 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,6 +1,4 @@
 AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
-DIST cadabra-2.4.2.2.tar.gz 25156757 BLAKE2B 05d4e490d1fa740b3dd505b72d5f4f298e62e234859e81b5bdf865e895ab820b3cd5d6db3ecda1cac0426b031cc5c87428d464bdb66b24cb9b945ababc860a90 SHA512 c5c55abad090d72f981341d94d3e299583f446a4bff1df994a60c740cede9e543b5cdee146dae2a846deec4adf446172e62b0f12deab8c89e7a085ffa7006acf
 DIST cadabra-2.4.3.2.tar.gz 25157173 BLAKE2B 895b91a01f5dedc87294903959ee3aca0234016fce0094f4288c07e2d265f90f834670b9c50dcfa059e46564c773f73f049cf65db74f49932e442d15d68ecd88 SHA512 21c76804442397fa3d5fa407fc74395fc800d01c2a5d84270e9cf3abd875c8ff96e2ba8f8349037797ff4ef3d2b9033c2a1a6af45bb75c3a201acdd7357adb6f
-EBUILD cadabra-2.4.2.2-r1.ebuild 2366 BLAKE2B bb04d2b44dfa890cb72b67988aececd2317433c3b2f88e7e2a15078a647b097804076b48bdc5a6386ced66c4a875e9ab9c5d0a19d01f4655a5bc91ea4ceeff78 SHA512 a81b0bb03307ce1ef3b03772e183cd60a858e2aa04de7ad281d4fadddb7452b69dd5f2d248b2b5cd0a6e6cf67456e3eaa8c1a2bb54c6096200c5d19d104d67b1
-EBUILD cadabra-2.4.3.2.ebuild 2365 BLAKE2B 2074e07f0b3f7b4d9186f843a10abfd647f36855bab1d3831a3f079912db36363cc4cb3ce8553fb63d9b2e5538d3274216843c93de2e9d90e1a609d49b415e7f SHA512 0b27c49db0d95481f091833886ddf7ffb876f29f4065a9a821fd1207b1c612d80de92ebd929ffd71385409099a6c3d1d9369fb457e6a51e4ca3b34a6d9cdb4ec
+EBUILD cadabra-2.4.3.2-r1.ebuild 2329 BLAKE2B 877d2060a10c388f43d1723f0830cfdb9a67426af825d7fb16709978b8f1f77888de668f676c76f60e652252261074e60b8087cf144e8f0d1add2db74656e67e SHA512 d081f07f31259e6bf596f6ed3e0362e426b83e02aa99d51cf51601f1654bead5c1d6e5e8a1bd0be000b2237018eab41c9cd00cb6141a76473bed3f1cbaec106f
 MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.4.2.2-r1.ebuild b/sci-mathematics/cadabra/cadabra-2.4.2.2-r1.ebuild
deleted file mode 100644
index 729dbdb870fa..000000000000
--- a/sci-mathematics/cadabra/cadabra-2.4.2.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-
-inherit xdg-utils python-single-r1 cmake
-
-DESCRIPTION="Field-theory motivated approach to computer algebra"
-HOMEPAGE="https://cadabra.science/"
-
-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="gtk +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/gmpy:2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
-	')
-	gtk? ( 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 )
-
-# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk"
-xdg_update() {
-	if use gtk ; 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 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 gtk)
-		-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.3.2.ebuild b/sci-mathematics/cadabra/cadabra-2.4.3.2-r1.ebuild
index 6481aada846a..dc848e56ac06 100644
--- a/sci-mathematics/cadabra/cadabra-2.4.3.2.ebuild
+++ b/sci-mathematics/cadabra/cadabra-2.4.3.2-r1.ebuild
@@ -6,12 +6,13 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CADABRA=${PN}${MAJOR}
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit xdg-utils python-single-r1 cmake
 
 DESCRIPTION="Field-theory motivated approach to computer algebra"
-HOMEPAGE="https://cadabra.science/"
+HOMEPAGE="https://cadabra.science/
+	https://github.com/kpeeters/cadabra2/"
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
@@ -25,7 +26,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${MAJOR}"
-IUSE="gtk +jupyter test"
+IUSE="gui +jupyter test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -45,7 +46,7 @@ RDEPEND="
 		dev-python/sympy[${PYTHON_USEDEP}]
 		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
 	')
-	gtk? ( dev-cpp/gtkmm:3.0 )
+	gui? ( dev-cpp/gtkmm:3.0 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
@@ -54,9 +55,8 @@ PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch )
 
 DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst )
 
-# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk"
 xdg_update() {
-	if use gtk ; then
+	if use gui ; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update
 		xdg_mimeinfo_database_update
@@ -75,7 +75,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		-DENABLE_SYSTEM_JSONCPP=ON
 		-DPACKAGING_MODE=ON
 		-DUSE_PYTHON_3=ON
@@ -84,7 +84,7 @@ src_configure() {
 		-DENABLE_MATHEMATICA=OFF
 		-DINSTALL_TARGETS_ONLY=OFF
 		-DBUILD_TESTS=$(usex test)
-		-DENABLE_FRONTEND=$(usex gtk)
+		-DENABLE_FRONTEND=$(usex gui)
 		-DENABLE_PY_JUPYTER=$(usex jupyter)
 	)
 	cmake_src_configure