Version bump, closes bug 124109. Also cleaned up old versions and marked newer version stable on amd64.

Package-Manager: portage-2.1_pre6-r6

11 files changed, 447 insertions, 286 deletions

diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index d72fc059483a..b4546b9d5137 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,15 @@
 # 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.3 2006/02/16 19:29:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.4 2006/03/27 00:51:59 cryos Exp $
+
+*qtiplot-0.8.1 (27 Mar 2006)
+
+  27 Mar 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/qtiplot-0.7.4-qmake.patch, -files/qtiplot-0.7.6-qmake.patch,
+  +files/qtiplot-0.8.1-qmake.patch, -qtiplot-0.7.4.ebuild,
+  -qtiplot-0.7.6.ebuild, qtiplot-0.7.7.ebuild, +qtiplot-0.8.1.ebuild:
+  Version bump, closes bug 124109. Also cleaned up old versions and marked
+  newer version stable on amd64.
 
 *qtiplot-0.7.7 (30 Jan 2006)
 
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 83a8d2b16f60..17b93b86fb16 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,43 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 274813fd4a020cf7014fa15813f2b040 ChangeLog 2198
-RMD160 dcbc53bf392a3fa35238be395acbcb06e7b2fb70 ChangeLog 2198
-SHA256 c14fe9921a8acf03b82072562114f1e4826bf6e73e00a42bc73f423b87196c7b ChangeLog 2198
-MD5 5adcb06c1529439b2546dc3afb1e3609 files/digest-qtiplot-0.7.4 62
-RMD160 3ae402d81207e2b1ff459081ff2fd9ec9b3280a6 files/digest-qtiplot-0.7.4 62
-SHA256 1de3918e3bb744fbf14eaa1a0286b504c5eed481bde09101865263b565c00d9e files/digest-qtiplot-0.7.4 62
-MD5 cab60c3e8730d451474342ca5b129198 files/digest-qtiplot-0.7.6 62
-RMD160 fcf6282bc10cf1cec998a4603b22840ab1b778e0 files/digest-qtiplot-0.7.6 62
-SHA256 34b6694a52e6e949330b684615dcf5becb472dc4310682d04ed4a0ff782970bc files/digest-qtiplot-0.7.6 62
+MD5 6cec5a3425d7401ed8fb1d12a3037227 ChangeLog 2585
+RMD160 38f500a51bc94bfa63a6b1e46ca0cbac5da6162f ChangeLog 2585
+SHA256 218b1554485f754762450fb1fb0b1daed8856be3fea458263779f1ca08fd584c ChangeLog 2585
 MD5 a3adbc9ccdf0e1bf64d330ba37aa813b files/digest-qtiplot-0.7.7 232
 RMD160 c4c81408eb4f94aea249dae351ca57045f3efbe8 files/digest-qtiplot-0.7.7 232
 SHA256 75c861de948534c8196d042ed309aad5bdada00d5e0dbee7c27ae6ee9d18fda0 files/digest-qtiplot-0.7.7 232
-MD5 4260dd304cd0920a91f163ff379938c3 files/qtiplot-0.7.4-qmake.patch 5573
-RMD160 6c6b37a5996c88b3b5fdc676b8b07345e7839bfd files/qtiplot-0.7.4-qmake.patch 5573
-SHA256 77de86ec731bdfc7c2064e8d011fc1d46a1a37b004b098c3a3894b20111dd395 files/qtiplot-0.7.4-qmake.patch 5573
-MD5 255a39958bfe0778043cbe4795eea8f2 files/qtiplot-0.7.6-qmake.patch 985
-RMD160 13f7076a15a234073bd5163925d182347d258c34 files/qtiplot-0.7.6-qmake.patch 985
-SHA256 08941617611df7fac9be938cac639a75b8c8c353e2f09a3348fe84349934e8ac files/qtiplot-0.7.6-qmake.patch 985
+MD5 316126cda49b56bd011e3836aa89b65e files/digest-qtiplot-0.8.1 232
+RMD160 adeaa9693b33cf4565d360372426f35c74e1d964 files/digest-qtiplot-0.8.1 232
+SHA256 cb7e0bafcc86e66c6e50bb074eaa7fd06b3cd0c4f3b774f19408aa3dcb0226ba files/digest-qtiplot-0.8.1 232
 MD5 7836bfdcab65707d6d53c3841de4d1f3 files/qtiplot-0.7.7-qmake.patch 11384
 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 files/qtiplot-0.7.7-qmake.patch 11384
 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca files/qtiplot-0.7.7-qmake.patch 11384
