sci-biology/ncbi-tools: Fix all config files, #459720, #459726, #459878

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

3 files changed, 16 insertions, 11 deletions

diff --git a/sci-biology/ncbi-tools/ChangeLog b/sci-biology/ncbi-tools/ChangeLog
index 559f9a2b0024..c5df21be9444 100644
--- a/sci-biology/ncbi-tools/ChangeLog
+++ b/sci-biology/ncbi-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/ncbi-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.88 2013/03/01 09:14:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ChangeLog,v 1.89 2013/03/01 14:52:31 jlec Exp $
+
+*ncbi-tools-2.2.26-r2 (01 Mar 2013)
+
+  01 Mar 2013; Justin Lecher <jlec@gentoo.org> -ncbi-tools-2.2.26-r1.ebuild,
+  +ncbi-tools-2.2.26-r2.ebuild:
+  Fix all config files, #459720, #459726, #459878
 
 *ncbi-tools-2.2.26-r1 (01 Mar 2013)
 
diff --git a/sci-biology/ncbi-tools/Manifest b/sci-biology/ncbi-tools/Manifest
index f5a34f1d58e0..8bcd69b72389 100644
--- a/sci-biology/ncbi-tools/Manifest
+++ b/sci-biology/ncbi-tools/Manifest
@@ -12,14 +12,14 @@ DIST ncbi-tools-20080302.tar.gz 17294669 SHA256 93a30ec0a6e408858c6364039a4eb240
 DIST ncbi-tools-sdk-doc.tar.bz2 263568 SHA256 352ec02e527f24d03bafb7d40b31c98e0a6f931bed34c4933c5f7153b8034cb2
 EBUILD ncbi-tools-0.20080302.ebuild 7172 SHA256 0cb4afa52072d210070446bbf5087488c8ec5d9606552cc12fb600429461acff SHA512 c01be3c1468862020b9d43bc3e14bd5a165058e33cb507ae7ddaafa7c0df5ea06df04306dea4c082b00b2a3aa910a8b60db82185de2e57ae37b5d08a3a34dca7 WHIRLPOOL 7a5d5f83c033b45a9456af36c80a2a8c9be3eff253709aabb2251209463bf1b5999b650d9aeba4563715691ae8052fbe8afaeb513f7303e3e60c84747ddd5949
 EBUILD ncbi-tools-0.20090809.ebuild 6154 SHA256 5ca2bff0d8ec0883db98f2b855e1a58adb63bda490a0572c52adbe8455837444 SHA512 b5f10ce32bdce79c8b4d6faecc5d1c7b9930011a4f0f0c8f5bb7453e874e9b461176cbb684e04b925a95e0bbc615c8c349eac72a25c85ac42b16810b0fe91af4 WHIRLPOOL 07487e7f2fe84c5850c4af595a744fd55335c736be08f6651053c2ec9eef2e4968e50a12ff98d0da18b7ab8464f5a3d1cee260d9626843fbdc40dc8e34a9960c
-EBUILD ncbi-tools-2.2.26-r1.ebuild 4582 SHA256 3a911ca33f2da9b326956b4cb5d4ecb0b0d7bde4784493f222b3e8c002d1888f SHA512 5d78e52b88ad9ad3f4d526034ee33478261d20f300d920f0464f24ebbd6e52e52fade4c3507ccc3dc33185ac03b7705e942769825b6777013d6d2db316efa499 WHIRLPOOL a4fea72276d7e43c2f785e8c97d7b6f38c9cf8a2b5c643038774f5f65c2661ddb3e110170dbf3ed4d6e89547854827c13fc02e3e6b634e3caf4ceb385f56400a
+EBUILD ncbi-tools-2.2.26-r2.ebuild 4481 SHA256 5a3a9f4035d9e516d85fc30cb5bad5dff942b3a225d92aa37394da6efadf61c1 SHA512 c44f1cf13ee93dd41327e7354eb1a83fee61d4aa5d13d619ea71164c6dc4b7fac9b8496ee99633d0a2b392828d4034ef0aa9cc770cf467af657886fc8d679007 WHIRLPOOL 92e1d7fce7b18052cc2bb344c2a728215df89056128440499a559469fcb2674848590859340c7f110257c76f40cb17d29a49a03d85cf7b13e44e35468051ccad
 EBUILD ncbi-tools-2.2.26.ebuild 4571 SHA256 8a345ab1cbf762aebb79fbe3fd07b5026060184db8ad364c62442b4f341f6abe SHA512 58f838b40ed9f24c12ec6a744055b538bb84e55315ba5b2f9c8e56b9f507f307f00ed0b8e6dd3cf18020c0e8ce9aaa51a84bd02874ba4ae7df88a86830c0986f WHIRLPOOL 121f00ef6075162a84b5eb1dc571443d26a81ff2dc27d4500ad970a640a40e1deeba6b95259a5a738fad2e5e68654ab352a59a118958ea4c58755d8ab1376dc9
