From 995beac53ba53656301db5aa654a2ac4e45337b3 Mon Sep 17 00:00:00 2001 From: "Marcus D. Hanwell" Date: Tue, 29 Nov 2005 21:10:03 +0000 Subject: [PATCH] Version bump, closes bug 112952. Package-Manager: portage-2.0.53_rc7 --- sci-mathematics/qtiplot/ChangeLog | 9 +- sci-mathematics/qtiplot/Manifest | 15 +- .../qtiplot/files/digest-qtiplot-0.7 | 1 - .../qtiplot/files/digest-qtiplot-0.7.3 | 1 + .../qtiplot/files/qtiplot-0.7.3-qmake.patch | 192 ++++++++++++++++++ sci-mathematics/qtiplot/qtiplot-0.7.3.ebuild | 41 ++++ sci-mathematics/qtiplot/qtiplot-0.7.ebuild | 45 ---- 7 files changed, 250 insertions(+), 54 deletions(-) delete mode 100644 sci-mathematics/qtiplot/files/digest-qtiplot-0.7 create mode 100644 sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3 create mode 100644 sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch create mode 100644 sci-mathematics/qtiplot/qtiplot-0.7.3.ebuild delete mode 100644 sci-mathematics/qtiplot/qtiplot-0.7.ebuild diff --git a/sci-mathematics/qtiplot/ChangeLog b/sci-mathematics/qtiplot/ChangeLog index 8868e7946288..99f524266b31 100644 --- a/sci-mathematics/qtiplot/ChangeLog +++ b/sci-mathematics/qtiplot/ChangeLog @@ -1,6 +1,13 @@ # 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.2 2005/10/23 15:02:38 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtiplot/ChangeLog,v 1.3 2005/11/29 21:10:03 cryos Exp $ + +*qtiplot-0.7.3 (29 Nov 2005) + + 29 Nov 2005; Marcus D. Hanwell + +files/qtiplot-0.7.3-qmake.patch, -qtiplot-0.7.ebuild, + +qtiplot-0.7.3.ebuild: + Version bump, closes bug 112952. *qtiplot-0.7 (23 Oct 2005) diff --git a/sci-mathematics/qtiplot/Manifest b/sci-mathematics/qtiplot/Manifest index 9ac707810d0f..1f68339ec070 100644 --- a/sci-mathematics/qtiplot/Manifest +++ b/sci-mathematics/qtiplot/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 9137e4cfbd339113203a1e6e24a1b5a0 ChangeLog 599 -MD5 0fb2c4631892f19ca2c9701415170d7a files/digest-qtiplot-0.7 60 +MD5 8d9a54f22e7abfa9a644165517f79804 ChangeLog 799 +MD5 5d9f95f51f7d2f4b6eb8722baf13f709 files/digest-qtiplot-0.7.3 62 +MD5 5d8eba869ecfe0dbeb485ba932ed801a files/qtiplot-0.7.3-qmake.patch 5604 MD5 be5373660391ac23dc1d97a654ca9e79 metadata.xml 604 -MD5 6dfdb8f5ea22b60828e3e4dd4894ff95 qtiplot-0.7.ebuild 1136 +MD5 bf66aaa24823269f627014a6563c06ed qtiplot-0.7.3.ebuild 1068 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDW6YrntT9W3vfTuoRAi1uAJ9B8823IB8xl/XvZpIdUstaTTZw+QCaAgwF -FQJe/TRacVNMlZ15AstssvY= -=zMmF +iD8DBQFDjMO2ntT9W3vfTuoRAgmuAJ9f7j8Tk8lXAHNrc2HsGQwX0X10LgCgl26e +IpvbRUW2zZyX9uTiwyQqwW0= +=cCdN -----END PGP SIGNATURE----- diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7 deleted file mode 100644 index 14b192147693..000000000000 --- a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 70b42b5699f2e8102528d1e67c11a7db qtiplot-0.7.zip 616783 diff --git a/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3 b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3 new file mode 100644 index 000000000000..95255f436432 --- /dev/null +++ b/sci-mathematics/qtiplot/files/digest-qtiplot-0.7.3 @@ -0,0 +1 @@ +MD5 395a1b5d89c5c8aeb8dcf5fd4bdba8fa qtiplot-0.7.3.zip 669068 diff --git a/sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch b/sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch new file mode 100644 index 000000000000..b6cc76d90a20 --- /dev/null +++ b/sci-mathematics/qtiplot/files/qtiplot-0.7.3-qmake.patch @@ -0,0 +1,192 @@ +--- 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/qtiplot-0.7.3.ebuild b/sci-mathematics/qtiplot/qtiplot-0.7.3.ebuild new file mode 100644 index 000000000000..a6012b27518e --- /dev/null +++ b/sci-mathematics/qtiplot/qtiplot-0.7.3.ebuild @@ -0,0 +1,41 @@ +# 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.3.ebuild,v 1.1 2005/11/29 21:10:03 cryos Exp $ + +inherit eutils 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} + 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 +} + +src_compile() { + /usr/qt/3/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-mathematics/qtiplot/qtiplot-0.7.ebuild b/sci-mathematics/qtiplot/qtiplot-0.7.ebuild deleted file mode 100644 index ecf58df2db88..000000000000 --- a/sci-mathematics/qtiplot/qtiplot-0.7.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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.ebuild,v 1.1 2005/10/23 15:02:38 cryos Exp $ - -inherit eutils - -IUSE="" -DESCRIPTION="Qt based clone of the Origin plotting package" - -MY_P=${P/_p/-} -SRC_URI="http://soft.proindependent.com/src/${MY_P}.zip" -HOMEPAGE="http://soft.proindependent.com/qtiplot.html" -S=${WORKDIR}/${A/.zip/} - -QTIPLOT_DIR=${S}/${A/.zip/} -QTIPLOT_PRO=${A/.zip}.pro - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="=x11-libs/qt-3* - >=x11-libs/qwt-4.2.0 - >=x11-libs/qwtplot3d-0.2.6 - >=sci-libs/gsl-1.6" - -src_unpack () { - unpack ${A} - cd ${QTIPLOT_DIR} - mv ${QTIPLOT_PRO} qtiplot.pro - sed -e 's/INCLUDEPATH.*//' -i qtiplot.pro - echo >> qtiplot.pro "INCLUDEPATH += /usr/include/qwt" - echo >> qtiplot.pro "INCLUDEPATH += /usr/include/qwtplot3d" -} - -src_compile () { - cd ${QTIPLOT_DIR} - qmake qtiplot.pro || die 'qmake failed.' - emake || die 'emake failed.' -} - -src_install() { - make_desktop_entry qtiplot qtiplot qtiplot Graphics - dobin qtiplot || die 'Binary installation failed.' -} -- 2.26.2