+MD5 36a3324a431bedea10a0f018f599451b files/qtiplot-0.8.1-qmake.patch 11662
+RMD160 add23ae46f1ef8aae81140881935b22674cdaed0 files/qtiplot-0.8.1-qmake.patch 11662
+SHA256 f532f85b7e0466e06b10ee1c8f0e14d83e48c3ae4d1041d9c8c9f215b802aed6 files/qtiplot-0.8.1-qmake.patch 11662
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 metadata.xml 604
 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c metadata.xml 604
-MD5 5e7cff1f68ef4fecfe75f3d2c1df97c5 qtiplot-0.7.4.ebuild 1049
-RMD160 1f101e2dbbed375e0db0b274459d26c3d3658c42 qtiplot-0.7.4.ebuild 1049
-SHA256 9bb6403d33e4074e110e5c2fc6de5a40359c90478100d8a16f93c7403d1ba31b qtiplot-0.7.4.ebuild 1049
-MD5 c46106ddb89756fca7bd7d0d6b299617 qtiplot-0.7.6.ebuild 1050
-RMD160 1b29ca78d02aabae40b53ec123a03213ee0d7c1f qtiplot-0.7.6.ebuild 1050
-SHA256 2488e053f47f74460ee6ba07066395c47858c5d5b993447bf0016ed7096b8ecf qtiplot-0.7.6.ebuild 1050
-MD5 a7be4c3f9f7ee8fcc89b2c26058313fe qtiplot-0.7.7.ebuild 1050
-RMD160 039f6ba25aadb084407b4f13b0ae7d8aaca9aa9c qtiplot-0.7.7.ebuild 1050
-SHA256 55a3999c10f61f0584abef5cbe7ab87404088b16596f1949f2a02c679e55afb1 qtiplot-0.7.7.ebuild 1050
+MD5 9df67f55e3de06d8f5324b1e56fa9c15 qtiplot-0.7.7.ebuild 1049
+RMD160 70f59f384b5d91349960c3d5b99f26a8b85efd69 qtiplot-0.7.7.ebuild 1049
+SHA256 9e5cf7389a3ac4d1a953f6b5ddd4d6c6049fd6244d0ae51f42aed70c87d41afa qtiplot-0.7.7.ebuild 1049
+MD5 b155136e523af4bca2fb6f07243398c8 qtiplot-0.8.1.ebuild 1050
+RMD160 f55dd5dd36e72a52c8b366e4ec710254a31dd2ac qtiplot-0.8.1.ebuild 1050
+SHA256 68b45506c2a3066c6cc52c7f7a39652517eab233bd0f0e309b47295ed796ae16 qtiplot-0.8.1.ebuild 1050
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD9NKxI1lqEGTUzyQRAiWKAKCwfa8zlMLfc9yQM13TnEhIcefOxwCfSEqB
-PysNEVo+VLF+5xAwpldN2P8=
-=9EnN
+iD8DBQFEJzc7ntT9W3vfTuoRArr4AKCMbuQxrrLkdBpoQyFfduHBXkK1NACfQCQ2
+omsLM1jilJyTyrRRUI46v7Q=
+=z712
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.7.4 b/sci-visualization/qtiplot/files/digest-qtiplot-0.7.4
deleted file mode 100644
index c798de9663e9..000000000000
--- a/sci-visualization/qtiplot/files/digest-qtiplot-0.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47fea7f66dcbfc461131a258dd5fb2b1 qtiplot-0.7.4.zip 789580
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.7.6 b/sci-visualization/qtiplot/files/digest-qtiplot-0.7.6
deleted file mode 100644
index 9dae857359cd..000000000000
--- a/sci-visualization/qtiplot/files/digest-qtiplot-0.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 251f69422543fbe8b4816914e99d94ee qtiplot-0.7.6.zip 811249
diff --git a/sci-visualization/qtiplot/files/digest-qtiplot-0.8.1 b/sci-visualization/qtiplot/files/digest-qtiplot-0.8.1
new file mode 100644
index 000000000000..2d3811481d3b
--- /dev/null
+++ b/sci-visualization/qtiplot/files/digest-qtiplot-0.8.1
@@ -0,0 +1,3 @@
+MD5 04ad123d8d3e67e1b2bc10f5698eb18e qtiplot-0.8.1.zip 856277
+RMD160 b0f476c52c8ee807656831535ed07c53e941b660 qtiplot-0.8.1.zip 856277
+SHA256 ab842c865180ea71b06fcfbdd4e7f3dcd55421a35d0a0edab5add19d0d2989c0 qtiplot-0.8.1.zip 856277
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.7.4-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.7.4-qmake.patch
deleted file mode 100644
index 49bb4c46e316..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.7.4-qmake.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- qtiplot-0.7.4.pro.orig	2005-12-17 15:13:35.000000000 +0000
-+++ qtiplot-0.7.4.pro	2005-12-17 15:19:25.000000000 +0000
-@@ -4,27 +4,25 @@
- MOC_DIR      = ../tmp/qtiplot
- OBJECTS_DIR  = ../tmp/qtiplot
- DESTDIR           = ../
--DEFINES += QT_PLUGIN

