4 files changed, 96 insertions, 2 deletions
diff --git a/sci-biology/psipred/ChangeLog b/sci-biology/psipred/ChangeLog
index 340315e55790..970c787dc9e5 100644
--- a/sci-biology/psipred/ChangeLog
+++ b/sci-biology/psipred/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/psipred
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/ChangeLog,v 1.1 2010/02/28 10:31:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/ChangeLog,v 1.2 2010/05/06 18:27:49 jlec Exp $
+
+*psipred-3.0 (06 May 2010)
+*psipred-2.6.1-r1 (06 May 2010)
+
+  06 May 2010; Justin Lecher <jlec@gentoo.org> +files/3.0-path.patch,
+  -psipred-2.6.1.ebuild, +psipred-2.6.1-r1.ebuild, +psipred-3.0.ebuild:
+  Version Bump, #317977; fixed installation of shipped bins
 
 *psipred-2.6.1 (28 Feb 2010)
 
diff --git a/sci-biology/psipred/files/3.0-path.patch b/sci-biology/psipred/files/3.0-path.patch
new file mode 100644
index 000000000000..ebf9b2a61f4e
--- /dev/null
+++ b/sci-biology/psipred/files/3.0-path.patch
@@ -0,0 +1,38 @@
+diff --git a/runpsipred b/runpsipred
+index e133686..6ad57cc 100755
+--- a/runpsipred
++++ b/runpsipred
+@@ -14,13 +14,13 @@
+ set dbname = uniref90
+ 
+ # Where the NCBI programs have been installed
+-set ncbidir = /usr/local/bin
++set ncbidir = @GENTOO_PORTAGE_EPREFIX@/usr/bin
+ 
+ # Where the PSIPRED V3 programs have been installed
+-set execdir = ./bin
++set execdir = @GENTOO_PORTAGE_EPREFIX@/usr/bin
+ 
+ # Where the PSIPRED V3 data files have been installed
+-set datadir = ./data
++set datadir = @GENTOO_PORTAGE_EPREFIX@/usr/share/psipred/data
+ 
+ set basename = $1:r
+ set rootname = $basename:t
+diff --git a/runpsipred_single b/runpsipred_single
+index 1f7680b..7bd5bc3 100755
+--- a/runpsipred_single
++++ b/runpsipred_single
+@@ -10,10 +10,10 @@
+ # NOTE: Script modified to be more cluster friendly (DTJ April 2008)
+ 
+ # Where the PSIPRED V3 programs have been installed
+-set execdir = ./bin
++set execdir = @GENTOO_PORTAGE_EPREFIX@/usr/bin
+ 
+ # Where the PSIPRED V3 data files have been installed
+-set datadir = ./data
++set datadir = @GENTOO_PORTAGE_EPREFIX@/usr/share/psipred/data
+ 
+ set basename = $1:r
+ set rootname = $basename:t
diff --git a/sci-biology/psipred/psipred-2.6.1.ebuild b/sci-biology/psipred/psipred-2.6.1-r1.ebuild
index 2ac04814cdfe..d80c361b20a2 100644
--- a/sci-biology/psipred/psipred-2.6.1.ebuild
+++ b/sci-biology/psipred/psipred-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-2.6.1.ebuild,v 1.1 2010/02/28 10:31:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-2.6.1-r1.ebuild,v 1.1 2010/05/06 18:27:50 jlec Exp $
 
 EAPI="3"
 
@@ -24,6 +24,7 @@ RDEPEND="
 S="${WORKDIR}"
 
 src_prepare() {
+	rm -f bin/*
 	epatch "${FILESDIR}"/${PV}-Makefile.patch
 	epatch "${FILESDIR}"/${PV}-path.patch
 	eprefixify runpsipred*
diff --git a/sci-biology/psipred/psipred-3.0.ebuild b/sci-biology/psipred/psipred-3.0.ebuild
new file mode 100644
index 000000000000..d74553f2952d
--- /dev/null
+++ b/sci-biology/psipred/psipred-3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/psipred/psipred-3.0.ebuild,v 1.1 2010/05/06 18:27:49 jlec Exp $
+
+EAPI="3"
+
+inherit eutils prefix toolchain-funcs versionator
+
+MY_P="${PN}$(delete_all_version_separators)"
+
+DESCRIPTION="Protein Secondary Structure Prediction"
+HOMEPAGE="http://bioinf.cs.ucl.ac.uk/psipred/"
+SRC_URI="http://bioinf.cs.ucl.ac.uk/downloads/${PN}/${MY_P}.tar.gz"
+
+LICENSE="psipred"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sci-biology/ncbi-tools
+	sci-biology/ncbi-tools++"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	rm -f bin/*
+	epatch "${FILESDIR}"/2.6.1-Makefile.patch
+	epatch "${FILESDIR}"/${PV}-path.patch
+	eprefixify runpsipred*
+}
+
+src_compile() {
+	emake -C src CC=$(tc-getCC) || die "emake failed"
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install || die "installation failed"
+	dobin runpsipred* || die
+	insinto /usr/share/${PN}
+	doins -r data || die "failed to install data"
+	dodoc README || die "nothing to read"
+}
+
+pkg_postinst() {
+	elog "Please use the update_blastdb.pl in order to"
+	elog "maintain your own local blastdb"
+}