* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/files/, sci-mathematics/wxmaxima/
@ 2017-12-31 13:27 Andrey Grozin
0 siblings, 0 replies; 3+ messages in thread
From: Andrey Grozin @ 2017-12-31 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 75c98d03ea71aad91fdc6aa610dfbfcd9c0bb17f
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 13:25:55 2017 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 13:27:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c98d03
sci-mathematics/wxmaxima: use wxwidgets.eclass
Closes: https://bugs.gentoo.org/642734
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../wxmaxima/files/wxmaxima-require-wxGTK-3.0.patch | 8 --------
sci-mathematics/wxmaxima/wxmaxima-17.10.1.ebuild | 11 ++++-------
2 files changed, 4 insertions(+), 15 deletions(-)
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 b08434061d3..00000000000
--- 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 52fa2ddc14e..c121ca2e948 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 \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/files/, sci-mathematics/wxmaxima/
@ 2019-12-24 16:55 Andrey Grozin
0 siblings, 0 replies; 3+ messages in thread
From: Andrey Grozin @ 2019-12-24 16:55 UTC (permalink / raw
To: gentoo-commits
commit: d4404cfaaa8412b41c99d7544f98968859e1b616
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 16:55:31 2019 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 16:55:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4404cfa
sci-mathematics/wxmaxima: bump to 19.12.2
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/wxmaxima/Manifest | 1 +
.../wxmaxima/files/wxmaxima-19.12.2.patch | 10 +++++
sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild | 51 ++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index e269d1c3599..5c652127de0 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -5,3 +5,4 @@ DIST wxmaxima-19.09.0.tar.gz 15153282 BLAKE2B 96cb2db8938b73fb2dc3547310109df581
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
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 00000000000..79ccce08390
--- /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.12.2.ebuild b/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
new file mode 100644
index 00000000000..d1fd945c6f9
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
@@ -0,0 +1,51 @@
+# 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"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/files/, sci-mathematics/wxmaxima/
@ 2020-01-30 15:48 Andrey Grozin
0 siblings, 0 replies; 3+ messages in thread
From: Andrey Grozin @ 2020-01-30 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 8d17e228d597602df8711f46c2be366d13ebb50d
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 15:48:14 2020 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 15:48:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d17e228
sci-mathematics/wxmaxima: cleaning old
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
sci-mathematics/wxmaxima/Manifest | 1 -
.../wxmaxima/files/wxmaxima-19.12.2.patch | 10 -----
sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild | 51 ----------------------
3 files changed, 62 deletions(-)
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 8b184821529..3fa7e6769a4 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,4 +1,3 @@
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
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 79ccce08390..00000000000
--- 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-19.12.2.ebuild
deleted file mode 100644
index 809444233ee..00000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-19.12.2.ebuild
+++ /dev/null
@@ -1,51 +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 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"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
-
-src_prepare() {
- setup-wxwidgets
- cmake_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_src_install
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-30 15:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-24 16:55 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/files/, sci-mathematics/wxmaxima/ Andrey Grozin
-- strict thread matches above, loose matches on Subject: below --
2020-01-30 15:48 Andrey Grozin
2017-12-31 13:27 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox