Version bump. Removed 0.9.1 because many issues and missing doc upstream. python-2.5 now only needed if python flag set.

Package-Manager: portage-2.1.4_rc4

5 files changed, 87 insertions, 56 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index dd6157c3837f..3ad2b700e468 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,15 @@
 # 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.12 2007/11/28 23:28:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.13 2007/12/03 11:20:14 bicatali Exp $
+
+*qtiplot-0.9.2 (03 Dec 2007)
+
+  03 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/qtiplot-0.9.1-systemlibs.patch,
+  +files/qtiplot-0.9.2-systemlibs.patch, -qtiplot-0.9.1.ebuild,
+  +qtiplot-0.9.2.ebuild:
+  Version bump. Removed 0.9.1 because many issues and missing doc upstream.
+  python-2.5 now only needed if python flag set.
 
 *qtiplot-0.9.1 (28 Nov 2007)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 10f3cd47a5c9..1f8715fecffd 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca
 MD5 7836bfdcab65707d6d53c3841de4d1f3 files/qtiplot-0.7.7-qmake.patch 11384
 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 files/qtiplot-0.7.7-qmake.patch 11384
@@ -6,15 +9,15 @@ 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.1-systemlibs.patch 4217 RMD160 49a6ce908cfa3b5e7360184c73482b9fd9916edf SHA1 17a7ac5f64b29713f96113b32aea5f78465f9de4 SHA256 0951a7ea19419164d6c064a854a6d7ee933eab78216e5dd8787f32440a071202
-MD5 0cc566b7a522398e6f73c5ab3a19f1e1 files/qtiplot-0.9.1-systemlibs.patch 4217
-RMD160 49a6ce908cfa3b5e7360184c73482b9fd9916edf files/qtiplot-0.9.1-systemlibs.patch 4217
-SHA256 0951a7ea19419164d6c064a854a6d7ee933eab78216e5dd8787f32440a071202 files/qtiplot-0.9.1-systemlibs.patch 4217
+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
 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.1.tar.bz2 651078 RMD160 02c46ebbd6a3e57638fd9e1be27027572bbb571f SHA1 282bb3bd735af378783f889d3304f5054775a43c SHA256 d4390d3343964c6ee3e4ad34f9c82773183d72a393ff1b3390a7cd0af95a6075
+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
 RMD160 d1cd62584b4ae4b61fa53d6623e59fd002ab18b0 qtiplot-0.7.7.ebuild 1051
@@ -23,14 +26,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.1.ebuild 2504 RMD160 dcd7fb4922f9f886e179a81ffd900ede4a393cab SHA1 46058d3bfd51c90dbcf5a38aa0577c2c6d21fea6 SHA256 b142b89be5fd5f5d083a357491d74c4230207f8502e0c30fed00f5303eb4de05
-MD5 3842e53b92a668113eea73cd9c761e61 qtiplot-0.9.1.ebuild 2504
-RMD160 dcd7fb4922f9f886e179a81ffd900ede4a393cab qtiplot-0.9.1.ebuild 2504
-SHA256 b142b89be5fd5f5d083a357491d74c4230207f8502e0c30fed00f5303eb4de05 qtiplot-0.9.1.ebuild 2504
-MISC ChangeLog 4144 RMD160 df838e7d8bfa6fe1d44e28d27a970f6232fba588 SHA1 0ee6d02eeafc9aaa540c21369fb2927084493a30 SHA256 3f1b5d417d5f54ee293c2f767adef9c3c5f0fafd37a187883e58c49a68e3fdbc
-MD5 b490ea2bea75859cfdd52041e5e470a1 ChangeLog 4144
-RMD160 df838e7d8bfa6fe1d44e28d27a970f6232fba588 ChangeLog 4144
-SHA256 3f1b5d417d5f54ee293c2f767adef9c3c5f0fafd37a187883e58c49a68e3fdbc ChangeLog 4144
+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
 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 metadata.xml 604
