4 files changed, 43 insertions, 53 deletions
diff --git a/sci-biology/gmap/ChangeLog b/sci-biology/gmap/ChangeLog
index 5b42b51a3711..68263afbdb6c 100644
--- a/sci-biology/gmap/ChangeLog
+++ b/sci-biology/gmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/gmap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/gmap/ChangeLog,v 1.10 2011/09/25 21:57:32 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/gmap/ChangeLog,v 1.11 2011/10/08 22:39:22 weaver Exp $
+
+*gmap-2011.10.07 (08 Oct 2011)
+
+  08 Oct 2011; Andrey Kislyuk <weaver@gentoo.org> -gmap-2007.09.28.ebuild,
+  -gmap-2010.03.09.ebuild, +gmap-2011.10.07.ebuild:
+  Version bump, drop old
 
 *gmap-2011.09.14 (25 Sep 2011)
 
diff --git a/sci-biology/gmap/gmap-2007.09.28.ebuild b/sci-biology/gmap/gmap-2007.09.28.ebuild
deleted file mode 100644
index deb2be7163dd..000000000000
--- a/sci-biology/gmap/gmap-2007.09.28.ebuild
+++ /dev/null
@@ -1,26 +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/gmap/gmap-2007.09.28.ebuild,v 1.3 2009/03/22 16:32:22 maekke Exp $
-
-inherit versionator
-
-MY_PV=$(replace_all_version_separators '-')
-
-DESCRIPTION="A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
-HOMEPAGE="http://www.gene.com/share/gmap/"
-SRC_URI="http://www.gene.com/share/gmap/src/gmap-${MY_PV}.tar.gz"
-
-LICENSE="gmap"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/gmap-${MY_PV}"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/sci-biology/gmap/gmap-2010.03.09.ebuild b/sci-biology/gmap/gmap-2010.03.09.ebuild
deleted file mode 100644
index 1dcd26db992e..000000000000
--- a/sci-biology/gmap/gmap-2010.03.09.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/gmap/gmap-2010.03.09.ebuild,v 1.3 2010/07/16 21:51:32 hwoarang Exp $
-
-EAPI="2"
-
-MY_PV=${PV//./-}
-
-DESCRIPTION="A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
-HOMEPAGE="http://www.gene.com/share/gmap/"
-SRC_URI="http://www.gene.com/share/gmap/src/gmap-gsnap-${MY_PV}.tar.gz"
-
-LICENSE="gmap"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/gmap-${MY_PV}"
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/sci-biology/gmap/gmap-2011.10.07.ebuild b/sci-biology/gmap/gmap-2011.10.07.ebuild
new file mode 100644
index 000000000000..b7bd3d1d88ad
--- /dev/null
+++ b/sci-biology/gmap/gmap-2011.10.07.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/gmap/gmap-2011.10.07.ebuild,v 1.1 2011/10/08 22:39:22 weaver Exp $
+
+EAPI="2"
+
+MY_PV=${PV//./-}
+
+DESCRIPTION="A Genomic Mapping and Alignment Program for mRNA and EST Sequences"
+HOMEPAGE="http://www.gene.com/share/gmap/"
+SRC_URI="http://research-pub.gene.com/gmap/src/gmap-gsnap-${MY_PV}.tar.gz"
+
+LICENSE="gmap"
+SLOT="0"
+IUSE="+samtools +goby"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="samtools? ( sci-biology/samtools )
+	goby? ( sci-biology/goby-cpp )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/gmap-${MY_PV}"
+
+src_configure() {
+	econf $(use_with samtools) \
+		$(use_with goby goby /usr)
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS ChangeLog README
+}
+
+src_test() {
+	emake check || die
+}