Version bump. Thanks to Sebastien Fabbro <seb@ist.utl.pt> for preparing the ebuild...

Package-Manager: portage-2.1.2_pre3-r7

diff --git a/sci-astronomy/orsa/ChangeLog b/sci-astronomy/orsa/ChangeLog
index 6603f36ff9f63eb5c4a73a8b70b3c1caac353aa0..6a3f0b6b064e3b64969d47f691e73d3d1e999452 100644 (file)
--- a/sci-astronomy/orsa/ChangeLog
+++ b/sci-astronomy/orsa/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2006/10/25 16:01:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.14 2006/10/25 18:37:45 markusle Exp $
+
+*orsa-0.7.0 (25 Oct 2006)
+
+  25 Oct 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/orsa-0.7.0-gcc41.patch, +orsa-0.7.0.ebuild:
+  Version bump. Thanks to Sebastien Fabbro <seb@ist.utl.pt>
+  for preparing the ebuild and patch in the sci-overlay.
 
   25 Oct 2006; Markus Dittrich <markusle@gentoo.org>
   +files/orsa-0.6.1-as-needed.patch, +files/orsa-0.6.1-gcc4.patch,

diff --git a/sci-astronomy/orsa/Manifest b/sci-astronomy/orsa/Manifest
index 744a57314d2b6d4e2a295ee6da164e9cda021e1d..233933ed4abebb21576f0b9844da9be11d64255a 100644 (file)
--- a/sci-astronomy/orsa/Manifest
+++ b/sci-astronomy/orsa/Manifest
@@ -6,15 +6,24 @@ AUX orsa-0.6.1-gcc4.patch 3873 RMD160 8b938a18a38c3fb1f156d411da2f3ff7c418d21f S
 MD5 f7f6717fc7e156e891b7bb477ee7fa42 files/orsa-0.6.1-gcc4.patch 3873
 RMD160 8b938a18a38c3fb1f156d411da2f3ff7c418d21f files/orsa-0.6.1-gcc4.patch 3873
 SHA256 23a3ef50e200e357ee8edfce02a038c58a3aa264e9c497095e7be3334caeb8cf files/orsa-0.6.1-gcc4.patch 3873
+AUX orsa-0.7.0-gcc41.patch 3850 RMD160 885ad2a529aec481359032ead3170656688703cd SHA1 471461f37f58ba9d61224e692ad90be623d5e1ce SHA256 1eb151a4c40da4eb68a49cc4da5e1cee195e2988982ca62632516d56559aa8b2
+MD5 8142fcf645edbd59c53d94edbbfaf58f files/orsa-0.7.0-gcc41.patch 3850
+RMD160 885ad2a529aec481359032ead3170656688703cd files/orsa-0.7.0-gcc41.patch 3850
+SHA256 1eb151a4c40da4eb68a49cc4da5e1cee195e2988982ca62632516d56559aa8b2 files/orsa-0.7.0-gcc41.patch 3850
 DIST orsa-0.6.1.tar.gz 763872 RMD160 ad9de4bc511719bbb7ec936a76dfc692bddbf26f SHA1 d60b1c55b7ce241ac4c3cc03180134a0bfd3f046 SHA256 cf87cf675edb75dcf3a57108f79128691c625cc9122c99474403845cf89d1282
+DIST orsa-0.7.0.tar.gz 746444 RMD160 12bdaebf4b5730535a07247da9ca992f72fa9fe5 SHA1 cb604710717d88a71d2c525b7802c7f4e7c62a7f SHA256 959abd0f9ed4311cf28a31d088b8afecd50674bd0d9a8360ac4a5c2752f22879
 EBUILD orsa-0.6.1.ebuild 1795 RMD160 96cbdd3c127eebee204c39f9f5683dc46a84c85a SHA1 e0d60eb112057f86e12cbf13de2928a2aa57ceea SHA256 cc4a7cb5b9680f2aff31f5c22a778f84df385ad4a7df85e63ab7f52835d6ceef
 MD5 9e768e845a0f928e540ab56f65a7fa89 orsa-0.6.1.ebuild 1795
 RMD160 96cbdd3c127eebee204c39f9f5683dc46a84c85a orsa-0.6.1.ebuild 1795
 SHA256 cc4a7cb5b9680f2aff31f5c22a778f84df385ad4a7df85e63ab7f52835d6ceef orsa-0.6.1.ebuild 1795
