gentoo resync : 28.04.2021

6 files changed, 116 insertions, 61 deletions

diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 8c1675fd8dc4..5ca755d6efbf 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,7 +1,7 @@
-DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
 DIST wxmaxima-21.01.0.tar.gz 16220587 BLAKE2B b987e8c44c253484d152092093ab9154b7c2a5817c584bc1a4f4a0e5beec3ec2e0bc6995aea6ba28df2223b039ca97905225cc2524840174b2c99a5f7774dab2 SHA512 aec5aa5d3a9883e9b21b890c133684004576411a8341f3913ae548175979ad1f07a16d0fccd24c7757d40f4d06b4070b00fa7ef54f73f26b99c825e03e2a408b
-EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
-EBUILD wxmaxima-20.12.2.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
-EBUILD wxmaxima-21.01.0.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
-MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
+DIST wxmaxima-21.04.0.tar.gz 17684730 BLAKE2B a3b12970ad976a3ee3fc237b6d60f52d460e87997b869825d17645daa0f82bcc6f7999188fe4c92bba819d7a895cff468ff273ab62ab30f38a7a54a6dba47786 SHA512 723373c9fd9877bce38a205455e6ac58a48a61ac3ad0be5c09d0b24abeebd35af481f19efe5de08a2507f1198a8b4b6cfa987c50e4d4a580b4e05ec2c3e5a4f7
+EBUILD wxmaxima-20.12.2.ebuild 1431 BLAKE2B 9a4b92a92dcf9636eec1449f27de9c4dbf5493d13e9cbbbc4c6ea8be8bfe5ca9d282b9df2b6c4a3f1d3c442a363551becf1bbf1c40da4eec77bdc69ed36723af SHA512 36ac799799deba2250d21a576a4387d2f4491afeae5dcaf5316d62008196a7ec80b4cc0d1745b67bc845c47172b1affb0f24405fd39edd12abf94c070ef32946
+EBUILD wxmaxima-21.01.0.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
+EBUILD wxmaxima-21.04.0.ebuild 1896 BLAKE2B 5f1defc0d4e009b83ed05b436d58ac434c0d85733c4e51a17e54ebf62c4eeb7fe33b74acb9a650ece08587b0e7fbb4742043b3f0b130d8fcf72d7fe600947e39 SHA512 747541798d41f07190e841518563e648de0e379d6f8485dd03b62b22407cbd090e24bdaf4c7e8d094e07ec00e82b440ce60129f4eaccca3fe7bf1f15559fc966
+MISC metadata.xml 723 BLAKE2B ab9996b65f11ba1e2a463a837e93de7520b8bc71bf691f3d01a9586d94f27273d41c9114912d5c551fc41329b1f2bce92fd433d620caadbba2bbe947e8532660 SHA512 277b301079c31fb3c5d8daddd6d53baab62eeea4ea66b6492aeb8bbea9f8cc15394b56e32e91e40899aa8637ee74da3b35c231ef117ac8c31a5880f87a096c05
diff --git a/sci-mathematics/wxmaxima/metadata.xml b/sci-mathematics/wxmaxima/metadata.xml
index de974d73bcb2..f18f25f2a4a2 100644
--- a/sci-mathematics/wxmaxima/metadata.xml
+++ b/sci-mathematics/wxmaxima/metadata.xml
@@ -13,6 +13,6 @@ completion based on previous input (tab-key).
 wxMaxima provides 2d formated display of maxima output.
 </longdescription>
   <upstream>
-    <remote-id type="github">andrejv/wxmaxima</remote-id>
+    <remote-id type="github">wxMaxima-developers/wxmaxima</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild
deleted file mode 100644
index 786a11df35cd..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-18.11.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="ca cs da de el es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="http://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-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-utils_src_prepare
-
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm "${S}"/locales/${1}.po || die "rm ${1}.po failed"
-	}
-	l10n_find_plocales_changes "${S}"/locales '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
index a76a6aeeb045..cddb6c554f07 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 S="${WORKDIR}"/${PN}-Version-${PV}
 
diff --git a/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
index a76a6aeeb045..86038f4610e9 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-21.01.0.ebuild
@@ -2,6 +2,7 @@
 # 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 wxwidgets l10n xdg
@@ -9,12 +10,13 @@ inherit cmake wxwidgets l10n 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=""
-S="${WORKDIR}"/${PN}-Version-${PV}
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxml2:2
@@ -45,6 +47,32 @@ src_prepare() {
 	l10n_for_each_disabled_locale_do 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-21.04.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-21.04.0.ebuild
new file mode 100644
index 000000000000..86038f4610e9
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-21.04.0.ebuild
@@ -0,0 +1,79 @@
+# 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 wxwidgets l10n 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
+	}
+	l10n_find_plocales_changes locales/wxMaxima '' '.po'
+	l10n_for_each_disabled_locale_do 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
+}