Address bug 300722, bug 312921

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index 3b5159c1448e52d6e44f7f6502b413debb31e384..8f131d601e514e2befa92f59615c9a4ff6a1922e 100644 (file)
--- a/sci-biology/ncbi-tools++/ChangeLog
+++ b/sci-biology/ncbi-tools++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/ncbi-tools++
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.12 2010/03/11 20:49:57 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.13 2010/05/31 22:05:20 weaver Exp $
+
+*ncbi-tools++-2009.05.15-r4 (31 May 2010)
+
+  31 May 2010; Andrey Kislyuk <weaver@gentoo.org>
+  -ncbi-tools++-2009.05.15-r3.ebuild, +ncbi-tools++-2009.05.15-r4.ebuild:
+  Address bug 300722, bug 312921
 
 *ncbi-tools++-2009.05.15-r3 (11 Mar 2010)
 

diff --git a/sci-biology/ncbi-tools++/Manifest b/sci-biology/ncbi-tools++/Manifest
index a6d6431404ced34033d2960d9e5d05583243ed89..4d7b04e459dd8ec8af9d6b8fe7cc0b00e5b90d90 100644 (file)
--- a/sci-biology/ncbi-tools++/Manifest
+++ b/sci-biology/ncbi-tools++/Manifest
@@ -1,5 +1,5 @@
 AUX ncbi-tools++-2009.05.15-gcc44.patch 554 RMD160 57a23cbaad59b6011124f684db55f4ac2e4a43ab SHA1 7ed63addba554bf87a347d25ea2d4ea6b6552a1a SHA256 ddc2379ff636851e1bb4fb601930ee926c396819e06812b1ba76da001255d5c6
 DIST ncbi_cxx--May_15_2009.tar.gz 13986626 RMD160 131a04d43056fd4d4fd1781d38a5c1b9e3089a13 SHA1 0cecad93774ce40b3455149b2c3538dfce032b85 SHA256 ccb86f2e33251580e23c94b8d2a4aa4832c278171ded29513f0c9859b303f1d8
-EBUILD ncbi-tools++-2009.05.15-r3.ebuild 2692 RMD160 8b337c986551dc52d2cdfd6c630d87e4ddce72a3 SHA1 38caea9979ef082608b3c24ed173bda2276c0b4a SHA256 0751f47af667e46eccde2c7bfee91e0ee669d54c81b174eb602388031549ea73
-MISC ChangeLog 2323 RMD160 bb9a9d21b8b6be4a97d710fcf5c22d1d0b9afea9 SHA1 b14f35f112d64dbd726fb937122b85afb95bb2b7 SHA256 0142f981ac1a45fd8e5f8012f8bb01aeb6b28fe9f068c871c078ee8fbcb5c49c
+EBUILD ncbi-tools++-2009.05.15-r4.ebuild 2800 RMD160 deae9836d7f308c3af7fb332232903ac81b9e03b SHA1 5623e6dc9e5c74f91dccda237d9a0d54fcd8b7a4 SHA256 2f27212b10388fe3e37fbfaa572addf95f692a803c3b1ff033b4904647948af2
+MISC ChangeLog 2524 RMD160 31d7a54e6020972f1c738f8cd6b30a90f3ec8223 SHA1 b514c1ea23ac6d072c09c81813dededdba39cbb3 SHA256 5cec3bc8df7dd512706df1b7dda38fc646f28b529d2e6888f7828f0388b001db
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110

diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r3.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r4.ebuild
similarity index 91%
rename from sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r3.ebuild
rename to sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r4.ebuild
index 3af93c79214816e2b41d9e7c55a622738149a6f0..2e393f892986b561f0603027aceb6597cd1cfa83 100644 (file)
--- a/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r3.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r3.ebuild,v 1.1 2010/03/11 20:49:57 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15-r4.ebuild,v 1.1 2010/05/31 22:05:20 weaver Exp $
 
 EAPI="3"
 
@@ -48,7 +48,9 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-gcc44.patch
-       sed -i -e 's/-print-file-name=libstdc++.a//' src/build-system/configure
+       sed -i -e 's/-print-file-name=libstdc++.a//' \
+               -e '/sed/ s/\([gO]\[0-9\]\)\*/\1\\+/' \
+               src/build-system/configure || die
 }
 
 src_configure() {
@@ -57,12 +59,14 @@ src_configure() {
 
        # econf fails
        # --with-bin-release and --without-ftds are workarounds for build system bugs
+       # --without-boost: see bug 312921
        # NB: build system supports ICC
        "${S}"/configure --without-debug \
                --with-bin-release \
                --without-static \
                --with-dll \
                --without-ftds \
+               --without-boost \
                --prefix="${ED}"/usr \
                --libdir="${ED}"/usr/$(get_libdir)/${PN} \
                --with-z="${EPREFIX}/usr" \