Version bump.

(Portage version: 2.1_pre3-r1)

7 files changed, 42 insertions, 198 deletions

diff --git a/sci-mathematics/qtiplot/ChangeLog b/sci-mathematics/qtiplot/ChangeLog
index 146495132e40..15ef9d9f31ac 100644
--- a/sci-mathematics/qtiplot/ChangeLog
+++ b/sci-mathematics/qtiplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/qtiplot
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.7 2006/01/12 09:54:54 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.8 2006/01/16 23:16:16 cryos Exp $
+
+*qtiplot-0.7.6 (16 Jan 2006)
+
+  16 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/qtiplot-0.7.5-qmake.patch, +files/qtiplot-0.7.6-qmake.patch,
+  -qtiplot-0.7.5.ebuild, +qtiplot-0.7.6.ebuild:
+  Version bump.
 
 *qtiplot-0.7.5 (12 Jan 2006)
 
diff --git a/sci-mathematics/qtiplot/Manifest b/sci-mathematics/qtiplot/Manifest
index 4475f885da1c..52677ce50ef1 100644
--- a/sci-mathematics/qtiplot/Manifest
+++ b/sci-mathematics/qtiplot/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 23574fb726fc9a059c63d7b88977032e ChangeLog 1405
 MD5 5adcb06c1529439b2546dc3afb1e3609 files/digest-qtiplot-0.7.4 62
 MD5 e115c90fda522ac3a3ecec20951dfa15 files/digest-qtiplot-0.7.5 62
+MD5 cab60c3e8730d451474342ca5b129198 files/digest-qtiplot-0.7.6 62
 MD5 4260dd304cd0920a91f163ff379938c3 files/qtiplot-0.7.4-qmake.patch 5573
 MD5 58f2705264b48bbcbdb46f092d94158d files/qtiplot-0.7.5-qmake.patch 5733
+MD5 255a39958bfe0778043cbe4795eea8f2 files/qtiplot-0.7.6-qmake.patch 985
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
 MD5 cfcd3d5fde60261f6b11618ae36deccf qtiplot-0.7.4.ebuild 1011
 MD5 7e3b585d8a4170f40149ff268af5c03e qtiplot-0.7.5.ebuild 1011
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxid6ntT9W3vfTuoRAhJ4AJ98aCzQdF8kl5ungwif8gkBMP5ojgCfbaSn
-FGJ6vf70T42reK6ntlkoA4w=
-=SXQK
------END PGP SIGNATURE-----
+MD5 7e3b585d8a4170f40149ff268af5c03e qtiplot-0.7.6.ebuild 1011
diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.5 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.5
deleted file mode 100644
index dc8b6a5e5fe8..000000000000
--- a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a48cae98d231aea18efb56d084d2fb6 qtiplot-0.7.5.zip 801435
diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.6 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.6
new file mode 100644
index 000000000000..9dae857359cd
--- /dev/null
+++ b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.6
@@ -0,0 +1 @@
+MD5 251f69422543fbe8b4816914e99d94ee qtiplot-0.7.6.zip 811249
diff --git a/sci-mathematics/qtiplot/files/qtiplot-0.7.5-qmake.patch b/sci-mathematics/qtiplot/files/qtiplot-0.7.5-qmake.patch
deleted file mode 100644
index 193e295414ac..000000000000
--- a/sci-mathematics/qtiplot/files/qtiplot-0.7.5-qmake.patch
+++ /dev/null
@@ -1,185 +0,0 @@
---- qtiplot-0.7.5.pro.orig	2006-01-12 09:40:27.000000000 +0000
-+++ qtiplot-0.7.5.pro	2006-01-12 09:41:50.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,28 +73,28 @@
- 	 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/interpolationDialog.h\

--	 src/fileDialogs.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\
-+	 src/fileDialogs.h\
- 	 src/epsExportDialog.h
-      
- SOURCES  = src/application.cpp \
-@@ -142,48 +140,48 @@
- 	 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\

--	 src/epsExportDialog.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\
-+	 src/epsExportDialog.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-mathematics/qtiplot/files/qtiplot-0.7.6-qmake.patch b/sci-mathematics/qtiplot/files/qtiplot-0.7.6-qmake.patch
new file mode 100644
index 000000000000..85a273271e03
--- /dev/null
+++ b/sci-mathematics/qtiplot/files/qtiplot-0.7.6-qmake.patch
@@ -0,0 +1,29 @@
+--- 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-mathematics/qtiplot/qtiplot-0.7.5.ebuild b/sci-mathematics/qtiplot/qtiplot-0.7.6.ebuild
index 615a7823ea09..dea52d498b5e 100644
--- a/sci-mathematics/qtiplot/qtiplot-0.7.5.ebuild
+++ b/sci-mathematics/qtiplot/qtiplot-0.7.6.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-mathematics/qtiplot/qtiplot-0.7.5.ebuild,v 1.1 2006/01/12 09:54:54 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/qtiplot-0.7.6.ebuild,v 1.1 2006/01/16 23:16:16 cryos Exp $
 
 inherit eutils multilib qt3