diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2008-03-28 18:30:45 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2008-03-28 18:30:45 +0000 |
commit | c4f264f58fcfc0308442d414d22175b14e127b7f (patch) | |
tree | 4a5680bcb4a15797ac8f52c17cd2ef9552d31554 /sci-visualization | |
parent | Version bump. (diff) | |
download | gentoo-2-c4f264f58fcfc0308442d414d22175b14e127b7f.tar.gz gentoo-2-c4f264f58fcfc0308442d414d22175b14e127b7f.tar.bz2 gentoo-2-c4f264f58fcfc0308442d414d22175b14e127b7f.zip |
Version bump. Thanks Dieter Ries for the update (closing bug #215192). Removed older versions.
(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.4-systemlibs.patch | 114 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.2.ebuild | 101 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.4.ebuild (renamed from sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild) | 51 |
4 files changed, 146 insertions, 130 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index 1fa8fb927dd8..5f2c08823767 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.19 2008/03/15 11:16:35 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.20 2008/03/28 18:30:44 bicatali Exp $ + +*qtiplot-0.9.4 (28 Mar 2008) + + 28 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> + +files/qtiplot-0.9.4-systemlibs.patch, -qtiplot-0.9.2.ebuild, + -qtiplot-0.9.2-r1.ebuild, +qtiplot-0.9.4.ebuild: + Version bump. Thanks Dieter Ries for the update (closing bug #215192). + Removed older versions. 15 Mar 2008; Markus Rothe <corsair@gentoo.org> qtiplot-0.9.3.ebuild: Added ~ppc64 diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch new file mode 100644 index 000000000000..514612309633 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch @@ -0,0 +1,114 @@ +--- qtiplot/qtiplot.pro.orig 2008-03-06 15:02:08.000000000 +0000 ++++ qtiplot/qtiplot.pro 2008-03-06 21:57:33.000000000 +0000 +@@ -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 ###############################################
+
+@@ -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
+--- qtiplot.pro.orig 2008-03-28 15:58:25.000000000 +0000 ++++ qtiplot.pro 2008-03-28 15:58:41.000000000 +0000 +@@ -2,6 +2,5 @@ +
+ SUBDIRS = fitPlugins/fitRational0\
+ fitPlugins/fitRational1\
+- 3rdparty/qwt\
+ manual\
+ qtiplot diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild deleted file mode 100644 index fc8a56970f2e..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# 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.4 2008/03/07 03:00:16 bicatali Exp $ - -inherit eutils multilib qt4 python - -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" - -LANGUAGES="de es fr ja ru sv" -for l in ${LANGUAGES}; 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 - - for l in ${LANGUAGES}; do - use linguas_${l} || \ - sed -i -e "s:translations/qtiplot_${l}.ts::" ${PN}/${PN}.pro - done - use python || sed -i -e 's/^\(SCRIPTING_LANGS += Python\)/#\1/' ${PN}.pro - - # the lib$$suff did not work in the fitRational*.pro files - sed -i \ - -e "s|/usr/lib\$\${libsuff}|$(get_libdir)|g" \ - fitPlugins/fit*/fitRational*.pro \ - || die "sed fitRational* failed" -} - -src_compile() { - eqmake4 ${PN}.pro || 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 Science - doman qtiplot.1 - - if use doc; then - insinto "/usr/share/doc/${PF}" - doins -r "${WORKDIR}"/manual-en - fi - - for l in ${LANGUAGES}; do - if use linguas_${l}; then - insinto /usr/share/${PN}/translations - doins ${PN}/translations/*${l}*.qm - fi - done - - if use python; then - cd "${S}"/${PN} - insinto /etc - doins qtiplotrc.py - python_version - insinto /usr/$(get_libdir)/python${PYVER}/site-packages/ - doins qtiUtil.py - fi -} - -pkg_postinst() { - use python && python_mod_optimize \ - "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil -} - -pkg_postrm() { - use python && python_mod_cleanup \ - "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild index 365313f00ffc..e4e797599463 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.2-r1.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild @@ -1,8 +1,8 @@ # 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-r1.ebuild,v 1.2 2008/02/13 14:33:59 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild,v 1.1 2008/03/28 18:30:44 bicatali Exp $ -inherit eutils multilib qt4 python +inherit eutils multilib qt4 DESCRIPTION="Qt based clone of the Origin plotting package" HOMEPAGE="http://soft.proindependent.com/qtiplot.html" @@ -11,7 +11,7 @@ SRC_URI="http://soft.proindependent.com/src/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="python doc bindist" LANGS="de es fr ja ru sv" @@ -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 )" @@ -42,6 +42,12 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-systemlibs.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' \ @@ -54,10 +60,18 @@ src_unpack() { -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 ${PN}.pro || die "eqmake4 failed" + eqmake4 || die "eqmake4 failed" emake || die "emake failed" } @@ -65,37 +79,18 @@ src_install() { emake INSTALL_ROOT="${D}" install || die 'emake install failed' newicon qtiplot_logo.png qtiplot.png - make_desktop_entry qtiplot QtiPlot qtiplot "Education;Science;Math;Qt" + make_desktop_entry qtiplot QtiPlot qtiplot doman qtiplot.1 || die "doman failed" if use doc; then insinto /usr/share/doc/${PF} - doins -r "${WORKDIR}"/manual-en || die "install manual failed" + doins -r "${WORKDIR}"/qtiplot-manual-en \ + || die "install manual failed" fi - for l in ${LANGS}; do - if use linguas_${l}; then - insinto /usr/share/${PN}/translations - doins ${PN}/translations/*${l}*.qm || die "install ${l} failed" - fi - done - if use python; then cd "${S}"/${PN} insinto /etc - doins qtiplotrc.py || die - python_version - insinto /usr/$(get_libdir)/python${PYVER}/site-packages - doins qtiUtil.py || die + doins qtiplotrc.py qtiUtil.py || die fi } - -pkg_postinst() { - use python && python_mod_optimize \ - "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil.py -} - -pkg_postrm() { - use python && python_mod_cleanup \ - "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/qtiUtil* -} |