| 1 |
markusle 10/02/19 04:28:55 |
| 2 |
|
| 3 |
Modified: orsa-0.7.0.ebuild ChangeLog orsa-0.6.1.ebuild |
| 4 |
Log: |
| 5 |
Removed dependency on qt3 (fixes bug #304465). |
| 6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 sci-astronomy/orsa/orsa-0.7.0.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: orsa-0.7.0.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- orsa-0.7.0.ebuild 1 Oct 2008 15:20:50 -0000 1.4 |
| 22 |
+++ orsa-0.7.0.ebuild 19 Feb 2010 04:28:54 -0000 1.5 |
| 23 |
@@ -1,10 +1,10 @@ |
| 24 |
-# Copyright 1999-2008 Gentoo Foundation |
| 25 |
+# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild,v 1.4 2008/10/01 15:20:50 fmccor Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild,v 1.5 2010/02/19 04:28:54 markusle Exp $ |
| 29 |
|
| 30 |
EAPI=1 |
| 31 |
|
| 32 |
-inherit qt3 flag-o-matic multilib |
| 33 |
+inherit flag-o-matic multilib |
| 34 |
|
| 35 |
DESCRIPTION="Celestial orbit reconstruction, simulation and analysis" |
| 36 |
HOMEPAGE="http://orsa.sourceforge.net/" |
| 37 |
@@ -13,13 +13,12 @@ |
| 38 |
LICENSE="GPL-2" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 41 |
-IUSE="opengl qt3 mpi ginac cln gsl fftw xinerama threads static" |
| 42 |
+IUSE="opengl mpi ginac cln gsl fftw xinerama threads static" |
| 43 |
|
| 44 |
DEPEND=">=sys-libs/readline-4.2 |
| 45 |
opengl? ( virtual/opengl ) |
| 46 |
fftw? ( =sci-libs/fftw-2.1* ) |
| 47 |
gsl? ( >=sci-libs/gsl-1.5 ) |
| 48 |
- qt3? ( x11-libs/qt:3 ) |
| 49 |
mpi? ( sys-cluster/openmpi ) |
| 50 |
ginac? ( >=sci-mathematics/ginac-1.2.0 ) |
| 51 |
cln? ( >=sci-libs/cln-1.1.6 )" |
| 52 |
@@ -33,7 +32,7 @@ |
| 53 |
} |
| 54 |
|
| 55 |
src_compile() { |
| 56 |
- local myconf="" |
| 57 |
+ local myconf="--with-qt-dir=/no/such/file" |
| 58 |
use mpi || export MPICXX="g++" |
| 59 |
use ginac || myconf="--with-ginac-prefix=/no/such/file" |
| 60 |
use gsl || myconf="${myconf} --with-gsl-prefix=/no/such/file" |
| 61 |
@@ -42,7 +41,6 @@ |
| 62 |
sed -i -e 's/have_fftw=yes/have_fftw=no/' configure \ |
| 63 |
|| die "sed to fix fftw failed" |
| 64 |
fi |
| 65 |
- use qt3 || myconf="${myconf} --with-qt-dir=/no/such/file" |
| 66 |
if use mpi; then |
| 67 |
sed -e "s|\(orsa_LDADD = .*\)|\1 /usr/$(get_libdir)/libmpi.la /usr/$(get_libdir)/libmpi_cxx.la|" \ |
| 68 |
-i src/orsa/Makefile.in || die "sed to fix MPI failed" |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.19 sci-astronomy/orsa/ChangeLog |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/ChangeLog?rev=1.19&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/ChangeLog?rev=1.19&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/ChangeLog?r1=1.18&r2=1.19 |
| 77 |
|
| 78 |
Index: ChangeLog |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v |
| 81 |
retrieving revision 1.18 |
| 82 |
retrieving revision 1.19 |
| 83 |
diff -u -r1.18 -r1.19 |
| 84 |
--- ChangeLog 1 Oct 2008 15:20:50 -0000 1.18 |
| 85 |
+++ ChangeLog 19 Feb 2010 04:28:54 -0000 1.19 |
| 86 |
@@ -1,6 +1,10 @@ |
| 87 |
# ChangeLog for sci-astronomy/orsa |
| 88 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.18 2008/10/01 15:20:50 fmccor Exp $ |
| 90 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.19 2010/02/19 04:28:54 markusle Exp $ |
| 92 |
+ |
| 93 |
+ 19 Feb 2010; Markus Dittrich <markusle@g.o> orsa-0.6.1.ebuild, |
| 94 |
+ orsa-0.7.0.ebuild: |
| 95 |
+ Removed dependency on qt3 (fixes bug #304465). |
| 96 |
|
| 97 |
01 Oct 2008; Ferris McCormick <fmccor@g.o> orsa-0.7.0.ebuild: |
| 98 |
Add ~sparc keyword for testing. |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.12 sci-astronomy/orsa/orsa-0.6.1.ebuild |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild?rev=1.12&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild?rev=1.12&content-type=text/plain |
| 106 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild?r1=1.11&r2=1.12 |
| 107 |
|
| 108 |
Index: orsa-0.6.1.ebuild |
| 109 |
=================================================================== |
| 110 |
RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v |
| 111 |
retrieving revision 1.11 |
| 112 |
retrieving revision 1.12 |
| 113 |
diff -u -r1.11 -r1.12 |
| 114 |
--- orsa-0.6.1.ebuild 27 Jul 2008 22:18:43 -0000 1.11 |
| 115 |
+++ orsa-0.6.1.ebuild 19 Feb 2010 04:28:54 -0000 1.12 |
| 116 |
@@ -1,10 +1,10 @@ |
| 117 |
-# Copyright 1999-2008 Gentoo Foundation |
| 118 |
+# Copyright 1999-2010 Gentoo Foundation |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.11 2008/07/27 22:18:43 carlo Exp $ |
| 121 |
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.12 2010/02/19 04:28:54 markusle Exp $ |
| 122 |
|
| 123 |
EAPI=1 |
| 124 |
|
| 125 |
-inherit base flag-o-matic qt3 |
| 126 |
+inherit base flag-o-matic |
| 127 |
|
| 128 |
DESCRIPTION="Orbit Reconstruction, Simulation and Analysis" |
| 129 |
HOMEPAGE="http://orsa.sourceforge.net/" |
| 130 |
@@ -13,13 +13,12 @@ |
| 131 |
LICENSE="GPL-2" |
| 132 |
SLOT="0" |
| 133 |
KEYWORDS="x86 ~ppc" |
| 134 |
-IUSE="opengl mpi fftw ginac cln gsl qt3" |
| 135 |
+IUSE="opengl mpi fftw ginac cln gsl" |
| 136 |
|
| 137 |
S="${WORKDIR}/${P/_/-}" |
| 138 |
|
| 139 |
DEPEND="fftw? ( =sci-libs/fftw-2.1* ) |
| 140 |
>=sci-libs/gsl-1.3 |
| 141 |
- qt3? ( x11-libs/qt:3 ) |
| 142 |
>=sys-libs/readline-4.2 |
| 143 |
mpi? ( sys-cluster/lam-mpi ) |
| 144 |
ginac? ( >=sci-mathematics/ginac-1.2.0 ) |
| 145 |
@@ -41,7 +40,7 @@ |
| 146 |
if ! use mpi; then |
| 147 |
export MPICXX="g++" |
| 148 |
fi |
| 149 |
- local myconf |
| 150 |
+ local myconf="--with-qt-dir=/no/such/file" |
| 151 |
if ! use ginac; then |
| 152 |
myconf="--with-ginac-prefix=/no/such/file" |
| 153 |
fi |
| 154 |
@@ -54,11 +53,6 @@ |
| 155 |
if ! use fftw; then |
| 156 |
sed -e 's/have_fftw=yes/have_fftw=no/' -i configure |
| 157 |
fi |
| 158 |
- if ! use qt3; then |
| 159 |
- myconf="${myconf} --with-qt-dir=/no/such/file" |
| 160 |
- else |
| 161 |
- addwrite "${QTDIR}/etc/settings" |
| 162 |
- fi |
| 163 |
econf ${myconf} $(use_with opengl gl) || die "configure failed" |
| 164 |
if use mpi; then |
| 165 |
sed -e 's/\(orsa_LDADD = .*\)/\1 -llammpi++ -lmpi -llam -lpthread -lutil/' \ |
Archives