--win32:DEFINES  += QT_DLL QWT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL 

-+DEFINES += QT_PLUGIN
-+win32:DEFINES  += QT_DLL QWT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL
- 
- TRANSLATIONS = translations/qtiplot_de.ts \
--			   translations/qtiplot_es.ts \

--			   translations/qtiplot_fr.ts \

--			   translations/qtiplot_ja.ts \

--			   translations/qtiplot_pt.ts 

--

--win32:INCLUDEPATH += C:/Qt/WinGsl

-+			   translations/qtiplot_es.ts \
-+			   translations/qtiplot_fr.ts \
-+			   translations/qtiplot_ja.ts \
-+			   translations/qtiplot_pt.ts 
- 
--INCLUDEPATH += ../3rdparty/qwt/include

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

-+win32:INCLUDEPATH += C:/Qt/WinGsl
-+
-+INCLUDEPATH += /usr/include/qwt
-+INCLUDEPATH += /usr/include/qwtplot3d
- 
- win32:LIBS     += ../3rdparty/qwt/lib/qwt.lib 
- win32:LIBS     += ../3rdparty/qwtplot3d/lib/qwtplot3d.lib 
- win32:LIBS     += C:/Qt/WinGsl/Lib/WinGsl.lib 
- 
--unix:LIBS += -L../3rdparty/qwt/lib -lqwt
--unix:LIBS += -L../3rdparty/qwtplot3d/lib -lqwtplot3d
--unix:LIBS += -L /usr/lib -lgsl -lgslcblas
-+unix:LIBS += -L_LIBDIR_ -lgsl -lgslcblas -lqwt -lqwtplot3d
- 
- unix:target.path=/usr/bin
- unix:INSTALLS += target
-@@ -32,7 +30,7 @@
- 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 \
-@@ -75,26 +73,26 @@
- 	 src/bars.h \
- 	 src/cones.h \
- 	 src/configDialog.h \
--	 src/BarCurve.h \

-+	 src/BarCurve.h \
- 	 src/Histogram.h \
- 	 src/VectXYXYCurve.h \
-      src/scaleDraws.h \
- 	 src/imageExportDialog.h \
--	 src/matrix.h \

--	 src/matrixDialog.h \

--	 src/matrixSizeDialog.h \

-+	 src/matrix.h \
-+	 src/matrixDialog.h \
-+	 src/matrixSizeDialog.h \
- 	 src/matrixValuesDialog.h \
--     src/analysisDialog.h \

--	 src/parser.h \