-MISC ChangeLog 3697 RMD160 db43d8e3e327eebba17047b36a4dc1a2961b407d SHA1 d39098d9ce20dc59e966011521aad0a3c6f05833 SHA256 990fe0a29de284446d3066b11acff245a1205f09d3f457de3471d06e5c253b90
-MD5 dc63838fe90e75cd2622e8805002e6b7 ChangeLog 3697
-RMD160 db43d8e3e327eebba17047b36a4dc1a2961b407d ChangeLog 3697
-SHA256 990fe0a29de284446d3066b11acff245a1205f09d3f457de3471d06e5c253b90 ChangeLog 3697
+EBUILD orsa-0.7.0.ebuild 1894 RMD160 593d07569bef32bac29b8530b763f735341eb9e6 SHA1 24cd083aae3709cf803254a6504ae8d90dbf16cd SHA256 b23f1b38f389ff2f530ad1e2743822328606d67ab3da820b16c6a5154a87892e
+MD5 d1fdaf11162309411fff9728e0a3d7ff orsa-0.7.0.ebuild 1894
+RMD160 593d07569bef32bac29b8530b763f735341eb9e6 orsa-0.7.0.ebuild 1894
+SHA256 b23f1b38f389ff2f530ad1e2743822328606d67ab3da820b16c6a5154a87892e orsa-0.7.0.ebuild 1894
+MISC ChangeLog 3948 RMD160 543d314c4ff0859f0634811bf81b06e11fa4e977 SHA1 b3df1a66411e194e4db028ad0037826544204861 SHA256 be989a3837dd4d79a81dcf7233cbbe2f47860214bf9c1a1a6a0ef0b87467fb2c
+MD5 d597dc44acefd0512047ce3aee079bf0 ChangeLog 3948
+RMD160 543d314c4ff0859f0634811bf81b06e11fa4e977 ChangeLog 3948
+SHA256 be989a3837dd4d79a81dcf7233cbbe2f47860214bf9c1a1a6a0ef0b87467fb2c ChangeLog 3948
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -22,3 +31,6 @@ SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata
 MD5 77aa6450704bf965ce31bcd3ff5f6f4b files/digest-orsa-0.6.1 232
 RMD160 b870e8e8a1ad6620bb2d698a0f2ff7f040a556d1 files/digest-orsa-0.6.1 232
 SHA256 2dfb9b8418399b86308d1bff481986639aab3412f0aa3ebb364aa551dee4f17a files/digest-orsa-0.6.1 232
+MD5 9ba46826ea5416257896680705008306 files/digest-orsa-0.7.0 232
+RMD160 d34d0f4fed8d830d2f48161a58d4645550cef509 files/digest-orsa-0.7.0 232
+SHA256 ed00a6970972569be6d0eb15a0dc604ff68a004672c3ac3af228f4f11e57f526 files/digest-orsa-0.7.0 232

diff --git a/sci-astronomy/orsa/files/digest-orsa-0.7.0 b/sci-astronomy/orsa/files/digest-orsa-0.7.0
new file mode 100644 (file)
index 0000000..c87caa6
--- /dev/null
+++ b/sci-astronomy/orsa/files/digest-orsa-0.7.0
@@ -0,0 +1,3 @@
+MD5 16c86f3aa73920631f9768d8c70cce70 orsa-0.7.0.tar.gz 746444
+RMD160 12bdaebf4b5730535a07247da9ca992f72fa9fe5 orsa-0.7.0.tar.gz 746444
+SHA256 959abd0f9ed4311cf28a31d088b8afecd50674bd0d9a8360ac4a5c2752f22879 orsa-0.7.0.tar.gz 746444

