Removed dependency on qt3 (fixes bug #304465).

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 16 insertions, 20 deletions

diff --git a/sci-astronomy/orsa/ChangeLog b/sci-astronomy/orsa/ChangeLog
index 2657bcae04fc..0ea763020f5c 100644
--- a/sci-astronomy/orsa/ChangeLog
+++ b/sci-astronomy/orsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/orsa
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.18 2008/10/01 15:20:50 fmccor Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.19 2010/02/19 04:28:54 markusle Exp $
+
+  19 Feb 2010; Markus Dittrich <markusle@gentoo.org> orsa-0.6.1.ebuild,
+  orsa-0.7.0.ebuild:
+  Removed dependency on qt3 (fixes bug #304465).
 
   01 Oct 2008; Ferris McCormick <fmccor@gentoo.org> orsa-0.7.0.ebuild:
   Add ~sparc keyword for testing.
diff --git a/sci-astronomy/orsa/orsa-0.6.1.ebuild b/sci-astronomy/orsa/orsa-0.6.1.ebuild
index fbe911b8504a..cb7fbd3396b2 100644
--- a/sci-astronomy/orsa/orsa-0.6.1.ebuild
+++ b/sci-astronomy/orsa/orsa-0.6.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.11 2008/07/27 22:18:43 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.12 2010/02/19 04:28:54 markusle Exp $
 
 EAPI=1
 
-inherit base flag-o-matic qt3
+inherit base flag-o-matic
 
 DESCRIPTION="Orbit Reconstruction, Simulation and Analysis"
 HOMEPAGE="http://orsa.sourceforge.net/"
@@ -13,13 +13,12 @@ SRC_URI="mirror://sourceforge/orsa/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-IUSE="opengl mpi fftw ginac cln gsl qt3"
+IUSE="opengl mpi fftw ginac cln gsl"
 
 S="${WORKDIR}/${P/_/-}"
 
 DEPEND="fftw? ( =sci-libs/fftw-2.1* )
 	>=sci-libs/gsl-1.3
-	qt3? ( x11-libs/qt:3 )
 	>=sys-libs/readline-4.2
 	mpi? ( sys-cluster/lam-mpi )
 	ginac? ( >=sci-mathematics/ginac-1.2.0 )
@@ -41,7 +40,7 @@ src_compile() {
 	if ! use mpi; then
 		export MPICXX="g++"
 	fi
-	local myconf
+	local myconf="--with-qt-dir=/no/such/file"
 	if ! use ginac; then
 		myconf="--with-ginac-prefix=/no/such/file"
 	fi
@@ -54,11 +53,6 @@ src_compile() {
 	if ! use fftw; then
 		sed -e 's/have_fftw=yes/have_fftw=no/' -i configure
 	fi
-	if ! use qt3; then
-		myconf="${myconf} --with-qt-dir=/no/such/file"
-	else
-		addwrite "${QTDIR}/etc/settings"
-	fi
 	econf ${myconf} $(use_with opengl gl) || die "configure failed"
 	if use mpi; then
 		sed -e 's/\(orsa_LDADD = .*\)/\1 -llammpi++ -lmpi -llam -lpthread -lutil/' \
diff --git a/sci-astronomy/orsa/orsa-0.7.0.ebuild b/sci-astronomy/orsa/orsa-0.7.0.ebuild
index a05aea682c9b..36fb3eeb8ba3 100644
--- a/sci-astronomy/orsa/orsa-0.7.0.ebuild
+++ b/sci-astronomy/orsa/orsa-0.7.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 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.4 2008/10/01 15:20:50 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.7.0.ebuild,v 1.5 2010/02/19 04:28:54 markusle Exp $
 
 EAPI=1
 
-inherit qt3 flag-o-matic multilib
+inherit flag-o-matic multilib
 
 DESCRIPTION="Celestial orbit reconstruction, simulation and analysis"
 HOMEPAGE="http://orsa.sourceforge.net/"
@@ -13,13 +13,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="opengl qt3 mpi ginac cln gsl fftw xinerama threads static"
+IUSE="opengl 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?   ( x11-libs/qt:3 )
 	mpi?   ( sys-cluster/openmpi )
 	ginac? ( >=sci-mathematics/ginac-1.2.0 )
 	cln?   ( >=sci-libs/cln-1.1.6 )"
@@ -33,7 +32,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf="--with-qt-dir=/no/such/file"
 	use mpi || export MPICXX="g++"
 	use ginac || myconf="--with-ginac-prefix=/no/such/file"
 	use gsl || myconf="${myconf} --with-gsl-prefix=/no/such/file"
@@ -42,7 +41,6 @@ src_compile() {
 		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 /usr/$(get_libdir)/libmpi.la /usr/$(get_libdir)/libmpi_cxx.la|" \
 			-i src/orsa/Makefile.in || die "sed to fix MPI failed"