summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-07-16 22:42:45 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-07-16 22:42:45 +0000
commit449e0a5c476fcff7f17067a1186a46ed99e56da4 (patch)
treef1ca001e5983d8175186087c77b7ef0c3a716609 /sci-mathematics/qtoctave
parentVersion bump (diff)
downloadgentoo-2-449e0a5c476fcff7f17067a1186a46ed99e56da4.tar.gz
gentoo-2-449e0a5c476fcff7f17067a1186a46ed99e56da4.tar.bz2
gentoo-2-449e0a5c476fcff7f17067a1186a46ed99e56da4.zip
Import patches from Debian (upstream stalled). Fixed Qt dependencies (bug #477008, thanks Patrick Lauer), switch to EAPI5
(Portage version: 2.2.01.22124-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-mathematics/qtoctave')
-rw-r--r--sci-mathematics/qtoctave/ChangeLog18
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch20
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch98
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch8
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch64
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch37
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch61
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch35
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch15
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch34
-rw-r--r--sci-mathematics/qtoctave/metadata.xml8
-rw-r--r--sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild48
12 files changed, 445 insertions, 1 deletions
diff --git a/sci-mathematics/qtoctave/ChangeLog b/sci-mathematics/qtoctave/ChangeLog
index f277a901e7b8..feee9efc53a2 100644
--- a/sci-mathematics/qtoctave/ChangeLog
+++ b/sci-mathematics/qtoctave/ChangeLog
@@ -1,6 +1,22 @@
# ChangeLog for sci-mathematics/qtoctave
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.21 2013/03/02 23:25:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.22 2013/07/16 22:42:45 bicatali Exp $
+
+*qtoctave-0.10.1-r1 (16 Jul 2013)
+
+ 16 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/qtoctave-0.10.1-build-out-of-source.patch,
+ +files/qtoctave-0.10.1-build-widgetserver.patch,
+ +files/qtoctave-0.10.1-desktop-file.patch,
+ +files/qtoctave-0.10.1-doc-path.patch,
+ +files/qtoctave-0.10.1-filedialog-filters.patch,
+ +files/qtoctave-0.10.1-initial_position.patch,
+ +files/qtoctave-0.10.1-no-native-menubars.patch,
+ +files/qtoctave-0.10.1-qtinfo-octave3.4.patch,
+ +files/qtoctave-0.10.1-use_octave_htmldoc.patch, +qtoctave-0.10.1-r1.ebuild,
+ metadata.xml:
+ Import patches from Debian (upstream stalled). Fixed Qt dependencies (bug
+ #477008, thanks Patrick Lauer), switch to EAPI5
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> qtoctave-0.10.1.ebuild,
qtoctave-0.9.1-r1.ebuild:
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch
new file mode 100644
index 000000000000..e4e7ad9f6a69
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch
@@ -0,0 +1,20 @@
+From: Thomas Weber <tweber@debian.org>
+Description: Remove configure.h to enable correct out-of-source builds
+ The file is included in the upstream tarball due to the way the release
+ tarball is generated.
+Forwarded: not-needed
+
+--- a/qtoctave/src/configure.h
++++ /dev/null
+@@ -1,11 +0,0 @@
+-
+-#ifndef __CONFIGURE_H__
+-#define __CONFIGURE_H__
+-#define CONFIG_PATH "/opt/qtoctave/share/qtoctave"
+-#define HELP_PATH "/opt/qtoctave/share/doc/octave-html/octave_doc/index.html"
+-#define ICON_PATH "/opt/qtoctave/share/qtoctave/images"
+-#define LANG_PATH "/opt/qtoctave/share/qtoctave/lang"
+-#define QTOCTAVE_HELP_PATH "/opt/qtoctave/share/doc/qtoctave/qtoctave_doc/index.html"
+-
+-#define PKG_CMD_PATH "/opt/qtoctave/share/qtoctave/pkg-commands.list"
+-#endif
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch
new file mode 100644
index 000000000000..17d92a61d5f2
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch
@@ -0,0 +1,98 @@
+From: Jordi Gutiérrez Hermoso <jordigh@gmail.com>
+Subject: widgetserver wasn't included in newer CMake build, this fixes this
+Forwarded: http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2010-June/007430.html
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,6 +38,7 @@
+
+ add_subdirectory (qtoctave_pkg/src)
+ add_subdirectory (xmlwidget/qt4)
++add_subdirectory (widgetserver)
+ add_subdirectory (easy_plot)
+ add_subdirectory (simple_rcs)
+ add_subdirectory (qtjs)
+--- /dev/null
++++ b/widgetserver/CMakeLists.txt
+@@ -0,0 +1,11 @@
++add_subdirectory(widgetserver)
++
++install(
++ DIRECTORY doc
++ DESTINATION share/doc/qtoctave-utils/widgetserver
++)
++
++install(
++ FILES "leeme.txt" "readme.txt"
++ DESTINATION share/doc/qtoctave-utils/widgetserver
++)
+--- /dev/null
++++ b/widgetserver/widgetserver/CMakeLists.txt
+@@ -0,0 +1,48 @@
++FIND_PACKAGE(Qt4 REQUIRED)
++
++MESSAGE (STATUS "Use file: ${QT_USE_FILE}")
++
++SET(QT_USE_QTXML 1)
++
++include(UseQt4)
++
++include_directories(${QT_INCLUDE_DIR})
++include_directories(${QT_QT_INCLUDE_DIR})
++include_directories(${QT_QTCORE_INCLUDE_DIR})
++include_directories(${QT_QTGUI_INCLUDE_DIR})
++include_directories(${QT_QTXML_INCLUDE_DIR})
++include_directories(${CMAKE_CURRENT_BINARY_DIR})
++include_directories(${QT_QTSCRIPT_INCLUDE_DIR})
++include_directories(${QT_QTUITOOLS_INCLUDE_DIR})
++
++FILE(GLOB widgetserver_moc_headers *.h )
++FILE(GLOB widgetserver_sources *.cpp )
++
++# run moc on these files:
++QT4_WRAP_CPP( widgetserver_moc_sources ${widgetserver_moc_headers} )
++
++add_executable(widgetserver
++ ${widgetserver_sources} ${widgetserver_moc_sources} ${widgetserver_moc_headers}
++)
++
++SET_TARGET_PROPERTIES(widgetserver
++ PROPERTIES INSTALL_RPATH ":usr/lib"
++ BUILD_WITH_INSTALL_RPATH true
++ INSTALL_RPATH_USE_LINK_PATH true
++)
++
++TARGET_LINK_LIBRARIES(widgetserver
++ ${Qt4_LIBRARIES}
++ ${QT_QTCORE_LIBRARY}
++ ${QT_QTGUI_LIBRARY}
++ ${QT_QTXML_LIBRARY}
++ ${QT_QTSCRIPT_LIBRARY}
++ ${QT_QTUITOOLS_LIBRARY}
++)
++
++
++install (
++ TARGETS widgetserver
++ RUNTIME DESTINATION bin
++ )
++
+--- a/widgetserver/widgetserver/input.h
++++ b/widgetserver/widgetserver/input.h
+@@ -4,6 +4,7 @@
+ #include <QThread>
+ #include "process.h"
+ #include "buffer.h"
++#include <cstdio>
+
+ class Input:public QThread
+ {
+--- a/widgetserver/widgetserver/process.h
++++ b/widgetserver/widgetserver/process.h
+@@ -5,6 +5,7 @@
+ #include <QMap>
+ #include <QWidget>
+ #include <QBuffer>
++#include <cstdio>
+
+
+ class Widget: public QObject
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch
new file mode 100644
index 000000000000..b48a3c215737
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch
@@ -0,0 +1,8 @@
+--- qtoctave/src/config_files/qtoctave.desktop.orig 2013-07-16 11:26:02.619168052 -0700
++++ qtoctave/src/config_files/qtoctave.desktop 2013-07-16 11:25:54.316124742 -0700
+@@ -4,4 +4,4 @@
+ Icon=qtoctave
+ Exec=qtoctave
+ Type=Application
+-Categories=Education;Science;Math;Qt;
++Categories=Development;Education;Science;Math;Qt;
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch
new file mode 100644
index 000000000000..481520b5c656
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch
@@ -0,0 +1,64 @@
+--- qtoctave-0.10.1/qtjs/CMakeLists.txt 2011-01-06 23:48:05.000000000 +0200
++++ qtoctave-0.10.1/qtjs/CMakeLists.txt 2011-02-06 18:16:37.000000000 +0200
+@@ -2,10 +2,5 @@
+
+ install(
+ DIRECTORY doc
+- DESTINATION share/doc/qtoctave-utils/qtjs
++ DESTINATION share/qtoctave/qtjs
+ )
+-
+-install(
+- FILES "instalar.txt" "install.txt"
+- DESTINATION share/doc/qtoctave-utils/qtjs
+-)
+\ No newline at end of file
+--- qtoctave-0.10.1/qtoctave/src/CMakeLists.txt 2011-01-06 23:48:07.000000000 +0200
++++ qtoctave-0.10.1/qtoctave/src/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200
+@@ -74,7 +74,7 @@
+
+ install (
+ DIRECTORY qtoctave_doc
+- DESTINATION share/doc/qtoctave
++ DESTINATION share/qtoctave
+ PATTERN ".svn" EXCLUDE
+ )
+
+--- qtoctave-0.10.1/qtoctave/src/configure.h.in 2011-01-06 23:48:06.000000000 +0200
++++ qtoctave-0.10.1/qtoctave/src/configure.h.in 2011-02-06 18:15:41.000000000 +0200
+@@ -5,7 +5,7 @@
+ #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html"
+ #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+ #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
+-#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html"
++#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html"
+
+ #define PKG_CMD_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/pkg-commands.list"
+ #endif
+--- qtoctave-0.10.1/simple_rcs/CMakeLists.txt 2011-01-06 23:48:06.000000000 +0200
++++ qtoctave-0.10.1/simple_rcs/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200
+@@ -17,6 +17,6 @@
+
+ install(
+ DIRECTORY design
+- DESTINATION share/doc/qtoctave-utils/simple_rcs
++ DESTINATION share/qtoctave/simple_rcs
+ PATTERN ".svn" EXCLUDE
+ )
+\ No newline at end of file
+--- qtoctave-0.10.1/xmlwidget/CMakeLists.txt 2011-01-06 23:48:06.000000000 +0200
++++ qtoctave-0.10.1/xmlwidget/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200
+@@ -2,10 +2,10 @@
+
+ install(
+ DIRECTORY doc
+- DESTINATION share/doc/qtoctave-utils/xmlwidget
++ DESTINATION share/qtoctave/xmlwidget
+ )
+
+ install(
+ DIRECTORY examples
+- DESTINATION share/doc/qtoctave-utils/xmlwidget
++ DESTINATION share/qtoctave/xmlwidget
+ )
+\ No newline at end of file
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch
new file mode 100644
index 000000000000..ddee96afc906
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch
@@ -0,0 +1,37 @@
+Description: Fix *.m filename filters in file dialogs
+ Not forwarded to upstream since upstream author stopped development.
+Author: Sébastien Villemot <sebastien@debian.org>
+Bug-Debian: http://bugs.debian.org/620062
+Forwarded: no
+Last-Update: 2011-08-21
+--- a/qtoctave/src/editor.cpp
++++ b/qtoctave/src/editor.cpp
+@@ -295,7 +295,7 @@
+ {
+ QStringList filters;
+
+- filters << "Octave (*.m; *.M)"
++ filters << "Octave (*.m *.M)"
+ << "Plain text (*.txt)"
+ << "All files (*)";
+
+@@ -475,7 +475,7 @@
+ QFileDialog openDialog(this, tr("Open") /*Qt::Dialog*/);
+
+ QStringList filters;
+- filters << "Octave (*.m; *.M)"
++ filters << "Octave (*.m *.M)"
+ << "Plain text (*.txt)"
+ << "All files (*)";
+
+--- a/qtoctave/src/main.cpp
++++ b/qtoctave/src/main.cpp
+@@ -308,7 +308,7 @@
+ QFileDialog openDialog(NULL, tr("Open"), ".");
+ QStringList filters;
+
+- filters << "Octave (*.m; *.M)";
++ filters << "Octave (*.m *.M)";
+
+ openDialog.setFilters(filters);
+ openDialog.setAcceptMode(QFileDialog::AcceptOpen);
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch
new file mode 100644
index 000000000000..cd97291a9bd5
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch
@@ -0,0 +1,61 @@
+Description: Fix crash when closing a dock tool within the first 5 seconds
+ (a NULL pointer dereference caused by a race condition between the user
+ closing the tool and the timer setting the initial positions, prevented by
+ using a QWeakPointer instead of a raw QWidget *)
+Author: Kevin Kofler <kevin.kofler@chello.at>
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=722986
+Forwarded: no
+Last-Update: 2011-10-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff -ur qtoctave-0.10.1/qtoctave/src/main.cpp qtoctave-0.10.1-initialposition/qtoctave/src/main.cpp
+--- qtoctave-0.10.1/qtoctave/src/main.cpp 2011-01-06 22:48:07.000000000 +0100
++++ qtoctave-0.10.1-initialposition/qtoctave/src/main.cpp 2011-10-06 20:17:03.000000000 +0200
+@@ -595,7 +595,7 @@
+ initPos.maximized=maximized;
+ initPos.minimized=minimized;
+ initPos.widget=bw->parentWidget();
+- if(initPos.widget!=NULL)
++ if(!initPos.widget.isNull())
+ initialPositionList.append(initPos);
+ //bw->show();
+ //bw->move(x,y);
+@@ -694,10 +694,14 @@
+ {
+ foreach(InitialPosition i, initialPositionList)
+ {
+- i.widget->move(i.x,i.y);
+- i.widget->resize(i.width, i.height);
+- if(i.maximized) i.widget->showMaximized();
+- if(i.minimized) i.widget->showMinimized();
++ QWidget *widget = i.widget.data();
++ if (widget)
++ {
++ widget->move(i.x,i.y);
++ widget->resize(i.width, i.height);
++ if(i.maximized) widget->showMaximized();
++ if(i.minimized) widget->showMinimized();
++ }
+ }
+ }
+
+diff -ur qtoctave-0.10.1/qtoctave/src/main.h qtoctave-0.10.1-initialposition/qtoctave/src/main.h
+--- qtoctave-0.10.1/qtoctave/src/main.h 2011-01-06 22:48:08.000000000 +0100
++++ qtoctave-0.10.1-initialposition/qtoctave/src/main.h 2011-10-06 20:12:55.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <QListWidget>
+ #include <QTimer>
+ #include <QVector>
++#include <QWeakPointer>
+ #include "mainwindow.h"
+ #include "octave_connection.h"
+ #include "terminal.h"
+@@ -41,7 +42,7 @@
+ struct InitialPosition
+ {
+ int x, y, width, height;
+- QWidget *widget;
++ QWeakPointer<QWidget> widget;
+ bool maximized, minimized;
+ };
+
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch
new file mode 100644
index 000000000000..677b5e5ed817
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch
@@ -0,0 +1,35 @@
+Description: Do not export docked window menubars to desktop panel
+Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
+Forwarded: Sent to http://groups.google.com/group/qtoctave-english
+Bug-Ubuntu: https://bugs.launchpad.net/appmenu-qt/+bug/673210
+Index: qtoctave-0.10.1/qtoctave/src/basewidget.cpp
+===================================================================
+--- qtoctave-0.10.1.orig/qtoctave/src/basewidget.cpp 2011-01-06 22:48:07.000000000 +0100
++++ qtoctave-0.10.1/qtoctave/src/basewidget.cpp 2011-09-14 11:03:11.000000000 +0200
+@@ -30,6 +30,7 @@
+ //setFocusPolicy(Qt::StrongFocus);
+ session=NULL;
+ QWidget *central=new QWidget(this);
++ menuBar()->setNativeMenuBar(false);
+ setCentralWidget(central);
+
+ QMenu *windows_menu=menuBar()->addMenu(tr("View"));
+Index: qtoctave-0.10.1/qtoctave/src/mainwindow.cpp
+===================================================================
+--- qtoctave-0.10.1.orig/qtoctave/src/mainwindow.cpp 2011-01-06 22:48:07.000000000 +0100
++++ qtoctave-0.10.1/qtoctave/src/mainwindow.cpp 2011-09-14 12:03:14.000000000 +0200
+@@ -39,7 +39,13 @@
+ setSession(session);
+ setWindowIcon(QIcon(QString(ICON_PATH) + "/qtoctave.png"));
+
+- menuBar()->clear();
++ //The menubar provided by BaseWidget is set as not-native to avoid showing up
++ //in top-panel menubars on desktops like Unity, but we want a native menubar
++ //here, and we also want to get rid of the generic "View" item BaseWidget
++ //added to the menubar. Setting a new menubar is the simplest way to do this
++ //(the old one gets deleted).
++ //[1] https://bugs.launchpad.net/appmenu-qt/+bug/673210
++ setMenuBar(new QMenuBar());
+
+ setWindowTitle("QtOctave ["+session->getProjectName()+"]");
+ //resize(QSize(800, 600).expandedTo(minimumSizeHint()));
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch
new file mode 100644
index 000000000000..5d8824789894
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch
@@ -0,0 +1,15 @@
+Description: Make qtinfo compatible with Octave >= 3.4
+Origin: upstream, commit: 282
+Forwarded: not-needed
+Last-Update: 2012-03-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/qtoctave/src/scripts_octave/qtinfo.m
++++ b/qtoctave/src/scripts_octave/qtinfo.m
+@@ -1,5 +1,5 @@
+ function qtinfo()
+ command=sprintf("qtoctave-info-reader %s > /dev/null", info_file);
+ printf("Starting info: %s\n", command);
+- system(command, 1, "async");
++ system(command, 0, "async");
+ endfunction
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch
new file mode 100644
index 000000000000..08eeb9c52e34
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch
@@ -0,0 +1,34 @@
+Description: Update Octave's HTML doc path to use octave-htmldoc
+ Also, avoid failure on nonexistent path to upstream stripped HTML files.
+Author: Thomas Weber <tweber@debian.org>
+Author: Sébastien Villemot <sebastien@debian.org>
+Last-Update: 2012-03-11
+Forwarded: not-needed
+--- a/qtoctave/src/configure.h.in
++++ b/qtoctave/src/configure.h.in
+@@ -2,7 +2,7 @@
+ #ifndef __CONFIGURE_H__
+ #define __CONFIGURE_H__
+ #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave"
+-#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html"
++#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-htmldoc/interpreter/index.html"
+ #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images"
+ #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang"
+ #define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html"
+--- a/qtoctave/src/CMakeLists.txt
++++ b/qtoctave/src/CMakeLists.txt
+@@ -64,14 +64,6 @@
+ DESTINATION share/qtoctave/lang
+ )
+
+-
+-
+-install (
+- DIRECTORY octave_doc
+- DESTINATION share/doc/octave-html
+- PATTERN ".svn" EXCLUDE
+- )
+-
+ install (
+ DIRECTORY qtoctave_doc
+ DESTINATION share/doc/qtoctave
diff --git a/sci-mathematics/qtoctave/metadata.xml b/sci-mathematics/qtoctave/metadata.xml
index 5a2f1c7b832e..19eb759e10bc 100644
--- a/sci-mathematics/qtoctave/metadata.xml
+++ b/sci-mathematics/qtoctave/metadata.xml
@@ -2,4 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci-mathematics</herd>
+<longdescription lang='en'>
+ Besides offering an attractive front-end to GNU Octave, an
+ environment for numerical computation highly compatible with MATLAB,
+ QtOctave currently also features matrix data entry and display and
+ some GUI shortcuts to frequently used Octave functions. It also
+ offers access in place to Octave's documentation with octave-htmldoc
+ or octave-info.
+</longdescription>
</pkgmetadata>
diff --git a/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild b/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..c0b3b6634153
--- /dev/null
+++ b/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild,v 1.1 2013/07/16 22:42:45 bicatali Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+PID=2054
+
+DESCRIPTION="Qt4 front-end for Octave"
+HOMEPAGE="http://forja.rediris.es/projects/csl-qtoctave/"
+SRC_URI="http://forja.rediris.es/frs/download.php/${PID}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-fbsd ~x86-linux"
+IUSE=""
+
+CDEPEND="
+ || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+ >=dev-qt/qtsvg-4.6:4"
+RDEPEND="${CDEPEND}
+ sci-mathematics/octave"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+DOCS=(readme.txt leeme.txt)
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build-out-of-source.patch
+ "${FILESDIR}"/${P}-build-widgetserver.patch
+ "${FILESDIR}"/${P}-doc-path.patch
+ "${FILESDIR}"/${P}-filedialog-filters.patch
+ "${FILESDIR}"/${P}-initial_position.patch
+ "${FILESDIR}"/${P}-no-native-menubars.patch
+ "${FILESDIR}"/${P}-qtinfo-octave3.4.patch
+ "${FILESDIR}"/${P}-use_octave_htmldoc.patch
+ "${FILESDIR}"/${P}-desktop-file.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_INSTALL_RPATH=ON
+ -DCMAKE_SKIP_RPATH=ON
+ )
+ cmake-utils_src_configure
+}