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.

Package-Manager: portage-2.1.4

5 files changed, 38 insertions, 42 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/Manifest b/sci-visualization/qtiplot/Manifest
index 1f8715fecffd..8d1c0d5330d5 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -9,14 +9,13 @@ AUX qtiplot-0.8.5-qmake.patch 467 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb4
 MD5 368896cc81a7ffdc53eeccec04069ae4 files/qtiplot-0.8.5-qmake.patch 467
 RMD160 00b5de4a8ab62eb3d2b3b7cb4a0a69a92d42cb44 files/qtiplot-0.8.5-qmake.patch 467
 SHA256 51230401a221a49371db906d37eca2b2734346ff82684dc572e37294fbd1ed0f files/qtiplot-0.8.5-qmake.patch 467
-AUX qtiplot-0.9.2-systemlibs.patch 4635 RMD160 3d495844bc5e150a54b7ad77bb8c17ac5c118e2b SHA1 8525ac7a55071c0e6ddd161e97416617b2308694 SHA256 74bdc99c297b5f421c497ef6f70b8db2f1d0052e1dba779281f6b74c80f21822
-MD5 cfcd0225e4128654c22c5b6d0f185865 files/qtiplot-0.9.2-systemlibs.patch 4635
-RMD160 3d495844bc5e150a54b7ad77bb8c17ac5c118e2b files/qtiplot-0.9.2-systemlibs.patch 4635
-SHA256 74bdc99c297b5f421c497ef6f70b8db2f1d0052e1dba779281f6b74c80f21822 files/qtiplot-0.9.2-systemlibs.patch 4635
-DIST manual-en.tar.bz2 5315240 RMD160 a5e84275cd4b0d435ef0bf23cb7452bf7eab45eb SHA1 df4a4f773396a291bfe10fa93ce8522953032174 SHA256 b66298d91df974bcce8f2712704b7b01dbe29e2993a489cfdb4c5e322b69ac4a
-DIST manual-es.zip 291117 RMD160 df6161700fc5e18b4020e7963eedac1ef690bc42 SHA1 d259421b19a2d9999a20947c180e655ebe86ae26 SHA256 41cb6f04baa23cb1f15469a049f9833506c6899b9410b8af064677a221d413c9
+AUX qtiplot-0.9.2-systemlibs.patch 4667 RMD160 cd9a1fb03548aa316e40488b889625f4f1f21e1a SHA1 26ce159b345c009d141f438bfb659a1d30dcc1f1 SHA256 c42c88105a8344d6b4b21def0a62e3b7ceaaa92db6868149db653c3546f1c19a
+MD5 12ccb94476bbad5dafc17799a72be69f files/qtiplot-0.9.2-systemlibs.patch 4667
+RMD160 cd9a1fb03548aa316e40488b889625f4f1f21e1a files/qtiplot-0.9.2-systemlibs.patch 4667
+SHA256 c42c88105a8344d6b4b21def0a62e3b7ceaaa92db6868149db653c3546f1c19a files/qtiplot-0.9.2-systemlibs.patch 4667
 DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
 DIST qtiplot-0.8.5.tar.bz2 530579 RMD160 72f4f60f1171c57e6c2614a1a5a7b6dfc3bda4f5 SHA1 d8142877bfc86fad8a43e64f6f3e0a16126e5f0a SHA256 81831d8dfaddbdf32d85a6e7eaf0e54e2321e2fba6ffaabfe6943bc326a6f874
+DIST qtiplot-0.9.2-manual-en.tar.bz2 5233394 RMD160 9e3bbd5b71e8549cef627230d0e78e2e53636053 SHA1 f0b64cb56cb6d2581871a15e712452ee4f0b8d2b SHA256 39ab4baeeebec24b8a42e3cffb9354a24b0f1987bd0cb470f1e1954b13661b7d
 DIST qtiplot-0.9.2.tar.bz2 897629 RMD160 5b1a71f87a3d6801aa26337fbb5932191aed228c SHA1 5e3bcfd4c2555472f6dedf68e52e24a079aba60e SHA256 051a55e3e120ad53b2463a3a9295d22f9d36d1146468c5ebd869a5f180c145fd
 EBUILD qtiplot-0.7.7.ebuild 1051 RMD160 d1cd62584b4ae4b61fa53d6623e59fd002ab18b0 SHA1 3fe8bd35d4a961b69cc0f2517b62c7a4bf7a159c SHA256 f9832d9e8938d8076ac81b98435dcdbd925cbf9c7a8605ce3134c572145822db
 MD5 57a25de89584d06cc2bdc3aacce950b4 qtiplot-0.7.7.ebuild 1051
@@ -26,14 +25,14 @@ EBUILD qtiplot-0.8.5.ebuild 1168 RMD160 d33cca7e753c802f98386f4066fb033b4f494598
 MD5 b879e71c79f1705e91abef5130a18762 qtiplot-0.8.5.ebuild 1168
 RMD160 d33cca7e753c802f98386f4066fb033b4f494598 qtiplot-0.8.5.ebuild 1168
 SHA256 172baa2403f9fddcc33339ee51333b9a84ad3909772f9e1d7815d035f33e665b qtiplot-0.8.5.ebuild 1168
