gentoo resync : 28.04.2021

5 files changed, 35 insertions, 46 deletions

diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index 807e4bf5a789..e7b206537f60 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -1,11 +1,11 @@
-AUX treeviewx-0.5.1-70_choose_tree.patch 439 BLAKE2B 5730b4f8b20ef4be14fbd4956100571cf9b26ef697834773095a3f11f2510466bc0c85582c31c1e2d0fd113ab4540db394831abb5891e4ff36c6c5a44a8f5a73 SHA512 efe6e903929264359388f88288a95ea28d98efe1eb3dca6248801afa0ab44ee7afdf456f271d088f7b3231b1b9db58c5fde7b147c4ca76b5761d77a1139762bc
+AUX treeviewx-0.5.1-70_choose_tree.patch 347 BLAKE2B deb36ebad2fce531b353376d3e115bafad9a21ee7ac62ea7cc9571733e2565903f85e733fc27cef306bb82b038e2bd16c7a69a7666af2aa9c7a04ea04319f244 SHA512 8e83180f7619e61ab6a6cdce7a576820a8e12fc2c0caf73b68c3943a98c7e618fcf0d477276b976039b594d60388a80a24f0502ebbc45ec1be371946f5c0cf1e
 AUX treeviewx-0.5.1-fix_loading_crash.patch 951 BLAKE2B 7fb391335a57114a9f8ee707ffe908839a064bbe6aeab05fe0b1af8928ccb0504d91ce9e25cc55a7762422f71978e28f1479adae11293249a8a67ce8536f8d05 SHA512 9c205520dce7851520b24532f88348906c4d5a7f0fe392348099ee9f7377b778792170620856d533a275251a024756482bbd4b83d1da8281b84c39cdf2b3a711
 AUX treeviewx-0.5.1-gcc4.3.patch 2601 BLAKE2B 740a3efb736389fa0de40b0f2344e2767450809547189ef6cf659b05b6d80954550b5d5688e03a904ce6f8ec45866dff174cda0dbdbee5b0baff8cef86992240 SHA512 4629ad00ca712163fccbdb029dbb42970d432b2bcaf6b6345a7bf3dca2331ab988742a6dfbc8874e2624988c699b4ba1fff8032dda53afcffbd8264df62b480b
 AUX treeviewx-0.5.1-svg.patch 1181 BLAKE2B b647b33738af0a933d0a946aa15d02f67b87175c4845813e9f01578dad6a3052902cc946b2f13dfe19451595364094094e388d8838c6c67b1448f8a32a832a65 SHA512 d71ee136f4f47792ce98826d8f7bca18320f404937abd90cdacd2685f62ed28f48601a105dd1cfb9717891a8930be339b6a663b11784f305d03af0cba24b4c4f
 AUX treeviewx-0.5.1-treeview-xpm-not-xbm.patch 519 BLAKE2B 33a73602f4da18a723e292b0903a695add936697fbfd29ef978267f5e2ae1e1aa6dd49754c21900fabaf6259f732d7531f4d571f85ee544bc3d18f99961a31d4 SHA512 324b77dc43a99b55be45e1b561e528c8bb2f56ec4b1c7162987c848d0e6ea034efe262d910ee67fddcf0137b6eaeedfb50f26b8b2106b0459582942f5eccfbd4
