14 files changed, 0 insertions, 561 deletions
diff --git a/academic/QtiPlot/QtiPlot.SlackBuild b/academic/QtiPlot/QtiPlot.SlackBuild
deleted file mode 100644
index 9457c38d8e..0000000000
--- a/academic/QtiPlot/QtiPlot.SlackBuild
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for QtiPlot
-
-# Copyright 2011-2016 Petar Petrov slackalaxy@gmail.com
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=QtiPlot
-VERSION=${VERSION:-0.9.8.9}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-SRCNAM=$(echo $PRGNAM | tr A-Z a-z)
-
-QTEXENGINE=QTeXEngine-0.3-opensource
-UNOFPLUGIN=importOPJ-20111106
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-  QMAKESPEC="linux-g++"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-  QMAKESPEC="linux-g++"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-  QMAKESPEC="linux-g++-64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  QMAKESPEC="linux-g++"
-fi
-
-# Define these here, as numbers change between Slackware releases. The
-# folder names are used for some documentation path fixes, needed to
-# generate the html manual later on.
-DOCBOOK=dsssl-stylesheets-1.79
-CHUNK=xsl-stylesheets-1.78.1
-DOCBOOKX=xml-dtd-4.5
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-unzip $CWD/$QTEXENGINE.zip
-tar xvf $CWD/$UNOFPLUGIN.tar.gz
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Copy QTeXEngine and importOPJ to their locations to be built later
-cp -a QTeXEngine $SRCNAM-$VERSION/3rdparty
-cp -a $UNOFPLUGIN/qtiplot/src/plugins $SRCNAM-$VERSION/qtiplot/src
-cp -a $UNOFPLUGIN/qtiplot/importOPJ.pro $SRCNAM-$VERSION/qtiplot
-cd $SRCNAM-$VERSION
-
-# Patches for recent libpng, sip, gsl, etc
-# thanks to slack_jack, Raveriux, ponce, Arch and Gentoo
-patch -p0 -d 3rdparty/qwtplot3d < $CWD/qwtplot3d-libpng15.patch
-patch -p1 < $CWD/sip-4.15.patch
-patch -p1 < $CWD/qtiplot-0.9.8.9-private.patch
-patch -p1 < $CWD/pyqt-4.11.patch
-patch -p1 < $CWD/qtiplot-0.9.8.9_gsl-2.patch
-
-# Use the custom build.conf
-cp $CWD/build.conf.slack build.conf
-
-# Make qtiplot.pro aware of the unofficial importOPJ plugin. Thanks to
-# the author of the plugin, Stephan Zevenhuizen. For more info visit
-# this site: http://www.staff.science.uu.nl/~zeven101/qtiplot.html
-patch -p1 -i $CWD/importOPJ.patch
-sed -i "143 a Q_IMPORT_PLUGIN(FreeSoftwareQtiPlotImportOPJ);" qtiplot/src/core/main.cpp
-
-# Fix qwtplot3d
-sed -i "10 a #include <GL/glu.h>" 3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
-
-# Make a few path fixes to qtiplot.pro
-sed -i "s:/usr/local:/usr/share:" qtiplot/qtiplot.pro
-sed -i "s:/share/man:/man:" qtiplot/qtiplot.pro
-sed -i "s:/share/doc/qtiplot:/doc/$PRGNAM-$VERSION:" qtiplot/qtiplot.pro
-
-# Point to the right places of qt-assistant-compat, libreoffice (when
-# installed), latex, java, the QtiPlot html manual and fitPlugins
-sed -i "s:<QAssistantClient>:<QtAssistant/qassistantclient.h>:" qtiplot/src/core/ApplicationWindow.cpp
-sed -i "s:/usr/bin/soffice:/usr/bin/libreoffice:" qtiplot/src/core/ApplicationWindow.cpp
-sed -i "s:/usr/bin/latex:/usr/share/texmf/bin/latex:" qtiplot/src/core/ApplicationWindow.cpp
-sed -i "s:/usr/bin/java:/usr/lib${LIBDIRSUFFIX}/java/bin/java:" qtiplot/src/core/ApplicationWindow.cpp
-sed -i "s:/index.html:/html/index.html:" qtiplot/src/core/ApplicationWindow.cpp
-sed -i "s:/local/qtiplot/fitPlugins:/lib${LIBDIRSUFFIX}/qtiplot/plugins:" qtiplot/src/core/ApplicationWindow.cpp
-
-# Path fixes, needed to generate the html manual
-sed -i "s:stylesheet/dsssl/modular:${DOCBOOK}:" manual/qtiplot.dsl
-sed -i "s:stylesheet/nwalsh:${CHUNK}:" manual/qtiplot_html.xsl
-sed -i "s:schema/dtd/4.4:${DOCBOOKX}:" manual/docbook-en/index.docbook
-
-# Build QtiPlot's qwt
-cd 3rdparty/qwt
-qmake
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1
-
-# Build QtiPlot's qwtplot3d
-cd ../qwtplot3d
-qmake
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1
-
-# Build QTeXEngine
-cd ../QTeXEngine
-qmake
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1
-
-# Build importOPJ
-cd ../../qtiplot
-qmake importOPJ.pro
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1
-
-# Make the html manual. If you want to generate the handbook as a PDF,
-# change "web" to "en" below and make sure you have installed dblatex.
-cd ../manual
-make -j1 web
-
-# Build QtiPlot
-cd ../qtiplot
-qmake qtiplot.pro "QMAKESPEC=$QMAKESPEC"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1 "QMAKESPEC=$QMAKESPEC"
-make -j1 install INSTALL_ROOT=$PKG
-
-# Generate translations and copy them to their proper place
-lrelease qtiplot.pro
-mkdir -p $PKG/usr/share/qtiplot/translations
-cp translations/*.qm $PKG/usr/share/qtiplot/translations
-
-# Copy some python examples
-mkdir -p $PKG/usr/share/qtiplot/python-examples
-cp examples/python/* $PKG/usr/share/qtiplot/python-examples
-
-# Build fitPlugins
-cd ../fitPlugins
-qmake "QMAKESPEC=$QMAKESPEC"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make -j1 "QMAKESPEC=$QMAKESPEC"
-make -j1 install INSTALL_ROOT=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-# Menu item, icon and mime types. The .xml is from Arch
-mkdir -p $PKG/usr/share/{pixmaps,applications,mime/packages}
-cp qtiplot_logo.png $PKG/usr/share/pixmaps/qtiplot.png
-cp $CWD/qtiplot.desktop $PKG/usr/share/applications
-cp $CWD/qtiplot.xml $PKG/usr/share/mime/packages
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README.html gpl_licence.txt qtiplot.css qtiplot_logo.png \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/build.conf.slack > $PKG/usr/doc/$PRGNAM-$VERSION/build.conf.slack
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/academic/QtiPlot/QtiPlot.info b/academic/QtiPlot/QtiPlot.info
deleted file mode 100644
index dcbffe5315..0000000000
--- a/academic/QtiPlot/QtiPlot.info
+++ /dev/null
@@ -1,14 +0,0 @@
-PRGNAM="QtiPlot"
-VERSION="0.9.8.9"
-HOMEPAGE="https://www.qtiplot.com/"
-DOWNLOAD="http://sourceforge.net/projects/qtiplot.berlios/files/qtiplot-0.9.8.9.tar.bz2 \
-        http://sourceforge.net/projects/qtiplot.berlios/files/QTeXEngine-0.3-opensource.zip \
-	http://sourceforge.net/projects/sboppetrov/files/QtiPlot/importOPJ-20111106.tar.gz"
-MD5SUM="652096a365851da3b5f6fefdcbe2aaec \
-	d1b234623770ec6209b14d1b5137f2f1 \
-	6f6925beb9e27f2ea0fbd01f23da548a"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="alglib muParser qt-assistant-compat tamu_anova"
-MAINTAINER="Petar Petrov"
-EMAIL="slackalaxy@gmail.com"
diff --git a/academic/QtiPlot/README b/academic/QtiPlot/README
deleted file mode 100644
index 950c7a7f05..0000000000
--- a/academic/QtiPlot/README
+++ /dev/null
@@ -1,32 +0,0 @@
-QtiPlot is a program for two- and three-dimensional graphical 
-presentation of data sets and for data analysis. Plots can be produced
-from data sets stored in tables or from analytical functions. QtiPlot 
-offers a complete alternative solution to software like Origin, 
-SigmaPlot, SPSS, Regressi or Igor Pro. QtiPlot is used for teaching as
-well as for complex data analysis and visualisation in companies, high
-schools, universities and reseach institutes all over the world.
-
-Features:
-
-- Fully Python scriptable
-- OpenGL based 3D plotting
-- Publication quality plots and easy export to various image formats 
-  (EMF, EPS, PS, PDF, SVG, BMP, JPG, PNG, TIFF, etc ...)
-- Easy integration with LaTeX typesetting system
-- Powerful and versatile spreadsheets with column-logic calculations 
-  and easy import/export of multiple files
-- One-click access to extensive built-in data analysis routines
-- Advanced statistical analysis: Student's t-Test, ANOVA, chi-square 
-  test for variance, normality test (Shapiro-Wilk)
-- Linear and nonlinear curve fitting with weighting and estimation of 
-  statistical errors of the fit-parameters
-- Multi-peak fitting
-- Image analysis tools
-- Templates support: all settings for plots, tables and matrices can 
-  be saved and restored later on for a fast editing process
-- Project files based on folders, a powerful project explorer with 
-  built-in drag and drop and searching facilities
-
-QtiPlot comes with its own, slightly modified versions of qwt and
-qwtplot3d, while the script additionally builds in QTeXEngine and the
-unofficial importOPJ plugin.
diff --git a/academic/QtiPlot/build.conf.slack b/academic/QtiPlot/build.conf.slack
deleted file mode 100644
index 22ac622871..0000000000
--- a/academic/QtiPlot/build.conf.slack
+++ /dev/null
@@ -1,75 +0,0 @@
-isEmpty( QTI_ROOT ) {
-  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-}
-
-# System specific configuration
-SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib${LIBDIRSUFFIX} -lz -lGLU
-
-# zlib (http://www.zlib.net/)
-#ZLIB_INCLUDEPATH = $$QTI_ROOT/3rdparty/zlib/
-ZLIB_INCLUDEPATH =
-
-
-# muParser (http://muparser.sourceforge.net/)
-MUPARSER_INCLUDEPATH =
-MUPARSER_LIBS = -lmuparser
-
-# GNU Sientific Library (http://www.gnu.org/software/gsl/)
-GSL_INCLUDEPATH = 
-GSL_LIBS = -lgsl -lgslcblas
-
-# QWT - use local copy till upstream catches up
-# (http://qwt.sourceforge.net/index.html)
-QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-
-# QwtPlot3D - use local copy till upstream catches up
-# (http://qwtplot3d.sourceforge.net/)
-QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
-QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-
-# libpng
-LIBPNG_LIBS = -lpng
-
-# QTeXEngine (http://soft.proindependent.com/qtexengine/)
-TEX_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/QTeXEngine/src
-TEX_ENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a
-
-# ALGLIB (http://www.alglib.net/)
-ALGLIB_INCLUDEPATH = /usr/include/libalglib
-ALGLIB_LIBS = -lalglib
-
-# TAMUANOVA (http://www.stat.tamu.edu/~aredd/tamuanova/)
-TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
-TAMUANOVA_LIBS = -ltamuanova
-
-# the python interpreter to use
-PYTHON = python
-
-# Qt tools - allows to use specific versions
-LUPDATE = lupdate
-LRELEASE = lrelease
-
-# Target specific configuration: configure Qtiplot itself
-contains( TARGET, qtiplot ) {
-# building without muParser doesn't work yet
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-# a console displaying output of scripts
-DEFINES         += SCRIPTING_CONSOLE
-
-# Uncomment the following line if you want to perform a custom 
-# installation using the *.path variables defined in ./qtiplot.pro.
-CONFIG          += CustomInstall
-
-# Uncomment the following line if you want to build QtiPlot as a browser plugin (not working on Internet Explorer).
-#CONFIG          += BrowserPlugin
-  
-#CONFIG          += release
-#CONFIG          += debug
-  
-# Uncomment the following line if you want to link statically against Qt.
-#CONFIG           += StaticBuild
-}
diff --git a/academic/QtiPlot/doinst.sh b/academic/QtiPlot/doinst.sh
deleted file mode 100644
index 9a8ded3c60..0000000000
--- a/academic/QtiPlot/doinst.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/academic/QtiPlot/importOPJ.patch b/academic/QtiPlot/importOPJ.patch
deleted file mode 100644
index 12a0d2073b..0000000000
--- a/academic/QtiPlot/importOPJ.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -pruN qtiplot-0.9.8.9.orig/qtiplot/qtiplot.pro qtiplot-0.9.8.9/qtiplot/qtiplot.pro
---- qtiplot-0.9.8.9.orig/qtiplot/qtiplot.pro	2011-11-02 18:55:25.000000000 +0200
-+++ qtiplot-0.9.8.9/qtiplot/qtiplot.pro	2012-08-03 01:27:29.649544418 +0300
-@@ -232,3 +232,14 @@ contains(CONFIG, BrowserPlugin){
- 	RC_FILE	= qtiplot.rc
- 	include(../3rdparty/QtSolutions/qtbrowserplugin/src/qtbrowserplugin.pri)
- }
-+
-+###############################################################
-+##################### OriginPlugin ############################
-+###############################################################
-+
-+TARGET		=	qtiplot
-+DESTDIR		=	
-+LIBS		+=	../tmp/qtiplot/libFreeSoftwareQtiPlotImportOPJ.a
-+				
-+
-+include(src/plugins/OriginPlugin/OriginPlugin.pri)
diff --git a/academic/QtiPlot/pyqt-4.11.patch b/academic/QtiPlot/pyqt-4.11.patch
deleted file mode 100644
index dc7d56f3e3..0000000000
--- a/academic/QtiPlot/pyqt-4.11.patch
+++ /dev/null
@@ -1,33 +0,0 @@
- qtiplot/python-sipcmd.py | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py
-index f643194..d8d1ef2 100755
---- a/qtiplot/python-sipcmd.py
-+++ b/qtiplot/python-sipcmd.py
-@@ -27,6 +27,21 @@
- #                                                                          #
- ############################################################################
- 
--from PyQt4 import pyqtconfig
--config = pyqtconfig.Configuration()
--print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags])
-+from __future__ import print_function
-+
-+import os
-+import sipconfig
-+import PyQt4.QtCore
-+
-+try:
-+	# >= 4.10
-+	SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
-+except:
-+	import PyQt4.pyqtconfig
-+	SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
-+
-+PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
-+SIP_BIN = sipconfig.Configuration().sip_bin
-+SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
-+
-+print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS]))
-
diff --git a/academic/QtiPlot/qtiplot-0.9.8.9-private.patch b/academic/QtiPlot/qtiplot-0.9.8.9-private.patch
deleted file mode 100644
index 1dd92fd1a3..0000000000
--- a/academic/QtiPlot/qtiplot-0.9.8.9-private.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h
---- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h	2010-10-17 09:04:05.000000000 +0200
-+++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h	2013-11-01 12:11:36.559973891 +0100
-@@ -67,10 +67,10 @@
- 	void setWindowName(const QString& name){d_window_name = name;};
- 
- 	static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size);
-+	void paintEvent(QPaintEvent *e);
- 
- private:
- 	void draw(QPainter *painter, const QRect& r);
--	void paintEvent(QPaintEvent *e);
- 	QPixmap d_pix;
- 	//! The file from which the image was loaded.
- 	QString d_file_name;
-
diff --git a/academic/QtiPlot/qtiplot-0.9.8.9_gsl-2.patch b/academic/QtiPlot/qtiplot-0.9.8.9_gsl-2.patch
deleted file mode 100644
index d6ff7d00b0..0000000000
--- a/academic/QtiPlot/qtiplot-0.9.8.9_gsl-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -u -r qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp qtiplot-0.9.8.9-patched/qtiplot/src/analysis/Fit.cpp
---- qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp	2011-10-17 11:06:00.000000000 +0100
-+++ qtiplot-0.9.8.9-patched/qtiplot/src/analysis/Fit.cpp	2015-11-18 22:26:22.535193469 +0000
-@@ -39,6 +39,7 @@
- #include <gsl/gsl_statistics.h>
- #include <gsl/gsl_blas.h>
- #include <gsl/gsl_cdf.h>
-+#include <gsl/gsl_version.h>
- 
- #include <QApplication>
- #include <QMessageBox>
-@@ -106,6 +107,10 @@
- gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iterations, int &status)
- {
- 	const gsl_multifit_fdfsolver_type *T;
-+#if GSL_MAJOR_VERSION >=2
-+	gsl_matrix *J=0;
-+#endif
-+
- 	if (d_solver)
- 		T = gsl_multifit_fdfsolver_lmder;
- 	else
-@@ -128,7 +133,14 @@
- 	}
- 
- 	if (status){
-+#if GSL_MAJOR_VERSION >=2
-+	    J=gsl_matrix_alloc(s->fdf->n, s->fdf->p);
-+	    gsl_multifit_fdfsolver_jac (s, J);
-+	    gsl_multifit_covar (J, 0.0, covar);
-+	    gsl_matrix_free(J);
-+#else
- 	    gsl_multifit_covar (s->J, 0.0, covar);
-+#endif
- 	    iterations = 0;
- 	    return s;
- 	}
-@@ -155,7 +167,14 @@
- 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
- 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
- 
-+#if GSL_MAJOR_VERSION >=2
-+	J=gsl_matrix_alloc(s->fdf->n, s->fdf->p);
-+	gsl_multifit_fdfsolver_jac (s, J);
-+	gsl_multifit_covar (J, 0.0, covar);
-+	gsl_matrix_free(J);
-+#else
- 	gsl_multifit_covar (s->J, 0.0, covar);
-+#endif
- 
- 	iterations = iter;
- 	return s;
diff --git a/academic/QtiPlot/qtiplot.desktop b/academic/QtiPlot/qtiplot.desktop
deleted file mode 100644
index cf93e4911a..0000000000
--- a/academic/QtiPlot/qtiplot.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=qtiplot
-Terminal=false
-Name=QtiPlot
-Icon=qtiplot
-Categories=Office;
diff --git a/academic/QtiPlot/qtiplot.xml b/academic/QtiPlot/qtiplot.xml
deleted file mode 100644
index 7ad4c4aa02..0000000000
--- a/academic/QtiPlot/qtiplot.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qtiplot-project">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file</comment>
-    <glob pattern="*.qti" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-compressed">
-    <comment>Compressed QtiPlot project file</comment>
-    <glob pattern="*.qti.gz" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-backup">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file backup</comment>
-    <glob pattern="*.qti~" />
-  </mime-type>
-</mime-info>
diff --git a/academic/QtiPlot/qwtplot3d-libpng15.patch b/academic/QtiPlot/qwtplot3d-libpng15.patch
deleted file mode 100644
index 828f0c6d84..0000000000
--- a/academic/QtiPlot/qwtplot3d-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
-+++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
-@@ -47,6 +47,7 @@
- #endif
- 
- #if defined(GL2PS_HAVE_LIBPNG)
-+#include <zlib.h>
- #include <png.h>
- #endif
- 
diff --git a/academic/QtiPlot/sip-4.15.patch b/academic/QtiPlot/sip-4.15.patch
deleted file mode 100644
index 504223190a..0000000000
--- a/academic/QtiPlot/sip-4.15.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./qtiplot/src/analysis/FFT.cpp.orig	2011-07-06 11:51:08.000000000 +0000
-+++ ./qtiplot/src/analysis/FFT.cpp	2013-10-23 23:07:45.674925476 +0000
-@@ -353,7 +353,7 @@
- 	ml->arrangeLayers(false, false);
- }
- 
--bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to)
-+bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused)
- {
- 	d_init_err = true;
- 
---- ./qtiplot/src/analysis/FFT.h.orig	2011-07-05 22:05:03.000000000 +0000
-+++ ./qtiplot/src/analysis/FFT.h	2013-10-23 23:11:34.277924367 +0000
-@@ -52,6 +52,8 @@
- 	Matrix *realOutputMatrix(){return d_re_out_matrix;}
- 	Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;}
- 
-+    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false);
-+
- private:
-     void init();
-     void output();
-@@ -60,8 +62,6 @@
- 	void fftTable();
- 	void fftMatrix();
- 
--    bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1);
--
-     double d_sampling;
-     //! Flag telling if an inverse FFT must be performed.
-     bool d_inverse;
-
diff --git a/academic/QtiPlot/slack-desc b/academic/QtiPlot/slack-desc
deleted file mode 100644
index c6e9172090..0000000000
--- a/academic/QtiPlot/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-       |-----handy-ruler------------------------------------------------------|
-QtiPlot: QtiPlot (Data Analysis and Visualisation)
-QtiPlot:
-QtiPlot: QtiPlot is a program for two- and three-dimensional graphical
-QtiPlot: presentation of data sets and for data analysis. Plots can be
-QtiPlot: produced from data sets stored in tables or from analytical
-QtiPlot: functions.
-QtiPlot:
-QtiPlot: Home: https://www.qtiplot.com/
-QtiPlot:
-QtiPlot:
-QtiPlot: