gentoo resync : 05.02.2020

3 files changed, 5 insertions, 18 deletions

diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index d71338ac611c..309807009438 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,8 +1,7 @@
-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.12.2.tar.gz 15765011 BLAKE2B fa788a9b5c204a06f85f84a89548af3b846e3e06f572df2b0f2d74aaf6dbfea98b26d8bbfd7c1c62ab8a0aa376d1af9d37bce563b474f5badf2a2bde43135d61 SHA512 5614f78f169eb1cacb46ae46ddb754103aa85cf90b309fffece4543fc06c600e967e2ea73bb8b82065075ded82fea44ccd709be651f5075e3b91edb304ad5ab6
 DIST wxmaxima-20.01.1.tar.gz 14011946 BLAKE2B ed80f02158aa0c43f37c040225010b35eea49756d8f052bcfa245d31a4a2203880463f51833ed40f2e1365473eb138269287c30a52e9f9b98ef4d9a5daac8cf5 SHA512 bff946f87db39b4bf416ef3440fdfea277f9dc9ed95debcea5798211299ae8c8dbb136a44be586a79e538b99fd38c46febf5378caab6ac31a01a01033f083937
+DIST wxmaxima-20.01.3.tar.gz 14221966 BLAKE2B cdaf62f5456446fe6edf1247323faa9f0aeb84dbe890cb03028f9f441c4c6bd3e7acf806b71a86b156ea7f10664c0188517b8f2aa15536e3350e16e3307f412c SHA512 4a977bd293255ac3c010610c74aa39fba8b8468aaa9fc59707bab69ede7a427e261ce827bae8d302ee1343bb0fce5e7aa5ee3c59f17198d5c473637571667abd
 EBUILD wxmaxima-18.11.4.ebuild 1324 BLAKE2B 1f6c20362bc7403da290ae6ae0bfa898b611d2986f770523d24780682562fa5c60a853697dda8507fe1ede01410b140bd6518cf1f5b0a65502fc36a9f0486a7d SHA512 e6102de11417007556f36485d8c37c100c0bc2f5df0cb39750ef5bda82d4c7a71d4036f7879e066dc407f45eab3e92122ae2c0494cbc94e607daf3982ea1702a
-EBUILD wxmaxima-19.12.2.ebuild 1367 BLAKE2B c12cba8e651a1edce842d59215dbe0e5ce34bdfd56db12e99c7338f4954f88fb31e4f298363fb13559e478ee903ecacd0245e4e0a6a5fb9cd9edc94164e7303a SHA512 87d33b367e9a0ff368443102c7da34a7ed3064a4ceb4d7d34b4abb61047903aa9cd9838f8d59ee4a1545e4d00f029e02215ed7c3d838a54aaf134c14612c1889
 EBUILD wxmaxima-20.01.1.ebuild 1347 BLAKE2B d67dc143889163798e870e8ec3d04c3821bbb99ce4d1f114ecb5bc76756ae2b6fefba5b01e1ac45b16d6255dce909a9568eba1b1128dc89e127b1a329d4ac789 SHA512 7863680d2507d628741568a67954fa40962fbce8b78afdd83cf9f2612eae3d65e53a0a83b02f313b4a79e9acaf6094ac044a34c1cc6bca6ac7fa94df999c9a9b
+EBUILD wxmaxima-20.01.3.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
deleted file mode 100644
index 79ccce08390d..000000000000
--- a/sci-mathematics/wxmaxima/files/wxmaxima-19.12.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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.12.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild
index 809444233eef..9a2b704c52cf 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-20.01.3.ebuild
@@ -4,7 +4,7 @@
 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 wxwidgets l10n xdg
+inherit cmake-utils wxwidgets l10n xdg
 
 DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
 HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
@@ -24,11 +24,9 @@ RDEPEND="${DEPEND}
 	sci-visualization/gnuplot[wxwidgets]
 	sci-mathematics/maxima"
 
-PATCHES=( "${FILESDIR}"/${P}.patch )
-
 src_prepare() {
 	setup-wxwidgets
-	cmake_src_prepare
+	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"
@@ -47,5 +45,5 @@ src_prepare() {
 
 src_install() {
 	docompress -x /usr/share/doc/${PF}
-	cmake_src_install
+	cmake-utils_src_install
 }