Version bump and address bug 290900

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

4 files changed, 13 insertions, 55 deletions

diff --git a/sci-biology/seaview/ChangeLog b/sci-biology/seaview/ChangeLog
index 1327255ff0fa..a19a4f9d37e6 100644
--- a/sci-biology/seaview/ChangeLog
+++ b/sci-biology/seaview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/seaview
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.31 2010/03/09 13:06:45 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/ChangeLog,v 1.32 2010/03/20 21:49:12 weaver Exp $
+
+*seaview-4.2.3 (20 Mar 2010)
+
+  20 Mar 2010; Andrey Kislyuk <weaver@gentoo.org>
+  -files/seaview-4.2-gcc44.patch, -seaview-4.2.ebuild,
+  +seaview-4.2.3.ebuild:
+  Version bump and address bug 290900
 
   09 Mar 2010; Jonathan Callen <abcd@gentoo.org> seaview-4.1.ebuild,
   seaview-4.2.ebuild:
diff --git a/sci-biology/seaview/Manifest b/sci-biology/seaview/Manifest
index f0027de39352..3e840ec541eb 100644
--- a/sci-biology/seaview/Manifest
+++ b/sci-biology/seaview/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX seaview-20071113-glibc-2.10.patch 545 RMD160 c8e5f91d20b08a902fc88706a52e6664340f7d1d SHA1 ca1026d79a56ce687bb62237a23a70a9022996ef SHA256 97d670caea6584417851b3da260353043ec73d60349b4a12a2b9fbcbf597f509
-AUX seaview-4.2-gcc44.patch 1291 RMD160 31bab0d688f189266e338038f3c5c37a040cc817 SHA1 6fc02cc3531b935620f12ebd8a698aa75930e7a7 SHA256 84d846adb6ff40ae94e4203c3196aecc8fd85f6865d6c2406b113e1f12826305
 AUX seaview.desktop 207 RMD160 d5b4e57a1866d5f2d384ab1f6acf21292061570f SHA1 38b4a0b0055da291020690e9ac1974d7aed94871 SHA256 314a791477d6059888bce45de2627d58d1b8998a25200d6a9eb8f13c759c7b32
 DIST seaview-20071113.tar.gz 155890 RMD160 1a0b82137e1546eed7e69392a241e7af0e5c3068 SHA1 0928a9729142ebe0fcc32b612150a09ee663eddf SHA256 93335e7e95255a189a5f89cd8fd40a22e3e096727ab30f31b6383c85854c709f
 DIST seaview_4.1.tar.gz 315678 RMD160 de3a7f3e684d73508cf6d9ab0d004549d9abdbf9 SHA1 d8227d0e91dff3221b09ea415e1201d833ead5c5 SHA256 902c6cd8e0f7fb17a4d2849bec3312d9cde94fceb1d7fd02c4242b986f693468
-DIST seaview_4.2.tar.gz 322095 RMD160 b4218953f56d466158e7fee335122ad8893a0aea SHA1 678cbb369e91422426ba66b61287e55e6bad0549 SHA256 eed5620d4462086f6897b7fafd9a40fb62aa4a5791e84c573b975ec65b43fe25
+DIST seaview_4.2.3.tar.gz 323465 RMD160 7b94a5fb14fb664854340e05ac18476a15109974 SHA1 ef28787632ae6c7bdff39e9e0f5ed77e9e43d21c SHA256 b3fb78bc4d3b767f4048231e2ee14944127c88a455ee5d16053cc906760bcf88
 EBUILD seaview-20071113.ebuild 1505 RMD160 d36b5c3a7941dafdaa9be9219aebe04b31c04578 SHA1 79c84456ff1db956d88b011999264941b4839455 SHA256 0649c61169c8d623461bb8697ce7b2d8f7a9821d23c7eb79afd6882962879068
 EBUILD seaview-4.1.ebuild 2298 RMD160 0a63d56879a4bf2d949610eaa9d80e8bfc3439fa SHA1 e2e1f3f83d349d8ddce2182e85f742bdd1d18532 SHA256 0041378d6075fc18c9e7e4ff2f01e35dcb5817894da18082b9e64def13e19918
