From: Andrey Kislyuk <weaver@gentoo.org>
Date: Thu, 17 Jun 2010 22:58:24 +0000 (+0000)
Subject: Version bump, drop keywords (package does not compile with >=gcc-4.4; has other problems)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33f518f16833920bd8cff9f3aa51c876033f9916;p=gentoo.git

Version bump, drop keywords (package does not compile with >=gcc-4.4; has other problems)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

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/Manifest b/sci-biology/mpiblast/Manifest
index 9652b85bbed4..485051c1b2b5 100644
--- a/sci-biology/mpiblast/Manifest
+++ b/sci-biology/mpiblast/Manifest
@@ -1,5 +1,4 @@
-AUX mpiblast-1.5.0-fix-build.patch 1985 RMD160 afbca2b7a67ffba5f8149c7a3548d958ea553188 SHA1 62416f4b5019048214e3dfbd3c8a3549bd806db9 SHA256 d22b9a446da5222a3895b8053e86a6fa170dcea7a011482c711b604a1a7a8e3c
-DIST mpiBLAST-1.5.0-pio.tgz 16386783 RMD160 d2690b5d4f18c2288f95ef329cee131ea7275cad SHA1 9688db5984761b5aaf25c4d1dcd9e38529ca069f SHA256 af0b2e9b0a93f1d4bc13df02dcae4dc91f8030707f954d7c25684604a9aebdc8
-EBUILD mpiblast-1.5.0.ebuild 718 RMD160 95ce72cd2c6318d179144d19d74bebbff7b297f5 SHA1 9da9439b18139dd9f97b15280cfb01f3fede53cb SHA256 fb5fe25a9fcdd8c2946b24ef68acad08dd90539989826cbdb37aeb7003847976
-MISC ChangeLog 620 RMD160 df1726f260778ddda81f7bd8cb8336a8725598cd SHA1 91872b00d740766889546e79ba2152377b10442f SHA256 01d2e3db89c0f9fba974dfd48cdff3808e8a9aeb535df9aa51fcb576ffe95d36
+DIST mpiBLAST-1.6.0-beta2.tgz 65155830 RMD160 91bbff83ce30473c6e08f434e30023f9a417e1bf SHA1 c12426cd3c838706164037d249a4a7f2eeee2dca SHA256 9b7359deb875b931792f765ab4537b0392f235336cee879af454f9455d44acca
+EBUILD mpiblast-1.6.0_beta2.ebuild 794 RMD160 3c41a2a9e0568f6a6f47eef90e29f4330bbf6ca8 SHA1 410d331c85b887155322b4b9cd27fd50b7ce9a6e SHA256 361261900b29a3027b5507ab88ce6b2e9a3f705345b08ee7b1c0f0b321c00228
+MISC ChangeLog 899 RMD160 37c1080c6ef848e196fa81bbc646f3129ad3a129 SHA1 a5d08cde4109fd9076f0f8068824c25d7540631d SHA256 bad111d84a70635aa1d793eeb5760bf6af38139b15f48f8486f9c36660be357a
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
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
similarity index 50%
rename from sci-biology/mpiblast/mpiblast-1.5.0.ebuild
rename to 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() {