diff --git a/sci-astronomy/orsa/files/orsa-0.7.0-gcc41.patch b/sci-astronomy/orsa/files/orsa-0.7.0-gcc41.patch
new file mode 100644 (file)
index 0000000..df6e322
--- /dev/null
+++ b/sci-astronomy/orsa/files/orsa-0.7.0-gcc41.patch
@@ -0,0 +1,60 @@
+diff -Naur orsa-0.7.0/src/liborsa/orsa_body.h orsa-0.7.0.new/src/liborsa/orsa_body.h
+--- orsa-0.7.0/src/liborsa/orsa_body.h 2004-12-30 03:58:03.000000000 +0000
++++ orsa-0.7.0.new/src/liborsa/orsa_body.h     2006-06-01 16:27:02.000000000 +0100
+@@ -183,7 +183,7 @@
+     inline void SetVelocity(const double x, const double y, const double z) { Vector v(x,y,z); SetVelocity(v); }
+     
+     // b position - this position
+-    inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); }
++    inline Vector distanceVector(const Body & b) const { return b.position()-position(); }
+     inline double distance(const Body & b) const { return distanceVector(b).Length(); }
+     
+     // alias
+diff -Naur orsa-0.7.0/src/libxorsa/xorsa_analysis.h orsa-0.7.0.new/src/libxorsa/xorsa_analysis.h
+--- orsa-0.7.0/src/libxorsa/xorsa_analysis.h   2004-06-25 01:58:30.000000000 +0100
++++ orsa-0.7.0.new/src/libxorsa/xorsa_analysis.h       2006-06-01 16:27:02.000000000 +0100
+@@ -129,7 +129,7 @@
+   XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
+   
+  public:
+-  int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const;    
++  int compare(QListViewItem * i, int col, bool ascending) const;    
+   
+ };
+ 
+diff -Naur orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h orsa-0.7.0.new/src/libxorsa/xorsa_import_astorb_objects.h
+--- orsa-0.7.0/src/libxorsa/xorsa_import_astorb_objects.h      2005-01-05 03:04:17.000000000 +0000
++++ orsa-0.7.0.new/src/libxorsa/xorsa_import_astorb_objects.h  2006-06-01 16:27:02.000000000 +0100
+@@ -600,7 +600,7 @@
+   inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { };
+   
+  public:
+-  inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const {
++  inline int compare(QListViewItem *i, int col, bool ascending) const {
+ 
+     using std::atof;
+         
+diff -Naur orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc orsa-0.7.0.new/src/libxorsa/xorsa_object_selector.cc
+--- orsa-0.7.0/src/libxorsa/xorsa_object_selector.cc   2004-06-25 04:12:57.000000000 +0100
++++ orsa-0.7.0.new/src/libxorsa/xorsa_object_selector.cc       2006-06-01 16:27:02.000000000 +0100
+@@ -40,7 +40,7 @@
+   XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
+   
+  public:
+-  int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
++  int compare(QListViewItem * i, int col, bool ascending) const;    
+   
+ };
+ 
+diff -Naur orsa-0.7.0/src/orsa/xorsa.h orsa-0.7.0.new/src/orsa/xorsa.h
+--- orsa-0.7.0/src/orsa/xorsa.h        2004-07-13 03:21:19.000000000 +0100
++++ orsa-0.7.0.new/src/orsa/xorsa.h    2006-06-01 16:27:02.000000000 +0100
+@@ -62,7 +62,7 @@
+   ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null);
+   
+  public:
+-  int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const;    
++  int compare(QListViewItem * i, int col, bool ascending) const;    
+   
+ };
+ 

diff --git a/sci-astronomy/orsa/orsa-0.7.0.ebuild b/sci-astronomy/orsa/orsa-0.7.0.ebuild
new file mode 100644 (file)
index 0000000..2b962c9
--- /dev/null
+++ b/sci-astronomy/orsa/orsa-0.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 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 $
+
+inherit qt3 flag-o-matic
+
+DESCRIPTION="Celestial orbit reconstruction, simulation and analysis"
+HOMEPAGE="http://orsa.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="opengl qt3 mpi ginac cln gsl fftw xinerama threads static"
+
+DEPEND=">=sys-libs/readline-4.2
+       opengl? ( virtual/opengl )
+       fftw?  ( =sci-libs/fftw-2.1* )
+       gsl?   ( >=sci-libs/gsl-1.5 )
+       qt3?   ( $(qt_min_version 3.3) )
+       mpi?   ( sys-cluster/lam-mpi )
+       ginac? ( >=sci-mathematics/ginac-1.2.0 )
+       cln?   ( >=sci-libs/cln-1.1.6 )"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch "${FILESDIR}"/${P}-gcc41.patch
+       epatch "${FILESDIR}"/${PN}-0.6.1-as-needed.patch
+}
+
+src_compile() {
+       local myconf=""
+       use mpi || export MPICXX="g++"
+       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"
+       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"
+       fi
+
+       econf \
+               ${myconf} \
+               $(use_with mpi) \
+               $(use_with opengl gl) \
+               $(use_with threads) \
+               $(use_with xinerama) \
+               $(use_enable static) \
+               || die "econf failed"
+
+       emake || die "emake failed"
+}
+
+src_install() {
+       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"
+}