Fixed ppc64 lop patch

Package-Manager: portage-2.1-r1

5 files changed, 28 insertions, 7 deletions

diff --git a/sci-biology/ncbi-tools/ChangeLog b/sci-biology/ncbi-tools/ChangeLog
index 861dddd08051..74e1ab0c323b 100644
--- a/sci-biology/ncbi-tools/ChangeLog
+++ b/sci-biology/ncbi-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/ncbi-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.39 2006/06/26 17:24:32 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.40 2006/06/27 01:44:20 ribosome Exp $
+
+  27 Jun 2006; Olivier Fisette <ribosome@gentoo.org>
+  -files/ncbi-tools-20050605-lop.patch, +files/ncbi-tools-lop.patch,
+  ncbi-tools-20050605.ebuild, ncbi-tools-20050605-r2.ebuild,
+  ncbi-tools-20060507.ebuild:
+  Fixed ppc64 lop patch (my mistake).
 
 *ncbi-tools-20060507 (26 Jun 2006)
 
diff --git a/sci-biology/ncbi-tools/files/ncbi-tools-lop.patch b/sci-biology/ncbi-tools/files/ncbi-tools-lop.patch
new file mode 100644
index 000000000000..867b203aecb1
--- /dev/null
+++ b/sci-biology/ncbi-tools/files/ncbi-tools-lop.patch
@@ -0,0 +1,15 @@
+--- platform/linux-power.ncbi.mk.bak	2005-08-04 22:45:13.000000000 -0500
++++ platform/linux-power.ncbi.mk	2005-08-04 22:45:35.000000000 -0500
+@@ -9,10 +9,10 @@
+ #it appears the flags above do not work anymore with newer libc,
+ #the new flags should work. Dima. 08/23/01
+ NCBI_AR=ar
+-NCBI_CC = xlc_r -w -qcpluscmt -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
++NCBI_CC = gcc -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+ NCBI_CFLAGS1 = -c 
+ NCBI_LDFLAGS1 = -O3 -D_LARGE_FILES 
+-NCBI_OPTFLAG = -O3 -qmaxmem=-1 -D_LARGE_FILE
++NCBI_OPTFLAG = -O3  -D_LARGE_FILE
+ NCBI_BIN_MASTER = /vol/stcfs/rchen/LoP/ncbi/bin
+ NCBI_BIN_COPY = /vol/stcfs/rchen/LoP/ncbi/bin
+ NCBI_INCDIR = /vol/stcfs/rchen/LoP/ncbi/include
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
index 6933cd0935e9..fcf51fe78cf6 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild,v 1.3 2006/02/02 02:51:41 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605-r2.ebuild,v 1.4 2006/06/27 01:44:20 ribosome Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -40,7 +40,7 @@ src_unpack() {
 
 	if use ppc64; then
 		cd "${S}"
-		epatch "${FILESDIR}"/${P}-lop.patch
+		epatch "${FILESDIR}"/${PN}-lop.patch
 	fi
 
 	if use mpi; then
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
index 2dffbf36a223..c9baaa55d1eb 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild,v 1.11 2006/02/01 09:10:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild,v 1.12 2006/06/27 01:44:20 ribosome Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -36,7 +36,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	use ppc64 && cd ${S} && epatch ${FILESDIR}/${P}-lop.patch
+	use ppc64 && cd ${S} && epatch ${FILESDIR}/${PN}-lop.patch
 
 	if ! use X; then
 		cd ${S}/make
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20060507.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20060507.ebuild
index 410e8126a5d0..91a8a67f84ed 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20060507.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20060507.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20060507.ebuild,v 1.1 2006/06/26 17:24:32 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20060507.ebuild,v 1.2 2006/06/27 01:44:20 ribosome Exp $
 
 inherit flag-o-matic toolchain-funcs eutils autotools
 
@@ -41,7 +41,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-asn2all.patch
 
 	if use ppc64; then
-		epatch "${FILESDIR}"/${P}-lop.patch
+		epatch "${FILESDIR}"/${PN}-lop.patch
 	fi
 
 	if use mpi; then