diff options
author | Markus Dittrich <markusle@gentoo.org> | 2008-08-26 03:07:37 +0000 |
---|---|---|
committer | Markus Dittrich <markusle@gentoo.org> | 2008-08-26 03:07:37 +0000 |
commit | e8b75e0a5258c426edc489e22e97f366c6e12510 (patch) | |
tree | a71f57bcfd42035581ab0a733ec8ae3d2e95aa47 /sci-visualization/qtiplot | |
parent | Version bump (diff) | |
download | gentoo-2-e8b75e0a5258c426edc489e22e97f366c6e12510.tar.gz gentoo-2-e8b75e0a5258c426edc489e22e97f366c6e12510.tar.bz2 gentoo-2-e8b75e0a5258c426edc489e22e97f366c6e12510.zip |
Version bump (fixes #233610) and removed old ebuilds.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)
Diffstat (limited to 'sci-visualization/qtiplot')
-rw-r--r-- | sci-visualization/qtiplot/ChangeLog | 14 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch | 109 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch | 114 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch | 34 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch | 79 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch | 32 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch | 89 | ||||
-rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch | 14 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.4.ebuild | 94 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild | 99 | ||||
-rw-r--r-- | sci-visualization/qtiplot/qtiplot-0.9.7.ebuild (renamed from sci-visualization/qtiplot/qtiplot-0.9.6.ebuild) | 43 |
11 files changed, 61 insertions, 660 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index 840c88dc2d53..5bebe70f18b2 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,18 @@ # 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.31 2008/08/25 22:43:50 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.32 2008/08/26 03:07:35 markusle Exp $ + +*qtiplot-0.9.7 (26 Aug 2008) + + 26 Aug 2008; Markus Dittrich <markusle@gentoo.org> + -files/qtiplot-0.9.2-systemlibs.patch, + -files/qtiplot-0.9.4-systemlibs.patch, + -files/qtiplot-0.9.5-fitplugins.patch, -files/qtiplot-0.9.5-profile.patch, + -files/qtiplot-0.9.6-fitplugins.patch, -files/qtiplot-0.9.6-profile.patch, + +files/qtiplot-0.9.7-gcc4.3.patch, -qtiplot-0.9.4.ebuild, + -qtiplot-0.9.5-r1.ebuild, -qtiplot-0.9.6.ebuild, +qtiplot-0.9.7.ebuild: + Version bump (fixes #233610) and removed old ebuilds. Thanks much to + Alexey Shvetsov <alexxyum@gmail.com> for his patches. 25 Aug 2008; Markus Dittrich <markusle@gentoo.org> qtiplot-0.9.6.2.ebuild: Added missing dependency on x11-libs/qt-assistant:4 (fixes bug #235618). diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch deleted file mode 100644 index 74f518ca66e8..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.2-systemlibs.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- qtiplot/qtiplot.pro.orig 2007-12-01 17:26:18.930878533 +0000 -+++ qtiplot/qtiplot.pro 2007-12-01 17:34:09.321684577 +0000 -@@ -35,12 +35,11 @@ - #!!! 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
-@@ -49,17 +48,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 += -lgsl -lgslcblas
-+unix:LIBS += -lorigin
-+unix:LIBS += -lz
-
- ##################### Windows ###############################################
-
-@@ -118,8 +119,8 @@ - ###################### DOCUMENTATION ########################################
-
- documentation.files += ../manual/html \
-- ../README.html \
-- ../gpl_licence.txt \
-+# ../README.html \
-+# ../gpl_licence.txt \
-
- ###################### HEADERS ##############################################
-
-@@ -368,8 +369,8 @@ - ################# Origin Import (liborigin) ###################
- ###############################################################
-
--HEADERS += ../3rdparty/liborigin/OPJFile.h
--SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-+#HEADERS += ../3rdparty/liborigin/OPJFile.h
-+#SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-
- ###############################################################
- ################# Restricted Module: FFT 2D ###################
---- fitPlugins/fitRational0/fitRational0.pro.orig 2007-12-01 17:34:26.038637222 +0000 -+++ fitPlugins/fitRational0/fitRational0.pro 2007-12-01 17:35:30.542313077 +0000 -@@ -12,12 +12,12 @@ - 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
-+#LIBS += ../../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-
- #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 2007-12-01 17:35:44.879130086 +0000 -+++ fitPlugins/fitRational1/fitRational1.pro 2007-12-01 17:36:19.221087122 +0000 -@@ -12,12 +12,12 @@ - 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
-+#LIBS += ../../3rdparty/gsl/lib/libgsl.a
-+#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-
- #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/files/qtiplot-0.9.4-systemlibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch deleted file mode 100644 index 514612309633..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.4-systemlibs.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- 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/files/qtiplot-0.9.5-fitplugins.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch deleted file mode 100644 index 5eb0bec52850..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.5-fitplugins.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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/files/qtiplot-0.9.5-profile.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch deleted file mode 100644 index efc660a08f4f..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.5-profile.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- qtiplot/qtiplot.pro.orig 2008-04-24 18:54:47.622675411 +0000 -+++ qtiplot/qtiplot.pro 2008-04-30 15:23:34.648191881 +0000 -@@ -20,7 +20,7 @@ - # Uncomment the following line if you want to perform a custom installation using
- # the *.path variables defined bellow.
- ######################################################################################
--#CONFIG += CustomInstall
-+CONFIG += CustomInstall
-
- CONFIG += release
- #CONFIG += debug
-@@ -30,12 +30,11 @@ - #!!! 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
-@@ -44,17 +43,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 ###############################################
-
-@@ -147,8 +148,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
-
-@@ -403,8 +403,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 #############################
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch deleted file mode 100644 index 64e54655df61..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.6-fitplugins.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro ---- qtiplot-0.9.6.orig/fitPlugins/fitRational0/fitRational0.pro 2007-10-29 05:44:06.000000000 +0600 -+++ qtiplot-0.9.6/fitPlugins/fitRational0/fitRational0.pro 2008-05-15 10:42:10.000000000 +0700 -@@ -13,10 +13,8 @@ -
- # 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
-diff -U2 -r qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro ---- qtiplot-0.9.6.orig/fitPlugins/fitRational1/fitRational1.pro 2007-10-29 05:44:06.000000000 +0600 -+++ qtiplot-0.9.6/fitPlugins/fitRational1/fitRational1.pro 2008-05-15 10:43:01.000000000 +0700 -@@ -13,10 +13,8 @@ -
- # 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
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch deleted file mode 100644 index 18b1a1babfe4..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.6-profile.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -r -U2 qtiplot-0.9.6.orig/qtiplot/qtiplot.pro qtiplot-0.9.6/qtiplot/qtiplot.pro ---- qtiplot-0.9.6.orig/qtiplot/qtiplot.pro 2008-05-13 17:22:46.000000000 +0700 -+++ qtiplot-0.9.6/qtiplot/qtiplot.pro 2008-05-19 05:59:59.000000000 +0700 -@@ -18,8 +18,8 @@ - # the *.path variables defined bellow.
- ######################################################################################
--#CONFIG += CustomInstall
-+CONFIG += CustomInstall
-
--#CONFIG += release
--CONFIG += debug
-+CONFIG += release
-+#CONFIG += debug
- win32: CONFIG += console
-
-@@ -28,10 +28,9 @@ - #############################################################################
-
--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 ###########################
-@@ -42,15 +41,17 @@ -
- # 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 ###############################################
-@@ -127,5 +128,5 @@ -
- #system(lupdate -verbose qtiplot.pro)
--#system(lrelease -verbose qtiplot.pro)
-+system(lrelease -verbose qtiplot.pro)
-
- translations.files += translations/qtiplot_de.qm \
-@@ -141,6 +142,5 @@ - ../manual/qtiplot-manual-en.pdf
-
--documentation.files += ../README.html \
-- ../gpl_licence.txt
-+documentation.files += ../README.html
-
- unix: man.files += ../qtiplot.1
-@@ -240,6 +240,6 @@ - ###############################################################
-
-- HEADERS += ../3rdparty/liborigin/OPJFile.h
-- SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-+# HEADERS += ../3rdparty/liborigin/OPJFile.h
-+# SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-
- ###############################################################
-@@ -474,5 +474,5 @@ - qti_wordlist.txt \
-
-- unix: pythonconfig.path = /usr/local/qtiplot
-+ unix: pythonconfig.path = /usr/share/qtiplot
- win32: pythonconfig.path = $$INSTALLBASE
- DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch new file mode 100644 index 000000000000..2b2d5126c833 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7-gcc4.3.patch @@ -0,0 +1,14 @@ +# patch needed for providing the proper includes needed for +# gcc-4.3 (08/25/2008) + +diff -Naur qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp +--- qtiplot-0.9.7/qtiplot/src/plot2D/ScaleEngine.cpp 2008-06-12 13:19:20.000000000 -0400 ++++ qtiplot-0.9.7.new/qtiplot/src/plot2D/ScaleEngine.cpp 2008-08-25 18:38:35.000000000 -0400 +@@ -27,6 +27,7 @@ + * * + ***************************************************************************/ + #include "ScaleEngine.h" ++#include <limits.h> + + QwtScaleTransformation* ScaleEngine::transformation() const + {
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild deleted file mode 100644 index 4780c8f5ead6..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.4.ebuild +++ /dev/null @@ -1,94 +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.4.ebuild,v 1.2 2008/04/29 14:55:52 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 ~ppc64 ~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="${CDEPEND} - 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 )" - -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 "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 -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild deleted file mode 100644 index 3ffc85daada1..000000000000 --- a/sci-visualization/qtiplot/qtiplot-0.9.5-r1.ebuild +++ /dev/null @@ -1,99 +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.5-r1.ebuild,v 1.1 2008/04/30 15:37:36 bicatali Exp $ - -EAPI="1" -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 ~ppc64 ~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="${CDEPEND} - 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 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-profile.patch - epatch "${FILESDIR}"/${P}-fitplugins.patch - - sed -i \ - -e '/manual/d'\ - -e '/3rd/d' \ - qtiplot.pro || die "sed qtiplot.pro failed" - sed -i \ - -e '/manual/d' \ - -e "s:doc/${PN}:doc/${PF}:" \ - qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed" - - if ! use python; then - sed -i \ - -e '/^SCRIPTING_LANGS += Python/d' \ - -e '/sipcmd/d' \ - qtiplot/qtiplot.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::" \ - qtiplot/qtiplot.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 - - if use doc; then - insinto /usr/share/doc/${PF}/html - doins -r "${WORKDIR}"/qtiplot-manual-en/* \ - || die "install manual failed" - fi - - if use python; then - insinto /etc - doins qtiplot/{qtiplotrc,qtiUtil}.py \ - || die "install python config failed" - fi -} diff --git a/sci-visualization/qtiplot/qtiplot-0.9.6.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.ebuild index 9f528c32a891..1c5305a8c19e 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.6.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.7.ebuild @@ -1,13 +1,13 @@ # 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.6.ebuild,v 1.2 2008/05/18 16:48:00 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.ebuild,v 1.1 2008/08/26 03:07:35 markusle Exp $ EAPI="1" -inherit eutils multilib qt4 +inherit eutils multilib qt4 fdo-mime 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 +SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2 doc? ( mirror://gentoo/${P}-manual-en.tar.bz2 )" LICENSE="GPL-2" @@ -22,6 +22,9 @@ done CDEPEND=">=x11-libs/qwt-5.1 >=x11-libs/qwtplot3d-0.2.7 + x11-libs/qt-gui:4 + x11-libs/qt-qt3support:4 + x11-libs/qt-assistant:4 >=dev-cpp/muParser-1.28 >=sci-libs/liborigin-20080225 !bindist? ( sci-libs/gsl ) @@ -37,19 +40,26 @@ RDEPEND="${CDEPEND} dev-python/pygsl sci-libs/scipy )" +QT4_BUILT_WITH_USE_CHECK="qt3support" + src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-profile.patch - epatch "${FILESDIR}"/${P}-fitplugins.patch + epatch "${FILESDIR}"/${PN}-0.9.6.2-pro.patch + epatch "${FILESDIR}"/${PN}-0.9.6.2-fitplugins.patch + epatch "${FILESDIR}"/${P}-gcc4.3.patch sed -i \ -e '/manual/d'\ -e '/3rd/d' \ qtiplot.pro || die "sed qtiplot.pro failed" + + python_version + sed -i \ -e '/manual/d' \ -e "s:doc/${PN}:doc/${PF}:" \ + -e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \ qtiplot/qtiplot.pro || die " sed for qtiplot/qtiplot.pro failed" if ! use python; then @@ -83,24 +93,39 @@ src_compile() { src_install() { emake INSTALL_ROOT="${D}" install || die 'emake install failed' rm -f "${D}"/usr/share/${PN}/translations/*.ts + use python && chmod -x "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/qti_wordlist.txt newicon qtiplot_logo.png qtiplot.png make_desktop_entry qtiplot QtiPlot qtiplot if use doc; then insinto /usr/share/doc/${PF}/html - doins -r "${WORKDIR}"/qtiplot-manual-en/* \ + doins -r "${WORKDIR}"/qtiplot-manual/* \ || die "install manual failed" rm -rf "${D}"/usr/share/doc/${PF}/html/*/.svn fi } pkg_postinst() { + fdo-mime_desktop_database_update + + if use python; then + python_version + python_mod_compile \ + /usr/$(get_libdir)/python${PYVER}/site-packages/qti{plotrc,Util}.py + fi + if use doc; then elog "On the first start, do Help -> Choose Help Folder" elog "and select /usr/share/doc/${PF}/html" - elog "Also do View -> Preferences, in the tab File Locations" - elog "set Python Configuration Files to /usr/share/${PN}" - elog "and Translations to /usr/share/${PN}/translations" + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + + if use python; then + python_version + python_mod_cleanup fi } |