Version bump, drop keywords (package does not compile with >=gcc-4.4; has other problems)

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

3 files changed, 21 insertions, 60 deletions

diff --git a/sci-biology/mpiblast/ChangeLog b/sci-biology/mpiblast/ChangeLog
index 4e540a73b469..149976ec915d 100644
--- a/sci-biology/mpiblast/ChangeLog
+++ b/sci-biology/mpiblast/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-biology/mpiblast
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mpiblast/ChangeLog,v 1.1 2009/04/13 00:58:49 weaver Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mpiblast/ChangeLog,v 1.2 2010/06/17 22:58:24 weaver Exp $
+
+*mpiblast-1.6.0_beta2 (17 Jun 2010)
+
+  17 Jun 2010; Andrey Kislyuk <weaver@gentoo.org>
+  -files/mpiblast-1.5.0-fix-build.patch, -mpiblast-1.5.0.ebuild,
+  +mpiblast-1.6.0_beta2.ebuild:
+  Version bump, drop keywords (package does not compile with >=gcc-4.4; has
+  other problems)
 
 *mpiblast-1.5.0 (12 Apr 2009)
 
diff --git a/sci-biology/mpiblast/files/mpiblast-1.5.0-fix-build.patch b/sci-biology/mpiblast/files/mpiblast-1.5.0-fix-build.patch
deleted file mode 100644
index 93aa68309777..000000000000
--- a/sci-biology/mpiblast/files/mpiblast-1.5.0-fix-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u mpiblast-1.5.0-pio{_c,}/ncbi/make/makedis.csh 
---- mpiblast-1.5.0-pio_c/ncbi/make/makedis.csh	2006-09-14 11:37:03.000000000 -0400
-+++ mpiblast-1.5.0-pio/ncbi/make/makedis.csh	2009-04-02 17:01:08.411742006 -0400
-@@ -419,9 +419,11 @@
-    CFLAGS1=\"$NCBI_OPTFLAG $NCBI_CFLAGS1 $OGL_INCLUDE $PNG_INCLUDE\" \
-    LDFLAGS1=\"$NCBI_LDFLAGS1\" OTHERLIBS=\"$NCBI_OTHERLIBS\" \
-    SHELL=\"$NCBI_MAKE_SHELL\" LCL=\"$NCBI_DEFAULT_LCL\" \
--   RAN=\"$NCBI_RANLIB\" AR=\"$NCBI_AR\" CC=\"$NCBI_CC\" $ALL_VIB all'
--eval echo $CMD
--eval echo $CMD | sh 
-+   RAN=\"$NCBI_RANLIB\" AR=\"$NCBI_AR\" CC=\"$NCBI_CC\" $ALL_VIB '
-+eval echo $CMD copy
-+eval echo $CMD copy | sh 
-+eval echo $CMD all
-+eval echo $CMD all | sh 
- 
- set make_stat = $status
- 
-@@ -473,14 +475,28 @@
- 		THREAD_OBJ=$NCBI_THREAD_OBJ \
- 		THREAD_OTHERLIBS=\"$NCBI_MT_OTHERLIBS\" \
- 		NETENTREZVERSION=\"$NETENTREZVERSION\" $NET_VIB'
-+    set CPY='make $MFLG -f makenet.unx \
-+		CFLAGS1=\"$NCBI_OPTFLAG $NCBI_CFLAGS1 $OGL_INCLUDE\" \
-+		LDFLAGS1=\"$NCBI_LDFLAGS1\" SHELL=\"$NCBI_MAKE_SHELL\" \
-+		AR=\"$NCBI_AR\" CC=\"$NCBI_CC\" RAN=\"$NCBI_RANLIB\" OTHERLIBS=\"$NCBI_OTHERLIBS\" \
-+		THREAD_OBJ=$NCBI_THREAD_OBJ \
-+		THREAD_OTHERLIBS=\"$NCBI_MT_OTHERLIBS\" \
-+		NETENTREZVERSION=\"$NETENTREZVERSION\" copy'
- else
- 	set CMD='make $MFLG -f makenet.unx \
- 		CFLAGS1=\"$NCBI_OPTFLAG $NCBI_CFLAGS1 $OGL_INCLUDE\" \
- 		LDFLAGS1=\"$NCBI_LDFLAGS1\" SHELL=\"$NCBI_MAKE_SHELL\" \
- 		AR=\"$NCBI_AR\" CC=\"$NCBI_CC\" RAN=\"$NCBI_RANLIB\" OTHERLIBS=\"$NCBI_OTHERLIBS\" \
- 		NETENTREZVERSION=\"$NETENTREZVERSION\" $NET_VIB'
-+    set CPY='make $MFLG -f makenet.unx \
-+		CFLAGS1=\"$NCBI_OPTFLAG $NCBI_CFLAGS1 $OGL_INCLUDE\" \
-+		LDFLAGS1=\"$NCBI_LDFLAGS1\" SHELL=\"$NCBI_MAKE_SHELL\" \
-+		AR=\"$NCBI_AR\" CC=\"$NCBI_CC\" RAN=\"$NCBI_RANLIB\" OTHERLIBS=\"$NCBI_OTHERLIBS\" \
-+		NETENTREZVERSION=\"$NETENTREZVERSION\" copy'
- endif
--eval echo $CMD
-+eval echo $CPY
-+eval echo $CPY | sh
-+eval echo $CMD 
- eval echo $CMD | sh 
- 
- set net_stat = $status
diff --git a/sci-biology/mpiblast/mpiblast-1.5.0.ebuild b/sci-biology/mpiblast/mpiblast-1.6.0_beta2.ebuild
index dab9edf50038..a8d74c70544d 100644
--- a/sci-biology/mpiblast/mpiblast-1.5.0.ebuild
+++ b/sci-biology/mpiblast/mpiblast-1.6.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mpiblast/mpiblast-1.5.0.ebuild,v 1.1 2009/04/13 00:58:49 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mpiblast/mpiblast-1.6.0_beta2.ebuild,v 1.1 2010/06/17 22:58:24 weaver Exp $
 
 EAPI="2"
 
@@ -8,26 +8,27 @@ inherit eutils
 
 DESCRIPTION="An MPI implementation of NCBI BLAST"
 HOMEPAGE="http://www.mpiblast.org/"
-SRC_URI="http://www.mpiblast.org/downloads/files/mpiBLAST-${PV}-pio.tgz"
+SRC_URI="http://www.mpiblast.org/downloads/files/mpiBLAST-1.6.0-beta2.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 
+# app-shells/tcsh
 DEPEND="virtual/mpi
-	app-shells/tcsh"
+	=sci-biology/ncbi-tools-20090301"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P}-pio"
+S="${WORKDIR}/${PN}-1.6.0"
 
-src_configure() {
-	epatch "${FILESDIR}"/${P}-*.patch
+src_prepare() {
+	sed -i 's/if test "@ARCH@" == "normal"/if true/' "${S}"/Makefile.{am,in} || die
 }
 
 src_compile() {
-	# configure also runs build
-	econf
+	emake ncbi || die
+	emake || die
 }
 
 src_install() {