summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-04-04 23:10:47 +0200
committerDavid Seifert <soap@gentoo.org>2021-04-04 23:10:47 +0200
commita8db9aed5f492023188313c5e4f9aa1f7f090066 (patch)
treea0065a8219866a0d57571d626e4e1ded94c45675 /sci-biology
parentsys-cluster/gmqtt: fix initd syntax (diff)
downloadgentoo-a8db9aed5f492023188313c5e4f9aa1f7f090066.tar.gz
gentoo-a8db9aed5f492023188313c5e4f9aa1f7f090066.tar.bz2
gentoo-a8db9aed5f492023188313c5e4f9aa1f7f090066.zip
sci-biology/treeviewx: Port to EAPI 7
Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch11
-rw-r--r--sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch24
-rw-r--r--sci-biology/treeviewx/files/treeviewx-wxt.patch8
-rw-r--r--sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild30
4 files changed, 31 insertions, 42 deletions
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
index ed5aa43e23c3..7a614edff72e 100644
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-70_choose_tree.patch
@@ -1,9 +1,8 @@
-## 70_choose_tree.dpatch by William Alexander Grant <william.grant@ubuntu.com.au>
---- tv-0.5.orig/tview.cpp
-+++ tv-0.5/tview.cpp
-@@ -209,7 +209,7 @@
- wxT("SVG vector picture files (*.svg)|*.svg"),
- wxSAVE|wxOVERWRITE_PROMPT);
+--- a/tview.cpp
++++ b/tview.cpp
+@@ -208,7 +208,7 @@
+ pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"),
+ wxSAVE|wxOVERWRITE_PROMPT);
- if (dialog.ShowModal() == wxID_OK)
+ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
index b1db5749990c..a1cfd906f176 100644
--- a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx30.patch
@@ -1,14 +1,6 @@
- tv.cpp | 4 ++--
- tview.cpp | 12 ++++++++----
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/tv.cpp b/tv.cpp
-old mode 100755
-new mode 100644
-index 1abe90b..0df45a8
--- a/tv.cpp
+++ b/tv.cpp
-@@ -163,9 +163,9 @@ bool MyApp::OnInit(void)
+@@ -163,9 +163,9 @@
{
// Optional command line argument is name of file to open
#if wxUSE_UNICODE
@@ -20,10 +12,6 @@ index 1abe90b..0df45a8
#endif
// Read input/output files
if (argc > 1)
-diff --git a/tview.cpp b/tview.cpp
-old mode 100755
-new mode 100644
-index 93972c3..4b2d593
--- a/tview.cpp
+++ b/tview.cpp
@@ -62,9 +62,13 @@
@@ -40,7 +28,7 @@ index 93972c3..4b2d593
// GUI interface
#include "tv.h"
-@@ -186,7 +190,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event))
+@@ -186,7 +190,7 @@
wxFrame *f = GetMainFrame();
wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
pictureFileName, wxT("Enhanced metafile (*.emf)|*.emf"),
@@ -49,16 +37,16 @@ index 93972c3..4b2d593
if (dialog.ShowModal() == wxID_OK)
{
-@@ -206,7 +210,7 @@ void TView::OnSavePicture (wxCommandEvent& WXUNUSED(event))
+@@ -206,7 +210,7 @@
#endif
wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""),
pictureFileName, wxT("SVG vector picture files (*.svg)|*.svg"),
- wxSAVE|wxOVERWRITE_PROMPT);
+ wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
- if (dialog.ShowModal() == wxID_OK)
+ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
{
-@@ -361,7 +365,7 @@ bool TView::OnClose(bool deleteWindow)
+@@ -361,7 +365,7 @@
// Clear the canvas in case we're in single-window mode,
// and the canvas stays.
@@ -67,7 +55,7 @@ index 93972c3..4b2d593
canvas->ClearBackground();
#else
canvas->Clear();
-@@ -686,7 +690,7 @@ void TView::OnLeafFont (wxCommandEvent& WXUNUSED(event))
+@@ -686,7 +690,7 @@
wxFontData data;
data.SetInitialFont (LeafFont);
diff --git a/sci-biology/treeviewx/files/treeviewx-wxt.patch b/sci-biology/treeviewx/files/treeviewx-wxt.patch
index b1c03bbb39f9..a971e1a85074 100644
--- a/sci-biology/treeviewx/files/treeviewx-wxt.patch
+++ b/sci-biology/treeviewx/files/treeviewx-wxt.patch
@@ -1,5 +1,5 @@
---- tv.cpp~ 2005-10-01 16:47:35.000000000 -0400
-+++ tv.cpp 2005-10-01 16:52:30.000000000 -0400
+--- a/tv.cpp
++++ b/tv.cpp
@@ -312,11 +312,15 @@
{
#ifdef __WXMSW__
@@ -18,8 +18,8 @@
#endif
#endif
file_menu->AppendSeparator();
---- tview.cpp~ 2005-10-01 16:47:45.000000000 -0400
-+++ tview.cpp 2005-10-01 16:50:42.000000000 -0400
+--- a/tview.cpp
++++ b/tview.cpp
@@ -184,10 +184,10 @@
wxString pictureFileName = GetFrame()->GetTitle();
pictureFileName += wxT(".emf");
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
index 7d1fe1c773e0..6ef3961e4df8 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r3.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-WX_GTK_VER=3.0
-
-inherit autotools eutils wxwidgets
+WX_GTK_VER="3.0"
+inherit autotools wxwidgets
DESCRIPTION="A phylogenetic tree viewer"
HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
SRC_URI="http://darwin.zoology.gla.ac.uk/~rpage/${PN}/download/0.5/tv-${PV}.tar.gz"
-LICENSE="GPL-2"
+S="${WORKDIR}/tv-${PV}"
-KEYWORDS="amd64 x86"
+LICENSE="GPL-2"
SLOT="0"
-IUSE=""
-
-DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
+KEYWORDS="amd64 x86"
-S="${WORKDIR}/tv-${PV}"
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-wxt.patch
@@ -30,10 +27,15 @@ PATCHES=(
"${FILESDIR}"/${P}-svg.patch
"${FILESDIR}"/${P}-treeview-xpm-not-xbm.patch
"${FILESDIR}"/${P}-wxstring-maxlen.patch
- )
+)
src_prepare() {
- epatch "${PATCHES[@]}"
+ default
mv configure.{in,ac} || die
eautoreconf
}
+
+src_configure() {
+ setup-wxwidgets
+ default
+}