Version bump and removed old ebuilds (fixes bug #235943).

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)

4 files changed, 96 insertions, 54 deletions

diff --git a/sci-biology/vienna-rna/ChangeLog b/sci-biology/vienna-rna/ChangeLog
index 72816ef39a7c..7b5d6edd2c62 100644
--- a/sci-biology/vienna-rna/ChangeLog
+++ b/sci-biology/vienna-rna/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-biology/vienna-rna
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.16 2008/08/06 15:06:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/ChangeLog,v 1.17 2008/08/29 01:21:38 markusle Exp $
+
+*vienna-rna-1.7.2 (28 Aug 2008)
+
+  28 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/vienna-rna-1.7.2-gcc4.3.patch, -vienna-rna-1.6.1.ebuild,
+  -vienna-rna-1.6.5.ebuild, +vienna-rna-1.7.2.ebuild:
+  Version bump and removed old ebuilds (fixes bug #235943). Thanks much to
+  Chad A. Simmons <chad.simmons@member.fsf.org> for his ebuild and patches.
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-biology/vienna-rna/files/vienna-rna-1.7.2-gcc4.3.patch b/sci-biology/vienna-rna/files/vienna-rna-1.7.2-gcc4.3.patch
new file mode 100644
index 000000000000..4f5bd37f3a77
--- /dev/null
+++ b/sci-biology/vienna-rna/files/vienna-rna-1.7.2-gcc4.3.patch
@@ -0,0 +1,79 @@
+diff -Naur ViennaRNA-1.7/Cluster/AS_main.c ViennaRNA-1.7.new/Cluster/AS_main.c
+--- ViennaRNA-1.7/Cluster/AS_main.c	2001-04-05 04:36:41.000000000 -0400
++++ ViennaRNA-1.7.new/Cluster/AS_main.c	2008-08-28 10:53:11.000000000 -0400
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include "distance_matrix.h"
+ #include "statgeom.h"
+ #include "split.h"
+diff -Naur ViennaRNA-1.7/Cluster/statgeom.c ViennaRNA-1.7.new/Cluster/statgeom.c
+--- ViennaRNA-1.7/Cluster/statgeom.c	2001-04-05 04:36:41.000000000 -0400
++++ ViennaRNA-1.7.new/Cluster/statgeom.c	2008-08-28 10:53:11.000000000 -0400
+@@ -7,6 +7,7 @@
+ #include <stdio.h>
+ #include <strings.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ #include "utils.h"
+ #include "PS3D.h"
+ #include "distance_matrix.h"
+diff -Naur ViennaRNA-1.7/Cluster/treeplot.c ViennaRNA-1.7.new/Cluster/treeplot.c
+--- ViennaRNA-1.7/Cluster/treeplot.c	2001-04-05 04:36:41.000000000 -0400
++++ ViennaRNA-1.7.new/Cluster/treeplot.c	2008-08-28 10:53:11.000000000 -0400
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <math.h>
++#include <stdlib.h>
+ #include "distance_matrix.h"
+ #include "utils.h"
+ 
+diff -Naur ViennaRNA-1.7/RNAforester/src/main.cpp ViennaRNA-1.7.new/RNAforester/src/main.cpp
+--- ViennaRNA-1.7/RNAforester/src/main.cpp	2005-08-05 10:14:10.000000000 -0400
++++ ViennaRNA-1.7.new/RNAforester/src/main.cpp	2008-08-28 10:53:11.000000000 -0400
+@@ -19,6 +19,8 @@
+ #include <list>
+ #include <sstream>
+ #include <string>
++#include <cstring>
++#include <climits>
+ #include <map>
+ 
+ //#include <sys/timeb.h>

+diff -Naur ViennaRNA-1.7/RNAforester/src/ppforestbase.h ViennaRNA-1.7.new/RNAforester/src/ppforestbase.h
+--- ViennaRNA-1.7/RNAforester/src/ppforestbase.h	2006-05-08 07:49:33.000000000 -0400
++++ ViennaRNA-1.7.new/RNAforester/src/ppforestbase.h	2008-08-28 10:53:11.000000000 -0400
+@@ -16,6 +16,7 @@
+ 
+ #include <algorithm>
+ #include <cassert>
++#include <cstring>
+ 
+ #include "misc.h"
+ #include "types.h"
+diff -Naur ViennaRNA-1.7/RNAforester/src/rna_algebra.h ViennaRNA-1.7.new/RNAforester/src/rna_algebra.h
+--- ViennaRNA-1.7/RNAforester/src/rna_algebra.h	2004-09-01 17:55:22.000000000 -0400
++++ ViennaRNA-1.7.new/RNAforester/src/rna_algebra.h	2008-08-28 10:53:11.000000000 -0400
+@@ -3,6 +3,8 @@
+ 

+ #include <assert.h>
+ #include <algorithm>
++#include <cstring>
++#include <climits>
+ 
+ #include "algebra.h"
+ #include "debug.h"
+diff -Naur ViennaRNA-1.7/Readseq/ureadseq.c ViennaRNA-1.7.new/Readseq/ureadseq.c
+--- ViennaRNA-1.7/Readseq/ureadseq.c	2002-11-27 06:23:56.000000000 -0500
++++ ViennaRNA-1.7.new/Readseq/ureadseq.c	2008-08-28 10:53:11.000000000 -0400
+@@ -16,7 +16,7 @@
+  *
+  */
+ 
+-
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
diff --git a/sci-biology/vienna-rna/vienna-rna-1.6.1.ebuild b/sci-biology/vienna-rna/vienna-rna-1.6.1.ebuild
deleted file mode 100644
index a7514b28edbb..000000000000
--- a/sci-biology/vienna-rna/vienna-rna-1.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 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.6.1.ebuild,v 1.2 2007/04/29 01:06:35 je_fro Exp $
-
-inherit toolchain-funcs
-
-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_compile() {
-	econf --with-cluster || die "Configuration failed."
-	cd "${S}"/RNAforester/g2-0.70
-	sed -e "s:LIBDIR = /usr/lib:LIBDIR = ${D}/usr/lib:" \
-		-e "s:INCDIR = /usr/include:INCDIR = ${D}/usr/include:" \
-		-i Makefile || die "Failed patching RNAForester build system."
-	cd "${S}"
-	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."
-	make || die "Failed to compile readseq."
-	# TODO: Add (optional?) support for the NCBI toolkit.
-}
-
-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 || die \
-		"Installing readseq Readme failed."
-}
diff --git a/sci-biology/vienna-rna/vienna-rna-1.6.5.ebuild b/sci-biology/vienna-rna/vienna-rna-1.7.2.ebuild
index 44c09db8b71d..6e40c88002a0 100644
--- a/sci-biology/vienna-rna/vienna-rna-1.6.5.ebuild
+++ b/sci-biology/vienna-rna/vienna-rna-1.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.6.5.ebuild,v 1.1 2007/11/24 15:10:04 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vienna-rna/vienna-rna-1.7.2.ebuild,v 1.1 2008/08/29 01:21:38 markusle Exp $
 
-inherit toolchain-funcs multilib eutils
+inherit toolchain-funcs multilib eutils versionator
 
 DESCRIPTION="The Vienna RNA Package - RNA secondary structure prediction and comparison"
 LICENSE="vienna-rna"
@@ -21,17 +21,18 @@ S="${WORKDIR}/ViennaRNA-${PV}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-c-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.6.5-c-fixes.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
 }
 
 src_compile() {
 	econf --with-cluster || die "Configuration failed."
-	cd "${S}"/RNAforester/g2-0.70
 	sed -e "s:LIBDIR = /usr/lib:LIBDIR = ${D}/usr/$(get_libdir):" \
 		-e "s:INCDIR = /usr/include:INCDIR = ${D}/usr/include:" \
-		-i Makefile || die "Failed patching RNAForester build system."
-	cd "${S}"
+		-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."