Removed spanish manual (incomplete), added english one on mirror (closing bug #205366), fixed patch to use pkg-config for gsl, therefore possibly using external cblas library.

(Portage version: 2.1.4)

4 files changed, 18 insertions, 21 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 3ad2b700e468..7c6569b4ede4 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/qtiplot
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.13 2007/12/03 11:20:14 bicatali Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.14 2008/01/14 18:20:41 bicatali Exp $
+
+  14 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/qtiplot-0.9.2-systemlibs.patch, qtiplot-0.9.2.ebuild:
+  Removed spanish manual (incomplete), added english one on mirror (closing
+  bug #205366), fixed patch to use pkg-config for gsl, therefore possibly using
+  external cblas library.
 
 *qtiplot-0.9.2 (03 Dec 2007)
 
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.9.2 b/sci-visualization/qtiplot/files/digest-qtiplot-0.9.2
index c9e3f4f1e5a2..2b4463de4479 100644
--- a/sci-visualization/qtiplot/files/digest-qtiplot-0.9.2
+++ b/sci-visualization/qtiplot/files/digest-qtiplot-0.9.2
@@ -1,9 +1,6 @@
-MD5 ab8139bfdcbca5bb4d620e084300ea66 manual-en.tar.bz2 5315240
-RMD160 a5e84275cd4b0d435ef0bf23cb7452bf7eab45eb manual-en.tar.bz2 5315240
-SHA256 b66298d91df974bcce8f2712704b7b01dbe29e2993a489cfdb4c5e322b69ac4a manual-en.tar.bz2 5315240
-MD5 920a78cbd4a72d23f1bc79ba89e2a1f9 manual-es.zip 291117
-RMD160 df6161700fc5e18b4020e7963eedac1ef690bc42 manual-es.zip 291117
-SHA256 41cb6f04baa23cb1f15469a049f9833506c6899b9410b8af064677a221d413c9 manual-es.zip 291117
+MD5 89390a03d52cbc7ba64f8734e00e0086 qtiplot-0.9.2-manual-en.tar.bz2 5233394
+RMD160 9e3bbd5b71e8549cef627230d0e78e2e53636053 qtiplot-0.9.2-manual-en.tar.bz2 5233394
+SHA256 39ab4baeeebec24b8a42e3cffb9354a24b0f1987bd0cb470f1e1954b13661b7d qtiplot-0.9.2-manual-en.tar.bz2 5233394
 MD5 943c50f7fb28e1b11ed0188ec918cf4c qtiplot-0.9.2.tar.bz2 897629
 RMD160 5b1a71f87a3d6801aa26337fbb5932191aed228c qtiplot-0.9.2.tar.bz2 897629
 SHA256 051a55e3e120ad53b2463a3a9295d22f9d36d1146468c5ebd869a5f180c145fd qtiplot-0.9.2.tar.bz2 897629
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
index 237962274e1c..0bf440077a6a 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
@@ -84,7 +84,7 @@
  

  #dynamically link against GSL installed system-wide

 -#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+unix:LIBS += -lgsl -lgslcblas

++unix:LIBS += $$(system pkg-config --libs gsl)

  

  target.path=/usr/lib$${libsuff}/qtiplot/plugins

  INSTALLS += target

@@ -103,7 +103,7 @@
  

  #dynamically link against GSL installed system-wide

 -#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas

-+unix:LIBS += -lgsl -lgslcblas

++unix:LIBS += $$(system pkg-config --libs gsl)

  

  target.path=/usr/lib$${libsuff}/qtiplot/plugins

  INSTALLS += target

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
index 1b282881a56e..1e1897f04a36 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
@@ -1,14 +1,13 @@
-# 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.9.2.ebuild,v 1.1 2007/12/03 11:20:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild,v 1.2 2008/01/14 18:20:41 bicatali Exp $
 
 inherit eutils multilib qt4 python
 
 DESCRIPTION="Qt based clone of the Origin plotting package"
 HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
 SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2
-	doc? ( http://soft.proindependent.com/doc/manual-en.tar.bz2
-		linguas_es? ( http://soft.proindependent.com/doc/manual-es.zip ) )"
+	doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +26,8 @@ CDEPEND=">=x11-libs/qwt-5.0.2
 	>=sci-libs/gsl-1.10"
 
 DEPEND="${RDEPEND}
-	python? ( >=dev-python/sip-4.5.2 )
-	doc? ( linguas_es? ( app-arch/unzip ) )"
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.5.2 )"
 
 RDEPEND="${CDEPEND}
 	python? ( >=dev-lang/python-2.5
@@ -36,10 +35,6 @@ RDEPEND="${CDEPEND}
 		dev-python/pygsl
 		sci-libs/scipy )"
 
-# manual-en.html never changes version
-# could also uses docbook2html, but the dep is quite heavy
-RESTRICT=" doc? ( mirror )"
-
 QT4_BUILT_WITH_USE_CHECK="qt3support"
 
 src_unpack() {
@@ -75,7 +70,6 @@ src_install() {
 	if use doc; then
 		insinto "/usr/share/doc/${PF}"
 		doins -r "${WORKDIR}"/manual-en
-		use linguas_es && doins -r "${WORKDIR}"/manual-es
 	fi
 
 	for l in ${LANGUAGES}; do