Version bump, fix bug 261278

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

5 files changed, 23 insertions, 33 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/Manifest b/sci-biology/clustalx/Manifest
index c91c3eb13d3d..6909c890cb35 100644
--- a/sci-biology/clustalx/Manifest
+++ b/sci-biology/clustalx/Manifest
@@ -1,7 +1,6 @@
-AUX clustalx-2.0.9-gcc4.3.patch 422 RMD160 e007258fa3d392dbdc1b87db9cf36d94f78b95a5 SHA1 f4b54102653ac78d6634c64cdf6c7a7e57adfaf3 SHA256 caa09ddf63e4f517005345cd092e3cf42b9d5524874b6cbcb5fd1f007c506879
-DIST clustalx-2.0.9-src.tar.gz 326319 RMD160 f42646362cf520f452b2d2fa5314aca72c8fc1b7 SHA1 4aa881bdddea3d8d2bad391e9ad036f2c7c72247 SHA256 dfd55dbddeced355207b542431953263e616b2461eab35bbf726250ecda4e3ff
+DIST clustalx-2.0.11.tar.gz 332593 RMD160 310d2be671494830535e7c49189bea04b44511e8 SHA1 815cb1f0158778f2cdad8161dc8529069e86904c SHA256 8fd25e8c4e442d3ef8044c55f15ee2c1e1fe1319e36ff641a0824238fb08cf87
 DIST clustalx1.83.sun.tar.gz 860205 RMD160 d64c2bc17204b7c9dc08a0ea0050e68b57d37283 SHA1 456e850f24c59b6bbe9944864711257106205329 SHA256 67082dd0b788dc75cc99ed283cd1e8ad0c95d9c7d3642d27bb69211f616daca2
 EBUILD clustalx-1.83-r2.ebuild 1851 RMD160 4b8a212d88b47ed7ae67a688cf91175053dbb4ce SHA1 28e34f881ef45d20cbbc7c2711bace77c5abc087 SHA256 6e3584190450fd23e1ef7a214872b70af551458418b96dc7fa21ec6241451fca
-EBUILD clustalx-2.0.9.ebuild 1363 RMD160 24975e9a507c2edb5666ac02695c93a14cfe3e40 SHA1 33e141ca32906fe144032af66572799097ff3e45 SHA256 00804997bd95d31154392766cb2267d6ef5ef7365c737994c35f313db840464f
-MISC ChangeLog 3316 RMD160 c935d87532f759de230481311e9157c117f3bb3d SHA1 9ebf0636b88dc7fd2a824640ebb92770be4aabef SHA256 d0be2f07d3c5793a8619c802c5f89209e714153de7cc1ba7be71a8ee1522178a
-MISC metadata.xml 420 RMD160 8ac4d71ee8bddfdfdfe36cc8395a75151090bf49 SHA1 010f63fc6cbbb817c7ca8ce3312278ebfddb85b9 SHA256 2f4879b8d18c1cf5c1da6879547d3fae104a1e1bfafa5de48de13cc5e679ace0
+EBUILD clustalx-2.0.11.ebuild 1320 RMD160 f9024311bf40351220f5f196de26e4f29cd868ff SHA1 5f23fd91a7fb081a8e61808e90f07665e193c172 SHA256 18651522f0899915e19c9914b409438282e4633985ba7f7ec29daefe98604da6
+MISC ChangeLog 3566 RMD160 ae4e158e48e4a72c476ad2521b5c28a1f6b2b716 SHA1 9620e58ae9b7a698900020cc49dafc5b684078b3 SHA256 77c147a116e14ba4448ae65cf50ef852e50e1e12cf392210daedf0955576b5b0
+MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
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>