-MISC ChangeLog 17910 SHA256 0ab3d3c16dfea95971018d83fae28e31b661f8c4650af64e2c3f76d62e12cfdb SHA512 6ffcb562a009c07ec3d90fd1ca6a7f0597a26265be9578755533570a255e43e096c639ccc1b6e5ee40f360c35775fe9dc41a8bad2594a9555961399b54fda8a6 WHIRLPOOL face3e7e947301c33fdbc151726bd524403cfc722eef810bd31965e7068999880df34e57dbb03b93d232543cc68c40f2e44e2522426148e009d68099763b0f8a
+MISC ChangeLog 18107 SHA256 26a371e0ab5e29479a47a090f88ccc12ff1cc09bdc38e0012c555a67a3307129 SHA512 1d9d0b099fcbe358e9b461a7063356d035638b1aaade30bbcffc42d2a1d4c48060c4e9b59bf05b07f0e4926788cdf349d8d5b52a90a7eec7f69b24af81595126 WHIRLPOOL 5f222182d0d4822aff452f6e63468cefbe2c16502da5dfd9c84c813fe1118cba3f57d73c66ed54697c90a703bc7112108f9c03d5538f6ce43cf23a11cdfe7be6
 MISC metadata.xml 266 SHA256 98c7d1da8a728a1f1d796a79d51f25e4164e24048ec1aacbbf0ae2ffb171ff35 SHA512 879cdcca092d4c82b8c63672c91e08e7b01e81419d2c7c7b766de96ba2a32dd1e21c18968ed7172eec8604f52c92b19a31773f428bce9461d9b8190384680194 WHIRLPOOL 0f46288ab7090ad3da5b31816792427e4ad1a950e39a503bb406ebe8789cffedd9c85b46bfbf040fffb8aad443f512c28716a0a6436d0c06309155277060cdcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEwcXIACgkQgAnW8HDreRYUhwCgubpFsXfMLw5psO5gYNq0zXAu
-2TYAoII+JHmEkkg+PfA3tlC3A4OsOyMe
-=lUqF
+iEYEAREIAAYFAlEwwLEACgkQgAnW8HDreRYahACfaOHhMyF2cOSMI6BtjHgYhN66
+s7cAnjWx+saSz9tT7u4iembS9RP2nLBP
+=CxE7
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild b/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild
index a9f6b23ec9df..346b38415cbf 100644
--- a/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild
+++ b/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r1.ebuild,v 1.1 2013/03/01 09:14:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild,v 1.1 2013/03/01 14:52:31 jlec Exp $
 
 EAPI=5
 
@@ -56,11 +56,11 @@ src_prepare() {
 	# Apply user C flags...
 	cd "${S}"/platform
 	sed \
-		-e 's:-O[23]\?::g' \
+		-e "s:-O[s0-9]\?:asd:g" \
 		-e 's:-m\(cpu\|arch\)=[a-zA-Z0-9]*::g' \
 		-e 's:-x[A-Z]*::g' \
 		-e 's:-pipe::g' \
-		-e "/NCBI_MAKE_SHELL *=/s:=.*:= \"${EPREFIX}\"/bin/sh:g" \
+		-e "/NCBI_MAKE_SHELL *=/s:=.*:= \"${EPREFIX}/bin/sh\":g" \
 		-e "/NCBI_AR *=/s:ar:$(tc-getAR):g" \
 		-e "/NCBI_RANLIB *=/s:ranlib:$(tc-getRANLIB):g" \
 		-e "/NCBI_CC *=/s:= [a-zA-Z0-9]* := $(tc-getCC) :g" \
@@ -69,8 +69,7 @@ src_prepare() {
 		-e "/NCBI_OGLLIBS *=/s:=.*:= $($(tc-getPKG_CONFIG) --cflags gl glu 2>/dev/null):g" \
 		-e "/OPENGL_LIBS *=/s:=.*:= $($(tc-getPKG_CONFIG) --libs gl glu 2>/dev/null):g" \
 		-e "/NCBI_OGLLIBS *=/s:=.*:= $($(tc-getPKG_CONFIG) --libs gl glu 2>/dev/null):g" \
-		-i linux-x86.ncbi.mk linux-alpha.ncbi.mk hppalinux.ncbi.mk \
-			ppclinux.ncbi.mk linux64.ncbi.mk linux.ncbi.mk || die
+		-i * || die
 
 	# We use dynamic libraries
 	sed -i -e "s/-Wl,-Bstatic//" *linux*.ncbi.mk || die