3 files changed, 27 insertions, 59 deletions
diff --git a/sci-biology/gibbs/ChangeLog b/sci-biology/gibbs/ChangeLog
index 4f702807d9f3..0ee2a35d038c 100644
--- a/sci-biology/gibbs/ChangeLog
+++ b/sci-biology/gibbs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/gibbs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/gibbs/ChangeLog,v 1.8 2009/12/28 23:49:26 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/gibbs/ChangeLog,v 1.9 2012/04/26 16:17:09 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> gibbs-3.1.ebuild,
+  -gibbs-1995.9.ebuild:
+  Move to EAPI=4, drop old
 
   28 Dec 2009; Markus Meier <maekke@gentoo.org> gibbs-3.1.ebuild:
   x86 stable, bug #290933
diff --git a/sci-biology/gibbs/gibbs-1995.9.ebuild b/sci-biology/gibbs/gibbs-1995.9.ebuild
deleted file mode 100644
index 054f2a6078cb..000000000000
--- a/sci-biology/gibbs/gibbs-1995.9.ebuild
+++ /dev/null
@@ -1,43 +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/gibbs/gibbs-1995.9.ebuild,v 1.3 2009/09/30 14:40:39 weaver Exp $
-
-DESCRIPTION="The Gibbs Motif Sampler identifies motifs, conserved regions, in DNA or protein sequences"
-
-HOMEPAGE="http://www.people.fas.harvard.edu/~junliu/index1.html"
-
-SRC_NAME="gibbs9_95"    # 9_95 refers to the september 1995 version
-SRC_URI="http://www.fas.harvard.edu/~junliu/Software/${SRC_NAME}.tar"
-
-LICENSE="public-domain"
-
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-S="${WORKDIR}"/${SRC_NAME}/code
-
-src_compile() {
-	LIBS="-lm" make -e || die
-}
-
-src_install() {
-	cd "${WORKDIR}"/${SRC_NAME}
-	dobin gibbs purge scan
-	dobin "${FILESDIR}"/gibbs-demo
-
-	dodoc README
-
-	insinto /usr/share/${PN}
-	doins demo.out
-	insinto /usr/share/${PN}/examples
-	doins examples/*
-}
-
-pkg_postinst() {
-	einfo 'Testcase: To ensure the gibbs sampler works correctly,'
-	einfo 'run "gibbs-demo > mydemo.out" and compare "mydemo.out"'
-	einfo 'with "/usr/share/gibbs/demo.out" using diff. The files'
-	einfo 'should differ only by their timing statistics and the'
-	einfo 'paths of the example files.'
-}
diff --git a/sci-biology/gibbs/gibbs-3.1.ebuild b/sci-biology/gibbs/gibbs-3.1.ebuild
index 9aa8c38884b8..812b6b2a38f4 100644
--- a/sci-biology/gibbs/gibbs-3.1.ebuild
+++ b/sci-biology/gibbs/gibbs-3.1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2009 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/gibbs/gibbs-3.1.ebuild,v 1.5 2009/12/28 23:49:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/gibbs/gibbs-3.1.ebuild,v 1.6 2012/04/26 16:17:09 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit autotools
+AUTOTOOLS_AUTORECONF=yes
 
-DESCRIPTION="The Gibbs Motif Sampler identifies motifs, conserved regions, in DNA or protein sequences"
+inherit autotools-utils multilib
+
+DESCRIPTION="Identify motifs, conserved regions, in DNA or protein sequences"
 HOMEPAGE="http://bayesweb.wadsworth.org/gibbs/gibbs.html"
 SRC_URI="mirror://gentoo/gibbs-${PV}.tar.gz"
 
@@ -15,29 +17,34 @@ SLOT="0"
 IUSE="mpi"
 KEYWORDS="amd64 x86"
 
-DEPEND="mpi? ( virtual/mpi
-	sys-cluster/mpe2 )"
+DEPEND="
+	mpi? (
+		virtual/mpi
+		sys-cluster/mpe2 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i -e 's/CFLAGS="$OPTFLAGS/CFLAGS="$CFLAGS $OPTFLAGS/' \
-		-e 's/-Werror//' configure.in || die
-	eautoreconf
+	sed \
+		-e 's/CFLAGS="$OPTFLAGS/CFLAGS="$CFLAGS $OPTFLAGS/' \
+		-e 's/-Werror//' \
+		-i configure.in || die
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	if use mpi; then export CC=mpicc; fi
-	econf $(use_enable mpi) || die
+	local myeconfargs=( $(use_enable mpi) )
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	exeinto /usr/share/${PN}
+	autotools-utils_src_install
+	exeinto /usr/$(get_libdir)/${PN}
 	doexe *.pl
 	dodoc README ChangeLog
 }
 
 pkg_postinst() {
-	einfo "Supplementary Perl scripts for Gibbs have been installed into /usr/share/${PN}."
+	einfo "Supplementary Perl scripts for Gibbs have been installed into /usr/$(get_libdir)/${PN}."
 	einfo "These scripts require installation of sci-biology/bioperl."
 }