gentoo resync : 22.01.2021

7 files changed, 16 insertions, 269 deletions

diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index af114c8b14bb..785fb93c3757 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,15 +1,5 @@
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
-DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35eea49756d8f052bcfa245d31a4a2203880463f51833ed40f2e1365473eb138269287c30a52e9f9b98ef4d9a5daac8cf5 SHA512 bff946f87db39b4bf416ef3440fdfea277f9dc9ed95debcea5798211299ae8c8dbb136a44be586a79e538b99fd38c46febf5378caab6ac31a01a01033f083937
-DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0aeb84dbe890cb03028f9f441c4c6bd3e7acf806b71a86b156ea7f10664c0188517b8f2aa15536e3350e16e3307f412c SHA512 4a977bd293255ac3c010610c74aa39fba8b8468aaa9fc59707bab69ede7a427e261ce827bae8d302ee1343bb0fce5e7aa5ee3c59f17198d5c473637571667abd
-DIST wxmaxima-20.02.4.tar.gz 15242422 BLAKE2B ea9dc613fa94d046a9d461c56a9d1564001f4fa28d90a553040e85b7dd442df025521dd9501257d12c808a2e9285b7f34b04c9f10d4ce658bc6d423055c9fbd7 SHA512 d5eb0e09de55c3e6ebafeaa95957ca8bbdacac9ec1d99f6041fa99b7fa59364b3228336675f9bffa71b879b17268b80c695f16c9259bee6d5cab9ef7ed86294b
-DIST wxmaxima-20.04.0.tar.gz 15313618 BLAKE2B 04a9544aeb1a7084250696fad99c51be21bf0b119581cebdf62b8dece3034ebcc1469b9d07576bfed8d72efe77ce6db47b5a29c4185a5e85114b552d3385caf9 SHA512 8caf9effa0167c3307eff4a6895a3b19b41aab37f845e4cdc139f3cdd03d9a061adc9ea4ad8ca7e0f28d83faf34d15f828f03c86d05ad7d83f0e28aee82aba70
-DIST wxmaxima-20.07.0.tar.gz 15723971 BLAKE2B cdec59e8ca17d0f4577a316a68e90795424d3d31829130e1854d908d76e54c02b125d20ce3a41ad5b4b06d57d918156bbbce7dead114b05daade34845d045124 SHA512 7272df5314ac79248154ee899397361da0570a6188ddc464b0479d2d6ac556ddf3941cf1ac17c9e6642e77d79a8458b902e70513dfdea15bc6a6d36d76b0bec2
-DIST wxmaxima-20.09.0.tar.gz 16159536 BLAKE2B 758537f9d35ecbec1405318465ccce91b172f0e6fb00c71b926224f1cb90ed31263d8ae69a14a437c05e9e489e5143fb2e010ccb44e3fd9d7cf29785dbac9dfa SHA512 952fdfec3f07904e3385657b43f5ad669a3149307843d352aa4d78c6ff88fb51aa31f301964a13c86faece5d4a2acce5af91338e7de57599d7414da447564fe8
+DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
-EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
-EBUILD wxmaxima-20.01.3.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
-EBUILD wxmaxima-20.02.4.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
-EBUILD wxmaxima-20.04.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
-EBUILD wxmaxima-20.07.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
-EBUILD wxmaxima-20.09.0.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
+EBUILD wxmaxima-20.12.2.ebuild 1433 BLAKE2B aab53bc0b36e755aeb883cf18b2a9dc74e6420478765b351c920f2937f6970a20524d31833da7d51730bd7a5955f998e2968cf36d3a48b8122f2eac339b04f8a SHA512 32773324509bc19466c91a43c39050f25a4922f67eac211a117ec6f69be379881f5615a4d000176c0fb490bd91a7534f75038867e4e91064d1ea1b59fcb79570
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-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-utils 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"
-
-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/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
-	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.02.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-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-utils 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"
-
-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/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
-	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.04.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-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-utils 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"
-
-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/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
-	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.07.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-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-utils 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"
-
-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/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
-	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild
deleted file mode 100644
index 9a2b704c52cf..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-20.09.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-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-utils 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"
-
-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/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
-	}
-	l10n_find_plocales_changes "${S}"/locales/wxMaxima '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
index 9a2b704c52cf..a76a6aeeb045 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.12.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-WX_GTK_VER="3.0"
+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-utils wxwidgets l10n xdg
+inherit cmake wxwidgets l10n xdg
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
@@ -26,24 +26,26 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	setup-wxwidgets
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \
+	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 "${S}"/locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f "${S}"/locales/manual/${1}.po
-		rm -f "${S}"/locales/wxwin/${1}.po
-		rm -f "${S}"/info/${PN}.${1}.md
-		rm -f "${S}"/info/${PN}.${1}.html
+		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 "${S}"/locales/wxMaxima '' '.po'
+	l10n_find_plocales_changes locales/wxMaxima '' '.po'
 	l10n_for_each_disabled_locale_do rm_po
 }
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}
-	cmake-utils_src_install
+	cmake_src_install
 }