sci-biology/sra_sdk-2.1.6: adjust to altered source tree strcuture, add weird ncbi/ subdirs to be installed, more comments in the ebuild

(Portage version: 2.1.10.19/git/Linux i686, unsigned Manifest commit)

3 files changed, 34 insertions, 6 deletions

diff --git a/sci-biology/sra_sdk/ChangeLog b/sci-biology/sra_sdk/ChangeLog
index b1c199c02..994dd9185 100644
--- a/sci-biology/sra_sdk/ChangeLog
+++ b/sci-biology/sra_sdk/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Sep 2011; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  sra_sdk-2.1.6.ebuild:
+  adjust to altered source tree strcuture, add weird ncbi/ subdirs to be
+  installed, more comments in the ebuild
+
 *sra_sdk-2.1.6 (22 Sep 2011)
 
   22 Sep 2011; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
diff --git a/sci-biology/sra_sdk/Manifest b/sci-biology/sra_sdk/Manifest
index 6638c19cf..e461f9846 100644
--- a/sci-biology/sra_sdk/Manifest
+++ b/sci-biology/sra_sdk/Manifest
@@ -1,4 +1,4 @@
 DIST sra_sdk-2.1.6.tar.gz 2057465 RMD160 3e5575c5c799cfdc8c0c7edc5d9fd002f1304520 SHA1 b2d1158a2f97484159d0fff53c522b1742bce67b SHA256 c0051287e9c6d00cf059b6ed9e9b922340ae9a75818bc356d47bd5bc33da8e95
-EBUILD sra_sdk-2.1.6.ebuild 1617 RMD160 96e84a1e33a13fa9601f41828213e0a559326cd1 SHA1 51a5d133ed03c5584758282192bfc633c523f847 SHA256 1a2fb0d817ef97962b0c70899e0b83e6b6aa2060d065404c8846dd6d3e516b1f
-MISC ChangeLog 471 RMD160 ae8eb57357f5db20279c87c209c7a8f3aa416d6d SHA1 c7eed9e8c29c9441675c67845edbe0764588018a SHA256 5034e8f899330c63019f43b0476244053230abe3d3261f62d6966227c0624deb
+EBUILD sra_sdk-2.1.6.ebuild 2441 RMD160 cb76b79d01413a51d02dbeba9d1e49b30c8114ff SHA1 b51e358b780471e3c19a634ed9ab94155246f101 SHA256 f939d582c2143aebada7c8444d0fa1937b025beaa813d20c9430f47b8922a89a
+MISC ChangeLog 670 RMD160 e4a3960b669d0546f9561f29bba676ea6eccc4c3 SHA1 938c1baf547561b99912eabbaf7a307e8dbe0b15 SHA256 ec01e40f141efe357423dfa0b6becae33f6bc086affe837e37636177b3668182
 MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
diff --git a/sci-biology/sra_sdk/sra_sdk-2.1.6.ebuild b/sci-biology/sra_sdk/sra_sdk-2.1.6.ebuild
index 86aee29ea..8e964bd81 100644
--- a/sci-biology/sra_sdk/sra_sdk-2.1.6.ebuild
+++ b/sci-biology/sra_sdk/sra_sdk-2.1.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS=""
 #KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="static"
 
 DEPEND="app-shells/bash
 	sys-libs/zlib
@@ -29,22 +29,45 @@ src_compile(){
 	# -I/var/tmp/portage/sci-biology/sra_sdk-2.0.1/work/sra_sdk-2.0.1/interfaces/os/unix
 	LIBXML_INCLUDES="/usr/include/libxml2" make -j1 OUTDIR="${WORKDIR}"/objdir out || die
 	LIBXML_INCLUDES="/usr/include/libxml2" make -j1 OUTDIR="${WORKDIR}"/objdir || die
+
+	# COMP env variable may have 'GCC' or 'ICC' values
+	if use static; then
+		emake static
+	else
+		emake dynamic
+	fi
 }
 
 src_install(){
+	# for details see "${WORKDIR}"/sra_sdk-2.1.6/README-build
+
+	# BUG: at the moment every binary is installed three times, e.g.:
+	# -rwxr-xr-x 1 root root 1797720 Sep 23 01:31 abi-dump
+	# -rwxr-xr-x 1 root root 1797720 Sep 23 01:31 abi-dump.2
+	# -rwxr-xr-x 1 root root 1797720 Sep 23 01:31 abi-dump.2.1.6
 	if use amd64; then
-		dobin "${WORKDIR}"/objdir/linux/rel/gcc/x86_64/bin/*
+		dobin "${WORKDIR}"/objdir/linux/pub/gcc/x86_64/bin/*
+		insinto /usr/bin/ncbi
+		dobin "${WORKDIR}"/objdir/linux/pub/gcc/x86_64/bin/ncbi/*
 	elif use x86; then
-		dobin "${WORKDIR}"/objdir/linux/rel/gcc/i386/bin/*
+		dobin "${WORKDIR}"/objdir/linux/pub/gcc/i386/bin/*
+		insinto /usr/bin/ncbi
+		dobin "${WORKDIR}"/objdir/linux/pub/gcc/i386/bin/ncbi/*
 	fi
 
 	# mkdir -p ${D}/usr/bin || die
 	# for f in ${W}/objdir/linux/rel/gcc/i386/bin/*; do if [ ! -l "$f" ]; then cp "$f" ${D}/usr/bin || die "copy failed" ; fi; done
 
-	# looks the binaries have the folllowing libs statically linked
+	# looks the binaries have the folllowing libs statically linked in so we do NOT need these files
 	# mkdir -p ${D}/usr/ilib || die
 	# dolib ${W}/objdir/linux/rel/gcc/i386/ilib/*
+	# insinto "${D}"/usr/lib/ncbi
+	# doins ${W}/objdir/linux/rel/gcc/i386/ilib/ncbi/*
 
 	# mkdir -p ${D}/usr/lib || die
 	# dolib ${W}/objdir/linux/rel/gcc/i386/lib/*
+	# insinto "${D}"/usr/lib/ncbi
+	# doins ${W}/objdir/linux/rel/gcc/i386/lib/ncbi/*
+
+	# same for mod/ and wmod/ subdirs
 }