Fix building with GCC 4.4+ wrt #280237. Keyword -amd64 because the build system doesn't support x86_64 (relocation R_X86_64_32S -fPIC issues).

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

4 files changed, 30 insertions, 6 deletions

diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index 35c06fadcfb3..2d130bddd4fb 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.3 2009/07/27 14:52:41 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.4 2009/08/10 14:02:36 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  ncbi-tools++-2009.05.15.ebuild,
+  +files/ncbi-tools++-2009.05.15-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #280237. Keyword -amd64 because the build
+  system doesn't support x86_64 (relocation R_X86_64_32S -fPIC issues).
 
   27 Jul 2009; Andrey Kislyuk <weaver@gentoo.org>
   ncbi-tools++-2009.05.15.ebuild:
diff --git a/sci-biology/ncbi-tools++/Manifest b/sci-biology/ncbi-tools++/Manifest
index 6777a0707a9c..28451b13a0dc 100644
--- a/sci-biology/ncbi-tools++/Manifest
+++ b/sci-biology/ncbi-tools++/Manifest
@@ -1,4 +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.ebuild 2120 RMD160 0ffcbcbc6c4427ff09ebdfa3cabf36751a603bff SHA1 c38a1cf38cf602fa001db6007d00a04b907bd27e SHA256 ecdddc70aae72a2077e0eef37daa38c4f9ee1931068f576ce4cefd7e2b2a85c8
-MISC ChangeLog 778 RMD160 cd87179c057f22ae689acaea1b2a405846babf00 SHA1 b188e4ddcbd78c3b1dd54574ab3075bd6707480e SHA256 acc2247dc90811bc3d25040c88e7347427582c32aadf64d2bdb3745d25efdd60
+EBUILD ncbi-tools++-2009.05.15.ebuild 2230 RMD160 b283e380199226a108d18c763b46a730f08591ff SHA1 865e24c2181798861383f546250d05dc32084a13 SHA256 bcd53c4b3a30819ee0dc9fbb1fd245668b49c8c249590dcf88013e65f5dfac41
+MISC ChangeLog 1063 RMD160 e3177b2ec39e7a76ee67e1d731ae05cb428ce335 SHA1 8c51dacca1c3fe801edd600028b8198e360e600a SHA256 0a5a64615c19b5efb68692f58b24ef3e6ce89a391b941760c502a69ffdf13b85
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-2009.05.15-gcc44.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-2009.05.15-gcc44.patch
new file mode 100644
index 000000000000..9ab210d338e0
--- /dev/null
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-2009.05.15-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur ncbi_cxx--May_15_2009.orig/src/dbapi/driver/dblib/context.cpp ncbi_cxx--May_15_2009/src/dbapi/driver/dblib/context.cpp
+--- ncbi_cxx--May_15_2009.orig/src/dbapi/driver/dblib/context.cpp	2008-11-13 23:13:10.000000000 +0200
++++ ncbi_cxx--May_15_2009/src/dbapi/driver/dblib/context.cpp	2009-08-10 16:54:33.000000000 +0300
+@@ -781,7 +781,7 @@
+ #  elif NCBI_FTDS == 8
+ #    define NCBI_FTDS_DRV_NAME    "ftds8"
+ #    define NCBI_FTDS_ENTRY_POINT DBAPI_E_ftds8
+-#  elif
++#  else
+ #    error "This version of FreeTDS is not supported"
+ #  endif
+ #endif
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15.ebuild
index 22084042c412..618394b380dd 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.ebuild,v 1.3 2009/07/27 14:52:41 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2009.05.15.ebuild,v 1.4 2009/08/10 14:02:36 ssuominen Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit eutils multilib
 
 MY_TAG="May_15_2009"
 MY_Y="${MY_TAG/*_/}"
@@ -18,7 +18,8 @@ LICENSE="public-domain"
 SLOT="0"
 #IUSE="X unicode opengl gnutls test"
 IUSE="sqlite"
-KEYWORDS="~amd64 ~x86"
+# relocation R_X86_64_32S errors on AMD64
+KEYWORDS="-amd64 ~x86"
 
 # wxGTK: must run eselect wxwindows after installing wxgtk or build will fail. Check and abort here.
 # dev-libs/xalan-c - problems detecting, api mismatch?
@@ -46,6 +47,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_configure() {
 	# econf fails
 	"${S}"/configure --without-debug --with-bin-release --prefix="${D}"/usr \