if ! is_depends_enabled $SPELL pyqt4; then
sed -i '/^SCRIPT.*Python/d' $SOURCE_DIRECTORY/qtiplot/qtiplot.pro
diff --git a/science/qtiplot/build.conf b/science/qtiplot/build.conf
new file mode 100644
index 0000000..6778a40
--- /dev/null
+++ b/science/qtiplot/build.conf
@@ -0,0 +1,10 @@
+ZLIB_INCLUDEPATH = /usr/include
+MUPARSER_INCLUDEPATH = /usr/include
+QWT_INCLUDEPATH = /usr/include
+QWT3D_INCLUDEPATH = /usr/include/qwtplot3d
+GSL_INCLUDEPATH = /usr/include/gsl
+
+MUPARSER_LIBS = -lmuparser
+QWT_LIBS = -lqwt
+QWT3D_LIBS = -lqwtplot3d
+GSL_LIBS = -lgsl -lgslcblas
diff --git a/science/qtiplot/conf.patch b/science/qtiplot/conf.patch
deleted file mode 100644
index 95257e2..0000000
--- a/science/qtiplot/conf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- qtiplot/qtiplot.pro.orig 2007-07-12 17:42:26.000000000 +0200
-+++ qtiplot/qtiplot.pro 2007-07-12 17:45:40.000000000 +0200
-@@ -26,11 +26,12 @@
-
#############################################################################
-
- INCLUDEPATH += ../3rdparty/muParser
--INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
- INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
- INCLUDEPATH += ../3rdparty/zlib123/include
-+INCLUDEPATH += /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt
-+INCLUDEPATH += /usr/include/gsl
-+
-
- ##################### 3rd PARTY LIBRARIES SECTION
###########################
- #!!! Warning: You must modify these paths according to your computer
settings
-@@ -43,18 +44,14 @@
- unix:LIBS += -L /usr/lib$${libsuff}
-
- # statically link against Qwt(3D) in 3rdparty
--unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
- # dynamically link against Qwt(3D) installed system-wide
- # WARNING: make sure they are compiled against Qt4
--#unix:LIBS += -lqwtplot3d
--#unix:LIBS += -lqwt
-+unix:LIBS += -lqwtplot3d
-+unix:LIBS += -lqwt
-
- # statically link against GSL in 3rdparty
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -lgsl -lgslcblas
-+unix:LIBS += -lgsl -lgslcblas
-
- ##################### Windows
###############################################
-
diff --git a/science/qtoctave/BUILD b/science/qtoctave/BUILD
index 961b5c2..2113434 100755
--- a/science/qtoctave/BUILD
+++ b/science/qtoctave/BUILD
@@ -1,6 +1 @@
-cmake "-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_ROOT}/usr" \
- "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CXXFLAGS}" \
- "-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF" \
- "-DQT_QMAKE_EXECUTABLE:FILEPATH=${TRACK_ROOT}/usr/bin/qt4/qmake" \
- . &&
-default_build_make
+qt4_cmake_build
diff --git a/science/qtoctave/DETAILS b/science/qtoctave/DETAILS
index e29d90b..1fc1c15 100755
--- a/science/qtoctave/DETAILS
+++ b/science/qtoctave/DETAILS
@@ -1,8 +1,8 @@
SPELL=qtoctave
- VERSION=0.8.2
+ VERSION=0.10.1
+
SOURCE_HASH=sha512:b91e59ba9f16ebc2da9f2d606d0e7440d06e13cd6670fb7aa896eb30ad43835df74b7ba5127f1e9095c88de2468c6d2b2c174f1c5b1638678968bf81647b665f
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://forja.rediris.es/frs/download.php/1383/${SOURCE}
-
SOURCE_HASH=sha512:6a0e616e51f6b5f8e2659201b55f97e7c5aa2c59624bf6aca278a66ea7bf374558451b6883bad5f863b7522591713dcb8042921a2136b23230272f05a08ef85b
+ SOURCE_URL[0]=http://forja.rediris.es/frs/download.php/2054/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://forja.rediris.es/projects/csl-qtoctave"
LICENSE[0]=GPL
diff --git a/science/qtoctave/HISTORY b/science/qtoctave/HISTORY
index 068fecf..739ca59 100644
--- a/science/qtoctave/HISTORY
+++ b/science/qtoctave/HISTORY
@@ -1,3 +1,7 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.1
+ * BUILD: use qt4_cmake_build
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* qtoctave.desktop: added spanish comment
diff --git a/x11-toolkits/qt-embedded/HISTORY
b/x11-toolkits/qt-embedded/HISTORY
index 0ad87af..576231a 100644
--- a/x11-toolkits/qt-embedded/HISTORY
+++ b/x11-toolkits/qt-embedded/HISTORY
@@ -1,4 +1,4 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0
PATCHLEVEL=9999
spell deprecated
diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD
index 7255991..eec3de4 100755
--- a/x11-toolkits/qwt5/BUILD
+++ b/x11-toolkits/qwt5/BUILD
@@ -1,3 +1 @@
-export QTDIR=${INSTALL_ROOT}/usr &&
-$TRACK_ROOT/usr/bin/qt4/qmake &&
-make
+qt4_build
diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS
index 706b929..f1bde7b 100755
--- a/x11-toolkits/qwt5/DETAILS
+++ b/x11-toolkits/qwt5/DETAILS
@@ -1,9 +1,9 @@
SPELL=qwt5
- VERSION=6.0.1
+ VERSION=6.1.0
+
SOURCE_HASH=sha512:5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc
SOURCE=qwt-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/qwt/${SOURCE}
-
SOURCE_HASH=sha512:36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610
WEB_SITE=http://qwt.sourceforge.net
ENTERED=20061003
LICENSE[0]=http://qwt.sourceforge.net/qwtlicense.html
diff --git a/x11-toolkits/qwt5/HISTORY b/x11-toolkits/qwt5/HISTORY
index f623d90..32888a0 100644
--- a/x11-toolkits/qwt5/HISTORY
+++ b/x11-toolkits/qwt5/HISTORY
@@ -1,3 +1,8 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.1.0
+ * BUILD: use qt4_build
+ * PRE_BUILD: simplify
+
2012-08-15 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, BUILD, DEPENDS, PRE_BUILD: update to qt4-only 6.0.1 ...
qwt5
name is suboptimal now.
diff --git a/x11-toolkits/qwt5/PRE_BUILD b/x11-toolkits/qwt5/PRE_BUILD
index 9ac9b76..31656b1 100755
--- a/x11-toolkits/qwt5/PRE_BUILD
+++ b/x11-toolkits/qwt5/PRE_BUILD
@@ -2,12 +2,8 @@ default_pre_build &&
# Those messy droppings of this QT4 lib are annoying!
# Trying to get things into some system-like order.
+cd $SOURCE_DIRECTORY &&
+sed -i -e "/local/D;/QWT_INSTALL_PREFIX *=/s|=.*$|= $INSTALL_ROOT/usr|" \
+ -e "s|/doc|/share/doc|;/features/s|/|/share/qt4/mkspecs/|" \
+ qwtconfig.pri