Version bump

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 76 insertions, 47 deletions

diff --git a/sci-biology/wgs-assembler/ChangeLog b/sci-biology/wgs-assembler/ChangeLog
index d025702a3335..aa6b729201d7 100644
--- a/sci-biology/wgs-assembler/ChangeLog
+++ b/sci-biology/wgs-assembler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/wgs-assembler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/ChangeLog,v 1.5 2010/03/29 09:42:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wgs-assembler/ChangeLog,v 1.6 2010/05/07 20:00:24 weaver Exp $
+
+*wgs-assembler-6.1 (07 May 2010)
+
+  07 May 2010; Andrey Kislyuk <weaver@gentoo.org> -wgs-assembler-5.3.ebuild,
+  +wgs-assembler-6.1.ebuild:
+  Version bump
 
   29 Mar 2010; Pacho Ramos <pacho@gentoo.org> wgs-assembler-5.4.ebuild:
   amd64 stable, bug 298775
diff --git a/sci-biology/wgs-assembler/wgs-assembler-5.3.ebuild b/sci-biology/wgs-assembler/wgs-assembler-5.3.ebuild
deleted file mode 100644
index 4b95c05a3b7c..000000000000
--- a/sci-biology/wgs-assembler/wgs-assembler-5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 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.3.ebuild,v 1.1 2009/06/05 15:16:05 weaver Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Whole-genome shotgun assembler based on the Celera Assembler"
-HOMEPAGE="http://sourceforge.net/projects/wgs-assembler/"
-SRC_URI="mirror://sourceforge/${PN}/wgs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="x11-libs/libXt"
-RDEPEND="${DEPEND}
-	app-shells/tcsh
-	dev-perl/Log-Log4perl"
-
-S="${WORKDIR}/wgs-${PV}"
-
-src_compile() {
-	emake -C src -j1 SITE_NAME=LOCAL || die
-}
-
-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 '1 a use lib "/usr/share/'${PN}'/lib";' $(find $MY_S -name '*.p*') || die
-	insinto /usr/share/${PN}
-	doins -r ${MY_S}/bin/spec
-	insinto /usr/share/${PN}/lib
-	doins -r ${MY_S}/bin/TIGR || die
-	rm -rf ${MY_S}/bin/{TIGR,spec}
-	dobin ${MY_S}/bin/* || die
-	dolib.a ${MY_S}/lib/* || die
-	dodoc README
-}
diff --git a/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild b/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild
new file mode 100644
index 000000000000..d6b250aa990e
--- /dev/null
+++ b/sci-biology/wgs-assembler/wgs-assembler-6.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 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.1 2010/05/07 20:00:24 weaver Exp $
+
+EAPI="2"
+
+inherit eutils 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"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-libs/libXt"
+RDEPEND="${DEPEND}
+	app-shells/tcsh
+	dev-perl/Log-Log4perl"
+
+S="${WORKDIR}/wgs-${PV}"
+
+src_configure() {
+	sed -i -e "s/CC *= *gcc/CC = $(tc-getCC)/" \
+		-e "s/CXX *= *g++/CXX = $(tc-getCXX)/" \
+		"${S}"/src/c_make.as || die
+	sed -i -e "s/CC *:=.*/CC := $(tc-getCC)/" \
+		-e "s/CXX *:=.*/CXX := $(tc-getCXX)/" \
+		"${S}"/kmer/configure.sh || die
+	cd "${S}/kmer"
+	./configure.sh || die
+}
+
+src_compile() {
+	# not really an install target
+	emake -C kmer -j1 install || die
+	emake -C src -j1 SITE_NAME=LOCAL || die
+}
+
+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/* || die
+	insinto /usr/$(get_libdir)/${PN}
+	doins kmer/${MY_S}/lib/* || die
+	# Collisions
+	# dolib.a kmer/${MY_S}/lib/* || die
+	insinto /usr/include/${PN}
+	doins kmer/${MY_S}/include/*
+
+	insinto /usr/share/${PN}
+	doins -r ${MY_S}/bin/spec
+	insinto /usr/share/${PN}/lib
+	doins -r ${MY_S}/bin/TIGR || die
+	rm -rf ${MY_S}/bin/{TIGR,spec}
+	dobin ${MY_S}/bin/* || die
+	dolib.a ${MY_S}/lib/* || die
+	dodoc README
+}