diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2008-03-07 03:00:16 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-03-07 03:00:16 +0000 |
commit | 059fd898e1ef6fa0910d289dd76f13f3aa39ff8c (patch) | |
tree | cdb57b851c4426a406987dfa5568daea87497d53 /sci-visualization | |
parent | amd64 stabe - 211152 (diff) | |
download | gentoo-2-059fd898e1ef6fa0910d289dd76f13f3aa39ff8c.tar.gz gentoo-2-059fd898e1ef6fa0910d289dd76f13f3aa39ff8c.tar.bz2 gentoo-2-059fd898e1ef6fa0910d289dd76f13f3aa39ff8c.zip |
Version bump
(Portage version: 2.1.4.4)
Diffstat (limited to 'sci-visualization')
-rw-r--r-- | sci-visualization/qtiplot/ChangeLog | 10 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch | 11 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.3-systemlibs.patch | 127 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.2.ebuild | 4 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.3.ebuild | 97 |
5 files changed, 246 insertions, 3 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index b6a3f6cc99e0..8ea8b62e1b4f 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-visualization/qtiplot # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.16 2008/02/13 14:33:59 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.17 2008/03/07 03:00:16 bicatali Exp $ + +*qtiplot-0.9.3 (07 Mar 2008) + + 07 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> + +files/qtiplot-0.9.3-homepage.patch, + +files/qtiplot-0.9.3-systemlibs.patch, qtiplot-0.9.2.ebuild, + +qtiplot-0.9.3.ebuild: + Version bump 13 Feb 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.7.7.ebuild, qtiplot-0.8.5.ebuild, qtiplot-0.9.2.ebuild, qtiplot-0.9.2-r1.ebuild: diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch new file mode 100644 index 000000000000..12a9ebd1288e --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.3-homepage.patch @@ -0,0 +1,11 @@ +--- qtiplot/src/main.cpp.orig ++++ qtiplot/src/main.cpp +@@ -45,7 +45,7 @@ + <br> + + The QtiPlot web page can be found at<br> +- <a href="http://soft.proindependent.com/qtiPlot.html">http://soft.proindependent.com/qtiPlot.html</a><br> ++ <a href="http://soft.proindependent.com/qtiplot.html">http://soft.proindependent.com/qtiplot.html</a><br> + + \section libs QtiPlot uses the following libraries: + <a href="http://www.trolltech.com/products/qt/index.html">Qt</a>, diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.3-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.3-systemlibs.patch new file mode 100644 index 000000000000..ef09eb057a8f --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.3-systemlibs.patch @@ -0,0 +1,127 @@ +--- qtiplot/qtiplot.pro.orig 2008-03-06 15:02:08.000000000 +0000 ++++ qtiplot/qtiplot.pro 2008-03-06 21:57:33.000000000 +0000 +@@ -16,8 +16,8 @@ + # comment the following lines if you haven't subscribed for a QtiPlot binaries maintenance contract
+ #RESTRICTED_MODULES += EMF
+
+-#CONFIG += release
+-CONFIG += debug
++CONFIG += release
++#CONFIG += debug
+ #win32: CONFIG += console
+
+ # what to install and where
+@@ -45,12 +45,12 @@ + #!!! Warning: You must modify these paths according to your computer settings
+ #############################################################################
+
+-INCLUDEPATH += ../3rdparty/muparser/include
+-INCLUDEPATH += ../3rdparty/qwtplot3d/include
+-INCLUDEPATH += ../3rdparty/qwt/src
+-INCLUDEPATH += ../3rdparty/liborigin
+-INCLUDEPATH += ../3rdparty/gsl/include
+-INCLUDEPATH += ../3rdparty/zlib123/include
++INCLUDEPATH += /usr/include/muparser
++INCLUDEPATH += /usr/include/qwtplot3d
++INCLUDEPATH += /usr/include/qwt5
++INCLUDEPATH += /usr/include/liborigin
++INCLUDEPATH += /usr/include/gsl
++ +
+ ##################### 3rd PARTY LIBRARIES SECTION ###########################
+ #!!! Warning: You must modify these paths according to your computer settings
+@@ -59,17 +59,19 @@ + ##################### Linux (Mac OS X) ######################################
+
+ # statically link against libraries in 3rdparty
+-unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
+-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+-unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
+-unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
++#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
++#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
++#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
++#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
++#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
+
+ # dynamically link against dependencies if they are installed system-wide
+-#unix:LIBS += -lmuparser
+-#unix:LIBS += -lqwtplot3d
+-#unix:LIBS += -lqwt
+-#unix:LIBS += -lgsl -lgslcblas
++unix:LIBS += -lmuparser
++unix:LIBS += -lqwtplot3d
++unix:LIBS += -lqwt
++unix:LIBS += $$system(pkg-config --libs gsl)
++unix:LIBS += -lorigin
++unix:LIBS += -lz
+
+ ##################### Windows ###############################################
+
+@@ -124,8 +126,8 @@ + translations/qtiplot_ja.ts \
+ translations/qtiplot_sv.ts
+
+-#system(lupdate -verbose qtiplot.pro)
+-#system(lrelease -verbose qtiplot.pro)
++system(lupdate -verbose qtiplot.pro)
++system(lrelease -verbose qtiplot.pro)
+
+ translations.files += translations/qtiplot_de.qm \
+ translations/qtiplot_es.qm \
+@@ -139,8 +141,7 @@ + manual.files += ../manual/html \
+ ../manual/qtiplot-manual-en.pdf
+
+-documentation.files += ../README.html \
+- ../gpl_licence.txt
++documentation.files += ../README.html
+
+ unix: man.files += ../qtiplot.1
+
+@@ -395,8 +396,8 @@ + ################# Origin Import (liborigin) ###################
+ ###############################################################
+
+-HEADERS += ../3rdparty/liborigin/OPJFile.h
+-SOURCES += ../3rdparty/liborigin/OPJFile.cpp
++#HEADERS += ../3rdparty/liborigin/OPJFile.h
++#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
+
+ ###############################################################
+ ################# Module: Plot 2D #############################
+--- fitPlugins/fitRational0/fitRational0.pro.orig 2008-03-06 15:11:53.000000000 +0000 ++++ fitPlugins/fitRational0/fitRational0.pro 2008-03-06 15:16:28.000000000 +0000 +@@ -12,12 +12,10 @@ + DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++INCLUDEPATH += /usr/include/gsl
+
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += $$system(pkg-config --libs gsl)
+
+ target.path=/usr/lib$${libsuff}/qtiplot/plugins
+ INSTALLS += target
+--- fitPlugins/fitRational1/fitRational1.pro.orig 2008-03-06 15:13:35.000000000 +0000 ++++ fitPlugins/fitRational1/fitRational1.pro 2008-03-06 15:16:52.000000000 +0000 +@@ -12,12 +12,10 @@ + DESTDIR = ../
+
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
++INCLUDEPATH += /usr/include/gsl
+
+ #dynamically link against GSL installed system-wide
+-#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
++unix:LIBS += $$system(pkg-config --libs gsl)
+
+ target.path=/usr/lib$${libsuff}/qtiplot/plugins
+ INSTALLS += target
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild index c24cbffd182a..fc8a56970f2e 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild,v 1.3 2008/02/13 14:33:59 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild,v 1.4 2008/03/07 03:00:16 bicatali Exp $ inherit eutils multilib qt4 python @@ -22,7 +22,7 @@ done CDEPEND=">=x11-libs/qwt-5.0.2 >=x11-libs/qwtplot3d-0.2.7 >=dev-cpp/muParser-1.28 - >=sci-libs/liborigin-20071119 + <sci-libs/liborigin-20080225 !bindist? ( sci-libs/gsl ) bindist? ( <sci-libs/gsl-1.10 )" diff --git a/sci-visualization/qtiplot/qtiplot-0.9.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.3.ebuild new file mode 100644 index 000000000000..aeed0ddf9e51 --- /dev/null +++ b/sci-visualization/qtiplot/qtiplot-0.9.3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.3.ebuild,v 1.1 2008/03/07 03:00:16 bicatali Exp $ + +inherit eutils multilib qt4 + +DESCRIPTION="Qt based clone of the Origin plotting package" +HOMEPAGE="http://soft.proindependent.com/qtiplot.html" +SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2 + doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="python doc bindist" + +LANGS="de es fr ja ru sv" +for l in ${LANGS}; do + IUSE="${IUSE} linguas_${l}" +done + +CDEPEND=">=x11-libs/qwt-5.0.2 + >=x11-libs/qwtplot3d-0.2.7 + >=dev-cpp/muParser-1.28 + >=sci-libs/liborigin-20080225 + !bindist? ( sci-libs/gsl ) + bindist? ( <sci-libs/gsl-1.10 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + python? ( >=dev-python/sip-4.5.2 )" + +RDEPEND="${CDEPEND} + python? ( >=dev-lang/python-2.5 + dev-python/PyQt4 + dev-python/pygsl + sci-libs/scipy )" + +QT4_BUILT_WITH_USE_CHECK="qt3support" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-systemlibs.patch + epatch "${FILESDIR}"/${P}-homepage.patch + + # docs: remove default doc building + sed -i -e '/manual/d' qtiplot.pro qtiplot/qtiplot.pro \ + || die "die sed for docs failed" + sed -i -e "s:doc/${PN}:doc/${PF}:" qtiplot/qtiplot.pro + + if ! use python; then + sed -i \ + -e '/^SCRIPTING_LANGS += Python/d' \ + -e '/sipcmd/d' \ + ${PN}/${PN}.pro || die "sed for python option failed" + fi + + # the lib$$suff did not work in the fitRational*.pro files + sed -i \ + -e "s|/usr/lib\$\${libsuff}|/usr/$(get_libdir)|g" \ + fitPlugins/fit*/fitRational*.pro \ + || die "sed fitRational* failed" + + for l in ${LANGS}; do + if ! use linguas_${l}; then + sed -i \ + -e "s:translations/qtiplot_${l}.ts::" \ + ${PN}/${PN}.pro || die + fi + done +} + +src_compile() { + eqmake4 || die "eqmake4 failed" + emake || die "emake failed" +} + +src_install() { + emake INSTALL_ROOT="${D}" install || die 'emake install failed' + + newicon qtiplot_logo.png qtiplot.png + make_desktop_entry qtiplot QtiPlot qtiplot + doman qtiplot.1 || die "doman failed" + + if use doc; then + insinto /usr/share/doc/${PF} + doins -r "${WORKDIR}"/qtiplot-manual-en \ + || die "install manual failed" + fi + + if use python; then + cd "${S}"/${PN} + insinto /etc + doins qtiplotrc.py qtiUtil.py || die + fi +} |