summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-11-10 12:01:51 +0000
committerJustin Lecher <jlec@gentoo.org>2012-11-10 12:01:51 +0000
commitad7b4e75bdb3de0b226bf5c29e2b6006635645ac (patch)
tree18334d4d127fed85cffc5d05b939311a51265d79 /sci-biology/wgs-assembler
parentstable ppc, bug #442570 (diff)
downloadgentoo-2-ad7b4e75bdb3de0b226bf5c29e2b6006635645ac.tar.gz
gentoo-2-ad7b4e75bdb3de0b226bf5c29e2b6006635645ac.tar.bz2
gentoo-2-ad7b4e75bdb3de0b226bf5c29e2b6006635645ac.zip
sci-biology/wgs-assembler: Respect LDFLAGS, #331935; fix linking with gold; handle static-libs
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-biology/wgs-assembler')
-rw-r--r--sci-biology/wgs-assembler/ChangeLog9
-rw-r--r--sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch229
-rw-r--r--sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild6
-rw-r--r--sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild6
-rw-r--r--sci-biology/wgs-assembler/wgs-assembler-7.0-r1.ebuild75
-rw-r--r--sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild4
6 files changed, 320 insertions, 9 deletions
diff --git a/sci-biology/wgs-assembler/ChangeLog b/sci-biology/wgs-assembler/ChangeLog
index 59f24db3285d..83aaee0e6ef8 100644
--- a/sci-biology/wgs-assembler/ChangeLog
+++ b/sci-biology/wgs-assembler/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-biology/wgs-assembler
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/ChangeLog,v 1.9 2012/02/06 09:12:38 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/ChangeLog,v 1.10 2012/11/10 12:01:51 jlec Exp $
+
+*wgs-assembler-7.0-r1 (10 Nov 2012)
+
+ 10 Nov 2012; Justin Lecher <jlec@gentoo.org> wgs-assembler-5.4.ebuild,
+ wgs-assembler-6.1.ebuild, wgs-assembler-7.0.ebuild,
+ +wgs-assembler-7.0-r1.ebuild, +files/wgs-assembler-7.0-build.patch:
+ Respect LDFLAGS, #331935; fix linking with gold; handle static-libs
*wgs-assembler-7.0 (06 Feb 2012)
diff --git a/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch b/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch
new file mode 100644
index 000000000000..f7fb44743968
--- /dev/null
+++ b/sci-biology/wgs-assembler/files/wgs-assembler-7.0-build.patch
@@ -0,0 +1,229 @@
+ kmer/Make.rules | 4 ++--
+ kmer/configure.sh | 20 +++++++++----------
+ src/c_make.as | 58 +++++++++++++++++++++++++++----------------------------
+ src/c_make.gen | 4 ++--
+ 4 files changed, 43 insertions(+), 43 deletions(-)
+
+diff --git a/kmer/Make.rules b/kmer/Make.rules
+index f904b13..5c2d477 100644
+--- a/kmer/Make.rules
++++ b/kmer/Make.rules
+@@ -139,12 +139,12 @@ ${ALL_CXX_DEPS}:%.d:%
+ ## EXE targets
+ ALL_C_EXES :=$(strip $(foreach x,${//},${${x:.=.C_EXES}}))
+ ${ALL_C_EXES}:
+- ${-CC} ${CLD} ${CLDFLAGS} -o $@ $+ ${CLIBS}
++ ${-CC} ${CLD} ${CLDFLAGS} ${LDFLAGS} -o $@ $+ ${CLIBS}
+ __SUBGOALS__+=$${${1:.=.C_EXES}}
+
+ ALL_CXX_EXES :=$(strip $(foreach x,${//},${${x:.=.CXX_EXES}}))
+ ${ALL_CXX_EXES}:
+- ${-CXX} ${CXXLD} ${CXXLDFLAGS} -o $@ $+ ${CXXLIBS}
++ ${-CXX} ${CXXLD} ${CXXLDFLAGS} ${LDFLAGS} -o $@ $+ ${CXXLIBS}
+ __SUBGOALS__+=$${${1:.=.CXX_EXES}}
+
+ define .RULE-install-copy-C-CXX-EXES
+diff --git a/kmer/configure.sh b/kmer/configure.sh
+index 2f0d5ea..9daf89f 100755
+--- a/kmer/configure.sh
++++ b/kmer/configure.sh
+@@ -254,13 +254,13 @@ EOF
+ # -*- makefile -*-
+ # Linux, optimized
+ CC := $CC
+-SHLIB_FLAGS := -shared
+-CFLAGS_COMPILE := -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT -O3 -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts -funroll-loops -fexpensive-optimizations -finline-functions -fomit-frame-pointer
+-CLDFLAGS := -L/usr/local/lib
++SHLIB_FLAGS := -shared ${LDFLAGS}
++CFLAGS_COMPILE := -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts
++CLDFLAGS :=
+ CLIBS := -pthread -ldl
+ CXX := $CXX
+-CXXFLAGS_COMPILE := -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT -O3 -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts -funroll-loops -fexpensive-optimizations -finline-functions -fomit-frame-pointer
+-CXXLDFLAGS := -L/usr/local/lib
++CXXFLAGS_COMPILE := -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_REENTRANT -O3 -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts
++CXXLDFLAGS :=
+ CXXLIBS := -pthread -ldl
+ ARFLAGS := ruvs
+ INSTALL/ := $target/
+@@ -272,13 +272,13 @@ EOF
+ # -*- makefile -*-
+ # Linux64, optimized
+ CC := $CC
+-SHLIB_FLAGS := -shared
+-CFLAGS_COMPILE := -m64 -fPIC -D_REENTRANT -O3 -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts -funroll-loops -fexpensive-optimizations -finline-functions -fomit-frame-pointer
+-CLDFLAGS := -L/usr/local/lib
++SHLIB_FLAGS := -shared ${LDFLAGS}
++CFLAGS_COMPILE := -fPIC -D_REENTRANT -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts
++CLDFLAGS :=
+ CLIBS := -pthread -ldl
+ CXX := $CXX
+-CXXFLAGS_COMPILE := -m64 -fPIC -D_REENTRANT -O3 -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts -funroll-loops -fexpensive-optimizations -finline-functions -fomit-frame-pointer
+-CXXLDFLAGS := -L/usr/local/lib
++CXXFLAGS_COMPILE := -fPIC -D_REENTRANT -D_THREAD_SAFE -pthread -fmessage-length=0 -Wall -Wno-char-subscripts
++CXXLDFLAGS :=
+ CXXLIBS := -pthread -ldl
+ ARFLAGS := ruvs
+ INSTALL/ := $target/
+diff --git a/src/c_make.as b/src/c_make.as
+index 0172807..4304589 100644
+--- a/src/c_make.as
++++ b/src/c_make.as
+@@ -64,27 +64,27 @@ include $(LOCAL_WORK)/src/c_make.gen
+
+ ifeq ($(OSTYPE), Linux)
+ ifeq ($(MACHINETYPE), i686)
+- ARCH_LDFLAGS += -pthread -lm
+- ARCH_CFLAGS += -pthread -Wall -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DX86_GCC_LINUX
++ LINK_LIBS += -pthread -lm
++ ARCH_CFLAGS += -pthread -Wall -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DX86_GCC_LINUX
+ ARCH_LIB = /usr/X11R6/lib
+ endif
+ ifeq ($(MACHINETYPE), amd64)
+- ARCH_LDFLAGS += -pthread -lm
+- ARCH_CFLAGS += -pthread -Wall -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DX86_GCC_LINUX
++ LINK_LIBS += -pthread -lm
++ ARCH_CFLAGS += -pthread -Wall -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DX86_GCC_LINUX
+ ARCH_LIB = /usr/lib64 /usr/X11R6/lib64
+ endif
+ ifeq ($(MACHINETYPE), ia64)
+- ARCH_LDFLAGS += -pthread -lm
+- ARCH_CFLAGS += -pthread -Wall -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++ LINK_LIBS += -pthread -lm
++ ARCH_CFLAGS += -pthread -Wall -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ ARCH_LIB = /usr/X11R6/lib
+ endif
+
+ ifeq ($(BUILDDEBUG), 1)
+- ARCH_CFLAGS += -g
+- ARCH_LDFLAGS +=
++ ARCH_CFLAGS +=
++ LINK_LIBS +=
+ else
+- ARCH_CFLAGS += -O2
+- ARCH_LDFLAGS += -Wl,-O1
++ ARCH_CFLAGS +=
++ LINK_LIBS +=
+ endif
+ endif
+
+@@ -94,19 +94,19 @@ endif
+
+ ifeq ($(OSTYPE), FreeBSD)
+ ifeq ($(MACHINETYPE), i386)
+- ARCH_LDFLAGS += -pthread -lthr -lm
+- ARCH_CFLAGS = -pthread -Wall -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare
+- ARCH_CFLAGS = -pthread -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare
++ LINK_LIBS += -pthread -lthr -lm
++ ARCH_CFLAGS = -pthread -Wall -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare
++ ARCH_CFLAGS = -pthread -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare
+ endif
+ ifeq ($(MACHINETYPE), amd64)
+- ARCH_LDFLAGS += -pthread -lthr -lm
+- ARCH_CFLAGS = -pthread -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -Wformat
+- ARCH_CFLAGS = -pthread -Wall -Wextra -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -Wformat
++ LINK_LIBS += -pthread -lthr -lm
++ ARCH_CFLAGS = -pthread -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -Wformat
++ ARCH_CFLAGS = -pthread -Wall -Wextra -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -Wformat
+ endif
+
+ ifeq ($(BUILDCOVERAGE), 1)
+ ARCH_CFLAGS += -g -fprofile-arcs -ftest-coverage
+- ARCH_LDFLAGS += -lgcov
++ LINK_LIBS += -lgcov
+ else
+ ifeq ($(BUILDDEBUG), 1)
+ ARCH_CFLAGS += -g
+@@ -140,14 +140,14 @@ ifeq ($(OSTYPE), Darwin)
+
+ ifeq ($(MACHINETYPE), i386)
+ ifeq ($(BUILDDEBUG), 1)
+- ARCH_CFLAGS += -fPIC -m64 -fmessage-length=0 -D_THREAD_SAFE -Wall -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -g
+- ARCH_LDFLAGS += -m64 -lm
++ ARCH_CFLAGS += -fPIC -m64 -fmessage-length=0 -D_THREAD_SAFE -Wall -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -g
++ LINK_LIBS += -m64 -lm
+ else
+ # Wow, -Wshorten-64-to-32 is tough
+- ARCH_CFLAGS += -fPIC -m64 -fmessage-length=0 -D_THREAD_SAFE -Wimplicit -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -fast
++ ARCH_CFLAGS += -fPIC -m64 -fmessage-length=0 -D_THREAD_SAFE -Wno-write-strings -Wno-unused -Wno-char-subscripts -Wno-sign-compare -fast
+ # ARCH_CFLAGS += -Wextra
+ # ARCH_CFLAGS += -pedantic (see above about pedantic)
+- ARCH_LDFLAGS += -m64 -lm
++ LINK_LIBS += -m64 -lm
+ endif
+ endif
+
+@@ -161,23 +161,23 @@ endif
+ ifeq ($(OSTYPE), SunOS)
+ ifeq ($(MACHINETYPE), i86pc)
+ ARCH_CFLAGS = -DBYTE_ORDER=LITTLE_ENDIAN -DANSI_C -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthreads
+- ARCH_LDFLAGS += -lm
++ LINK_LIBS += -lm
+ endif
+
+ ifeq ($(MACHINETYPE), sparc32)
+ ARCH_CFLAGS = -DANSI_C -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthreads
+- ARCH_LDFLAGS += -lm -lnsl -lsocket
++ LINK_LIBS += -lm -lnsl -lsocket
+ endif
+
+ ifeq ($(MACHINETYPE), sparc64)
+ ARCH_CFLAGS = -m64 -DANSI_C -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthreads
+- ARCH_LDFLAGS += -m64 -lm -lnsl -lsocket
++ LINK_LIBS += -lm -lnsl -lsocket
+ endif
+
+ ifeq ($(BUILDDEBUG), 1)
+- ARCH_CFLAGS += -g
++ ARCH_CFLAGS +=
+ else
+- ARCH_CFLAGS += -O
++ ARCH_CFLAGS +=
+ endif
+ endif
+
+@@ -186,14 +186,14 @@ endif
+
+ ifeq ($(BUILDPROFILE), 1)
+ ARCH_CFLAGS += -pg
+- ARCH_LDFLAGS += -pg
++ LINK_LIBS += -pg
+ endif
+
+ # One can argue that CXXFLAGS should be separate. For now, we only
+ # add to the flags.
+
+ CFLAGS += $(ARCH_CFLAGS)
+-CXXFLAGS += $(ARCH_CFLAGS) $(ARCH_CXXFLAGS)
++CXXFLAGS += $(ARCH_CXXFLAGS)
+ LDFLAGS += $(ARCH_LDFLAGS)
+
+ INC_IMPORT_DIRS += $(LOCAL_WORK)/src $(patsubst %, $(LOCAL_WORK)/src/%, $(strip $(SUBDIRS)))
+@@ -205,7 +205,7 @@ LIB_IMPORT_DIRS += $(ARCH_LIB)
+ OBJ_SEARCH_PATH = $(LOCAL_OBJ)
+
+ ifeq ($(SITE_NAME), JCVI)
+- LDFLAGS += -lcurl
++ LINK_LIBS += -lcurl
+ endif
+
+ # The order of compilation here is very carefully chosen to be the
+diff --git a/src/c_make.gen b/src/c_make.gen
+index 7b5227c..c27b777 100644
+--- a/src/c_make.gen
++++ b/src/c_make.gen
+@@ -396,12 +396,12 @@ $(LIBRARIES):
+ $(C_PROGS):
+ @ echo "++++++++++++++++++++ " $@ "++++++++++++++++++++++";
+ cd $(LOCAL_OBJ); \
+- $(CC) -o $(LOCAL_BIN)/$(notdir $@) $(filter-out lib%.a, $+) $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LD_DIRS) $(LDFLAGS)
++ $(CC) $(LDFLAGS) -o $(LOCAL_BIN)/$(notdir $@) $(filter-out lib%.a, $+) $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LD_DIRS) $(LINK_LIBS)
+
+ $(CXX_PROGS):
+ @ echo "++++++++++++++++++++ " $@ "++++++++++++++++++++++";
+ cd $(LOCAL_OBJ); \
+- $(CXX) -o $(LOCAL_BIN)/$(notdir $@) $(filter-out lib%.a, $+) $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LD_DIRS) $(LDFLAGS)
++ $(CXX) $(LDFLAGS) -o $(LOCAL_BIN)/$(notdir $@) $(filter-out lib%.a, $+) $(patsubst lib%.a, -l%, $(filter lib%.a, $+)) $(LD_DIRS) $(LINK_LIBS)
+
+ $(SCRIPT_PROGS): %.sh:
+ @echo "++++++++++++++++++++ " $@ "++++++++++++++++++++++";
diff --git a/sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild b/sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild
index 5ac658cc05f2..78654445f5a1 100644
--- a/sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild
+++ b/sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild,v 1.6 2011/03/20 20:19:27 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-5.4.ebuild,v 1.7 2012/11/10 12:01:51 jlec Exp $
EAPI="2"
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
DESCRIPTION="A de novo whole-genome shotgun DNA sequence assembler, also known as the Celera Assembler and CABOG"
HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/"
diff --git a/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild b/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild
index fc0cec90c551..2bb54da6921b 100644
--- a/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild
+++ b/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild,v 1.3 2011/03/20 20:19:27 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild,v 1.4 2012/11/10 12:01:51 jlec Exp $
EAPI="2"
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
DESCRIPTION="A de novo whole-genome shotgun DNA sequence assembler, also known as the Celera Assembler and CABOG"
HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/"
diff --git a/sci-biology/wgs-assembler/wgs-assembler-7.0-r1.ebuild b/sci-biology/wgs-assembler/wgs-assembler-7.0-r1.ebuild
new file mode 100644
index 000000000000..da3b225f16c3
--- /dev/null
+++ b/sci-biology/wgs-assembler/wgs-assembler-7.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-7.0-r1.ebuild,v 1.1 2012/11/10 12:01:51 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND=2
+
+inherit eutils python toolchain-funcs
+
+DESCRIPTION="A de novo whole-genome shotgun DNA sequence assembler, also known as the Celera Assembler and CABOG"
+HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/"
+SRC_URI="mirror://sourceforge/${PN}/wgs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND="
+ x11-libs/libXt
+ !x11-terms/terminator"
+RDEPEND="${DEPEND}
+ app-shells/tcsh
+ dev-perl/Log-Log4perl"
+
+S="${WORKDIR}/wgs-${PV}"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-build.patch
+ tc-export CC CXX
+}
+
+src_configure() {
+ cd "${S}/kmer"
+ ./configure.sh || die
+}
+
+src_compile() {
+ # not really an install target
+ emake -C kmer -j1 install
+ emake -C src -j1 SITE_NAME=LOCAL
+}
+
+src_install() {
+ OSTYPE=$(uname)
+ MACHTYPE=$(uname -m)
+ MACHTYPE=${MACHTYPE/x86_64/amd64}
+ MY_S="${OSTYPE}-${MACHTYPE}"
+ sed -i 's|#!/usr/local/bin/|#!/usr/bin/env |' $(find $MY_S -type f) || die
+
+ sed -i '/sub getBinDirectory ()/ a return "/usr/bin";' ${MY_S}/bin/runCA* || die
+ sed -i '/sub getBinDirectoryShellCode ()/ a return "bin=/usr/bin\n";' ${MY_S}/bin/runCA* || die
+ sed -i '1 a use lib "/usr/share/'${PN}'/lib";' $(find $MY_S -name '*.p*') || die
+
+ dobin kmer/${MY_S}/bin/*
+ insinto /usr/$(get_libdir)/${PN}
+ use static-libs && doins kmer/${MY_S}/lib/*
+
+ insinto /usr/include/${PN}
+ doins kmer/${MY_S}/include/*
+
+ insinto /usr/share/${PN}/lib
+ doins -r ${MY_S}/bin/TIGR
+ rm -rf ${MY_S}/bin/TIGR || die
+ dobin ${MY_S}/bin/*
+ use static-libs && dolib.a ${MY_S}/lib/*
+ dodoc README
+}
diff --git a/sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild b/sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild
index ddb80f0c3b09..170c6854e528 100644
--- a/sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild
+++ b/sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild,v 1.1 2012/02/06 09:12:38 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/wgs-assembler-7.0.ebuild,v 1.2 2012/11/10 12:01:51 jlec Exp $
EAPI="2"
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
DESCRIPTION="A de novo whole-genome shotgun DNA sequence assembler, also known as the Celera Assembler and CABOG"
HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/"