New version. Added 20050429 to x86. Removed old version.

(Portage version: 2.0.51.22-r2)

6 files changed, 53 insertions, 40 deletions

diff --git a/sci-biology/ncbi-tools/ChangeLog b/sci-biology/ncbi-tools/ChangeLog
index b9ab96970e91..0801d14682ed 100644
--- a/sci-biology/ncbi-tools/ChangeLog
+++ b/sci-biology/ncbi-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/ncbi-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.16 2005/06/09 10:16:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.17 2005/08/06 22:34:10 ribosome Exp $
+
+*ncbi-tools-20050605 (06 Aug 2005)
+
+  06 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
+  -ncbi-tools-20040616.ebuild, ncbi-tools-20050429.ebuild,
+  +ncbi-tools-20050605.ebuild:
+  New version. Added 20050429 to x86. Removed old version.
 
   09 Jun 2005; Markus Rothe <corsair@gentoo.org>
   ncbi-tools-20041020-r1.ebuild:
diff --git a/sci-biology/ncbi-tools/Manifest b/sci-biology/ncbi-tools/Manifest
index 3b3643fb2bff..bb1b7ca36742 100644
--- a/sci-biology/ncbi-tools/Manifest
+++ b/sci-biology/ncbi-tools/Manifest
@@ -1,11 +1,13 @@
-MD5 d6579d8e96764b37dfc63c939589e61f ChangeLog 5844
-MD5 e8b4df3df76800c376905734d8043cfa metadata.xml 216
-MD5 6ce3b09c8952b60891554cfecbf363a7 ncbi-tools-20040616.ebuild 5777
 MD5 6c8b57dc3b8c8523ae2adb7a1a8f1ed3 ncbi-tools-20041020-r1.ebuild 5630
+MD5 ccf2af7ec21c067026de0f080631fcbe ncbi-tools-20050605.ebuild 5630
 MD5 ccf2af7ec21c067026de0f080631fcbe ncbi-tools-20050429.ebuild 5630
-MD5 a5f54430f6f7422d75320e91068cae0b files/21ncbi-r1 232
-MD5 756db6700c84d3b303bfc3d0a28871de files/21ncbi 166
-MD5 6e3486cc782a091aa528a3e3f01192fc files/digest-ncbi-tools-20040616 144
+MD5 6ce3b09c8952b60891554cfecbf363a7 ncbi-tools-20040616.ebuild 5777
+MD5 d6579d8e96764b37dfc63c939589e61f ChangeLog 5844
+MD5 e8b4df3df76800c376905734d8043cfa metadata.xml 216
+MD5 23986a001c85eb8c2c319aacfa9cb40c files/ncbirc 33
 MD5 6fa8c1b5254e9c217c399c949bc75f45 files/digest-ncbi-tools-20041020-r1 144
+MD5 6e3486cc782a091aa528a3e3f01192fc files/digest-ncbi-tools-20040616 144
 MD5 ae77b2436a5f4dfcb6f71f2149782dc7 files/digest-ncbi-tools-20050429 144