-EBUILD qtiplot-0.9.2.ebuild 2707 RMD160 75c86527d55001de690b5459811fed4d94823d79 SHA1 14193bdbbabfa75b796bdd2707d37438c28b7a7d SHA256 d510b5bc0ae166883e5a6758607a881ce00e23f0c465ac6c47ae0df88ccb1f84
-MD5 e3894f0a8ef9ac0a9698cdd6b12ac3ab qtiplot-0.9.2.ebuild 2707
-RMD160 75c86527d55001de690b5459811fed4d94823d79 qtiplot-0.9.2.ebuild 2707
-SHA256 d510b5bc0ae166883e5a6758607a881ce00e23f0c465ac6c47ae0df88ccb1f84 qtiplot-0.9.2.ebuild 2707
-MISC ChangeLog 4485 RMD160 64ccac4c3a1f40f8f514b9c8fe41f1d55bf56d53 SHA1 536ce069725ff27df576a1e4e71a3fa4c7b7da98 SHA256 5ce29175e7d572f4243fecce78a3d036783b4fb16e457b843e47d2cd9d08732e
-MD5 7f820db89800fde44f29a3cce11e7d58 ChangeLog 4485
-RMD160 64ccac4c3a1f40f8f514b9c8fe41f1d55bf56d53 ChangeLog 4485
-SHA256 5ce29175e7d572f4243fecce78a3d036783b4fb16e457b843e47d2cd9d08732e ChangeLog 4485
+EBUILD qtiplot-0.9.2.ebuild 2426 RMD160 064ffc74acbf61b6ab5b1cc79e6efe0d50f67dd7 SHA1 302af9c9bacc0d8e6637ced6862e5fa85969bb47 SHA256 a57a5aa1333d3b0840b8f0b6a16102ff2663c97a1924cd38cb115ddc5003e42d
+MD5 e072f022cb9a4d84392133e35361f562 qtiplot-0.9.2.ebuild 2426
+RMD160 064ffc74acbf61b6ab5b1cc79e6efe0d50f67dd7 qtiplot-0.9.2.ebuild 2426
+SHA256 a57a5aa1333d3b0840b8f0b6a16102ff2663c97a1924cd38cb115ddc5003e42d qtiplot-0.9.2.ebuild 2426
+MISC ChangeLog 4785 RMD160 f5d0ca7a40e095edfc5cce976b9137401a8c5564 SHA1 ed6c2a0c014908f1c2a21664ccdbe36a7d28d525 SHA256 dffbcb774e45548c4240f50b7103a6489c85250c7c66205bdb1549cf39e998bc
+MD5 41f29639ab70d25deaabb0aedfbed5fc ChangeLog 4785
+RMD160 f5d0ca7a40e095edfc5cce976b9137401a8c5564 ChangeLog 4785
+SHA256 dffbcb774e45548c4240f50b7103a6489c85250c7c66205bdb1549cf39e998bc ChangeLog 4785
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 metadata.xml 604
@@ -44,13 +43,13 @@ SHA256 75c861de948534c8196d042ed309aad5bdada00d5e0dbee7c27ae6ee9d18fda0 files/di
 MD5 5696b36529f2e9f564374eb4f83c3a60 files/digest-qtiplot-0.8.5 244
 RMD160 9e12e40296c2d8b45e48876f98d9ac06da4a561d files/digest-qtiplot-0.8.5 244
 SHA256 6592bb1434d6145758e772cf561367a06aa7cbadd6aa822d6c171c5f47467b68 files/digest-qtiplot-0.8.5 244
-MD5 eec0d82bbcdab76cb728b6a8d8d4fc7b files/digest-qtiplot-0.9.2 699
-RMD160 de9067e971380beb5433b09eda3074fe0df52904 files/digest-qtiplot-0.9.2 699
-SHA256 19e6198ab81188b48a0ec681a76879c7f3be69058d07665828ae67e374c2aa3d files/digest-qtiplot-0.9.2 699
+MD5 b0f30722eb0d66608ab27233d5555fd7 files/digest-qtiplot-0.9.2 521
+RMD160 98edefa359b13616189dcc84bb7696c6c5fd1f68 files/digest-qtiplot-0.9.2 521
+SHA256 79d201447121656b2695ea108f1d107a5a0e1dd9a995e831b6922ab394532adc files/digest-qtiplot-0.9.2 521
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHU+Z01ycZbhPLE2ARAmjoAJ9C0HyiOQpgmylENw6RchZTU9IsbQCeJ5n/
-SNWq+r5WY3JrZHoXMpz8fqc=
-=DPwC
+iD8DBQFHi6gb1ycZbhPLE2ARAkmGAKCOuHEuntH653FA6P9PtLgx6AJmxQCgqEL1
+GFKj5bEYufIXMoADYryD0yM=
+=RghM
 -----END PGP SIGNATURE-----
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