Fix for gcc46

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

3 files changed, 80 insertions, 4 deletions

diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index 672412b60197..a8b48b6f9fbe 100644
--- a/sci-biology/ncbi-tools++/ChangeLog
+++ b/sci-biology/ncbi-tools++/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2010/09/26 07:39:29 weaver Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.18 2011/05/02 09:43:44 jlec Exp $
+
+  02 May 2011; Justin Lecher <jlec@gentoo.org> ncbi-tools++-2010.06.15.ebuild,
+  +files/ncbi-tools++-2010.06.15-gcc46.patch:
+  Fix for gcc46
 
 *ncbi-tools++-2010.06.15 (26 Sep 2010)
 
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-gcc46.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-gcc46.patch
new file mode 100644
index 000000000000..abc12ccb5fb9
--- /dev/null
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-gcc46.patch
@@ -0,0 +1,71 @@
+ include/dbapi/driver/dbapi_object_convert.hpp    |    8 ++++----
+ include/dbapi/driver/impl/dbapi_driver_utils.hpp |    2 +-
+ src/objtools/blast/seqdb_reader/seqdbimpl.hpp    |    2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/dbapi/driver/dbapi_object_convert.hpp b/include/dbapi/driver/dbapi_object_convert.hpp
+index b66a3b0..667a133 100644
+--- a/include/dbapi/driver/dbapi_object_convert.hpp
++++ b/include/dbapi/driver/dbapi_object_convert.hpp
+@@ -67,7 +67,7 @@ public:
+     operator const CTime&(void) const;
+ 
+ private:
+-    mutable obj_type& m_Value; 
++    obj_type& m_Value; 
+ };
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -92,7 +92,7 @@ public:
+     operator const CTime&(void) const;
+ 
+ private:
+-    mutable obj_type& m_Value; 
++    obj_type& m_Value; 
+ };
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -133,7 +133,7 @@ public:
+     operator const CTime&(void) const;
+ 
+ private:
+-    mutable obj_type& m_Value; 
++    obj_type& m_Value; 
+ };
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -174,7 +174,7 @@ public:
+     operator const CTime&(void) const;
+ 
+ private:
+-    mutable obj_type& m_Value; 
++    obj_type& m_Value; 
+ };
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+diff --git a/include/dbapi/driver/impl/dbapi_driver_utils.hpp b/include/dbapi/driver/impl/dbapi_driver_utils.hpp
+index ee22035..c2e21e7 100644
+--- a/include/dbapi/driver/impl/dbapi_driver_utils.hpp
++++ b/include/dbapi/driver/impl/dbapi_driver_utils.hpp
+@@ -231,7 +231,7 @@ protected:
+ 
+ private:
+     const string& m_SPName;
+-    mutable impl::CConnection& m_Conn;
++    impl::CConnection& m_Conn;
+ };
+ 
+ 
+diff --git a/src/objtools/blast/seqdb_reader/seqdbimpl.hpp b/src/objtools/blast/seqdb_reader/seqdbimpl.hpp
+index 7070fdb..814658b 100644
+--- a/src/objtools/blast/seqdb_reader/seqdbimpl.hpp
++++ b/src/objtools/blast/seqdb_reader/seqdbimpl.hpp
+@@ -1234,7 +1234,7 @@ private:
+     CSeqDBAtlasHolder m_AtlasHolder;
+     
+     /// Reference to memory management layer.
+-    mutable CSeqDBAtlas & m_Atlas;
++    CSeqDBAtlas & m_Atlas;
+     
+     /// The list of database names provided to the constructor.
+     string m_DBNames;
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild
index 85509db43671..fd76f8b88266 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild,v 1.1 2010/09/26 07:39:29 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15.ebuild,v 1.2 2011/05/02 09:43:44 jlec Exp $
 
 EAPI="3"
 
@@ -30,6 +30,7 @@ src_prepare() {
 	sed -i -e 's/-print-file-name=libstdc++.a//' \
 		-e '/sed/ s/\([gO]\[0-9\]\)\*/\1\\+/' \
 		src/build-system/configure || die
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 }
 
 src_configure() {