Fixed typo in ebuild and added gcc-4.3 patch (#225797).

(Portage version: 2.1.4.4)

4 files changed, 125 insertions, 16 deletions

diff --git a/sci-astronomy/orsa/ChangeLog b/sci-astronomy/orsa/ChangeLog
index 6a3f0b6b064e..14cb37d3de42 100644
--- a/sci-astronomy/orsa/ChangeLog
+++ b/sci-astronomy/orsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/orsa
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.14 2006/10/25 18:37:45 markusle Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.15 2008/06/11 22:51:12 markusle Exp $
+
+  11 Jun 2008; Markus Dittrich <markusle@gentoo.org> orsa-0.6.1.ebuild,
+  orsa-0.7.0.ebuild, +files/orsa-0.7.0-gcc4.3.patch:
+  Fixed typo in ebuild and added gcc-4.3 patch (#225797).
 
 *orsa-0.7.0 (25 Oct 2006)
 
diff --git a/sci-astronomy/orsa/files/orsa-0.7.0-gcc4.3.patch b/sci-astronomy/orsa/files/orsa-0.7.0-gcc4.3.patch
new file mode 100644
index 000000000000..050a339ed2bb
--- /dev/null
+++ b/sci-astronomy/orsa/files/orsa-0.7.0-gcc4.3.patch
@@ -0,0 +1,102 @@
+diff -Naur orsa-0.7.0/src/liborsa/orsa_coord.cc orsa-0.7.0.new/src/liborsa/orsa_coord.cc
+--- orsa-0.7.0/src/liborsa/orsa_coord.cc	2004-09-21 15:44:20.000000000 -0400
++++ orsa-0.7.0.new/src/liborsa/orsa_coord.cc	2008-06-11 06:40:39.000000000 -0400
+@@ -26,6 +26,7 @@
+ 
+ #include <cmath>
+ #include <iostream>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+diff -Naur orsa-0.7.0/src/liborsa/orsa_file.cc orsa-0.7.0.new/src/liborsa/orsa_file.cc
+--- orsa-0.7.0/src/liborsa/orsa_file.cc	2005-01-10 20:01:11.000000000 -0500
++++ orsa-0.7.0.new/src/liborsa/orsa_file.cc	2008-06-11 06:44:22.000000000 -0400
+@@ -27,6 +27,8 @@
+ #include <iostream>
+ 
+ #include <ctype.h>
++#include <cstring>
++#include <algorithm>
+ 
+ #include "orsa_common.h"
+ #include "orsa_units.h"
+@@ -1126,7 +1128,7 @@
+   
+   Vector LocationFile::ObsPos(const string obscode, const Date &date) {
+     
+-    std::list<std::string>::iterator it_find = find(codes.begin(),codes.end(),obscode);
++    std::list<std::string>::iterator it_find = std::find(codes.begin(),codes.end(),obscode);
+     if (it_find == codes.end()) {
+       ORSA_ERROR("obscode %s not found in file %s",obscode.c_str(),GetFileName().c_str());      
+       return Vector();
+diff -Naur orsa-0.7.0/src/liborsa/orsa_file_jpl.cc orsa-0.7.0.new/src/liborsa/orsa_file_jpl.cc
+--- orsa-0.7.0/src/liborsa/orsa_file_jpl.cc	2005-01-04 21:25:06.000000000 -0500
++++ orsa-0.7.0.new/src/liborsa/orsa_file_jpl.cc	2008-06-11 06:44:35.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include "orsa_secure_math.h"
+ 
+ #include <cstdio>
++#include <cstring>
+ 
+ #include "sdncal.h"
+ #include "jpleph.h"
+diff -Naur orsa-0.7.0/src/liborsa/orsa_interaction.cc orsa-0.7.0.new/src/liborsa/orsa_interaction.cc
+--- orsa-0.7.0/src/liborsa/orsa_interaction.cc	2005-01-04 17:31:25.000000000 -0500
++++ orsa-0.7.0.new/src/liborsa/orsa_interaction.cc	2008-06-11 06:41:24.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "orsa_error.h"
+ 
+ #include <cmath>
++#include <cstring>
+ #include <iostream>
+ 
+ using namespace std;
+diff -Naur orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc orsa-0.7.0.new/src/liborsa/orsa_interaction_tree.cc
+--- orsa-0.7.0/src/liborsa/orsa_interaction_tree.cc	2004-10-01 20:04:30.000000000 -0400
++++ orsa-0.7.0.new/src/liborsa/orsa_interaction_tree.cc	2008-06-11 06:41:42.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include "orsa_universe.h"
+ 
+ #include <iostream>
++#include <cstring>
+ #include <list>
+ #include <stack>
+ #include <map>
+diff -Naur orsa-0.7.0/src/liborsa/orsa_units.h orsa-0.7.0.new/src/liborsa/orsa_units.h
+--- orsa-0.7.0/src/liborsa/orsa_units.h	2005-01-04 22:54:27.000000000 -0500
++++ orsa-0.7.0.new/src/liborsa/orsa_units.h	2008-06-11 06:37:55.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <cmath>
+ #include <string>
+ #include <cstdio>
++#include <cstdlib>
+ 
+ #include "orsa_secure_math.h"
+ #include "orsa_coord.h"
+@@ -181,7 +182,7 @@
+     inline static double __int_pow__(const double x, const int p) {
+       if (p == 0) return 1.0;
+       double _pow = x;
+-      const unsigned int max_k = static_cast<unsigned int>(std::abs(p));
++      const unsigned int max_k = static_cast<unsigned int>(abs(p));
+       for (unsigned int k=1; k < max_k; ++k) {
+ 	_pow *= x;
+       }
+diff -Naur orsa-0.7.0/src/libxorsa/xorsa_plot_area.h orsa-0.7.0.new/src/libxorsa/xorsa_plot_area.h
+--- orsa-0.7.0/src/libxorsa/xorsa_plot_area.h	2005-01-04 21:25:06.000000000 -0500
++++ orsa-0.7.0.new/src/libxorsa/xorsa_plot_area.h	2008-06-11 06:47:20.000000000 -0400
+@@ -57,7 +57,13 @@
+   }
+ }
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
+ extern char *MonthNameShort[13]; // sdncal.h
++#ifdef __cplusplus
++}
++#endif
+ 
+ void FineDate(QString & label, const orsa::UniverseTypeAwareTime & t, bool=true);
+ void FineDate_HMS(QString & label, const orsa::UniverseTypeAwareTime & t);
diff --git a/sci-astronomy/orsa/orsa-0.6.1.ebuild b/sci-astronomy/orsa/orsa-0.6.1.ebuild
index 8fd806d6ab46..e8181d8afe72 100644
--- a/sci-astronomy/orsa/orsa-0.6.1.ebuild
+++ b/sci-astronomy/orsa/orsa-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.9 2006/10/25 16:01:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.10 2008/06/11 22:51:12 markusle Exp $
 
 inherit base flag-o-matic qt3
 
@@ -67,7 +67,7 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "install failed"
+	make install DESTDIR="${D}" || die "install failed"
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS
 	dodoc src/test/*
 }
diff --git a/sci-astronomy/orsa/orsa-0.7.0.ebuild b/sci-astronomy/orsa/orsa-0.7.0.ebuild
index 2b962c9800d9..a9b90d5ad179 100644
--- a/sci-astronomy/orsa/orsa-0.7.0.ebuild
+++ b/sci-astronomy/orsa/orsa-0.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild,v 1.1 2006/10/25 18:37:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild,v 1.2 2008/06/11 22:51:12 markusle Exp $
 
-inherit qt3 flag-o-matic
+inherit qt3 flag-o-matic multilib
 
 DESCRIPTION="Celestial orbit reconstruction, simulation and analysis"
 HOMEPAGE="http://orsa.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="opengl qt3 mpi ginac cln gsl fftw xinerama threads static"
 
 DEPEND=">=sys-libs/readline-4.2
@@ -18,15 +18,16 @@ DEPEND=">=sys-libs/readline-4.2
 	fftw?  ( =sci-libs/fftw-2.1* )
 	gsl?   ( >=sci-libs/gsl-1.5 )
 	qt3?   ( $(qt_min_version 3.3) )
-	mpi?   ( sys-cluster/lam-mpi )
+	mpi?   ( sys-cluster/openmpi )
 	ginac? ( >=sci-mathematics/ginac-1.2.0 )
 	cln?   ( >=sci-libs/cln-1.1.6 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${PN}-0.6.1-as-needed.patch
+	epatch "${FILESDIR}"/${P}-gcc4.3.patch
 }
 
 src_compile() {
@@ -35,12 +36,14 @@ src_compile() {
 	use ginac || myconf="--with-ginac-prefix=/no/such/file"
 	use gsl || myconf="${myconf} --with-gsl-prefix=/no/such/file"
 	use cln || myconf="${myconf} --with-cln-prefix=/no/such/file"
-	use fftw || sed -i -e 's/have_fftw=yes/have_fftw=no/' configure \
-		die "sed to fix fftw failed"
+	if use fftw; then
+		sed -i -e 's/have_fftw=yes/have_fftw=no/' configure \
+		|| die "sed to fix fftw failed"
+	fi
 	use qt3 || myconf="${myconf} --with-qt-dir=/no/such/file"
 	if use mpi; then
-		sed -e 's/\(orsa_LDADD = .*\)/\1 -llammpi++ -lmpi -llam -lpthread -lutil/' \
-			-i src/orsa/Makefile || die "sed to fix MPI failed"
+		sed -e "s|\(orsa_LDADD = .*\)|\1 /usr/$(get_libdir)/libmpi.la /usr/$(get_libdir)/libmpi_cxx.la|" \
+			-i src/orsa/Makefile.in || die "sed to fix MPI failed"
 	fi
 
 	econf \
@@ -56,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS COPYRIGHT DEVELOPERS TODO THANKS
 	insinto /usr/share/${P}/test
 	doins src/test/*.{cc,h,fft,ggo} || die "Failed to install tests"