Version bump (fixes bug #243430).

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686)

4 files changed, 310 insertions, 1 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index d0af373477b4..b460868c6f1f 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2008/10/13 22:26:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.36 2008/10/24 22:50:43 markusle Exp $
+
+*qtiplot-0.9.7.3 (24 Oct 2008)
+
+  24 Oct 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/qtiplot-0.9.7.3-pro.patch, +files/qtiplot-0.9.7.3-qwt3d.patch,
+  +qtiplot-0.9.7.3.ebuild:
+  Version bump (fixes bug #243430).
 
   13 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org>
   qtiplot-0.9.7.2.ebuild:
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
new file mode 100644
index 000000000000..3cf5663dfa11
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-pro.patch
@@ -0,0 +1,147 @@
+diff -Naur qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro
+--- qtiplot-0.9.7.3/fitPlugins/exp_saturation/exp_saturation.pro	2008-10-13 03:43:31.000000000 -0400
++++ qtiplot-0.9.7.3.new/fitPlugins/exp_saturation/exp_saturation.pro	2008-10-24 10:15:30.000000000 -0400
+@@ -12,12 +12,12 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

+-INCLUDEPATH += ../../3rdparty/gsl/include/

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

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

++#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

++INCLUDEPATH += /usr/include/gsl

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

+ 

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

+ INSTALLS += target

+diff -Naur qtiplot-0.9.7.3/fitPlugins/explin/explin.pro qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro
+--- qtiplot-0.9.7.3/fitPlugins/explin/explin.pro	2008-10-13 03:43:31.000000000 -0400
++++ qtiplot-0.9.7.3.new/fitPlugins/explin/explin.pro	2008-10-24 10:15:49.000000000 -0400
+@@ -12,12 +12,13 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

+-INCLUDEPATH += ../../3rdparty/gsl/include/

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

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

++#INCLUDEPATH += ../../3rdparty/gsl/include/

++#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

++INCLUDEPATH += /usr/include/gsl

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

+ 

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

+ INSTALLS += target

+diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.7.3/fitPlugins/fitRational0/fitRational0.pro	2008-10-13 12:14:52.000000000 -0400
++++ qtiplot-0.9.7.3.new/fitPlugins/fitRational0/fitRational0.pro	2008-10-24 10:16:08.000000000 -0400
+@@ -12,12 +12,13 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

+-INCLUDEPATH += ../../3rdparty/gsl/include/

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

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

++#INCLUDEPATH += ../../3rdparty/gsl/include/

++#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

++INCLUDEPATH += /usr/include/gsl
++unix:LIBS += $$system(pkg-config --libs gsl)
+ 

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

+ INSTALLS += target

+diff -Naur qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.7.3/fitPlugins/fitRational1/fitRational1.pro	2007-10-28 19:44:06.000000000 -0400
++++ qtiplot-0.9.7.3.new/fitPlugins/fitRational1/fitRational1.pro	2008-10-24 10:16:25.000000000 -0400
+@@ -12,12 +12,13 @@
+ DESTDIR           = ../

+  

+ # statically link against GSL in 3rdparty

+-INCLUDEPATH += ../../3rdparty/gsl/include/

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

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

++#INCLUDEPATH += ../../3rdparty/gsl/include/

++#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

++INCLUDEPATH += /usr/include/gsl

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

+ 

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

+ INSTALLS += target

+diff -Naur qtiplot-0.9.7.3/qtiplot/qtiplot.pro qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.3/qtiplot/qtiplot.pro	2008-10-22 13:57:19.000000000 -0400
++++ qtiplot-0.9.7.3.new/qtiplot/qtiplot.pro	2008-10-24 11:03:21.000000000 -0400
+@@ -23,7 +23,7 @@
+ win32:LIBS 		  += ../3rdparty/libpng/libpng.a

+ 

+ # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.

+-#CONFIG          += CustomInstall

++CONFIG          += CustomInstall

+ 

+ CONFIG          += release

+ #CONFIG          += debug

+@@ -33,13 +33,12 @@
+ #!!! Warning: You must modify these paths according to your computer settings

+ #############################################################################

+ 

+-INCLUDEPATH       += ../3rdparty/muparser/include

+-INCLUDEPATH       += ../3rdparty/qwtplot3d/include

+-INCLUDEPATH       += ../3rdparty/qwt/src

+-INCLUDEPATH       += ../3rdparty/liborigin

+-INCLUDEPATH       += ../3rdparty/gsl/include

+-INCLUDEPATH       += ../3rdparty/zlib123/include

+-INCLUDEPATH       += ../3rdparty/boost_1_36_0

++INCLUDEPATH       += /usr/include/muparser
++INCLUDEPATH       += /usr/include/qwtplot3d
++INCLUDEPATH       += /usr/include/qwt5
++INCLUDEPATH       += ../3rdparty/liborigin
++INCLUDEPATH       += /usr/include/gsl
++INCLUDEPATH       += /usr/include/boost
+ 

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

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

+@@ -48,15 +47,15 @@
+ ##################### Linux (Mac OS X) ######################################

+ 

+ # statically link against libraries in 3rdparty

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

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

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

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

+-unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a

+-unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a

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

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

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

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

++#unix:LIBS         += /usr/local/lib/libboost_date_time-gcc41-mt.a

++#unix:LIBS         += /usr/local/lib/libboost_thread-gcc41-mt.a

+ 

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

+-#unix:LIBS         += -lmuparser

++unix:LIBS         += -lmuparser -lqwtplot3d -lqwt $$system(pkg-config --libs gsl) -lz -lboost_date_time -lboost_thread
+ #unix:LIBS         += -lqwt

+ #unix:LIBS         += -lgsl -lgslcblas

+ 

+@@ -184,7 +183,7 @@
+ ################# Default Modules #############################

+ ###############################################################

+ 

+-include(../3rdparty/qwtplot3d/qwtplot3d.pri)

++#include(../3rdparty/qwtplot3d/qwtplot3d.pri)

+ include(src/analysis/analysis.pri)

+ include(src/core/core.pri)

+ include(src/lib/libqti.pri)

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
new file mode 100644
index 000000000000..881d6e043cd0
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-qwt3d.patch
@@ -0,0 +1,21 @@
+diff -Naur qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp
+--- qtiplot-0.9.7.3/qtiplot/src/plot3D/Graph3D.cpp	2008-10-20 06:32:35.000000000 -0400
++++ qtiplot-0.9.7.3.new/qtiplot/src/plot3D/Graph3D.cpp	2008-10-24 11:04:56.000000000 -0400
+@@ -777,7 +777,7 @@
+ void Graph3D::setNumbersFont(const QFont& font)
+ {
+ 	sp->coordinates()->setNumberFont (font);
+-	sp->legend()->axis()->setNumberFont (font);
++	//sp->legend()->axis()->setNumberFont (font);
+ 	sp->makeCurrent();
+ 	sp->updateGL();
+ }
+@@ -1570,7 +1570,7 @@
+ void Graph3D::setNumbersColor(const QColor& numColor)
+ {
+ 	if(numCol != numColor){
+-		sp->legend()->axis()->setNumberColor(Qt2GL(numColor));
++		//sp->legend()->axis()->setNumberColor(Qt2GL(numColor));
+ 		sp->coordinates()->setNumberColor(Qt2GL(numColor));
+ 		numCol = numColor;
+ 	}
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
new file mode 100644
index 000000000000..be9b972f15da
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
@@ -0,0 +1,134 @@
+# 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.7.3.ebuild,v 1.1 2008/10/24 22:50:43 markusle Exp $
+
+EAPI="1"
+inherit eutils multilib qt4 fdo-mime python
+
+DESCRIPTION="Qt based clone of the Origin plotting package"
+HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2
+	doc? ( mirror://gentoo/${PN}-0.9.7-manual-en.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="python doc bindist"
+
+LANGS="de es fr ja ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+CDEPEND=">=x11-libs/qwt-5.1
+	>=x11-libs/qwtplot3d-0.2.7
+	x11-libs/qt-gui:4
+	x11-libs/qt-qt3support:4
+	x11-libs/qt-assistant:4
+	>=dev-cpp/muParser-1.28
+	>=dev-libs/boost-1.35.0
+	!bindist? ( sci-libs/gsl )
+	bindist? ( <sci-libs/gsl-1.10 )"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig
+	python? ( >=dev-python/sip-4.5.2 )"
+
+RDEPEND="${CDEPEND}
+	python? ( >=dev-lang/python-2.5
+		dev-python/PyQt4
+		dev-python/pygsl
+		sci-libs/scipy )"
+
+QT4_BUILT_WITH_USE_CHECK="qt3support"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-pro.patch
+	epatch "${FILESDIR}"/${P}-qwt3d.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7-gcc4.3.patch
+	epatch "${FILESDIR}"/${PN}-0.9.7.2-liborigin-gcc4.3.patch
+
+	sed -i \
+		-e '/manual/d'\
+		-e '/3rd/d' \
+		qtiplot.pro || die "sed qtiplot.pro failed"
+
+	python_version
+
+	sed -i \
+		-e '/manual/d' \
+		-e "s:doc/${PN}:doc/${PF}:" \
+		-e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \
+		qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed"
+
+	if ! use python; then
+		sed -i \
+			-e '/^SCRIPTING_LANGS += Python/d' \
+			-e '/sipcmd/d' \
+			qtiplot/qtiplot.pro || die "sed for python option failed"
+	fi
+
+	# the lib$$suff did not work in the fitRational*.pro files
+	pushd fitPlugins >& /dev/null
+	sed -i \
+		-e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \
+		fit*/fitRational*.pro exp_saturation/*.pro explin/*.pro \
+		|| die "sed fitRational* failed"
+	popd
+
+	for l in ${LANGS}; do
+		if ! use linguas_${l}; then
+			sed -i \
+				-e "s:translations/qtiplot_${l}.ts::" \
+				-e "s:translations/qtiplot_${l}.qm::" \
+				qtiplot/qtiplot.pro || die
+		fi
+	done
+}
+
+src_compile() {
+	eqmake4 || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die 'emake install failed'
+	rm -f "${D}"/usr/share/${PN}/translations/*.ts
+	use python && chmod -x "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/qti_wordlist.txt
+
+	newicon qtiplot_logo.png qtiplot.png
+	make_desktop_entry qtiplot QtiPlot qtiplot
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r "${WORKDIR}"/qtiplot-manual/* \
+			|| die "install manual failed"
+		rm -rf "${D}"/usr/share/doc/${PF}/html/*/.svn
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use python; then
+		python_version
+		python_mod_compile \
+			/usr/$(get_libdir)/python${PYVER}/site-packages/qti{plotrc,Util}.py
+	fi
+
+	if use doc; then
+		elog "On the first start, do Help -> Choose Help Folder"
+		elog "and select /usr/share/doc/${PF}/html"
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+
+	if use python; then
+		python_version
+		python_mod_cleanup
+	fi
+}