Version bump, bug 115497.

(Portage version: 2.0.53)

5 files changed, 228 insertions, 11 deletions

diff --git a/sci-mathematics/qtiplot/ChangeLog b/sci-mathematics/qtiplot/ChangeLog
index 1414f325c4c3..0ceed2b136de 100644
--- a/sci-mathematics/qtiplot/ChangeLog
+++ b/sci-mathematics/qtiplot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/qtiplot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.4 2005/12/09 14:44:39 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.5 2005/12/17 15:40:25 cryos Exp $
+
+*qtiplot-0.7.4 (17 Dec 2005)
+
+  17 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/qtiplot-0.7.4-qmake.patch, +qtiplot-0.7.4.ebuild:
+  Version bump, bug 115497.
 
   09 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> qtiplot-0.7.3.ebuild:
   Small cleanup for the Qt path.
diff --git a/sci-mathematics/qtiplot/Manifest b/sci-mathematics/qtiplot/Manifest
index 411f6de7aa3a..cc0dc1e39d98 100644
--- a/sci-mathematics/qtiplot/Manifest
+++ b/sci-mathematics/qtiplot/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3ccb8a12300b52f9e097043279bdcc4a ChangeLog 907
 MD5 5d9f95f51f7d2f4b6eb8722baf13f709 files/digest-qtiplot-0.7.3 62
+MD5 5adcb06c1529439b2546dc3afb1e3609 files/digest-qtiplot-0.7.4 62
 MD5 5d8eba869ecfe0dbeb485ba932ed801a files/qtiplot-0.7.3-qmake.patch 5604
+MD5 4260dd304cd0920a91f163ff379938c3 files/qtiplot-0.7.4-qmake.patch 5573
 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604
 MD5 8c81cfb77431fafb51538b2491d963d0 qtiplot-0.7.3.ebuild 1067
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDmZhintT9W3vfTuoRAtCJAJsEKfw1jdS1ABlCgCBsSktylTwACgCeKlXo
-aya0mcZCnl61AF8bKo81HG4=
-=lvBe
------END PGP SIGNATURE-----
+MD5 cf864991a824196ba408c756fc509878 qtiplot-0.7.4.ebuild 986
diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.4 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.4
new file mode 100644
index 000000000000..c798de9663e9
--- /dev/null
+++ b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.4
@@ -0,0 +1 @@
+MD5 47fea7f66dcbfc461131a258dd5fb2b1 qtiplot-0.7.4.zip 789580
diff --git a/sci-mathematics/qtiplot/files/qtiplot-0.7.4-qmake.patch b/sci-mathematics/qtiplot/files/qtiplot-0.7.4-qmake.patch
new file mode 100644
index 000000000000..49bb4c46e316
--- /dev/null
+++ b/sci-mathematics/qtiplot/files/qtiplot-0.7.4-qmake.patch
@@ -0,0 +1,179 @@
+--- 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-mathematics/qtiplot/qtiplot-0.7.4.ebuild b/sci-mathematics/qtiplot/qtiplot-0.7.4.ebuild
new file mode 100644
index 000000000000..cc4e64fdb218
--- /dev/null
+++ b/sci-mathematics/qtiplot/qtiplot-0.7.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/qtiplot-0.7.4.ebuild,v 1.1 2005/12/17 15:40:25 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=""
+
+DEPEND="$(qt_min_version 3.3)
+	>=x11-libs/qwt-4.2.0
+	>=x11-libs/qwtplot3d-0.2.6
+	>=sci-libs/gsl-1.6"
+
+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 ${P}.pro || die 'qmake failed.'
+	emake || die 'emake failed.'
+}
+
+src_install() {
+	make_desktop_entry qtiplot qtiplot qtiplot Graphics
+	dobin ../qtiplot || die 'Binary installation failed.'
+}