Fixed bug #112927 by adding 0.5.1 to x86 and removing 0.5.

(Portage version: 2.0.51.22-r3)

4 files changed, 8 insertions, 58 deletions

diff --git a/sci-biology/treeviewx/ChangeLog b/sci-biology/treeviewx/ChangeLog
index 3fe30e4008ca..59f8232a3f89 100644
--- a/sci-biology/treeviewx/ChangeLog
+++ b/sci-biology/treeviewx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-biology/treeviewx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.12 2005/11/19 16:28:48 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/ChangeLog,v 1.13 2005/12/13 20:38:01 ribosome Exp $
+
+  13 Dec 2005; Olivier Fisette <ribosome@gentoo.org> -treeviewx-0.5.ebuild,
+  treeviewx-0.5.1.ebuild:
+  Added 0.5.1 to x86. Removed old version. (Small change to propagate the
+  fix for bug #112927 to the stable branch.)
 
   19 Nov 2005; Olivier Fisette <ribosome@gentoo.org> treeviewx-0.5.1.ebuild:
   Added check for wxGTK built with X (fixes bug #112927).
diff --git a/sci-biology/treeviewx/files/digest-treeviewx-0.5 b/sci-biology/treeviewx/files/digest-treeviewx-0.5
deleted file mode 100644
index c1d739144b91..000000000000
--- a/sci-biology/treeviewx/files/digest-treeviewx-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c8bf75667184943f4d3f047a4e7538d tv-0.5.tar.gz 394811
diff --git a/sci-biology/treeviewx/treeviewx-0.5.1.ebuild b/sci-biology/treeviewx/treeviewx-0.5.1.ebuild
index 2f123af96049..ebab7572355d 100644
--- a/sci-biology/treeviewx/treeviewx-0.5.1.ebuild
+++ b/sci-biology/treeviewx/treeviewx-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.3 2005/11/19 16:28:48 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.5.1.ebuild,v 1.4 2005/12/13 20:38:01 ribosome Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ 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="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
diff --git a/sci-biology/treeviewx/treeviewx-0.5.ebuild b/sci-biology/treeviewx/treeviewx-0.5.ebuild
deleted file mode 100644
index f423b39861af..000000000000
--- a/sci-biology/treeviewx/treeviewx-0.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/treeviewx/treeviewx-0.5.ebuild,v 1.2 2005/05/13 03:18:18 ribosome Exp $
-
-inherit eutils
-
-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/${PV}/tv-${PV}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=x11-libs/wxGTK-2.4.2-r2"
-
-S=${WORKDIR}/tv-${PV}
-
-pkg_setup() {
-	if ! [ -e /usr/lib/libwx_gtk2-2.4.so ]; then
-		eerror "TreeView X requires the non Unicode, gtk2-enabled version"
-		eerror "of the wxGTK library. This version was not found on your"
-		eerror "system. Please install \">=x11-libs/wx_TK-2.4.2-r2\" with"
-		eerror "the \"gtk2\" \"USE\" flag enabled."
-		die "Could not find non Unicode, gtk2-enabled wxGTK library."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gcc-3.4.patch
-}
-
-src_compile() {
-	econf || die
-	# The configure script may pick the Unicode wxGTK.
-	if grep -q "gtk2u" Makefile; then
-		sed -i -e 's/gtk2u/gtk2/' Makefile || die
-		cd TreeLib
-		sed -i -e 's/gtk2u/gtk2/' Makefile || die
-		cd ../ncl-2.0
-		sed -i -e 's/gtk2u/gtk2/' Makefile || die
-		cd src
-		sed -i -e 's/gtk2u/gtk2/' Makefile || die
-	fi
-	cd ${S}
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-}