Version bump.

Package-Manager: portage-2.0.53

7 files changed, 211 insertions, 204 deletions

diff --git a/sci-mathematics/qtiplot/ChangeLog b/sci-mathematics/qtiplot/ChangeLog
index 5570a68f1cb5..146495132e40 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.6 2006/01/09 14:15:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.7 2006/01/12 09:54:54 cryos Exp $
+
+*qtiplot-0.7.5 (12 Jan 2006)
+
+  12 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/qtiplot-0.7.3-qmake.patch, +files/qtiplot-0.7.5-qmake.patch,
+  -qtiplot-0.7.3.ebuild, +qtiplot-0.7.5.ebuild:
+  Version bump.
 
   09 Jan 2006; Caleb Tennis <caleb@gentoo.org> qtiplot-0.7.3.ebuild,
   qtiplot-0.7.4.ebuild:
diff --git a/sci-mathematics/qtiplot/Manifest b/sci-mathematics/qtiplot/Manifest
index abed8a0d0aa8..4475f885da1c 100644
--- a/sci-mathematics/qtiplot/Manifest
+++ b/sci-mathematics/qtiplot/Manifest
@@ -1,8 +1,18 @@
-MD5 e206f56977c95b147126813f65d47edd ChangeLog 1188
-MD5 5d9f95f51f7d2f4b6eb8722baf13f709 files/digest-qtiplot-0.7.3 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 23574fb726fc9a059c63d7b88977032e ChangeLog 1405
 MD5 5adcb06c1529439b2546dc3afb1e3609 files/digest-qtiplot-0.7.4 62
-MD5 5d8eba869ecfe0dbeb485ba932ed801a files/qtiplot-0.7.3-qmake.patch 5604
+MD5 e115c90fda522ac3a3ecec20951dfa15 files/digest-qtiplot-0.7.5 62
 MD5 4260dd304cd0920a91f163ff379938c3 files/qtiplot-0.7.4-qmake.patch 5573
+MD5 58f2705264b48bbcbdb46f092d94158d files/qtiplot-0.7.5-qmake.patch 5733
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
-MD5 a095de3396efab16df95ee0de4e1eb48 qtiplot-0.7.3.ebuild 1092
 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-----
diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3
deleted file mode 100644
index 95255f436432..000000000000
--- a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 395a1b5d89c5c8aeb8dcf5fd4bdba8fa qtiplot-0.7.3.zip 669068
diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.5 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.5
new file mode 100644
index 000000000000..dc8b6a5e5fe8
--- /dev/null
+++ b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.5
@@ -0,0 +1 @@
+MD5 8a48cae98d231aea18efb56d084d2fb6 qtiplot-0.7.5.zip 801435
diff --git a/sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch b/sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch
deleted file mode 100644
index b6cc76d90a20..000000000000
--- a/sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- qtiplot-0.7.3.pro.orig	2005-11-29 17:32:57.000000000 +0000
-+++ qtiplot-0.7.3.pro	2005-11-29 17:37:38.000000000 +0000
-@@ -1,31 +1,29 @@
- TARGET  = qtiplot
- TEMPLATE     = app
--CONFIG      += qt warn_on debug thread opengl 
-+CONFIG      += qt warn_on thread opengl 
- MOC_DIR      = ../tmp/qtiplot
- OBJECTS_DIR  = ../tmp/qtiplot
- DESTDIR           = ../
--DEFINES += QT_PLUGIN

-+DEFINES += QT_PLUGIN
- 
- TRANSLATIONS = translations/qtiplot_de.ts \
--			   translations/qtiplot_es.ts \

--			   translations/qtiplot_fr.ts \

--			   translations/qtiplot_ja.ts \

--			   translations/qtiplot_pt.ts 

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

--
--QTIPLOT_PATH = /home/ion
--

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

--win32:INCLUDEPATH += C:/Qt/qwtplot3d/include

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

--

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

--win32:LIBS     += C:/Qt/qwtplot3d/lib/qwtplot3d.lib 

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

