Migrate to wxGTK-2.8 with patch from Debian. Use EAPI 2. Simplify

wxwidgets handling.

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

4 files changed, 61 insertions, 6 deletions

diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog
index 3583a0a1c111..d0f65b433afc 100644
--- a/sci-biology/treeviewx/ChangeLog
+++ b/sci-biology/treeviewx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/treeviewx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.21 2010/02/18 02:55:23 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.22 2010/09/06 06:42:18 dirtyepic Exp $
+
+*treeviewx-0.5.1-r2 (06 Sep 2010)
+
+  06 Sep 2010; Ryan Hill <dirtyepic@gentoo.org> +treeviewx-0.5.1-r2.ebuild,
+  +files/treeviewx-0.5.1-wx28.patch:
+  Migrate to wxGTK-2.8 with patch from Debian. Use EAPI 2. Simplify
+  wxwidgets handling.
 
   18 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> treeviewx-0.5.1.ebuild,
   treeviewx-0.5.1-r1.ebuild:
diff --git a/sci-biology/treeviewx/Manifest b/sci-biology/treeviewx/Manifest
index 0bb04df94e16..14e4e75a1889 100644
--- a/sci-biology/treeviewx/Manifest
+++ b/sci-biology/treeviewx/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX treeviewx-0.5.1-gcc4.3.patch 2601 RMD160 2da0e86085e327c55d0bb453b25359dd126b2944 SHA1 3c90941bb5b9a35193949d93b90bb3e03fce67ee SHA256 e2f0a1f1b3c53b61f61e6f8b6d820f37350573ca8ab35866f4cbe96cd654bb6a
+AUX treeviewx-0.5.1-wx28.patch 408 RMD160 ecb647e90822a1c2641f051b307a6a04b8cb97bb SHA1 07293820d005b768b590004769572e1d48aa0655 SHA256 7b29f9656b9de8434172b73699199dc923a57c59a427f345ecaf152bf19c7ed1
 AUX treeviewx-gcc-3.4.patch 1993 RMD160 1f9bc8764baee71be7490ac80744ae201f22ea1b SHA1 60fe792aea3f8be41ab0efc453dd52d31ea3f783 SHA256 8a6449a278d0e24b7430a327e0e8505fe590b4b6c4d57318534bac72f15457bc
 AUX treeviewx-wxt.patch 1854 RMD160 9531ffb260bff7d7c26023558db07b7773c790b7 SHA1 e3d56f36477a0b0b7c4d5f3a08cd5f8b0a698f09 SHA256 2881ec0a4644434320d284a4024f18cba765245de99fa7b50c3cc20ab7a37eb4
 DIST tv-0.5.1.tar.gz 426745 RMD160 27c92a0f43c59c8988fe2d1410adb6de429e94c9 SHA1 0b0887477ca0d9ded6d0ee8bef014b6208e1fc14 SHA256 118bdbefb3f21636b1ba9da92e1b2029cb4d7d9944f4d02d2deace4ebb14c2d1
 EBUILD treeviewx-0.5.1-r1.ebuild 871 RMD160 5b0e6a424e119e8d151f2e3078acd712346dc07d SHA1 df84d5eaa99e7890ec34605034620f1732b93e03 SHA256 df97495b826533d95cf5fb6f5436f3d1bdaf12c94472be5355b57f8ab19a5f38
+EBUILD treeviewx-0.5.1-r2.ebuild 817 RMD160 905f147eff5dcfb16ca6f5f98c44524e7c5acfb1 SHA1 e1242eb3ec507671e09ba803135a8289031bad0c SHA256 fdc1feca9bb5e2999f73509c5f1ab859f13a309948905042cfdee73ea0214e0d
 EBUILD treeviewx-0.5.1.ebuild 828 RMD160 291b2cbf6026c4fc1a2c649db5038681f80c58e2 SHA1 6282a9de8fae24e2d382f4591b864d8ee954b0de SHA256 c9fda95c5b59e8d3bb6ec6ebc9fc5ae52a8f5c7c54e092dcc896987e4f503025
-MISC ChangeLog 3570 RMD160 094c75b2c8e2b7dae02e9c71504e63b7c396228e SHA1 58f9387f5bb9aba7b5f547534d6b2bcc8d472bd3 SHA256 8b4787cb10f81cb8c4893fd4d367cdffb1cd4db0c3db0620f7a2d34b40ac8e64
+MISC ChangeLog 3809 RMD160 6955ea56d896ba15fb990b7a86ee1e8ec932719b SHA1 584d7b250995886a9ac4bd9d6e3f03dc5adce626 SHA256 f4aaa64ee470a8030ca240c55fe29e0429a445f01d87b8e4ef5b50977df6e015
 MISC metadata.xml 434 RMD160 b45477d2da27f59cad18e93b9e799d6a74d9cd11 SHA1 37cbb90e98818a22efbf01b521f219fbd647b8cc SHA256 e8fb6d1773b527b0d847b0a58af01be7a0abd7074b414c8f206e7015e48cb3c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkt8rKYACgkQiqiDRvmkBmI1wwCglFMTFxxIJZHRxZ5hqOm0btw5
-+boAmgNG9yVq6zvQOEOT0BDhTuzIUWYI
-=84ML
+iEYEARECAAYFAkyEjlUACgkQiqiDRvmkBmLHIwCfVNlDF0iocvRBWdq+GQYMaoBR
+qJsAnA9nDxKUO9XwNLF6Tc7IrDEBk/nK
+=2dsH
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/treeviewx/files/treeviewx-0.5.1-wx28.patch b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx28.patch
new file mode 100644
index 000000000000..e3ba6b2fff50
--- /dev/null
+++ b/sci-biology/treeviewx/files/treeviewx-0.5.1-wx28.patch
@@ -0,0 +1,14 @@
+Fix build w/ wxGTK-2.8
+http://bugs.debian.org/567238
+
+--- a/tview.cpp
++++ b/tview.cpp
+@@ -994,7 +994,7 @@ END_EVENT_TABLE()
+ MyCanvas::MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
+  wxScrolledWindow(frame, -1, pos, size, style)
+ {
+-	SetBackgroundColour(wxColour("WHITE"));
++	SetBackgroundColour(wxColour(wxT("WHITE")));
+ 	view = v;
+ 	magnification = 1;
+ }
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1-r2.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..1a65ecedcadd
--- /dev/null
+++ b/sci-biology/treeviewx/treeviewx-0.5.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.5.1-r2.ebuild,v 1.1 2010/09/06 06:42:18 dirtyepic Exp $
+
+EAPI=2
+
+WX_GTK_VER="2.8"
+inherit eutils 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"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:2.8[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/tv-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-wxt.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+	epatch "${FILESDIR}"/${P}-wx28.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+}