gentoo resync : 15.01.2020

8 files changed, 24 insertions, 227 deletions

diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 23810b10c33c..d71338ac611c 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,15 +1,8 @@
+AUX wxmaxima-19.12.2.patch 640 BLAKE2B 24b61f183bda737d581fcbefda5a0f6bd0c30497bcf9bf7c79142882753a6e3f7f5a9b2207ebf6849b883742f6920cc48af984c36f22957aec94d09cd02e5d84 SHA512 6a03b90ef4911a0464ef71afd39d27f47964487d587f8ba7b93a840fbaa877dceb77505a5fea5088fbf7c87d1835101017d74492ae830500c38c70f3020050f0
 DIST wxmaxima-18.11.4.tar.gz 12156776 BLAKE2B 75be0fb88402af011885616a646f7abcad25516ea9b0b375daf02edac5518b113188290262bc431e8bfb4836fc1f731982a1c41c62871818e4d2cc68c96ccb31 SHA512 964de93edc5c46e98de3de405b1873fa0ed594d54f1ddc030377b023110261cb1e6b0b08dbf210551888bf890e28d16e9b1698768c93dde413d5e1918cbd234e
-DIST wxmaxima-19.05.7.tar.gz 13832202 BLAKE2B 6afe37dfcefe3f1711cc1cc89e4c61071dff2d49c60742a6d64ece9fa029823f6e94e20eb69e6d6cd8ccad1f5f656670089d593752f4be4d179222f5f2090d53 SHA512 3a7caee5ab03eefd4d2811345678d7b74081b0a4315dcc7739dbf4d265d274bb47a93ace5980a30185a13f40c1c970a8e4ba444bdd64b8b9ebd3b9a263cc6c06
-DIST wxmaxima-19.08.1.tar.gz 15153254 BLAKE2B 1bd48735ab95b078b9f35d7be623c1a16da6764649254579a2c2252ff858adb05e9408a85e5ed84dba6f15f879db761472276a5da77fa15e1c1823c678160aa3 SHA512 07f650144b8acd8295a45411185805185078f5236b67b33dac0f12308fc3b7522a6a46dfd2df35397c1d2fd5a357fb8d12473be4af576fcf09bda1e34352ae68
-DIST wxmaxima-19.09.0.tar.gz 15153282 BLAKE2B 96cb2db8938b73fb2dc3547310109df581a780a0372687aed9957cd3434fcbec8fef23467543f854f7e6b2c302dba6f3d5a411b17ab83e886175a62dc3fac385 SHA512 fad35fa118e49834d2ff6d54fb1f7cb8675ca1caadbb43c526b7a313479412c1a6c69959a0820c17af0119fc926f66c31368598c9e212fac56305a96d7a39838
-DIST wxmaxima-19.10.0.tar.gz 16573758 BLAKE2B 9bee3f8822e9c9ed28058496f7c5c6b2358feeafad39d08d92f3e6ff382817a8a7fd3e33b821f6faba3863f4c8871bc3bebee2b9d97ec6ccfdbfd7c0f7d44940 SHA512 39681cefb81a3816b7daeef7df5b23f57f3a4572ff34396fd447829ceaf6505d09f730255d3c44dd48232879b9994f26a9f86801fe333e15483026d864efdf14
-DIST wxmaxima-19.11.0.tar.gz 15304346 BLAKE2B 3a8038f4b67cee261d261f64671227963f91b55969b922282c3b2057029617a5989dc44dc8c28ab17a74e57c2547381dab98b07bf2a1f2f01a5d3c838d6d8a68 SHA512 bb0701ad2be71463ab412649164b2040e5fe95bd6fadb5332fbe5712dc4b65ef30fc86f2ff375e14f1879156fd77e1b8431f15794a136d7e6ee4e6a9393b903a
-DIST wxmaxima-19.12.1.tar.gz 15303584 BLAKE2B 0d7d1fb738563ba0d5805ddc746fc88548c76f249d6c79217f558b7a29c497cf4865810c4aa52f5787e9f4b87aacc93a6ce05726c3bc423c74f382b572ced12d SHA512 74bb60223fb47528f08ed737709eb703d533c27fadfd87deece08f6ec2a6ef1caa489f7ad31f0204010b1b421ab992b4167be133c69bca1b56872685ec0b2cad
+DIST wxmaxima-19.12.2.tar.gz 15765011 BLAKE2B fa788a9b5c204a06f85f84a89548af3b846e3e06f572df2b0f2d74aaf6dbfea98b26d8bbfd7c1c62ab8a0aa376d1af9d37bce563b474f5badf2a2bde43135d61 SHA512 5614f78f169eb1cacb46ae46ddb754103aa85cf90b309fffece4543fc06c600e967e2ea73bb8b82065075ded82fea44ccd709be651f5075e3b91edb304ad5ab6
+DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35eea49756d8f052bcfa245d31a4a2203880463f51833ed40f2e1365473eb138269287c30a52e9f9b98ef4d9a5daac8cf5 SHA512 bff946f87db39b4bf416ef3440fdfea277f9dc9ed95debcea5798211299ae8c8dbb136a44be586a79e538b99fd38c46febf5378caab6ac31a01a01033f083937
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
-EBUILD wxmaxima-19.05.7.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
-EBUILD wxmaxima-19.08.1.ebuild 1460 BLAKE2B 1137943c8725f8a47b31404ff691f4d865f419b9bdc224a851decc4d76c067c4b7dec561039c6b6efa9c6fc8b2643bb8f57f4c94dec60db954b8a02a3d049f65 SHA512 7437cacffb38ce11970036778acb916aadec00ad84e8d8de0f9627bb935e96caac30ede0f6b08ea72539fb3e93d96879796773741d95402df239536418e6dff4
-EBUILD wxmaxima-19.09.0.ebuild 1234 BLAKE2B 8cd862e12a583116859213c861d120095b88f5a815fcf8aed15499eaadaedcc5c0eae3c1e5b40e5bd4beae165fba68408c1c0772bf69ed28651264e214a82bf8 SHA512 f544e092e687134e312791a7b4d003bcc15b42aded3bc9e464ab1271c6e626fdb5fbdd87ae52c189a5e901099d3f8d47a9431b46c449f499081488b39d0e5218
-EBUILD wxmaxima-19.10.0.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
-EBUILD wxmaxima-19.11.0.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
-EBUILD wxmaxima-19.12.1.ebuild 1397 BLAKE2B fbd3c30213c726d0aeeb9a32c4f87c3d747343421c19330336cf132875cc84ad84b1b9b33b92961dbc54330bc02e33753d9e6f58eeeb069eca5d7a12559c773d SHA512 2ca45bc6831052fa7b6a0f8d6e628394419c46b040adab85878ff79acb6b19da710add34c5dcc17ea9bc397c41cd84597451340c2d68f6511cdeeecdf4715412
+EBUILD wxmaxima-19.12.2.ebuild 1367 BLAKE2B c12cba8e651a1edce842d59215dbe0e5ce34bdfd56db12e99c7338f4954f88fb31e4f298363fb13559e478ee903ecacd0245e4e0a6a5fb9cd9edc94164e7303a SHA512 87d33b367e9a0ff368443102c7da34a7ed3064a4ceb4d7d34b4abb61047903aa9cd9838f8d59ee4a1545e4d00f029e02215ed7c3d838a54aaf134c14612c1889
+EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
 MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5