--	 src/colorBox.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/analysisDialog.h \
-+	 src/parser.h \
-+	 src/colorBox.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
-      
- SOURCES  = src/application.cpp \
-@@ -140,47 +138,47 @@
- 	 src/cones.cpp \
-      src/analysisDialog.cpp \
- 	 src/configDialog.cpp \
--	 src/BarCurve.cpp \

-+	 src/BarCurve.cpp \
- 	 src/Histogram.cpp \
- 	 src/VectXYXYCurve.cpp \
- 	 src/imageExportDialog.cpp \
--	 src/matrix.cpp \

--	 src/matrixDialog.cpp \

--	 src/matrixSizeDialog.cpp \

--	 src/matrixValuesDialog.cpp \

--	 src/parser.cpp\

--	 src/colorBox.cpp \

--	 src/patternBox.cpp \

-+	 src/matrix.cpp \
-+	 src/matrixDialog.cpp \
-+	 src/matrixSizeDialog.cpp \
-+	 src/matrixValuesDialog.cpp \
-+	 src/parser.cpp\
-+	 src/colorBox.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

--

--#parser (muParser)

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

-+	 src/main.cpp \
-+	 src/symbolDialog.cpp \
-+	 src/plot.cpp \
-+	 src/colorButton.cpp \
-+	 src/associationsDialog.cpp \
-+	 src/renameWindowDialog.cpp \
-+	 src/widget.cpp\
-+	 src/interpolationDialog.cpp
-+
-+#parser (muParser)
-+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
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.7.6-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.7.6-qmake.patch
deleted file mode 100644
index 85a273271e03..000000000000
--- a/sci-visualization/qtiplot/files/qtiplot-0.7.6-qmake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- qtiplot-0.7.6.pro.orig	2006-01-16 22:43:32.000000000 +0000
-+++ qtiplot-0.7.6.pro	2006-01-16 22:48:18.000000000 +0000
-@@ -15,16 +15,14 @@
- 

- win32:INCLUDEPATH += C:/Qt/WinGsl

- 

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

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

-+INCLUDEPATH += /usr/include/qwt

-+INCLUDEPATH += /usr/include/qwtplot3d

- 

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

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

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

- 

--unix:LIBS += -L../3rdparty/qwt/lib -lqwt

--unix:LIBS += -L../3rdparty/qwtplot3d/lib -lqwtplot3d

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

-+unix:LIBS += -L_LIBDIR_ -lgsl -lgslcblas -lqwt -lqwtplot3d

- 

- unix:target.path=/usr/bin

- unix:INSTALLS += target

-@@ -194,4 +192,4 @@
- 

- #Origin Import (liborigin)

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

--SOURCES+=../3rdparty/liborigin/OPJFile.cpp
-\ No newline at end of file
-+SOURCES+=../3rdparty/liborigin/OPJFile.cpp

diff --git a/sci-visualization/qtiplot/files/qtiplot-0.8.1-qmake.patch b/sci-visualization/qtiplot/files/qtiplot-0.8.1-qmake.patch
new file mode 100644
index 000000000000..9184aeb8a2c5
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.8.1-qmake.patch
@@ -0,0 +1,408 @@
+--- qtiplot.pro.orig	2006-03-27 01:25:39.000000000 +0100
++++ qtiplot.pro	2006-03-27 01:28:55.000000000 +0100
+@@ -1,202 +1,202 @@
+-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 QWT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL 

+-

+-TRANSLATIONS = translations/qtiplot_de.ts \

+-			   translations/qtiplot_es.ts \

+-			   translations/qtiplot_fr.ts \

+-			   translations/qtiplot_ja.ts \

+-			   translations/qtiplot_pt.ts 

+-

+-win32:INCLUDEPATH += C:/WinGsl

+-

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

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

+-

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

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

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

+-

+-unix:LIBS += -L../3rdparty/qwt/lib -lqwt

+-unix:LIBS += -L../3rdparty/qwtplot3d/lib -lqwtplot3d

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

+-

+-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/txtDlg.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/VectXYXYCurve.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

+-     

+-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/txtDlg.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/VectXYXYCurve.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

+-

+-#parser (muParser_v1.24)

+-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/muParserDLL.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/muParserDLL.cpp \

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

+-

+-#Origin Import (liborigin)

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