@@ -41,6 +44,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 5cca4c6ea1edf6662b03511318cbc9b2 files/digest-qtiplot-0.9.1 699
-RMD160 7c1999d8c858521dc254e8184a3d957d23c488a2 files/digest-qtiplot-0.9.1 699
-SHA256 c548ec68cf4a25d9a318713fabe31c02249c3923e14c3510215087de1d9aafd8 files/digest-qtiplot-0.9.1 699
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHU+Z01ycZbhPLE2ARAmjoAJ9C0HyiOQpgmylENw6RchZTU9IsbQCeJ5n/
+SNWq+r5WY3JrZHoXMpz8fqc=
+=DPwC
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.9.1 b/sci-visualization/qtiplot/files/digest-qtiplot-0.9.2
index 24f0b2dec5c9..c9e3f4f1e5a2 100644
--- a/sci-visualization/qtiplot/files/digest-qtiplot-0.9.1
+++ b/sci-visualization/qtiplot/files/digest-qtiplot-0.9.2
@@ -4,6 +4,6 @@ SHA256 b66298d91df974bcce8f2712704b7b01dbe29e2993a489cfdb4c5e322b69ac4a manual-e
 MD5 920a78cbd4a72d23f1bc79ba89e2a1f9 manual-es.zip 291117
 RMD160 df6161700fc5e18b4020e7963eedac1ef690bc42 manual-es.zip 291117
 SHA256 41cb6f04baa23cb1f15469a049f9833506c6899b9410b8af064677a221d413c9 manual-es.zip 291117
-MD5 2876d91235d053eb21552270a35d290e qtiplot-0.9.1.tar.bz2 651078
-RMD160 02c46ebbd6a3e57638fd9e1be27027572bbb571f qtiplot-0.9.1.tar.bz2 651078
-SHA256 d4390d3343964c6ee3e4ad34f9c82773183d72a393ff1b3390a7cd0af95a6075 qtiplot-0.9.1.tar.bz2 651078
+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.1-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
index 51aa129af7d5..237962274e1c 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.1-systemlibs.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch
@@ -1,6 +1,6 @@
---- qtiplot/qtiplot.pro.orig	2007-11-27 09:56:05.000000000 +0000
-+++ qtiplot/qtiplot.pro	2007-11-27 10:09:13.000000000 +0000
-@@ -34,12 +34,11 @@
+--- qtiplot/qtiplot.pro.orig	2007-12-01 17:26:18.930878533 +0000
++++ qtiplot/qtiplot.pro	2007-12-01 17:34:09.321684577 +0000
+@@ -35,12 +35,11 @@
  #!!! Warning: You must modify these paths according to your computer settings

  #############################################################################

  

@@ -18,17 +18,21 @@
  

  ##################### 3rd PARTY LIBRARIES SECTION ###########################

  #!!! Warning: You must modify these paths according to your computer settings

-@@ -47,18 +46,13 @@
- 

+@@ -49,17 +48,19 @@
  ##################### Linux (Mac OS X) ######################################

  

--# statically link against libraries in 3rdparty

+ # statically link against libraries in 3rdparty

 -unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

 -unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

 -unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

 -unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

 -unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

--

++#unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a

++#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a

++#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a

++#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a

++#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a

+ 

  # dynamically link against dependencies if they are installed system-wide

 -#unix:LIBS         += -lmuparser

 -#unix:LIBS         += -lqwtplot3d

@@ -43,35 +47,31 @@
  

  ##################### Windows ###############################################

  

-@@ -111,14 +105,13 @@
-                   translations/qtiplot_ja.ts \

-                   translations/qtiplot_sv.ts

- 

--#system(lupdate -verbose qtiplot.pro)

--#system(lrelease -verbose qtiplot.pro)

-+system(lupdate -verbose qtiplot.pro)

-+system(lrelease -verbose qtiplot.pro)

- 

+@@ -118,8 +119,8 @@
  ###################### DOCUMENTATION ########################################

  

  documentation.files += ../manual/html \

-                        ../README.html \

+-                       ../README.html \

 -                       ../gpl_licence.txt \

++#                       ../README.html \

++#                       ../gpl_licence.txt \

  

  ###################### HEADERS ##############################################

  

-@@ -363,8 +356,6 @@
+@@ -368,8 +369,8 @@
  ################# Origin Import (liborigin) ###################

  ###############################################################

  

 -HEADERS += ../3rdparty/liborigin/OPJFile.h

 -SOURCES += ../3rdparty/liborigin/OPJFile.cpp

++#HEADERS += ../3rdparty/liborigin/OPJFile.h

