Install ELFs in correct place, #300012

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

4 files changed, 25 insertions, 76 deletions

diff --git a/sci-biology/vienna-rna/ChangeLog b/sci-biology/vienna-rna/ChangeLog
index 06a83d769fdf..c0655d199364 100644
--- a/sci-biology/vienna-rna/ChangeLog
+++ b/sci-biology/vienna-rna/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/vienna-rna
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.30 2010/04/03 21:41:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.31 2010/06/25 09:22:36 jlec Exp $
+
+*vienna-rna-1.8.4-r1 (25 Jun 2010)
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org> -vienna-rna-1.7.2.ebuild,
+  -vienna-rna-1.8.3.ebuild, +vienna-rna-1.8.4-r1.ebuild,
+  +files/vienna-rna-1.8.4-bindir.patch:
+  Install ELFs in correct place, #300012
 
   03 Apr 2010; Justin Lecher <jlec@gentoo.org> vienna-rna-1.8.4.ebuild,
   +files/vienna-rna-1.8.4-jobserver-fix.patch:
diff --git a/sci-biology/vienna-rna/files/vienna-rna-1.8.4-bindir.patch b/sci-biology/vienna-rna/files/vienna-rna-1.8.4-bindir.patch
new file mode 100644
index 000000000000..76a5a259a862
--- /dev/null
+++ b/sci-biology/vienna-rna/files/vienna-rna-1.8.4-bindir.patch
@@ -0,0 +1,10 @@
+diff --git a/Utils/Makefile.am b/Utils/Makefile.am
+index f42ebf4..d84a0f1 100644
+--- a/Utils/Makefile.am
++++ b/Utils/Makefile.am
+@@ -1,4 +1,4 @@
+-pkgbindir = $(pkgdatadir)/bin
++pkgbindir = $(prefix)/bin
+ pkgbin_PROGRAMS = b2ct popt
+ 
+ pscript = b2mt.pl ct2b.pl dpzoom.pl mountain.pl relplot.pl rotate_ss.pl cmount.pl colorrna.pl coloraln.pl refold.pl
diff --git a/sci-biology/vienna-rna/vienna-rna-1.7.2.ebuild b/sci-biology/vienna-rna/vienna-rna-1.7.2.ebuild
deleted file mode 100644
index 42da1126e2a2..000000000000
--- a/sci-biology/vienna-rna/vienna-rna-1.7.2.ebuild
+++ /dev/null
@@ -1,70 +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/vienna-rna/vienna-rna-1.7.2.ebuild,v 1.4 2009/07/30 08:31:01 ssuominen Exp $
-
-inherit toolchain-funcs multilib eutils versionator autotools perl-module
-
-DESCRIPTION="The Vienna RNA Package - RNA secondary structure prediction and comparison"
-LICENSE="vienna-rna"
-HOMEPAGE="http://www.tbi.univie.ac.at/~ivo/RNA"
-SRC_URI="http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-${PV}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~ppc"
-
-DEPEND="dev-lang/perl
-	media-libs/gd"
-
-S=${WORKDIR}/ViennaRNA-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.6.5-c-fixes.patch
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
-	epatch "${FILESDIR}"/${P}-disable-gd.patch
-	epatch "${FILESDIR}"/${P}-gcc4.4.patch
-	eautoreconf
-
-	# we need a separate eautoreconf in RNAforester
-	cd RNAforester
-	eautoreconf
-}
-
-src_compile() {
-	econf --with-cluster || die "Configuration failed."
-	sed -e "s:LIBDIR = /usr/lib:LIBDIR = ${D}/usr/$(get_libdir):" \
-		-e "s:INCDIR = /usr/include:INCDIR = ${D}/usr/include:" \
-		-i RNAforester/g2-0.70/Makefile \
-			|| die "Failed patching RNAForester build system."
-	emake || die "Compilation failed."
-
-	cd "${S}"/Readseq
-	sed -e "s:CC=cc:CC=$(tc-getCC):" -e "s:CFLAGS=:CFLAGS=${CFLAGS}:" \
-		-i Makefile || die "Failed patching readseq Makefile."
-	emake || die "Failed to compile readseq."
-	# TODO: Add (optional?) support for the NCBI toolkit.
-}
-
-src_test() {
-	cd "${S}"/Perl && emake check || die "Perl tests failed"
-	cd "${S}"/Readseq && emake test || die "Readseq tests failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "Installation failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS \
-		|| die "Failed to install documentation."
-	newbin Readseq/readseq readseq-vienna \
-		|| die "Installing readseq failed."
-	dodoc Readseq/Readseq.help || die \
-		"Readseq Documentation installation failed."
-	newdoc Readseq/Readme README.readseq && \
-		newdoc Readseq/Formats Formats.readseq \
-		|| die "Installing readseq Readme failed."
-
-	# remove perlocal.pod to avoid file collisions (see #240358)
-	fixlocalpod || die "Failed to remove perlocal.pod"
-}
diff --git a/sci-biology/vienna-rna/vienna-rna-1.8.3.ebuild b/sci-biology/vienna-rna/vienna-rna-1.8.4-r1.ebuild
index 674f7c9efce1..110a6f3c9c0b 100644
--- a/sci-biology/vienna-rna/vienna-rna-1.8.3.ebuild
+++ b/sci-biology/vienna-rna/vienna-rna-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.8.3.ebuild,v 1.4 2009/11/02 20:23:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.8.4-r1.ebuild,v 1.1 2010/06/25 09:22:36 jlec Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-${PV}.tar.gz"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 DEPEND="dev-lang/perl
 	media-libs/gd"
@@ -24,8 +24,10 @@ S="${WORKDIR}/ViennaRNA-${PV}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.5-c-fixes.patch
 	"${FILESDIR}"/${PN}-1.7.2-LDFLAGS.patch
-	"${FILESDIR}"/${P}-gcc4.3.patch
-	"${FILESDIR}"/${P}-disable-gd.patch
+	"${FILESDIR}"/${PN}-1.8.3-gcc4.3.patch
+	"${FILESDIR}"/${PN}-1.8.3-disable-gd.patch
+	"${FILESDIR}"/${P}-jobserver-fix.patch
+	"${FILESDIR}"/${P}-bindir.patch
 )
 
 src_prepare() {