-MD5 23986a001c85eb8c2c319aacfa9cb40c files/ncbirc 33
+MD5 9cef4ca17113d005c44d3bf3d330f747 files/digest-ncbi-tools-20050605 144
+MD5 a5f54430f6f7422d75320e91068cae0b files/21ncbi-r1 232
+MD5 756db6700c84d3b303bfc3d0a28871de files/21ncbi 166
diff --git a/sci-biology/ncbi-tools/files/digest-ncbi-tools-20040616 b/sci-biology/ncbi-tools/files/digest-ncbi-tools-20040616
deleted file mode 100644
index 5b6b30f6e9ba..000000000000
--- a/sci-biology/ncbi-tools/files/digest-ncbi-tools-20040616
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12320f853acb397a14729fb0da0b09df ncbi-tools-20040616.tar.gz 13680457
-MD5 c0860f787d95623b72fba58dbf1b60c5 ncbi-tools-sdk-doc.tar.bz2 263568
diff --git a/sci-biology/ncbi-tools/files/digest-ncbi-tools-20050605 b/sci-biology/ncbi-tools/files/digest-ncbi-tools-20050605
new file mode 100644
index 000000000000..f3e9e71cec8d
--- /dev/null
+++ b/sci-biology/ncbi-tools/files/digest-ncbi-tools-20050605
@@ -0,0 +1,2 @@
+MD5 61864b4999390eb69e60734b3b02c149 ncbi-tools-20050605.tar.gz 14458684
+MD5 c0860f787d95623b72fba58dbf1b60c5 ncbi-tools-sdk-doc.tar.bz2 263568
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20050429.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050429.ebuild
index f66964fe2244..a646a5dfec9b 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20050429.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20050429.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050429.ebuild,v 1.3 2005/06/02 15:25:12 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050429.ebuild,v 1.4 2005/08/06 22:34:10 ribosome Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 	doc? ( mirror://gentoo/${PN}-sdk-doc.tar.bz2 )"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ppc64"
 IUSE="doc X"
 
 DEPEND="app-shells/tcsh
diff --git a/sci-biology/ncbi-tools/ncbi-tools-20040616.ebuild b/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
index e1bae093e17b..9b31bc68396c 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-20040616.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20040616.ebuild,v 1.4 2005/06/02 15:25:12 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-20050605.ebuild,v 1.1 2005/08/06 22:34:10 ribosome Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 	doc? ( mirror://gentoo/${PN}-sdk-doc.tar.bz2 )"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ppc-macos"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc-macos ~ppc64"
 IUSE="doc X"
 
 DEPEND="app-shells/tcsh
@@ -21,7 +21,7 @@ DEPEND="app-shells/tcsh
 		virtual/motif
 	)"
 
-S=${WORKDIR}/ncbi
+S="${WORKDIR}/ncbi"
 
 pkg_setup() {
 	echo
@@ -40,8 +40,9 @@ src_unpack() {
 
 	if ! use X; then
 		cd ${S}/make
-		sed -e "s:\#set HAVE_OGL=0:set HAVE_OGL=0:" -i makedis.csh
-		sed -e "s:\#set HAVE_MOTIF=0:set HAVE_MOTIF=0:" -i makedis.csh
+		sed -e "s:\#set HAVE_OGL=0:set HAVE_OGL=0:" \
+			-e "s:\#set HAVE_MOTIF=0:set HAVE_MOTIF=0:" \
+			-i makedis.csh || die
 	else
 		if use x86; then
 			# X applications segfault on startup on x86 with -O3.
@@ -52,40 +53,45 @@ src_unpack() {
 	# Apply user C flags...
 	cd ${S}/platform
 	# ... on x86...
-	sed -i -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" linux-x86.ncbi.mk
-	sed -i -e "s/NCBI_LDFLAGS1 = -O3 -mcpu=pentiumpro/NCBI_LDFLAGS1 = ${CFLAGS}/" linux-x86.ncbi.mk
-	sed -i -e "s/NCBI_OPTFLAG = -O3 -mcpu=pentiumpro/NCBI_OPTFLAG = ${CFLAGS}/" linux-x86.ncbi.mk
+	sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
+		-e "s/NCBI_LDFLAGS1 = -O3 -mcpu=pentium4/NCBI_LDFLAGS1 = ${CFLAGS}/" \
+		-e "s/NCBI_OPTFLAG = -O3 -mcpu=pentium4/NCBI_OPTFLAG = ${CFLAGS}/" \
+		-i linux-x86.ncbi.mk || die
 	# ... on alpha...
-	sed -i -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" linux-alpha.ncbi.mk
-	sed -i -e "s/NCBI_LDFLAGS1 = -O3 -mieee/NCBI_LDFLAGS1 = -mieee ${CFLAGS}/" linux-alpha.ncbi.mk
-	sed -i -e "s/NCBI_OPTFLAG = -O3 -mieee/NCBI_OPTFLAG = -mieee ${CFLAGS}/" linux-alpha.ncbi.mk
+	sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
+		-e "s/NCBI_LDFLAGS1 = -O3 -mieee/NCBI_LDFLAGS1 = -mieee ${CFLAGS}/" \
+		-e "s/NCBI_OPTFLAG = -O3 -mieee/NCBI_OPTFLAG = -mieee ${CFLAGS}/" \
+		-i linux-alpha.ncbi.mk || die
 	# ... on hppa...
-	sed -i -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" hppalinux.ncbi.mk
-	sed -i -e "s/NCBI_LDFLAGS1 = -O2/NCBI_LDFLAGS1 = ${CFLAGS}/" hppalinux.ncbi.mk
-	sed -i -e "s/NCBI_OPTFLAG = -O2/NCBI_OPTFLAG = ${CFLAGS}/" hppalinux.ncbi.mk
+	sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
+		-e "s/NCBI_LDFLAGS1 = -O2/NCBI_LDFLAGS1 = ${CFLAGS}/" \
+		-e "s/NCBI_OPTFLAG = -O2/NCBI_OPTFLAG = ${CFLAGS}/" \
+		-i hppalinux.ncbi.mk || die
 	# ... on ppc...
-	sed -i -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" ppclinux.ncbi.mk
-	sed -i -e "s/NCBI_LDFLAGS1 = -O2/NCBI_LDFLAGS1 = ${CFLAGS}/" ppclinux.ncbi.mk
-	sed -i -e "s/NCBI_OPTFLAG = -O2/NCBI_OPTFLAG = ${CFLAGS}/" ppclinux.ncbi.mk
+	sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
+		-e "s/NCBI_LDFLAGS1 = -O2/NCBI_LDFLAGS1 = ${CFLAGS}/" \
+		-e "s/NCBI_OPTFLAG = -O2/NCBI_OPTFLAG = ${CFLAGS}/" \
+		-i ppclinux.ncbi.mk || die
 	# ... on generic Linux.
-	sed -i -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" linux.ncbi.mk
-	sed -i -e "s/NCBI_LDFLAGS1 = -O3/NCBI_LDFLAGS1 = ${CFLAGS}/" linux.ncbi.mk
-	sed -i -e "s/NCBI_OPTFLAG = -O3/NCBI_OPTFLAG = ${CFLAGS}/" linux.ncbi.mk
+	sed -e "s/NCBI_CFLAGS1 = -c/NCBI_CFLAGS1 = -c ${CFLAGS}/" \
+		-e "s/NCBI_LDFLAGS1 = -O3/NCBI_LDFLAGS1 = ${CFLAGS}/" \
+		-e "s/NCBI_OPTFLAG = -O3/NCBI_OPTFLAG = ${CFLAGS}/" \
+		-i linux.ncbi.mk || die
 
 	# Put in our MAKEOPTS (doesn't work).
 	# sed -e "s:make \$MFLG:make ${MAKEOPTS}:" -i ncbi/make/makedis.csh
 
 	# Set C compiler...
 	# ... on x86...
-	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux-x86.ncbi.mk
+	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux-x86.ncbi.mk || die
 	# ... on alpha...
-	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux-alpha.ncbi.mk
+	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux-alpha.ncbi.mk || die
 	# ... on hppa...
-	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" hppalinux.ncbi.mk
+	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" hppalinux.ncbi.mk || die
 	# ... on ppc...
-	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" ppclinux.ncbi.mk
+	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" ppclinux.ncbi.mk || die
 	# ... on generic Linux.
-	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux.ncbi.mk
+	sed -i -e "s/NCBI_CC = gcc/NCBI_CC = $(tc-getCC)/" linux.ncbi.mk || die
 }
 
 src_compile() {
@@ -159,7 +165,5 @@ src_install() {
 	newins ${FILESDIR}/ncbirc .ncbirc
 
 	# Env file to set the location of the config file and BLAST databases.
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/21ncbi
+	newenvd ${FILESDIR}/21ncbi-r1 21ncbi
 }