-EBUILD seaview-4.2.ebuild 2415 RMD160 3fb29583c4e173a1cbe2a2f25d21c8a5cf44d273 SHA1 eadd19fb8bd6ff8ab037ea7032acc13436e55687 SHA256 999b5ec41170bf0aa9b7fa5ecbff8ffc88e437a9669323493a79af7152c7c42f
-MISC ChangeLog 5593 RMD160 64e4a1ad267d216e60a4981ba5c808a32ed4813b SHA1 6e205f197ee3a52133daa9cfdede9647cb6eed20 SHA256 62039bd0dd41d1dbbf9dbd7be9fdf0cb7f190701b52a1078cee2ef4946eb35b6
+EBUILD seaview-4.2.3.ebuild 2372 RMD160 9a0a715ef4f8b363f48e73114ed92fd5e893f1c2 SHA1 c66839649817ff2a8e364b9622ed8471384d3337 SHA256 23994833e3512cb54f99137409e26d5bd549620ff1cd9def5d04c223724c8b09
+MISC ChangeLog 5794 RMD160 e80573508789f308e1662971542e6b47e1352380 SHA1 df3eb0363ae8175079adb82ee15815e60f384092 SHA256 536e245e4d76ff8c403245904534f348fcb17d08068c7b56aa2b3174951f22ab
 MISC metadata.xml 619 RMD160 f7bd8491d8c59372963d3f53e322e52d509c0c81 SHA1 d35f32cd0b1171a837f6c9d0dbeb3e396a44fb90 SHA256 ee63d33ca527ca555056c6bc3a7d89fa9b5f32e5f82b7eae27b1c030c80ced9e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuWR+sACgkQOypDUo0oQOr+0gCfVymEk13dGIvFOLC6sJ0oHi7v
-joEAn15Grr2jdvZmrbrdL81j/W/iiYNO
-=23XD
------END PGP SIGNATURE-----
diff --git a/sci-biology/seaview/files/seaview-4.2-gcc44.patch b/sci-biology/seaview/files/seaview-4.2-gcc44.patch
deleted file mode 100644
index e472ea96048c..000000000000
--- a/sci-biology/seaview/files/seaview-4.2-gcc44.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -durr seaview.orig/seaview.cxx seaview/seaview.cxx
---- seaview.orig/seaview.cxx	2009-10-12 14:33:40.000000000 +0000
-+++ seaview/seaview.cxx	2009-10-18 17:02:56.612201461 +0000
-@@ -3903,7 +3903,7 @@
- if( clipboard_contains_alignment(clipboard) ) {
- 	char **seqs, **seqnames, **comments, *p, *message; 
- 	int i, count, num, changedwname = FALSE;
--	p = strchr(clipboard, ':') + 1;
-+	p = const_cast<char*>(strchr(clipboard, ':')) + 1;
- 	count = read_mase_seqs_header(p, &seqs, &seqnames, 
- 		&comments, NULL, &message);
- 	if(count == 0) return;
-diff -durr seaview.orig/use_mase_files.cxx seaview/use_mase_files.cxx
---- seaview.orig/use_mase_files.cxx	2009-10-10 15:36:30.000000000 +0000
-+++ seaview/use_mase_files.cxx	2009-10-18 17:02:56.612201461 +0000
-@@ -1523,7 +1523,7 @@
- void inform_prog_dir(const char *arg0)
- {
- char *p;
--if((p = strrchr(arg0, '/')) != NULL) {
-+if((p = const_cast<char*>(strrchr(arg0, '/'))) != NULL) {
- 	memcpy(seaview_prog_dir, arg0, p - arg0 + 1);
- 	seaview_prog_dir[p - arg0 + 1] = 0;
- 	}
-@@ -1764,9 +1764,9 @@
- 	char *p;
- 	
- #if defined(WIN32)
--	p = strrchr(pathname,'\\'); 
-+	p = const_cast<char*>(strrchr(pathname,'\\')); 
- #else
--	p = strrchr(pathname,'/'); 
-+	p = const_cast<char*>(strrchr(pathname,'/')); 
- #endif
- 	if(p == NULL) dirname[0] = 0;
- 	else {
diff --git a/sci-biology/seaview/seaview-4.2.ebuild b/sci-biology/seaview/seaview-4.2.3.ebuild
index c4ff86f50fc7..5b666fd6d1ff 100644
--- a/sci-biology/seaview/seaview-4.2.ebuild
+++ b/sci-biology/seaview/seaview-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.2.ebuild,v 1.2 2010/03/09 13:06:45 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/seaview/seaview-4.2.3.ebuild,v 1.1 2010/03/20 21:49:12 weaver Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ IUSE="+pdf +xft"
 DEPEND="x11-libs/fltk:1.1
 	pdf? ( media-libs/pdflib )
 	xft? (	x11-libs/libXft
-			x11-libs/fltk[xft] )"
+			x11-libs/fltk:1.1[xft] )"
 RDEPEND="${DEPEND}
 	sci-biology/clustalw
 	|| ( sci-libs/libmuscle sci-biology/muscle )
@@ -26,8 +26,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=( "${FILESDIR}/seaview-4.2-gcc44.patch" )
-
 src_prepare() {
 	# respect CXXFLAGS (package uses them as CFLAGS)
 	sed -i \