Version bump.

(Portage version: 2.1_rc1-r2)

4 files changed, 456 insertions, 1 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 4a6af7b80fa6..5f22977f00fb 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/qtiplot
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.8 2006/05/07 07:35:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.9 2006/05/18 15:54:43 cryos Exp $
+
+*qtiplot-0.8.4 (18 May 2006)
+
+  18 May 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/qtiplot-0.8.4-qmake.patch, +qtiplot-0.8.4.ebuild:
+  Version bump.
 
   07 May 2006; Markus Rothe <corsair@gentoo.org> qtiplot-0.8.2.ebuild:
   Added ~ppc64
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.8.4 b/sci-visualization/qtiplot/files/digest-qtiplot-0.8.4
new file mode 100644
index 000000000000..fb0f03969a4a
--- /dev/null
+++ b/sci-visualization/qtiplot/files/digest-qtiplot-0.8.4
@@ -0,0 +1,3 @@
+MD5 d8442ce9a6b0e6ab6e0f11a3c1fdb71b qtiplot-0.8.4.tar.bz2 514377
+RMD160 ba526d9f2507a770e37f7823f088c55516876b2f qtiplot-0.8.4.tar.bz2 514377
+SHA256 6eff34e2260ab8a5817868fc6bdfe248ed59b9eb806e16c5f027310e4a139226 qtiplot-0.8.4.tar.bz2 514377
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.8.4-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.8.4-qmake.patch
new file mode 100644
index 000000000000..981099210a3f
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.8.4-qmake.patch
@@ -0,0 +1,407 @@
+--- qtiplot.pro.orig	2006-05-18 10:42:48.000000000 +0100
++++ qtiplot.pro	2006-05-18 10:47:51.000000000 +0100
+@@ -1,207 +1,197 @@
+-TARGET  = qtiplot

+-TEMPLATE     = app

+-CONFIG      += qt warn_on release thread opengl

+-MOC_DIR      = ../tmp/qtiplot

+-OBJECTS_DIR  = ../tmp/qtiplot

+-DESTDIR           = ./

+-DEFINES += QT_PLUGIN

+-win32:DEFINES  += QT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL 

+-

+-TRANSLATIONS = translations/qtiplot_de.ts \

+-			   translations/qtiplot_es.ts \

+-			   translations/qtiplot_fr.ts 

+-

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

+-unix:INCLUDEPATH  += -I /usr/include/qwtplot3d

+-

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

+-win32:INCLUDEPATH += C:/WinGsl

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

+-

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

+-unix:LIBS         += -L /usr/lib -lgsl -lgslcblas -lqwtplot3d -lz

+-

+-win32:LIBS        += ../3rdparty/qwtplot3d/lib/qwtplot3d.lib

+-win32:LIBS        += ../3rdparty/qwt/lib/qwt.lib  

+-win32:LIBS        += C:/WinGsl/Lib/WinGsl.lib

+-win32:LIBS		  += ../3rdparty/zlib123/lib/zdll.lib

+-

+-unix:target.path=/usr/bin

+-unix:INSTALLS += target

+-

+-unix:documentation.path = /usr/share/doc/qtiplot

