Version bump, fix bug 261278

(Portage version: 2.2_rc30/cvs/Linux x86_64)

4 files changed, 19 insertions, 28 deletions

diff --git a/sci-biology/clustalx/ChangeLog b/sci-biology/clustalx/ChangeLog
index c4722614eded..247efe68a413 100644
--- a/sci-biology/clustalx/ChangeLog
+++ b/sci-biology/clustalx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/clustalx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalx/ChangeLog,v 1.18 2009/03/24 21:19:09 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalx/ChangeLog,v 1.19 2009/04/29 01:49:57 weaver Exp $
+
+*clustalx-2.0.11 (28 Apr 2009)
+
+  28 Apr 2009; Andrey Kislyuk <weaver@gentoo.org>
+  -files/clustalx-2.0.9-gcc4.3.patch, metadata.xml, -clustalx-2.0.9.ebuild,
+  +clustalx-2.0.11.ebuild:
+  Version bump, fix bug 261278, remove old, assume maintainership
 
   24 Mar 2009; Olivier Fisette <ribosome@gentoo.org> metadata.xml:
   Giving up maintainership of this package.
diff --git a/sci-biology/clustalx/clustalx-2.0.9.ebuild b/sci-biology/clustalx/clustalx-2.0.11.ebuild
index cc334fa16f60..898ede314a38 100644
--- a/sci-biology/clustalx/clustalx-2.0.9.ebuild
+++ b/sci-biology/clustalx/clustalx-2.0.11.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalx/clustalx-2.0.9.ebuild,v 1.2 2008/09/09 13:31:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/clustalx/clustalx-2.0.11.ebuild,v 1.1 2009/04/29 01:49:57 weaver Exp $
 
-EAPI=1
+EAPI=2
 
 inherit qt4 eutils
 
 DESCRIPTION="Graphical interface for the ClustalW multiple alignment program"
 HOMEPAGE="http://www.ebi.ac.uk/tools/clustalw2/"
-SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/clustalw2/${PV}/${P}-src.tar.gz"
+SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
 
 LICENSE="clustalw"
 SLOT="0"
@@ -17,12 +17,9 @@ IUSE=""
 
 DEPEND="x11-libs/qt-gui:4"
 
-RDEPEND="sci-biology/clustalw:2"
+RDEPEND=">=sci-biology/clustalw-2.0.11"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
+src_prepare() {
 	sed -e "s|colprot.xml|/usr/share/${PN}/colprot.xml|" \
 			-e "s|coldna.xml|/usr/share/${PN}/coldna.xml|" \
 			-e "s|colprint.xml|/usr/share/${PN}/colprint.xml|" \
@@ -31,6 +28,7 @@ src_unpack() {
 	sed -e "s|clustalx.hlp|/usr/share/${PN}/clustalx.hlp|" \
 			-i HelpDisplayWidget.cpp || \
 			die "Failed to patch help file location."
+	rm -f moc*.{cpp,o} || die
 }
 
 src_compile() {
diff --git a/sci-biology/clustalx/files/clustalx-2.0.9-gcc4.3.patch b/sci-biology/clustalx/files/clustalx-2.0.9-gcc4.3.patch
deleted file mode 100644
index 59b4b4968ab0..000000000000
--- a/sci-biology/clustalx/files/clustalx-2.0.9-gcc4.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# patch to fix missing headers under gcc-4.3 (see bug #237077)
-
-diff -Naur clustalx-2.0.9/Resources.cpp clustalx-2.0.9.new/Resources.cpp
---- clustalx-2.0.9/Resources.cpp	2008-06-23 06:58:51.000000000 -0400
-+++ clustalx-2.0.9.new/Resources.cpp	2008-09-09 08:57:22.000000000 -0400
-@@ -11,6 +11,7 @@
- #include <QDir>
- #include <QFile>
- #include <iostream>
-+#include <cstdlib>
- using namespace std;
- 
- //environment variables
diff --git a/sci-biology/clustalx/metadata.xml b/sci-biology/clustalx/metadata.xml
index fefad4e2d52f..3302123e5718 100644
--- a/sci-biology/clustalx/metadata.xml
+++ b/sci-biology/clustalx/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>weaver@gentoo.org</email>
+		<name>Andrey Kislyuk</name>
+	</maintainer>
 	<herd>sci-biology</herd>
-	<longdescription>
-		Clustal X is a graphical interface for the ClustalW multiple sequence
-		alignment program. It provides an integrated environment for performing
-		multiple sequence and profile alignments and analysing the results.
-	</longdescription>
 </pkgmetadata>