From 618c3037024b4e5328531cdc07c6ceb7486f5329 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Dec 2017 22:30:36 +0000 Subject: gentoo resync : 31.12.2017 (final resync this year) --- sci-mathematics/wxmaxima/Manifest | 3 +-- .../wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch | 8 -------- sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild | 11 ++++------- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch (limited to 'sci-mathematics/wxmaxima') diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest index 5cfff8dd3f92..7de2f00e2e22 100644 --- a/sci-mathematics/wxmaxima/Manifest +++ b/sci-mathematics/wxmaxima/Manifest @@ -1,4 +1,3 @@ -AUX wxmaxima-require-wxGTK-3.0.patch 466 BLAKE2B 54d6c8cad12edab71e7efc5c4c0fe3acf079f7419258d597096e284c7d8b4293e1b4e3dfb141d81fed6cba617b13f83d0f5449d3a67146914f4985164bc92187 SHA512 9c90982c43f9d4a0e6c2cd69704cd52694615234cd7b2f3180d14146ac3d5bc1deb9098bc75745dc5f18a2be664ef3b783cceb689bf200eabf47588ec59ca226 DIST wxmaxima-15.08.2.tar.gz 5592673 BLAKE2B cacb508cbcb24e27a43998ba0079b14117980669c25b39b017c0c659ef48d2ad338c6503aea99447a14250ed1a68a3414880828fc8ffdcbd3177b8eb9355a919 SHA512 a537c49477f54df4fd9e4e42a5e0d0d740f1ede817d807a98b7cec877a3ad77b2be0a61ae487a7fa5beb193b112eca163b8873292ecab5acf118d58a91e91af6 DIST wxmaxima-16.04.2.tar.gz 5178050 BLAKE2B 52c416040277fbbf0f8e930f3ad3b8a78f7ed65d28d31722b0fef8482df261c418185705dd00841d9975ea55838303756ca7874a0e94f174fd4274fbd2dbc5d4 SHA512 da8159e7c779f50bde7a6f6852987c18aaf724b1ebf0bdc4d231f40b80e04cee2870a520251d212681b3f0a7533d28b744d3684fc395a26d2a46b48c1a31a856 DIST wxmaxima-16.12.0.tar.gz 4842949 BLAKE2B 668219b2602b02e49eafa2c35fa7a5cfc995691356f5ce747590aa2e516ad8c1c8a6f57c8c8e19095ff301b7fd131942ea0ed6dbf4ce3b728fbb139e2139b5dc SHA512 6a68cf6b4fdf07bef7fdd19397c226c3cf4f693aaab8ae028e6af69b114a04fa7dbf20f7f183853f8f655ef8d0bf984ee2a0af6096697ab3c454d17f37c98819 @@ -8,5 +7,5 @@ EBUILD wxmaxima-15.08.2.ebuild 1653 BLAKE2B 1822797d2cf9afbd98b08d4ad3384c118c59 EBUILD wxmaxima-16.04.2.ebuild 1656 BLAKE2B 64e40008e8b3912ab8955fb70d839845e2f901e53ffb2f9f623c59abe8266a81829b14999ca86cb351a82d8a7f30c1f5f7608df43258915ff53905b70079c0f9 SHA512 e3a379cc00ace47d2864a330c505d8f0e288703e8652b66467234fa69dd5143af61db7efd9b1d4ee6a324530febfe188570ba7814d0a67b50c4e0cb6efbc9c74 EBUILD wxmaxima-16.12.0.ebuild 1656 BLAKE2B 64e40008e8b3912ab8955fb70d839845e2f901e53ffb2f9f623c59abe8266a81829b14999ca86cb351a82d8a7f30c1f5f7608df43258915ff53905b70079c0f9 SHA512 e3a379cc00ace47d2864a330c505d8f0e288703e8652b66467234fa69dd5143af61db7efd9b1d4ee6a324530febfe188570ba7814d0a67b50c4e0cb6efbc9c74 EBUILD wxmaxima-16.12.2.ebuild 1656 BLAKE2B c56ed7d7b05ac88ad7555183abec7a8a24f6a44b2920889c539b36c708a5c637ef36bb311df6b5f46ea58a9c1a7599678746e67bde4554190c6ccb69b37d61cc SHA512 e6452ab3a3d4ccbe71befe27477775c00bdfe1235fa10e25acc5ed8d6d528acb735937eccddc288e5a70149baeb852b17fa00d652720526f299b246b4882575a -EBUILD wxmaxima-17.10.1.ebuild 1311 BLAKE2B 3800a3abe3d2bf4425ae13927cc586b1f8305d87bf60c9e3c81adb2bef21db19bd0274699da2c9406816a6de1e1e4752f491e78a1101e4ba7c0853bd90068c55 SHA512 55516215396e1b53946ee8fd50dcfe375ea4a378561b5308a71844e4ed0729fc80c1af6816ff550ba0ebfeec3212d52176b6ce0ed4ef7376d9f7ebecd1a546c2 +EBUILD wxmaxima-17.10.1.ebuild 1306 BLAKE2B 5c96b27590bf6dd78beaff9a8b8b686a4c1b7c8a49f7045eaec2beb527168b4a371bd1dbe6b918d6c137bb6b4d2e88502268d406397b7dc9d5b703d7b3443ff4 SHA512 7ad43881f4bf03c28fe46e01e35cfc9a9bab8eb49745b40e3f0fd9a6b62c630312c7a8a7c7863efdcc5bea56b2f4cc7166dce7f1f6feff2e45dcf172b7903b0a MISC metadata.xml 711 BLAKE2B 00c54141e803d86fb20dc4f058fe99f6bbc2fd067175af6d0a5f893dc5a0b523fdd9116341ba33f991b11538989869337e1ce36c2259cfdb284725fed1aeaf60 SHA512 30a578958cbc4813e2615d0c3d7c4a1349f408933f285d3a43a382bf90bdf5c985ef1b844c4f8391205be643961de0335536ee800e1be24bf358bb4ead736fe5 diff --git a/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch b/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch deleted file mode 100644 index b08434061d39..000000000000 --- a/sci-mathematics/wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -r -U3 wxmaxima-Version-17.10.1.orig/src/CMakeLists.txt wxmaxima-Version-17.10.1/src/CMakeLists.txt ---- wxmaxima-Version-17.10.1.orig/src/CMakeLists.txt 2017-10-22 12:45:56.000000000 +0700 -+++ wxmaxima-Version-17.10.1/src/CMakeLists.txt 2017-12-28 21:29:58.389806037 +0700 -@@ -1,3 +1,4 @@ -+set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk2 --version=3.0) - find_package(wxWidgets REQUIRED std xml html adv aui core net base richtext) - - include(${wxWidgets_USE_FILE}) diff --git a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild b/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild index 52fa2ddc14ed..c121ca2e948d 100644 --- a/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild +++ b/sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild @@ -2,9 +2,9 @@ # 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 l10n xdg-utils gnome2-utils +inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit" HOMEPAGE="http://andrejv.github.io/wxmaxima/" @@ -18,17 +18,14 @@ S="${WORKDIR}"/${PN}-Version-${PV} DEPEND=" dev-libs/libxml2:2 - x11-libs/wxGTK:3.0" + x11-libs/wxGTK:${WX_GTK_VER}" RDEPEND="${DEPEND} media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima" -PATCHES=( - "${FILESDIR}"/${PN}-require-wxGTK-3.0.patch -) - src_prepare() { + setup-wxwidgets cmake-utils_src_prepare sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i "${S}"/info/CMakeLists.txt \ -- cgit v1.2.3