Install ELFs in correct place, #300012

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-biology/vienna-rna/ChangeLog b/sci-biology/vienna-rna/ChangeLog
index 06a83d769fdf967922d1360604c3e326b53672fd..c0655d1993640c6221e8e16ab786fe0ac439e4b8 100644 (file)
--- 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/Manifest b/sci-biology/vienna-rna/Manifest
index 7ee08afff2cd8fd94be47564cec04126e84d3d9e..3f4a23c2400f9b6520ed1fb507a0c9a8446dce0a 100644 (file)
--- a/sci-biology/vienna-rna/Manifest
+++ b/sci-biology/vienna-rna/Manifest
@@ -8,19 +8,17 @@ AUX vienna-rna-1.7.2-gcc4.3.patch 2738 RMD160 c559c768b8c4e9b92f9bdbd66f5e3ff12b
 AUX vienna-rna-1.7.2-gcc4.4.patch 8935 RMD160 134d76cd6fd3a5988b099dad902e65c49c5607bd SHA1 bc1b6d1012a6078fd641f135655ea1eb1e072b28 SHA256 70a9624a5ee0272fb3e558de0a55479f33307e0abca6532df1ca38c734055a82
 AUX vienna-rna-1.8.3-disable-gd.patch 655 RMD160 e918a233e1f1c8f3bee8c721ca793dcde60b2bcb SHA1 97a6f785187ffb9005696a8fa10207b66065b5b0 SHA256 f84d41142fd7368d809895b2feec057ed69d0022c6bfb2b521c7491295e56990
 AUX vienna-rna-1.8.3-gcc4.3.patch 2825 RMD160 564b0904d3442e1a835478c405771b288593668c SHA1 876fd2872300191131681d965b0b5f1a2c1cbe8d SHA256 1bea24f0fb851f8ec54973c14eaebbd0c27658b05c6a670557b45a883f0b1d57
+AUX vienna-rna-1.8.4-bindir.patch 351 RMD160 e12b774a2c8224ed85785f9e3994a48b3d8b89e6 SHA1 b45dc4691ae3b4ef205261ff0aae47a065be248a SHA256 ed37f36fcaf0db8bcae83e7de7cbcea44617671f691ad430b65e2931575b1749
 AUX vienna-rna-1.8.4-jobserver-fix.patch 681 RMD160 c72649a57ece3d511cc18f2cac47c7ab103c258d SHA1 0c5e67318c826f12553cf8cb807c3061c1e70574 SHA256 bec5248214ba303d85afda03e663f84061258cd06f2f50773011251299a42b84
-DIST ViennaRNA-1.7.2.tar.gz 1298982 RMD160 768f53ba9e0f784b066ae485451eb0abd6f6631c SHA1 36a4bfcf88599afc479be14bc324ef4ce9d629a3 SHA256 202887653033de9e50644acd5c3d8607f215d6c84eef9d68a936837edf71a00e
-DIST ViennaRNA-1.8.3.tar.gz 1706482 RMD160 988932b0b87ed708bd52fabca6fc42c21a9562b4 SHA1 ddbf130a9f0c1d28f1a2afcb4da16172c48628a9 SHA256 84feb86ebfc03c95ca82296cf255eee022da9733b38b452ce1b10084dc5f0108
 DIST ViennaRNA-1.8.4.tar.gz 1397733 RMD160 29939511e560d898164c21d2452316b0a3a6771e SHA1 6e3a0751849f1b43d4751ce64670a21a3718f040 SHA256 90a5408d05f7dd35031a527d1823607daa8fc8f394b438fb072be78afc7174b7
-EBUILD vienna-rna-1.7.2.ebuild 2278 RMD160 68d114c0f1305c08617bca9fe255f3c0c0b82ee8 SHA1 868dda0408447c202e29a5e4c302b01fe9109848 SHA256 291feae43b88b013158646c57cc021d61be3019eb2539341d01d3ee62c58a134
-EBUILD vienna-rna-1.8.3.ebuild 2353 RMD160 b4a0da4e43d0c49fba59436e718a2cfa2a6e303d SHA1 18d33c2e4b5414d170fc5e58315823b39fc037c4 SHA256 b4201dad5b60b862fc16ab69cc1655463bfd28bcbe153b3ec1d9f3a7f2d0fa0c
+EBUILD vienna-rna-1.8.4-r1.ebuild 2443 RMD160 0e0d943a037b1aff130894b351fae33eb5e75235 SHA1 bb18fe9b64f03039520aca05dfda1282c80d919a SHA256 ff23fef2d01cac3eb399099619e86d54fc4c18b9fada75c03cde4883537ff4f5
 EBUILD vienna-rna-1.8.4.ebuild 2405 RMD160 e88691d4b23d2f8e6856022b692b74522fa5a78d SHA1 25cc55c648d39c0fce9cabd381ebe0603f1a3d14 SHA256 c78a85279314697f399e067da5138fffb279027feb80e3d8b504f8c64798f5ac
-MISC ChangeLog 4539 RMD160 a9a6a9f9047081fabe8d87666c36791d7baaeec9 SHA1 eadfc558936bb58d73cd212f80929367d78f86a1 SHA256 7912d34e10838b1e2096742d21afb94d7109ed4db792854d3b71e0953ab32c1a
+MISC ChangeLog 4787 RMD160 81d16a7cbb78c9773e2c6ad49cd17c55cfce8049 SHA1 3a59acb00a7c61711d0200513b218932d1d2db40 SHA256 8764cdddde2c131dbe5db4fec86da8686e37a1d00735128284570b8b75bd6b28
 MISC metadata.xml 1210 RMD160 41d50f7af8428b196c4ef855b68dcb657588bb34 SHA1 08f8e1aa88086fd9a3f5fa03fa46c31e12a3f776 SHA256 9c8b3f60f6098accff7c67f26ea07cb5b57e9ed8eae5d3d03949f1718ab6517e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAku3tiUACgkQgAnW8HDreRZoXQCguwDWsdpDnlYWumBMDo+Q75Rv
-jUUAnRgflXrz7pcstNP2sn00JqMzi+QH
-=R9ZS
+iEYEARECAAYFAkwkdWEACgkQgAnW8HDreRbnrACgquXrvcPU10Vh3WndPBUQI3N6
+APIAn0VfHW7ckBNvG7zQkk6+IsB49LfT
+=5+U9
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..76a5a25
--- /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 (file)
index 42da112..0000000
--- 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
similarity index 88%
rename from sci-biology/vienna-rna/vienna-rna-1.8.3.ebuild
rename to sci-biology/vienna-rna/vienna-rna-1.8.4-r1.ebuild
index 674f7c9efce1422d5f32397901cbaede2744c89f..110a6f3c9c0bdbb9dcaa907fd25456f445a5d9e8 100644 (file)
--- 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() {