gentoo auto-resync : 27:09:2022 - 15:10:20

4 files changed, 3 insertions, 84 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index b8d202c96b29..575af8796ba1 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 9ff6788e2d44..55409c9fa8cb 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,9 +1,7 @@
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
-DIST wxmaxima-21.11.0.tar.gz 15982803 BLAKE2B 8eff24b3b08fd156341cbd1c565fd832277f99cbbfa2f166671502399e8658273dca86c48b3b09c8616b9d9a17ec4ea9230def645719bcf3c22fc410f5f31d62 SHA512 1660537d475dc16e6d25011ae02b50a9179dd97b19dd115e914636fac71684906d77a2e4f4ab2d8506ac9f6b297de8feeeb46489a6dbf5782783f890a4181506
-DIST wxmaxima-22.04.0.tar.gz 21477753 BLAKE2B aad35f628b2b74d41a7cb501d5e98c59b8588103f729fc39e901c50416a17bd296c4959f2276728a2654924bd16dd7416ef39b69eb01c5c05ee857f69ea1d42d SHA512 5197dab483012b39e910208406f32f2892d9acc3c0abc8582a61a43fad4f13e95692f8e499a2d0ca1680ca2ca48ea4c4853aa04c3f18d5e3a923c11316ebbf62
 DIST wxmaxima-22.05.0.tar.gz 21493488 BLAKE2B 0b1f4bd65e88e4f39d5d54f164373ca67a76bd2a18a1556cd4b86cdb5a62ca3f0c783c6e1725ec1006f6174163f08b7b934dcfa3fd8a8a7aa34e61588e1b0cb1 SHA512 e78ce86d3265b8c5d1d9b110075bdc8e3ff180a0a017142f852b022a1984e7e9bf0a4b7d2fb829f8c87b09899ef57a6e8ee203ec7edac52e7d05f0a05d2c9fe8
+DIST wxmaxima-22.09.0.tar.gz 21883782 BLAKE2B 370ea04f5101516fda494c08e21c1550556ff69e61e0458814aeb0922c66ae1b4a1be1e0b4d386f631b0479300fec04481f7f9e4be4214689b9bc0b9bd41f0f1 SHA512 778d3f221315f40f09918baaf26a4213dae3154ea19479c5ebf9254ed6c8036ca68f61472fce1d63e72d6c23787a635237c5f85ebc2975254893e6bec112ac3b
 EBUILD wxmaxima-20.12.2.ebuild 1428 BLAKE2B 30e26a147fe84b328902bedb1ee7df68a6c27d203b9b6e900096d931091ce51cce41d22e45fe779bb4144949b1ebcf259fbd085cc4e2f992e495405c5176410d SHA512 823b28ad77dfa70536103b64735ec68cdefe38abeec760b15acb6904f7f8f97d6ace10eec836f0536ff576f7711b2d135a989072087ae67d133506a301920882
-EBUILD wxmaxima-21.11.0.ebuild 1893 BLAKE2B 2540d12b43a6dd9d663446fd8c49f33b57cb95f24bdd7a87ffdd2f23213756086d98a520e5d5d6907288324913c98048c03045c22516545dc67262c098bb792e SHA512 4f1e82caeba02332438bcf5532a9e488341e5a77b077b0fc853f82f2b7c6c8528047a67c9b01c332d20e2ff162d9b6834fc12013062973b61ec0eb349e6e2d3e
-EBUILD wxmaxima-22.04.0.ebuild 1893 BLAKE2B e83faab0df73eb403b223b6698b1fb1d8f806f40b485023f5a7b31477f2aa6949585ae677afa59a5ffc127528213e6b0ecafc88168b7d0e9e2fb916179e11c93 SHA512 acff61ffbadf7d193630ecdc2bdcbab2a483757f4d67a944e28e78793c43b26d0e85d0214f24e1de8fc7e463ac2d53ff8efa87e591fc4961d3878470d5846ed0
 EBUILD wxmaxima-22.05.0.ebuild 1893 BLAKE2B e83faab0df73eb403b223b6698b1fb1d8f806f40b485023f5a7b31477f2aa6949585ae677afa59a5ffc127528213e6b0ecafc88168b7d0e9e2fb916179e11c93 SHA512 acff61ffbadf7d193630ecdc2bdcbab2a483757f4d67a944e28e78793c43b26d0e85d0214f24e1de8fc7e463ac2d53ff8efa87e591fc4961d3878470d5846ed0
+EBUILD wxmaxima-22.09.0.ebuild 1901 BLAKE2B 4eec649f59d4b941a3968023b6f4d31c257a15cdc43f96a3ca873a850afdb5a8992928816bf48bccde50a6216b4a93b01e37c8e6ad84708b33e32f4d44dbb6f7 SHA512 7ae6fbc815e3b8758e57c50877f66e04db096e6f245b44cea4b4bba5fb549bc77ee3a220870188965ddde6e94c1540cc6cb8eb8e50cc5a581f6e06e04e8bbaa5
 MISC metadata.xml 724 BLAKE2B d51bb78a15283c2c6dfe7f7e1d26c7d06522a9eafb9493e7ff3fb3e489ac8530cd896d207a2d5f49dbb2150553ba3075b4f7c131bc079af9950f6d5459131647 SHA512 3f1eddc6f7529e317ce91484474c9bf1165b85bb90ca62e9fe0c9fece1cb559c7c538fb5482580dd24af518c863570f2aa834da37147016fe1f7444c0c8e4a90
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.11.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.11.0.ebuild
deleted file mode 100644
index 9abff2ab71ee..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-21.11.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake plocale wxwidgets xdg
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake_src_prepare
-
-	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f locales/manual/${1}.po
-		rm -f info/${PN}.${1}.md
-		rm -f info/${PN}.${1}.html
-		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
-	}
-	plocale_find_changes locales/wxMaxima '' '.po'
-	plocale_for_each_disabled_locale rm_po
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWXM_UNIT_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Just run the unit tests manually for now as tests fail in a non-descriptive
-	# way even with virtualx
-	# bug #736695
-	cd "${BUILD_DIR}/test/unit_tests" || die
-
-	local tests=(
-		AFontSize
-		CellPtr
-		ImgCell
-	)
-
-	local test
-	for test in "${tests[@]}" ; do
-		./test_${test} || die "Unit test ${test} failed!"
-	done
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-22.04.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-22.09.0.ebuild
index 010023dd6e2b..16bca7a15010 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-22.04.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-22.09.0.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}"
+	x11-libs/wxGTK:${WX_GTK_VER}[webkit]"
 RDEPEND="${DEPEND}
 	media-fonts/jsmath
 	sci-visualization/gnuplot[wxwidgets]