-AUX treeviewx-0.5.1-wx30.patch 2211 BLAKE2B a0327c8a4238d0ff3aa0f7e108dc6df85a9e025862e1a72bd80669bb11f692d7b3033f6f9fe8dab5464731658434ecfa56423cdf4c3d8ac2056abffe4298b929 SHA512 0f1c05495badabba586d88a6fd0e3610b28dc5779c036d3da4956de6c5e02aabf1ef59e9aceffe85cc78ea582329965f6e228774ad6a944d91542e8bacb5daa6
+AUX treeviewx-0.5.1-wx30.patch 1722 BLAKE2B bc7d24b8b3953316ea4f8cb9eb26ab78fb7aee2adfce63f1ad6a758eb7d061badbcaf305d913c23fbf84773ead36242ec6995b476a1b795eb4110bc67ed4d135 SHA512 3efeea31429d623c65c958fc0ec859918e8e8b52d83973f7c7a131e47894093a2cbaafbb69c9a962ba12c0cf1ad733f2bf6d605888800d42a784d7bf3535c071
 AUX treeviewx-0.5.1-wxstring-maxlen.patch 1438 BLAKE2B a2dc6fe39c0312559628b61d86975a21db846e4c7cc3a0bb5739dd971417abd3ab9187ea56ef44d37c0394b28d4017981073eb4d890622d0d929f7a4d428950f SHA512 6e02ac59e8a28da8e94d5d6fdea71b3db9bc4501d9becf2d7aa6472d3f9f9b571fe68730390fd4cf6e1e422d618c21c40d86442d6b710e8395db107fc3445392
-AUX treeviewx-wxt.patch 1854 BLAKE2B 2b11d2395d6a2f8cde176feb04bcadca3c8fbd9ee3bc48fdb8f3d20c5d2f268fcf20f1f2f7bb9fe6263be2518610f2b87e2cdcf86d254185f81ada5484ef5248 SHA512 35f9682bd8f17a2d2436ae6c0b729bcb766fd848b9b24e3f17577e4cef0cd6fd820a8686818feaf6e1414c0f10891bac0befa818a9befc337fd5e87f5120e520
+AUX treeviewx-wxt.patch 1716 BLAKE2B f869d1d90dd23a7f0e242d9c1d0b0b97e0e053b5b2f00b283073f6e7f2d714cd2bf23656e65af1f3496bef0bf681ebb0618024f259b7f4d6dea777b048a438e4 SHA512 97d074e9501000099d0c5b3e3f56a796b1526499d4ccb44ef6f0b851bde1c27fc78bbc64f439ba5ecd3afa531b752c69148d7cd3b1e5a08a01566ad6155ce25c
 DIST tv-0.5.1.tar.gz 426745 BLAKE2B 080c4e09f441fd83da3406990bbe97f9e29fa531f47a65533ca887580f8a3ec561bb4766e66e2ef4764f68eee86fdabf48481cece56ddda90f9ffdc3c80b3a1a SHA512 45a7ac6dff5b22771e4428d6b1ee528c0039956a462658d28d4f588b6df32620d8f69b3bcf5ca23643e2bdd5361da00625fcb1495bcf4f74d44ee22022c63143
-EBUILD treeviewx-0.5.1-r3.ebuild 894 BLAKE2B 57111a7a18629dcfb207b2acd256db107324b4308240d55e656ca2eb9dea762b950109cf03e938ef09ef9d91ba2b101631871cfbdd4e72ee9ff0ce9bdac46614 SHA512 316d9b8359813322cf77338aae8b7f687d4a40ca52cd70d739fbf76b28a188e45ac97d430b90fdec2b2c0e081de868cc3c842d0a94a56c8f3d0124eac058ffa9
+EBUILD treeviewx-0.5.1-r3.ebuild 908 BLAKE2B 5d52ec68fa05f79848314599bb9b4a22378de9e26a5d958327f948780634a2de1a6155449968cc330f459525fb50ef28a5158e37bff9ae0e658174a2e92162a5 SHA512 92012299b8ca8dc97529c308e989258fd842e6c76bde1c267891afed198aa8c6ffd3b1f301b18c356613ecca47c32e61f60e2491d04a54d54f2eebfba874eb0d
 MISC metadata.xml 530 BLAKE2B e28ef45f05b4ade77b26155b743afe8e72989065c4dba57b7a645e738366afff1d99c827dc1ea1f5cdb192ae2ef790be6de9a6905eeebd58e792e5d4e02b0dcb SHA512 28c429150fb8df5db3205b352f077fe431f3e2ca530195468a340909a3b37882fae67e05452a7810ac34ffb8a02979625b48c28285a7d3abf31004238fce1463
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
+}