+-SOURCES+=../3rdparty/liborigin/OPJFile.cpp
+\ No newline at end of file
++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 QWT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL 
++
++TRANSLATIONS = translations/qtiplot_de.ts \
++			   translations/qtiplot_es.ts \
++			   translations/qtiplot_fr.ts \
++			   translations/qtiplot_ja.ts \
++			   translations/qtiplot_pt.ts 
++
++win32:INCLUDEPATH += C:/WinGsl
++
++INCLUDEPATH += /usr/include/qwt
++INCLUDEPATH += /usr/include/qwtplot3d
++
++win32:LIBS     += ../3rdparty/qwt/lib/qwt.lib 
++win32:LIBS     += ../3rdparty/qwtplot3d/lib/qwtplot3d.lib 
++win32:LIBS     += C:/WinGsl/Lib/WinGsl.lib 
++
++unix:LIBS += -L../3rdparty/qwt/lib -lqwt
++unix:LIBS += -L../3rdparty/qwtplot3d/lib -lqwtplot3d
++unix:LIBS += -L_LIBDIR_ -lgsl -lgslcblas -lqwt -lqwtplot3d
++
++unix:target.path=/usr/bin
++unix:INSTALLS += target
++
++unix:documentation.path = /usr/share/doc/_PF_
++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/txtDlg.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/VectXYXYCurve.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
++     
++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/txtDlg.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/VectXYXYCurve.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
++
++#parser (muParser_v1.24)
++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/muParserDLL.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/muParserDLL.cpp \
++		 ../3rdparty/muParser/muParserError.cpp
++
++#Origin Import (liborigin)
++HEADERS+=../3rdparty/liborigin/OPJFile.h   
++SOURCES+=../3rdparty/liborigin/OPJFile.cpp
diff --git a/sci-visualization/qtiplot/qtiplot-0.7.4.ebuild b/sci-visualization/qtiplot/qtiplot-0.7.4.ebuild
deleted file mode 100644
index 5a8df589aafe..000000000000
--- a/sci-visualization/qtiplot/qtiplot-0.7.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.7.4.ebuild,v 1.1 2006/01/29 15:43:33 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}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="$(qt_min_version 3.3)
-	>=x11-libs/qwt-4.2.0
-	>=x11-libs/qwtplot3d-0.2.6
-	>=sci-libs/gsl-1.6"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-qmake.patch
-	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" ${P}.pro || die "sed failed."
-}
-
-src_compile() {
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake ${P}.pro || die 'qmake failed.'
-	emake || die 'emake failed.'
-}
-
-src_install() {
-	make_desktop_entry qtiplot qtiplot qtiplot Graphics
-	dobin ../qtiplot || die 'Binary installation failed.'
-}
diff --git a/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild b/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
index 90a7e99f8889..4f1301fbd316 100644
--- a/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.7.ebuild,v 1.1 2006/01/30 20:46:07 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.7.7.ebuild,v 1.2 2006/03/27 00:51:59 cryos Exp $
 
 inherit eutils multilib qt3
 
@@ -10,7 +10,7 @@ SRC_URI="http://soft.proindependent.com/src/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="$(qt_min_version 3.3)
diff --git a/sci-visualization/qtiplot/qtiplot-0.7.6.ebuild b/sci-visualization/qtiplot/qtiplot-0.8.1.ebuild
index cfbd95356005..74ead6ec4994 100644
--- a/sci-visualization/qtiplot/qtiplot-0.7.6.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.6.ebuild,v 1.1 2006/01/29 15:43:33 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.8.1.ebuild,v 1.1 2006/03/27 00:51:59 cryos Exp $
 
 inherit eutils multilib qt3
 
@@ -20,21 +20,21 @@ RDEPEND="$(qt_min_version 3.3)
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S=${WORKDIR}/${P}/${P}
+S=${WORKDIR}/${P}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-qmake.patch
-	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" ${P}.pro || die "sed failed."
+	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" ${PN}.pro || die "sed failed."
 }
 
 src_compile() {
-	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake ${P}.pro || die 'qmake failed.'
+	${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.'
+	dobin qtiplot || die 'Binary installation failed.'
 }