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

(Portage version: 2.1.4_rc4)

4 files changed, 61 insertions, 40 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/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
 }