-+			   translations/qtiplot_es.ts \
-+			   translations/qtiplot_fr.ts \
-+			   translations/qtiplot_ja.ts \
-+			   translations/qtiplot_pt.ts
-+
-+win32:DEFINES  += QT_DLL QWT_DLL QT_THREAD_SUPPORT GSL_DLL QWTPLOT3D_DLL
-+
-+win32:INCLUDEPATH +=../3rdparty/qwt/include
-+win32:INCLUDEPATH += C:/Qt/qwtplot3d/include
-+win32:INCLUDEPATH += C:/Qt/WinGsl
-+
-+win32:LIBS     += ../3rdparty/qwt/lib/qwt.lib 
-+win32:LIBS     += C:/Qt/qwtplot3d/lib/qwtplot3d.lib 
-+win32:LIBS     += C:/Qt/WinGsl/Lib/WinGsl.lib 
- 
--unix:INCLUDEPATH +=  $${QTIPLOT_PATH}/qt/qwtplot3d/include
--unix:INCLUDEPATH += ../3rdparty/qwt/include
-+unix:INCLUDEPATH += /usr/include/qwt
-+unix:INCLUDEPATH += /usr/include/qwtplot3d
- 
- unix:LIBS += -L../3rdparty/qwt/lib -lqwt
- unix:LIBS += -L /usr/lib -lqwtplot3d -lgsl -lgslcblas
-@@ -36,7 +34,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 \
-@@ -79,26 +77,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 \
-@@ -144,47 +142,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+=src/parser/muParser.h \

--         src/parser/muParserBase.h \ 

--		 src/parser/muParserInt.h \

--		 src/parser/muParserError.h \ 

--         src/parser/muParserStack.h \ 

--         src/parser/muParserToken.h \

--		 src/parser/muParserBytecode.h \

--		 src/parser/muParserCallback.h \

--		 src/parser/muParserTokenReader.h \ 

--		 src/parser/muParserFixes.h \

--		 src/parser/muParserDef.h  	   

--SOURCES+=src/parser/muParser.cpp \

--         src/parser/muParserBase.cpp \ 

--         src/parser/muParserInt.cpp \

--		 src/parser/muParserBytecode.cpp \

--		 src/parser/muParserCallback.cpp \

--		 src/parser/muParserTokenReader.cpp \

--		 src/parser/muParserError.cpp

--

--#Origin Import (liborigin)

--HEADERS+=src/liborigin/OPJFile.h   

--SOURCES+=src/liborigin/OPJFile.cpp
-\ No newline at end of file
-+	 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+=src/parser/muParser.h \
-+         src/parser/muParserBase.h \ 
-+		 src/parser/muParserInt.h \
-+		 src/parser/muParserError.h \
-+         src/parser/muParserStack.h \
-+         src/parser/muParserToken.h \
-+		 src/parser/muParserBytecode.h \
-+		 src/parser/muParserCallback.h \
-+		 src/parser/muParserTokenReader.h \
-+		 src/parser/muParserFixes.h \
-+		 src/parser/muParserDef.h
-+SOURCES+=src/parser/muParser.cpp \
-+         src/parser/muParserBase.cpp \
-+         src/parser/muParserInt.cpp \
-+		 src/parser/muParserBytecode.cpp \
-+		 src/parser/muParserCallback.cpp \
-+		 src/parser/muParserTokenReader.cpp \
-+		 src/parser/muParserError.cpp
-+
-+#Origin Import (liborigin)
-+HEADERS+=src/liborigin/OPJFile.h
-+SOURCES+=src/liborigin/OPJFile.cpp
diff --git a/sci-mathematics/qtiplot/files/qtiplot-0.7.5-qmake.patch b/sci-mathematics/qtiplot/files/qtiplot-0.7.5-qmake.patch
new file mode 100644
index 000000000000..193e295414ac
--- /dev/null
+++ b/sci-mathematics/qtiplot/files/qtiplot-0.7.5-qmake.patch
@@ -0,0 +1,185 @@
+--- 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/qtiplot-0.7.3.ebuild b/sci-mathematics/qtiplot/qtiplot-0.7.5.ebuild
index 0799a82b02a1..615a7823ea09 100644
--- a/sci-mathematics/qtiplot/qtiplot-0.7.3.ebuild
+++ b/sci-mathematics/qtiplot/qtiplot-0.7.5.ebuild
@@ -1,8 +1,8 @@
 # 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.3.ebuild,v 1.3 2006/01/09 14:15:40 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/qtiplot-0.7.5.ebuild,v 1.1 2006/01/12 09:54:54 cryos Exp $
 
-inherit eutils qt3
+inherit eutils multilib qt3
 
 DESCRIPTION="Qt based clone of the Origin plotting package"
 HOMEPAGE="http://soft.proindependent.com/qtiplot.html"
@@ -23,11 +23,8 @@ S=${WORKDIR}/${P}/${P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	echo ${S}
 	epatch ${FILESDIR}/${P}-qmake.patch
-#	sed -e 's/INCLUDEPATH.*//' -i ${P}.pro
-#	echo "INCLUDEPATH += /usr/include/qwt" >> ${P}.pro
-#	echo "INCLUDEPATH += /usr/include/qwtplot3d" >> ${P}.pro
+	sed -i -e "s|_LIBDIR_|/usr/$(get_libdir)|" ${P}.pro || die "sed failed."
 }
 
 src_compile() {