++#SOURCES += ../3rdparty/liborigin/OPJFile.cpp

  

  ###############################################################

  ################# Restricted Module: FFT 2D ###################

---- fitPlugins/fitRational0/fitRational0.pro.orig	2007-11-27 09:54:29.000000000 +0000
-+++ fitPlugins/fitRational0/fitRational0.pro	2007-11-27 10:10:45.000000000 +0000
-@@ -12,12 +12,10 @@
+--- fitPlugins/fitRational0/fitRational0.pro.orig	2007-12-01 17:34:26.038637222 +0000
++++ fitPlugins/fitRational0/fitRational0.pro	2007-12-01 17:35:30.542313077 +0000
+@@ -12,12 +12,12 @@
  DESTDIR           = ../

   

  # statically link against GSL in 3rdparty

@@ -79,6 +79,8 @@
 -LIBS        += ../../3rdparty/gsl/lib/libgsl.a

 -LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

 +INCLUDEPATH += /usr/include/gsl

++#LIBS        += ../../3rdparty/gsl/lib/libgsl.a

++#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

  

  #dynamically link against GSL installed system-wide

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

@@ -86,9 +88,9 @@
  

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

  INSTALLS += target

---- fitPlugins/fitRational1/fitRational1.pro.orig	2007-11-27 09:54:39.000000000 +0000
-+++ fitPlugins/fitRational1/fitRational1.pro	2007-11-27 10:17:16.000000000 +0000
-@@ -12,12 +12,10 @@
+--- fitPlugins/fitRational1/fitRational1.pro.orig	2007-12-01 17:35:44.879130086 +0000
++++ fitPlugins/fitRational1/fitRational1.pro	2007-12-01 17:36:19.221087122 +0000
+@@ -12,12 +12,12 @@
  DESTDIR           = ../

   

  # statically link against GSL in 3rdparty

@@ -96,10 +98,12 @@
 -LIBS        += ../../3rdparty/gsl/lib/libgsl.a

 -LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

 +INCLUDEPATH += /usr/include/gsl

++#LIBS        += ../../3rdparty/gsl/lib/libgsl.a

++#LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a

  

  #dynamically link against GSL installed system-wide

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

-+#unix:LIBS += -lgsl -lgslcblas

++unix:LIBS += -lgsl -lgslcblas

  

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

  INSTALLS += target

diff --git a/sci-visualization/qtiplot/qtiplot-0.9.1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
index 27d7fb511639..1b282881a56e 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.1.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.1.ebuild,v 1.2 2007/11/29 23:13:41 mr_bones_ Exp $
-
-NEED_PYTHON=2.5
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild,v 1.1 2007/12/03 11:20:14 bicatali Exp $
 
 inherit eutils multilib qt4 python
 
@@ -22,34 +20,44 @@ for l in ${LANGUAGES}; do
 	IUSE="${IUSE} linguas_${l}"
 done
 
-RDEPEND=">=x11-libs/qwt-5.0.2
+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
-	python? ( dev-python/PyQt4
-		dev-python/pygsl
-		sci-libs/scipy )"
+	>=sci-libs/gsl-1.10"
 
 DEPEND="${RDEPEND}
 	python? ( >=dev-python/sip-4.5.2 )
 	doc? ( linguas_es? ( app-arch/unzip ) )"
 
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4
+		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() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-systemlibs.patch
+
 	for l in ${LANGUAGES}; do
 		use linguas_${l} || \
 			sed -i -e "s:translations/qtiplot_${l}.ts::" ${PN}/${PN}.pro
 	done
 	use python || sed -i -e 's/^\(SCRIPTING_LANGS += Python\)/#\1/' ${PN}.pro
+
 	# the lib$$suff did not work in the fitRational*.pro files
 	sed -i \
 		-e "s|/usr/lib\$\${libsuff}|$(get_libdir)|g" \
-		fit*/fitRational*.pro
+		fitPlugins/fit*/fitRational*.pro \
+		|| die "sed fitRational* failed"
 }
 
 src_compile() {
@@ -89,10 +97,10 @@ src_install() {
 
 pkg_postinst() {
 	use python && python_mod_optimize \
-		"${ROOT}" /usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil
+		"${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil
 }
 
 pkg_postrm() {
 	use python && python_mod_cleanup \
-		"${ROOT}" /usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil
+		"${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil
 }