+-unix:documentation.files = doc/*

+-unix:INSTALLS += documentation

+- 

+-win32:RC_FILE     = src/iPlot.rc

+-HEADERS  = src/application.h \

+-     src/graph.h \

+-     src/graph3D.h \

+-     src/worksheet.h \

+-     src/curvesDialog.h \

+-     src/valuesDialog.h \

+-     src/plotDialog.h \

+-     src/plot3DDialog.h \

+-     src/plotWizard.h \

+-     src/exportDialog.h \

+-     src/importDialog.h \

+-     src/axesDialog.h \

+-     src/pieDialog.h \

+-     src/polynomFitDialog.h \

+-     src/expDecayDialog.h \

+-     src/functionDialog.h \

+-     src/functionDialogui.h \

+-     src/fitDialog.h \

+-     src/surfaceDialog.h \

+-     src/tableDialog.h \

+-     src/textDialog.h \

+-     src/lineDlg.h \

+-     src/scalePicker.h \

+-     src/canvaspicker.h \

+-     src/ErrorBar.h \

+-     src/pie.h \

+-     src/errDlg.h \

+-     src/LegendMarker.h \

+-     src/LineMarker.h\

+-     src/ImageMarker.h\

+-     src/imageDialog.h \

+-     src/fit.h \

+-     src/nrutil.h\

+-     src/pixmaps.h\

+-     src/multilayer.h\

+-     src/layerDialog.h \

+-     src/intDialog.h \

+-     src/sortDialog.h\

+-	 src/bars.h \

+-	 src/cones.h \

+-	 src/configDialog.h \

+-	 src/BarCurve.h \

+-	 src/BoxCurve.h \

+-	 src/Histogram.h \

+-	 src/VectorCurve.h \

+-     src/scaleDraws.h \

+-	 src/imageExportDialog.h \

+-	 src/matrix.h \

+-	 src/matrixDialog.h \

+-	 src/matrixSizeDialog.h \

+-	 src/matrixValuesDialog.h \

+-     src/analysisDialog.h \

+-	 src/parser.h \

+-	 src/colorBox.h \

+-	 src/symbolBox.h \

+-	 src/patternBox.h \

+-	 src/importOPJ.h\

+-	 src/symbolDialog.h \

+-	 src/plot.h \

+-	 src/colorButton.h \

+-	 src/associationsDialog.h \

+-	 src/renameWindowDialog.h \

+-	 src/widget.h \

+-	 src/interpolationDialog.h\

+-	 src/fileDialogs.h\

+-	 src/epsExportDialog.h\

+-	 src/smoothCurveDialog.h\

+-	 src/filterDialog.h\

+-	 src/fftDialog.h\

+-	 src/note.h\

+-	 src/folder.h\

+-	 src/findDialog.h

+-     

+-SOURCES  = src/application.cpp \

+-     src/graph.cpp \

+-     src/analysis.cpp \

+-     src/graph3D.cpp \

+-     src/worksheet.cpp \

+-     src/valuesDialog.cpp \

+-     src/curvesDialog.cpp \

+-     src/plotDialog.cpp \

+-     src/plot3DDialog.cpp \

+-     src/plotWizard.cpp \

+-     src/exportDialog.cpp \

+-     src/importDialog.cpp \

+-     src/axesDialog.cpp \

+-     src/pieDialog.cpp \

+-     src/polynomFitDialog.cpp \

+-     src/tableDialog.cpp \

+-     src/textDialog.cpp \

+-     src/scalePicker.cpp \

+-     src/canvaspicker.cpp \

+-     src/expDecayDialog.cpp \

+-     src/functionDialog.cpp \

+-     src/functionDialogui.cpp \

+-     src/fitDialog.cpp \

+-     src/surfaceDialog.cpp \

+-     src/lineDlg.cpp \

+-     src/ErrorBar.cpp \

+-     src/pie.cpp \

+-     src/errDlg.cpp \

+-     src/LegendMarker.cpp \

+-     src/LineMarker.cpp \

+-     src/ImageMarker.cpp\

+-     src/imageDialog.cpp \

+-     src/multilayer.cpp\

+-     src/layerDialog.cpp \

+-     src/intDialog.cpp \

+-     src/sortDialog.cpp\

+-	 src/bars.cpp \

+-	 src/cones.cpp \

+-     src/analysisDialog.cpp \

+-	 src/configDialog.cpp \

+-	 src/BarCurve.cpp \

+-	 src/BoxCurve.cpp \

+-	 src/Histogram.cpp \

+-	 src/VectorCurve.cpp \

+-	 src/imageExportDialog.cpp \

+-	 src/matrix.cpp \

+-	 src/matrixDialog.cpp \

+-	 src/matrixSizeDialog.cpp \

+-	 src/matrixValuesDialog.cpp \

+-	 src/parser.cpp\

+-	 src/colorBox.cpp \

+-	 src/symbolBox.cpp \

+-	 src/patternBox.cpp \

+-	 src/importOPJ.cpp\

+-	 src/main.cpp \

+-	 src/symbolDialog.cpp \

+-	 src/plot.cpp \

+-	 src/colorButton.cpp \

+-	 src/associationsDialog.cpp \

+-	 src/renameWindowDialog.cpp \

+-	 src/widget.cpp\

+-	 src/interpolationDialog.cpp\

+-	 src/epsExportDialog.cpp\

+-	 src/nrutil.cpp\

+-     src/fit.cpp\

+-	 src/smoothCurveDialog.cpp\

+-	 src/filterDialog.cpp\

+-	 src/fftDialog.cpp\

+-	 src/note.cpp\

+-	 src/folder.cpp\

+-	 src/findDialog.cpp

+-

+-#parser (muParser_v1.26)

+-HEADERS+=../3rdparty/muParser/muParser.h \

+-         ../3rdparty/muParser/muParserBase.h \ 

+-	     ../3rdparty/muParser/muParserInt.h \

+-	     ../3rdparty/muParser/muParserError.h \ 

+-         ../3rdparty/muParser/muParserStack.h \ 

+-         ../3rdparty/muParser/muParserToken.h \

+-		 ../3rdparty/muParser/muParserBytecode.h \

+-		 ../3rdparty/muParser/muParserCallback.h \

+-		 ../3rdparty/muParser/muParserTokenReader.h \ 

+-		 ../3rdparty/muParser/muParserFixes.h \

+-		 ../3rdparty/muParser/muParserDef.h  	   

+-SOURCES+=../3rdparty/muParser/muParser.cpp \

+-         ../3rdparty/muParser/muParserBase.cpp \ 

+-         ../3rdparty/muParser/muParserInt.cpp \

+-		 ../3rdparty/muParser/muParserBytecode.cpp \

+-		 ../3rdparty/muParser/muParserCallback.cpp \

+-		 ../3rdparty/muParser/muParserTokenReader.cpp \

+-		 ../3rdparty/muParser/muParserError.cpp

+-

+-#Origin Import (liborigin)

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

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

+-

+-#Compression (zlib123)

+-SOURCES+=../3rdparty/zlib123/minigzip.c

++TARGET  = qtiplot
++TEMPLATE     = app
++CONFIG      += qt warn_on release thread opengl
++MOC_DIR      = ../tmp/qtiplot
++OBJECTS_DIR  = ../tmp/qtiplot
++DESTDIR           = ./
++DEFINES += QT_PLUGIN
++win32:DEFINES  += QT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL 
++
++TRANSLATIONS = translations/qtiplot_de.ts \
++			   translations/qtiplot_es.ts \
++			   translations/qtiplot_fr.ts 
++
++INCLUDEPATH       += -I /usr/include/qwt
++INCLUDEPATH       += -I /usr/include/qwtplot3d
++
++unix:LIBS         += -L_LIBDIR_ -lgsl -lgslcblas -lqwt -lqwtplot3d -lz
++
++unix:target.path=/usr/bin
++unix:INSTALLS += target
++
++unix:documentation.path = /usr/share/doc/qtiplot
++unix:documentation.files = doc/*
++unix:INSTALLS += documentation
++ 
++win32:RC_FILE     = src/iPlot.rc
++HEADERS  = src/application.h \
++     src/graph.h \
++     src/graph3D.h \
++     src/worksheet.h \
++     src/curvesDialog.h \
++     src/valuesDialog.h \
++     src/plotDialog.h \
++     src/plot3DDialog.h \
++     src/plotWizard.h \
++     src/exportDialog.h \
++     src/importDialog.h \
++     src/axesDialog.h \
++     src/pieDialog.h \
++     src/polynomFitDialog.h \
++     src/expDecayDialog.h \
++     src/functionDialog.h \
++     src/functionDialogui.h \
++     src/fitDialog.h \
++     src/surfaceDialog.h \
++     src/tableDialog.h \
++     src/textDialog.h \
++     src/lineDlg.h \
++     src/scalePicker.h \
++     src/canvaspicker.h \
++     src/ErrorBar.h \
++     src/pie.h \
++     src/errDlg.h \
++     src/LegendMarker.h \
++     src/LineMarker.h\
++     src/ImageMarker.h\
++     src/imageDialog.h \
++     src/fit.h \
++     src/nrutil.h\
++     src/pixmaps.h\
++     src/multilayer.h\
++     src/layerDialog.h \
++     src/intDialog.h \
++     src/sortDialog.h\
++	 src/bars.h \
++	 src/cones.h \
++	 src/configDialog.h \
++	 src/BarCurve.h \
++	 src/BoxCurve.h \
++	 src/Histogram.h \
++	 src/VectorCurve.h \
++     src/scaleDraws.h \
++	 src/imageExportDialog.h \
++	 src/matrix.h \
++	 src/matrixDialog.h \
++	 src/matrixSizeDialog.h \
++	 src/matrixValuesDialog.h \
++     src/analysisDialog.h \
++	 src/parser.h \
++	 src/colorBox.h \
++	 src/symbolBox.h \
++	 src/patternBox.h \
++	 src/importOPJ.h\
++	 src/symbolDialog.h \
++	 src/plot.h \
++	 src/colorButton.h \
++	 src/associationsDialog.h \
++	 src/renameWindowDialog.h \
++	 src/widget.h \
++	 src/interpolationDialog.h\
++	 src/fileDialogs.h\
++	 src/epsExportDialog.h\
++	 src/smoothCurveDialog.h\
++	 src/filterDialog.h\
++	 src/fftDialog.h\
++	 src/note.h\
++	 src/folder.h\
++	 src/findDialog.h
++     
++SOURCES  = src/application.cpp \
++     src/graph.cpp \
++     src/analysis.cpp \
++     src/graph3D.cpp \
++     src/worksheet.cpp \
++     src/valuesDialog.cpp \
++     src/curvesDialog.cpp \
++     src/plotDialog.cpp \
++     src/plot3DDialog.cpp \
++     src/plotWizard.cpp \
++     src/exportDialog.cpp \
++     src/importDialog.cpp \
++     src/axesDialog.cpp \
++     src/pieDialog.cpp \
++     src/polynomFitDialog.cpp \
++     src/tableDialog.cpp \
++     src/textDialog.cpp \
++     src/scalePicker.cpp \
++     src/canvaspicker.cpp \
++     src/expDecayDialog.cpp \
++     src/functionDialog.cpp \
++     src/functionDialogui.cpp \
++     src/fitDialog.cpp \
++     src/surfaceDialog.cpp \
++     src/lineDlg.cpp \
++     src/ErrorBar.cpp \
++     src/pie.cpp \
++     src/errDlg.cpp \
++     src/LegendMarker.cpp \
++     src/LineMarker.cpp \
++     src/ImageMarker.cpp\
++     src/imageDialog.cpp \
++     src/multilayer.cpp\
++     src/layerDialog.cpp \
++     src/intDialog.cpp \
++     src/sortDialog.cpp\
++	 src/bars.cpp \
++	 src/cones.cpp \
++     src/analysisDialog.cpp \
++	 src/configDialog.cpp \
++	 src/BarCurve.cpp \
++	 src/BoxCurve.cpp \
++	 src/Histogram.cpp \
++	 src/VectorCurve.cpp \
++	 src/imageExportDialog.cpp \
++	 src/matrix.cpp \
++	 src/matrixDialog.cpp \
++	 src/matrixSizeDialog.cpp \
++	 src/matrixValuesDialog.cpp \
++	 src/parser.cpp\
++	 src/colorBox.cpp \
++	 src/symbolBox.cpp \
++	 src/patternBox.cpp \
++	 src/importOPJ.cpp\
++	 src/main.cpp \
++	 src/symbolDialog.cpp \
++	 src/plot.cpp \
++	 src/colorButton.cpp \
++	 src/associationsDialog.cpp \
++	 src/renameWindowDialog.cpp \
++	 src/widget.cpp\
++	 src/interpolationDialog.cpp\
++	 src/epsExportDialog.cpp\
++	 src/nrutil.cpp\
++     src/fit.cpp\
++	 src/smoothCurveDialog.cpp\
++	 src/filterDialog.cpp\
++	 src/fftDialog.cpp\
++	 src/note.cpp\
++	 src/folder.cpp\
++	 src/findDialog.cpp
++
++#parser (muParser_v1.26)
++HEADERS+=../3rdparty/muParser/muParser.h \
++         ../3rdparty/muParser/muParserBase.h \ 
++	     ../3rdparty/muParser/muParserInt.h \
++	     ../3rdparty/muParser/muParserError.h \ 
++         ../3rdparty/muParser/muParserStack.h \ 
++         ../3rdparty/muParser/muParserToken.h \
++		 ../3rdparty/muParser/muParserBytecode.h \
++		 ../3rdparty/muParser/muParserCallback.h \
++		 ../3rdparty/muParser/muParserTokenReader.h \ 
++		 ../3rdparty/muParser/muParserFixes.h \
++		 ../3rdparty/muParser/muParserDef.h  	   
++SOURCES+=../3rdparty/muParser/muParser.cpp \
++         ../3rdparty/muParser/muParserBase.cpp \ 
++         ../3rdparty/muParser/muParserInt.cpp \
++		 ../3rdparty/muParser/muParserBytecode.cpp \
++		 ../3rdparty/muParser/muParserCallback.cpp \
++		 ../3rdparty/muParser/muParserTokenReader.cpp \
++		 ../3rdparty/muParser/muParserError.cpp
++
++#Origin Import (liborigin)
++HEADERS+=../3rdparty/liborigin/OPJFile.h   
++SOURCES+=../3rdparty/liborigin/OPJFile.cpp
++
++#Compression (zlib123)
++SOURCES+=../3rdparty/zlib123/minigzip.c
diff --git a/sci-visualization/qtiplot/qtiplot-0.8.4.ebuild b/sci-visualization/qtiplot/qtiplot-0.8.4.ebuild
new file mode 100644
index 000000000000..773d709e4d58
--- /dev/null
+++ b/sci-visualization/qtiplot/qtiplot-0.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.8.4.ebuild,v 1.1 2006/05/18 15:54:43 cryos Exp $
+
+inherit eutils multilib qt3
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="$(qt_min_version 3.3)
+	=x11-libs/qwt-4*
+	>=x11-libs/qwtplot3d-0.2.6
+	>=sci-libs/gsl-1.6
+	>=sys-libs/zlib-1.2.3"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-qmake.patch
+	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" ${PN}.pro || die "sed failed."
+}
+
+src_compile() {
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake ${PN}.pro || die 'qmake failed.'
+	emake || die 'emake failed.'
+}
+
+src_install() {
+	make_desktop_entry qtiplot qtiplot qtiplot Graphics
+	dobin qtiplot || die 'Binary installation failed.'
+}