diff --git a/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch b/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch
new file mode 100644
index 000000000000..79ccce08390d
--- /dev/null
+++ b/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch
@@ -0,0 +1,10 @@
+diff -r -U1 wxmaxima-Version-19.12.2.orig/src/Dirstructure.cpp wxmaxima-Version-19.12.2/src/Dirstructure.cpp
+--- wxmaxima-Version-19.12.2.orig/src/Dirstructure.cpp	2019-12-22 17:54:12.000000000 +0700
++++ wxmaxima-Version-19.12.2/src/Dirstructure.cpp	2019-12-24 22:47:33.433140055 +0700
+@@ -43,4 +43,4 @@
+   // The path Gentoo hides the manual at
+-  if(wxDirExists(m_helpDir + wxString::Format("doc/wxmaxima-%s",GITVERSION)))
+-    m_helpDir += wxString::Format("doc/wxmaxima-%s",GITVERSION);
++  if(wxDirExists(m_helpDir + wxString::Format("/doc/wxmaxima-%s",GITVERSION)))
++    m_helpDir += wxString::Format("/doc/wxmaxima-%s",GITVERSION);
+ 
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild
deleted file mode 100644
index 6e3b401b1d7f..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.05.7.ebuild
+++ /dev/null
@@ -1,57 +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 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-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
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
-
-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-19.08.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.08.1.ebuild
deleted file mode 100644
index 6e3b401b1d7f..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.08.1.ebuild
+++ /dev/null
@@ -1,57 +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 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-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
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
-
-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-19.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.09.0.ebuild
deleted file mode 100644
index f73edd67a189..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.09.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 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/${1}.po || die "rm ${1}.po failed"
-	}
-	l10n_find_plocales_changes "${S}"/locales '' '.po'
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.10.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.10.0.ebuild
deleted file mode 100644
index b22b9bbbbd26..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 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}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
index b22b9bbbbd26..809444233eef 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-19.12.1.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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
+inherit cmake wxwidgets l10n xdg
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
@@ -24,9 +24,11 @@ RDEPEND="${DEPEND}
 	sci-visualization/gnuplot[wxwidgets]
 	sci-mathematics/maxima"
 
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
 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 \
 		|| die "sed info/CMakeLists.txt failed"
@@ -44,6 +46,6 @@ src_prepare() {
 }
 
 src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
-	cmake-utils_src_install
+	docompress -x /usr/share/doc/${PF}
+	cmake_src_install
 }
diff --git a/sci-mathematics/wxmaxima/wxmaxima-19.11.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
index b22b9bbbbd26..9a2b704c52cf 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-19.11.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.01.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,6 +44,6 @@ src_prepare() {
 }
 
 src_install() {
-	docompress -x /usr/share/doc/${PF}/wxmaxima.hhp /usr/share/doc/${PF}/wxmaxima_tr.hhp
+	docompress -x /usr/share/doc/${PF}
 	cmake-utils_src_install
 }