Ebuild clean-up. Readded version 2.1.23c.

(Portage version: 2.1.1-r1)

5 files changed, 85 insertions, 10 deletions

diff --git a/sci-biology/wise/ChangeLog b/sci-biology/wise/ChangeLog
index 80f1b256584c..6399439d1d28 100644
--- a/sci-biology/wise/ChangeLog
+++ b/sci-biology/wise/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-biology/wise
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/ChangeLog,v 1.10 2006/11/03 03:08:09 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/ChangeLog,v 1.11 2006/11/10 23:06:26 ribosome Exp $
+
+  10 Nov 2006; Olivier Fisette <ribosome@gentoo.org> +wise-2.1.23c.ebuild,
+  wise-2.2.0.ebuild:
+  Ebuild clean-up. Readded version 2.1.23c. (I forgot we need it for threads
+  support.)
 
   03 Nov 2006; Olivier Fisette <ribosome@gentoo.org> -wise-2.1.23c.ebuild:
   Pruned old version.
diff --git a/sci-biology/wise/files/digest-wise-2.1.23c b/sci-biology/wise/files/digest-wise-2.1.23c
new file mode 100644
index 000000000000..59d95fc7512a
--- /dev/null
+++ b/sci-biology/wise/files/digest-wise-2.1.23c
@@ -0,0 +1,3 @@
+MD5 c058f9c3f4d5621caf581bb736f7b1f1 wise2.1.23c.tar.gz 2099297
+RMD160 3677760c3cb6dc7000caf2b24937669725b54cb0 wise2.1.23c.tar.gz 2099297
+SHA256 4200caa7edc81805c17f9032becc0c9d53a20be6693ba1e6dfdfa7a88e6a016a wise2.1.23c.tar.gz 2099297
diff --git a/sci-biology/wise/files/digest-wise-2.2.0 b/sci-biology/wise/files/digest-wise-2.2.0
index ad9dcdce97a3..7a34670f3cfb 100644
--- a/sci-biology/wise/files/digest-wise-2.2.0
+++ b/sci-biology/wise/files/digest-wise-2.2.0
@@ -1 +1,3 @@
 MD5 0584240f77885e37528e99e64535ab60 wise2.2.0.tar.gz 2108151
+RMD160 a4292fbfb405d19b628fe5c829d746297e740862 wise2.2.0.tar.gz 2108151
+SHA256 192db34ffa76ef14a9804cc5a7ab72554498284c841f940f8951b4bfae96d780 wise2.2.0.tar.gz 2108151
diff --git a/sci-biology/wise/wise-2.1.23c.ebuild b/sci-biology/wise/wise-2.1.23c.ebuild
new file mode 100644
index 000000000000..9f0aa79fdc68
--- /dev/null
+++ b/sci-biology/wise/wise-2.1.23c.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.1.23c.ebuild,v 1.3 2006/11/10 23:06:26 ribosome Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Intelligent algorithms for DNA searches"
+LICENSE="BSD"
+HOMEPAGE="http://www.ebi.ac.uk/Wise2/"
+SRC_URI="ftp://ftp.ebi.ac.uk/pub/software/unix/${PN}2/${PN}${PV}.tar.gz"
+
+SLOT="0"
+IUSE="threads"
+KEYWORDS="~alpha ~sparc ia64 x86"
+
+RDEPEND="=sci-biology/hmmer-2.3.2-r1"
+
+DEPEND="${RDEPEND}
+	app-shells/tcsh
+	dev-lang/perl
+	virtual/tetex"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use threads; then
+		append-flags "-DPTHREAD"
+		sed -e "s/#EXTRALIBS = -lpthread/EXTRALIBS = -lpthread/"  -i makefile || die
+	fi
+	sed -e "s/CC = cc/CC = $(tc-getCC)/" \
+		-e "s/CFLAGS = -c -O/CFLAGS = -c ${CFLAGS}/" \
+		-i makefile || die
+	cd "${S}"/docs
+}
+
+src_compile() {
+	cd src
+	make all || die
+	cd "${S}"/docs
+	for i in appendix dynamite wise2 wise3arch; do
+		latex ${i} || die
+		latex ${i} || die
+		dvips ${i}.dvi -o || die
+	done
+}
+
+src_install() {
+	dobin "${S}"/bin/* || die "Installing program failed"
+	dolib "${S}"/base/libwisebase.a || die "Failed to install libwisebase"
+	dolib "${S}"/dynlibsrc/libdyna.a || die "Failed to install libdyna"
+	dobin "${S}"/dynlibsrc/testgendb || die "Failed to install testgendb"
+	dolib "${S}"/models/libmodel.a || die "Failed to install libmodel"
+	insinto /usr/share/${PN}
+	doins -r "${S}"/wisecfg || die "Failed to install wisecfg"
+	insinto /usr/share/doc/${PF}
+	doins "${S}"/docs/*.ps || die "Failed to install documentation"
+	newenvd "${FILESDIR}"/${PN}-env 24wise || die "Failed to install env file"
+}
+
+src_test() {
+	cd "${S}"/src
+	WISECONFIGDIR="${S}/wisecfg" make test || die
+}
diff --git a/sci-biology/wise/wise-2.2.0.ebuild b/sci-biology/wise/wise-2.2.0.ebuild
index ae8855c2ca10..ad04919484a5 100644
--- a/sci-biology/wise/wise-2.2.0.ebuild
+++ b/sci-biology/wise/wise-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.2.0.ebuild,v 1.7 2006/04/06 22:00:07 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/wise/wise-2.2.0.ebuild,v 1.8 2006/11/10 23:06:26 ribosome Exp $
 
 inherit eutils toolchain-funcs
 
@@ -50,16 +50,16 @@ src_compile() {
 }
 
 src_install() {
-	dobin "${S}"/src/bin/*
-	dolib "${S}"/src/base/libwisebase.a
-	dolib "${S}"/src/dynlibsrc/libdyna.a
-	dobin "${S}"/src/dynlibsrc/testgendb
-	dolib "${S}"/src/models/libmodel.a
+	dobin "${S}"/src/bin/* || die "Failed to install program"
+	dolib "${S}"/src/base/libwisebase.a || die "Failed to install libwisebase"
+	dolib "${S}"/src/dynlibsrc/libdyna.a || die "Failed to install libdyna"
+	dobin "${S}"/src/dynlibsrc/testgendb || die "Failed to install testgendb"
+	dolib "${S}"/src/models/libmodel.a || die "Failed to install libmodel"
 	insinto /usr/share/${PN}
-	doins -r "${S}"/wisecfg
+	doins -r "${S}"/wisecfg || die "Failed to install wisecfg"
 	insinto /usr/share/doc/${PF}
-	doins "${S}"/docs/*.ps
-	newenvd "${FILESDIR}"/${PN}-env 24wise
+	doins "${S}"/docs/*.ps || die "Failed to install documentation"
+	newenvd "${FILESDIR}"/${PN}-env 24wise || die "Failed to install env file"
 }
 
 src_test() {