Fixed QA issues and added bindist for >=gsl-1.10 (see bug #199451).

(Portage version: 2.1.4.2)

5 files changed, 26 insertions, 18 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 39714bffd1ca..b6a3f6cc99e0 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.15 2008/02/12 11:41:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.16 2008/02/13 14:33:59 markusle Exp $
+
+  13 Feb 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.7.7.ebuild,
+  qtiplot-0.8.5.ebuild, qtiplot-0.9.2.ebuild, qtiplot-0.9.2-r1.ebuild:
+  Fixed QA issues and added bindist for >=gsl-1.10 (see bug #199451).
 
 *qtiplot-0.9.2-r1 (12 Feb 2008)
 
diff --git a/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild b/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
index 5198b6d7c08e..d1097ca60b7d 100644
--- a/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
@@ -1,6 +1,6 @@
-# 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-visualization/qtiplot/qtiplot-0.7.7.ebuild,v 1.3 2007/11/28 23:28:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild,v 1.4 2008/02/13 14:33:59 markusle Exp $
 
 inherit eutils multilib qt3
 
@@ -11,12 +11,13 @@ SRC_URI="http://soft.proindependent.com/src/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
+IUSE="bindist"
 
 RDEPEND="$(qt_min_version 3.3)
 	>=x11-libs/qwt-4.2.0
 	<x11-libs/qwtplot3d-0.2.7
-	>=sci-libs/gsl-1.6"
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -24,8 +25,8 @@ S=${WORKDIR}/${P}/${P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-qmake.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-qmake.patch
 	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" ${P}.pro || die "sed failed."
 }
 
diff --git a/sci-visualization/qtiplot/qtiplot-0.8.5.ebuild b/sci-visualization/qtiplot/qtiplot-0.8.5.ebuild
index 3bb1e1fde4d8..b0c05f2e83b0 100644
--- a/sci-visualization/qtiplot/qtiplot-0.8.5.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# 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-visualization/qtiplot/qtiplot-0.8.5.ebuild,v 1.2 2007/11/28 23:28:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.8.5.ebuild,v 1.3 2008/02/13 14:33:59 markusle Exp $
 
 inherit eutils multilib qt3
 
@@ -11,19 +11,20 @@ SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="bindist"
 
 DEPEND="$(qt_min_version 3.3)
 	=x11-libs/qwt-4*
 	<x11-libs/qwtplot3d-0.2.7
-	>=sci-libs/gsl-1.6
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )
 	>=sys-libs/zlib-1.2.3"
 
 S=${WORKDIR}/${P}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	mv "${PN}.pro" "${PN}.pro.orig"
 	tr -d '\r' < "${PN}.pro.orig" | sed -e '/^win32:/d' -e 's/^unix://' > "${PN}.pro"
 	epatch "${FILESDIR}/${P}-qmake.patch"
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild
index 95a85cd2a7a7..365313f00ffc 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild,v 1.1 2008/02/12 11:41:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild,v 1.2 2008/02/13 14:33:59 markusle Exp $
 
 inherit eutils multilib qt4 python
 
@@ -12,7 +12,7 @@ SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="python doc"
+IUSE="python doc bindist"
 
 LANGS="de es fr ja ru sv"
 for l in ${LANGS}; do
@@ -23,7 +23,8 @@ CDEPEND=">=x11-libs/qwt-5.0.2
 	>=x11-libs/qwtplot3d-0.2.7
 	>=dev-cpp/muParser-1.28
 	>=sci-libs/liborigin-20071119
-	>=sci-libs/gsl-1.10"
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
index 1e1897f04a36..c24cbffd182a 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild,v 1.2 2008/01/14 18:20:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild,v 1.3 2008/02/13 14:33:59 markusle Exp $
 
 inherit eutils multilib qt4 python
 
@@ -12,7 +12,7 @@ SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="python doc"
+IUSE="python doc bindist"
 
 LANGUAGES="de es fr ja ru sv"
 for l in ${LANGUAGES}; do
@@ -23,7 +23,8 @@ CDEPEND=">=x11-libs/qwt-5.0.2
 	>=x11-libs/qwtplot3d-0.2.7
 	>=dev-cpp/muParser-1.28
 	>=sci-libs/liborigin-20071119
-	>=sci-libs/gsl-1.10"
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig