app-office/texstudio: Version BUmp, #477292; drop old patches

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

11 files changed, 79 insertions, 468 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index bfda716ba939..270cd77310b7 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/texstudio
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.16 2013/07/18 02:09:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.17 2013/07/18 13:15:31 jlec Exp $
+
+*texstudio-2.6.2 (18 Jul 2013)
+
+  18 Jul 2013; Justin Lecher <jlec@gentoo.org> +texstudio-2.6.2.ebuild,
+  -files/texstudio-2.2-hunspell.patch, -files/texstudio-2.3-gcc47.patch,
+  -files/texstudio-2.3-hunspell.patch, -files/texstudio-2.3-test.patch,
+  -files/texstudio-2.3-xdg-open.patch, -files/texstudio-2.4-desktop.patch,
+  -files/texstudio-2.4-hunspell.patch, -files/texstudio-2.5-hunspell.patch,
+  -files/texstudio-2.5-qtsingle.patch:
+  Version BUmp, #477292; drop old patches
 
   18 Jul 2013; Patrick Lauer <patrick@gentoo.org> texstudio-2.6.0.ebuild:
   Fixing qtgui deps for qt-4.8.5
diff --git a/app-office/texstudio/files/texstudio-2.2-hunspell.patch b/app-office/texstudio/files/texstudio-2.2-hunspell.patch
deleted file mode 100644
index f55a2f7d3b64..000000000000
--- a/app-office/texstudio/files/texstudio-2.2-hunspell.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/texstudio.pro b/texstudio.pro
-index 437a376..c2c6998 100644
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -5,7 +5,10 @@ CONFIG = $$unique(CONFIG)
- CONFIG -= debug \
-     debug_and_release \
-     release
--CONFIG += qt debug_and_release precompile_header
-+CONFIG += qt debug_and_release precompile_header \
-+    link_pkgconfig
-+PKGCONFIG = hunspell
-+PHONON=
- exists(texmakerx_my.pri):include(texmakerx_my.pri)
- QT += network \
-     xml \
-@@ -55,24 +58,6 @@ HEADERS += texmaker.h \
-     codesnippet.h \
-     thesaurusdialog.h \
-     xmltagslistwidget.h \
--    hunspell/affentry.hxx \
--    hunspell/affixmgr.hxx \
--    hunspell/atypes.hxx \
--    hunspell/baseaffix.hxx \
--    hunspell/csutil.hxx \
--    hunspell/dictmgr.hxx \
--    hunspell/hashmgr.hxx \
--    hunspell/htypes.hxx \
--    hunspell/hunspell.hxx \
--    hunspell/hunspell.h \
--    hunspell/langnum.hxx \
--    hunspell/license.hunspell \
--    hunspell/phonet.hxx \
--    hunspell/suggestmgr.hxx \
--    hunspell/license.myspell \
--    hunspell/filemgr.hxx \
--    hunspell/hunzip.hxx \
--    hunspell/w_char.hxx \
-     qcodeedit/lib/qeditorinputbinding.h \
-     qcodeedit/lib/qeditorinputbindinginterface.h \
-     randomtextgenerator.h \
-@@ -88,7 +73,6 @@ HEADERS += texmaker.h \
-     latexdocument.h \
-     unicodeinsertion.h \
-     universalinputdialog.h \
--    hunspell/replist.hxx \
-     scriptengine.h \
-     insertgraphics.h \
-     tmxtabwidget.h \
-@@ -142,18 +126,6 @@ SOURCES += main.cpp \
-     codesnippet.cpp \
-     thesaurusdialog.cpp \
-     xmltagslistwidget.cpp \
--    hunspell/affentry.cxx \
--    hunspell/affixmgr.cxx \
--    hunspell/csutil.cxx \
--    hunspell/dictmgr.cxx \
--    hunspell/hashmgr.cxx \
--    hunspell/hunspell.cxx \
--    hunspell/phonet.cxx \
--    hunspell/replist.cxx \
--    hunspell/suggestmgr.cxx \
--    hunspell/utf_info.cxx \
--    hunspell/filemgr.cxx \
--    hunspell/hunzip.cxx \
-     encodingdialog.cpp \
-     qcodeedit/lib/qeditorinputbinding.cpp \
-     randomtextgenerator.cpp \
diff --git a/app-office/texstudio/files/texstudio-2.3-gcc47.patch b/app-office/texstudio/files/texstudio-2.3-gcc47.patch
deleted file mode 100644
index bdc1fedd858f..000000000000
--- a/app-office/texstudio/files/texstudio-2.3-gcc47.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- qcodeedit/lib/document/qdocumentcommand.cpp |    1 +
- qtsingleapplication/qtlocalpeer.cpp         |    5 +++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/qcodeedit/lib/document/qdocumentcommand.cpp b/qcodeedit/lib/document/qdocumentcommand.cpp
-index 308e4e4..35b7d9f 100644
---- a/qcodeedit/lib/document/qdocumentcommand.cpp
-+++ b/qcodeedit/lib/document/qdocumentcommand.cpp
-@@ -32,6 +32,7 @@
- 	\brief The base class for document editing command

- */

- 

-+#include <unistd.h>

- 

- /*!

- 	\brief ctor

-diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp
-index 120a8e8..fa32ff2 100644
---- a/qtsingleapplication/qtlocalpeer.cpp
-+++ b/qtsingleapplication/qtlocalpeer.cpp
-@@ -48,9 +48,9 @@
- #include "qtlocalpeer.h"

- #include <QtCore/QCoreApplication>

- #include <QtCore/QTime>

--#if QT_VERSION >= 0x040600
-+#if QT_VERSION >= 0x040600

- #include <QtCore/QProcessEnvironment>

--#endif
-+#endif

- 

- #if defined(Q_OS_WIN)

- #include <QtCore/QLibrary>

-@@ -60,6 +60,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif

- #if defined(Q_OS_UNIX)

- #include <time.h>

-+#include <unistd.h>

- #endif

- 

- namespace QtLP_Private {

diff --git a/app-office/texstudio/files/texstudio-2.3-hunspell.patch b/app-office/texstudio/files/texstudio-2.3-hunspell.patch
deleted file mode 100644
index 13a70cbee3db..000000000000
--- a/app-office/texstudio/files/texstudio-2.3-hunspell.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- texstudio.pro |   35 +++--------------------------------
- 1 files changed, 3 insertions(+), 32 deletions(-)
-
-diff --git a/texstudio.pro b/texstudio.pro
-index 528182a..eab0791 100644
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -1,7 +1,9 @@
- TEMPLATE = app

- LANGUAGE = C++

- DESTDIR = ./

--CONFIG += qt precompile_header

-+CONFIG += qt precompile_header link_pkgconfig
-+PKGCONFIG = hunspell
-+PHONON=

- exists(texmakerx_my.pri):include(texmakerx_my.pri)

- QT += network \

-     xml \

-@@ -51,24 +53,6 @@ HEADERS += texmaker.h \
-     codesnippet.h \

-     thesaurusdialog.h \

-     xmltagslistwidget.h \

--    hunspell/affentry.hxx \

--    hunspell/affixmgr.hxx \

--    hunspell/atypes.hxx \

--    hunspell/baseaffix.hxx \

--    hunspell/csutil.hxx \

--    hunspell/dictmgr.hxx \

--    hunspell/hashmgr.hxx \

--    hunspell/htypes.hxx \

--    hunspell/hunspell.hxx \

--    hunspell/hunspell.h \

--    hunspell/langnum.hxx \

--    hunspell/license.hunspell \

--    hunspell/phonet.hxx \

--    hunspell/suggestmgr.hxx \

--    hunspell/license.myspell \

--    hunspell/filemgr.hxx \

--    hunspell/hunzip.hxx \

--    hunspell/w_char.hxx \

-     qcodeedit/lib/qeditorinputbinding.h \

-     qcodeedit/lib/qeditorinputbindinginterface.h \

-     randomtextgenerator.h \

-@@ -84,7 +68,6 @@ HEADERS += texmaker.h \
-     latexdocument.h \

-     unicodeinsertion.h \

-     universalinputdialog.h \

--    hunspell/replist.hxx \

-     scriptengine.h \

-     insertgraphics.h \

-     tmxtabwidget.h \

-@@ -143,18 +126,6 @@ SOURCES += main.cpp \
-     codesnippet.cpp \

-     thesaurusdialog.cpp \

-     xmltagslistwidget.cpp \

--    hunspell/affentry.cxx \

--    hunspell/affixmgr.cxx \

--    hunspell/csutil.cxx \

--    hunspell/dictmgr.cxx \

--    hunspell/hashmgr.cxx \

--    hunspell/hunspell.cxx \

--    hunspell/phonet.cxx \

--    hunspell/replist.cxx \

--    hunspell/suggestmgr.cxx \

--    hunspell/utf_info.cxx \

--    hunspell/filemgr.cxx \

--    hunspell/hunzip.cxx \

-     encodingdialog.cpp \

-     qcodeedit/lib/qeditorinputbinding.cpp \

-     randomtextgenerator.cpp \

diff --git a/app-office/texstudio/files/texstudio-2.3-test.patch b/app-office/texstudio/files/texstudio-2.3-test.patch
deleted file mode 100644
index b3989e29bcde..000000000000
--- a/app-office/texstudio/files/texstudio-2.3-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cb478565396b325a0860747a3c9c90789b13aea1 Mon Sep 17 00:00:00 2001
-From: hannes <hannes@fedoraproject.org>
-Date: Thu, 16 Feb 2012 20:49:50 +0000
-Subject: [PATCH] Fix the testcase build failure
-
----
- tests/qsearchreplacepanel_t.cpp |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/qsearchreplacepanel_t.cpp b/tests/qsearchreplacepanel_t.cpp
-index e043f8b..22d6013 100644
---- tests/qsearchreplacepanel_t.cpp
-+++ tests/qsearchreplacepanel_t.cpp
-@@ -213,9 +213,9 @@ void QSearchReplacePanelTest::incrementalsearch(){
- 				widget->cFind->lineEdit()->cursorForward(false,search.length());	

- 				QTest::keyClick(widget->cFind->lineEdit(),search[search.length()-1].toLatin1());

- 			}

--			QDocumentCursor s=ed->cursor().selectionStart();

--			QEQUAL2(s.lineNumber(), cy, search+" "+ed->cursor().selectedText()+"  "+QString::number(loop));

--			QEQUAL2(s.columnNumber(), cx, search+" "+ed->cursor().selectedText());

-+			QDocumentCursor c=ed->cursor().selectionStart();

-+			QEQUAL2(c.lineNumber(), cy, search+" "+ed->cursor().selectedText()+"  "+QString::number(loop));

-+			QEQUAL2(c.columnNumber(), cx, search+" "+ed->cursor().selectedText());

- 			QEQUAL2(ed->cursor().selectedText(), res, search+" "+ed->cursor().selectedText());

- 			//searching shouldn't change highlighted selection

- 			QCEMULTIEQUAL(getHighlightedSelection(ed), panel->getSearchScope(), ed->document()->cursor(scopey1,scopex1,scopey2,scopex2));			

--- 
-1.7.7.6
-
diff --git a/app-office/texstudio/files/texstudio-2.3-xdg-open.patch b/app-office/texstudio/files/texstudio-2.3-xdg-open.patch
deleted file mode 100644
index b008bc2a1fc9..000000000000
--- a/app-office/texstudio/files/texstudio-2.3-xdg-open.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 2ae917fad7cd4e5d3043e3ab3f1cfe4faa63f532 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <haikel.guemar@sysfera.com>
-Date: Thu, 28 Jul 2011 16:55:32 +0200
-Subject: [PATCH 1/3] viewers: use xdg-open
-
----
- buildmanager.cpp |   22 +++++-----------------
- 1 files changed, 5 insertions(+), 17 deletions(-)
-
-diff --git buildmanager.cpp buildmanager.cpp
-index 1441564..d8986bb 100644
---- buildmanager.cpp
-+++ buildmanager.cpp
-@@ -460,23 +460,11 @@ QString BuildManager::guessCommandName(LatexCommand cmd) {
- // kdvi "file:%.dvi#src:@ %.tex"

- 	switch (cmd) {

- 	case CMD_VIEWDVI:

--		switch (x11desktop_env()) {

--		case 3:	return "kdvi %.dvi > /dev/null";

--		case 4:	return "okular %.dvi > /dev/null";

--		default:return "evince %.dvi > /dev/null";

--		};

-+                return "xdg-open %.dvi > /dev/null";

- 	case CMD_VIEWPS:

--		switch (x11desktop_env()) {

--		case 3: return "kghostview %.ps > /dev/null";

--		case 4:	return "okular %.ps > /dev/null";

--		default:return "evince %.ps > /dev/null";

--		};

-+		return "xdg-open %.ps > /dev/null";

- 	case CMD_VIEWPDF:

--		switch (x11desktop_env()) {

--		case 3: return "kpdf %.pdf > /dev/null";

--		case 4:	return "okular %.pdf > /dev/null";

--		default:return "evince %.pdf > /dev/null";

--		};

-+		return "xdg-open %.pdf > /dev/null";

- 	default:;

- 	}

- #endif

-@@ -610,7 +598,7 @@ void BuildManager::setLatexCommand(LatexCommand cmd, const QString &cmdString){
- 		    ((unquote == baseName) ||

- 		     (   (unquote.endsWith(QDir::separator() + baseName) || unquote.endsWith("/" + baseName))

- 		      && (!unquote.contains(" ") || (!unquote.contains('"') && unquote != trimmed)) //spaces mean options, if not everything is quoted

--		      && (QFileInfo(unquote).exists())		      

-+		      && (QFileInfo(unquote).exists())

- 		      )

- 		     ))

- 			commands[cmd] = cmdString + " " + defaultCommandOptions(cmd);

-@@ -619,7 +607,7 @@ void BuildManager::setLatexCommand(LatexCommand cmd, const QString &cmdString){
- 	}

- }

- 

--QString BuildManager::getLatexCommand(LatexCommand cmd){ 

-+QString BuildManager::getLatexCommand(LatexCommand cmd){

- 	return commands[cmd];

- }

- QString BuildManager::getLatexCommandForDisplay(LatexCommand cmd){

--- 
-1.7.4.4
-
diff --git a/app-office/texstudio/files/texstudio-2.4-desktop.patch b/app-office/texstudio/files/texstudio-2.4-desktop.patch
deleted file mode 100644
index 33f0a5bf51a3..000000000000
--- a/app-office/texstudio/files/texstudio-2.4-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- utilities/texstudio.desktop | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/utilities/texstudio.desktop b/utilities/texstudio.desktop
-index 199255f..9c95afd 100644
---- a/utilities/texstudio.desktop
-+++ b/utilities/texstudio.desktop
-@@ -1,13 +1,12 @@
- [Desktop Entry]
- Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
--Encoding=UTF-8
- Exec=texstudio %F
- GenericName=LaTeX Editor
- GenericName[fr]=Editeur LaTeX
- Comment=LaTeX development environment
- Comment[fr]=Environnement de développement LaTeX
- Icon=/usr/share/texstudio/texstudio48x48.png
--MimeType=text/x-tex;
-+MimeType=text/X-tex;
- Name=TeXstudio
- StartupNotify=false
- Terminal=false
diff --git a/app-office/texstudio/files/texstudio-2.4-hunspell.patch b/app-office/texstudio/files/texstudio-2.4-hunspell.patch
deleted file mode 100644
index 208cc8ecf217..000000000000
--- a/app-office/texstudio/files/texstudio-2.4-hunspell.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- texstudio.pro | 35 +++--------------------------------
- 1 file changed, 3 insertions(+), 32 deletions(-)
-
-diff --git a/texstudio.pro b/texstudio.pro
-index ee28d78..4ba31c0 100644
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -1,7 +1,9 @@
- TEMPLATE = app

- LANGUAGE = C++

- DESTDIR = ./

--CONFIG += qt precompile_header uitools

-+CONFIG += qt precompile_header uitools link_pkgconfig

-+PKGCONFIG = hunspell

-+PHONON=

- exists(texmakerx_my.pri):include(texmakerx_my.pri)

- QT += network \

-     xml \

-@@ -52,24 +54,6 @@ HEADERS += texmaker.h \
-     debughelper.h \

-     thesaurusdialog.h \

-     xmltagslistwidget.h \

--    hunspell/affentry.hxx \

--    hunspell/affixmgr.hxx \

--    hunspell/atypes.hxx \

--    hunspell/baseaffix.hxx \

--    hunspell/csutil.hxx \

--    hunspell/dictmgr.hxx \

--    hunspell/hashmgr.hxx \

--    hunspell/htypes.hxx \

--    hunspell/hunspell.hxx \

--    hunspell/hunspell.h \

--    hunspell/langnum.hxx \

--    hunspell/license.hunspell \

--    hunspell/phonet.hxx \

--    hunspell/suggestmgr.hxx \

--    hunspell/license.myspell \

--    hunspell/filemgr.hxx \

--    hunspell/hunzip.hxx \

--    hunspell/w_char.hxx \

-     qcodeedit/lib/qeditorinputbinding.h \

-     qcodeedit/lib/qeditorinputbindinginterface.h \

-     randomtextgenerator.h \

-@@ -85,7 +69,6 @@ HEADERS += texmaker.h \
-     latexdocument.h \

-     unicodeinsertion.h \

-     universalinputdialog.h \

--    hunspell/replist.hxx \

-     scriptengine.h \

-     insertgraphics.h \

-     txstabwidget.h \

-@@ -154,18 +137,6 @@ SOURCES += main.cpp \
-     codesnippet.cpp \

-     thesaurusdialog.cpp \

-     xmltagslistwidget.cpp \

--    hunspell/affentry.cxx \

--    hunspell/affixmgr.cxx \

--    hunspell/csutil.cxx \

--    hunspell/dictmgr.cxx \

--    hunspell/hashmgr.cxx \

--    hunspell/hunspell.cxx \

--    hunspell/phonet.cxx \

--    hunspell/replist.cxx \

--    hunspell/suggestmgr.cxx \

--    hunspell/utf_info.cxx \

--    hunspell/filemgr.cxx \

--    hunspell/hunzip.cxx \

-     encodingdialog.cpp \

-     qcodeedit/lib/qeditorinputbinding.cpp \

-     randomtextgenerator.cpp \

diff --git a/app-office/texstudio/files/texstudio-2.5-hunspell.patch b/app-office/texstudio/files/texstudio-2.5-hunspell.patch
deleted file mode 100644
index a895713ff557..000000000000
--- a/app-office/texstudio/files/texstudio-2.5-hunspell.patch
+++ /dev/null
@@ -1,84 +0,0 @@
- spellerutility.h |  2 +-
- texstudio.pro    | 37 ++++++-------------------------------
- 2 files changed, 7 insertions(+), 32 deletions(-)
-
-diff --git a/spellerutility.h b/spellerutility.h
-index 1e1d6e2..083f412 100644
---- a/spellerutility.h
-+++ b/spellerutility.h
-@@ -13,7 +13,7 @@
- 

- #include "mostQtHeaders.h"

- 

--#include "hunspell/hunspell.hxx"

-+#include <hunspell.hxx>

- class SpellerUtility: public QObject {

- 	Q_OBJECT

- public:

-diff --git a/texstudio.pro b/texstudio.pro
-index 541b6b6..f801fc2 100644
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -52,24 +52,6 @@ HEADERS += texmaker.h \
-     debughelper.h \

-     thesaurusdialog.h \

-     xmltagslistwidget.h \

--    hunspell/affentry.hxx \

--    hunspell/affixmgr.hxx \

--    hunspell/atypes.hxx \

--    hunspell/baseaffix.hxx \

--    hunspell/csutil.hxx \

--    hunspell/dictmgr.hxx \

--    hunspell/hashmgr.hxx \

--    hunspell/htypes.hxx \

--    hunspell/hunspell.hxx \

--    hunspell/hunspell.h \

--    hunspell/langnum.hxx \

--    hunspell/license.hunspell \

--    hunspell/phonet.hxx \

--    hunspell/suggestmgr.hxx \

--    hunspell/license.myspell \

--    hunspell/filemgr.hxx \

--    hunspell/hunzip.hxx \

--    hunspell/w_char.hxx \

-     qcodeedit/lib/qeditorinputbinding.h \

-     qcodeedit/lib/qeditorinputbindinginterface.h \

-     randomtextgenerator.h \

-@@ -85,7 +67,6 @@ HEADERS += texmaker.h \
-     latexdocument.h \

-     unicodeinsertion.h \

-     universalinputdialog.h \

--    hunspell/replist.hxx \

-     scriptengine.h \

-     insertgraphics.h \

-     txstabwidget.h \

-@@ -157,18 +138,6 @@ SOURCES += main.cpp \
-     codesnippet.cpp \

-     thesaurusdialog.cpp \

-     xmltagslistwidget.cpp \

--    hunspell/affentry.cxx \

--    hunspell/affixmgr.cxx \

--    hunspell/csutil.cxx \

--    hunspell/dictmgr.cxx \

--    hunspell/hashmgr.cxx \

--    hunspell/hunspell.cxx \

--    hunspell/phonet.cxx \

--    hunspell/replist.cxx \

--    hunspell/suggestmgr.cxx \

--    hunspell/utf_info.cxx \

--    hunspell/filemgr.cxx \

--    hunspell/hunzip.cxx \

-     encodingdialog.cpp \

-     qcodeedit/lib/qeditorinputbinding.cpp \

-     randomtextgenerator.cpp \

-@@ -591,4 +560,10 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c
- #QMAKE_CXXFLAGS_DEBUG += -Werror  -Wall -Wextra  -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas  -Wundef  -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered  -Wempty-body -Wsign-compare -Waddress -Wlogical-op   -Winline

- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra  -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas  -Wundef  -Wpointer-arith  -Wwrite-strings -Wempty-body -Wsign-compare -Waddress   -Winline

- 

-+# enable use of pkgconfig

-+unix {

-+  CONFIG   += link_pkgconfig

-+  # use system hunspell

-+  PKGCONFIG += hunspell

-+}

- 

diff --git a/app-office/texstudio/files/texstudio-2.5-qtsingle.patch b/app-office/texstudio/files/texstudio-2.5-qtsingle.patch
deleted file mode 100644
index 9ef2cb44f68f..000000000000
--- a/app-office/texstudio/files/texstudio-2.5-qtsingle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- texstudio.pro | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/texstudio.pro b/texstudio.pro
-index f801fc2..2b1d3df 100644
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -10,8 +10,6 @@ QT += network \
-     QT += phonon

-     DEFINES += PHONON

- }

--contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x")

--else:include(qtsingleapplication/qtsingleapplication.pri)

- 

- # ##############################

- PRECOMPILED_HEADER = mostQtHeaders.h

-@@ -567,3 +565,6 @@ unix {
-   PKGCONFIG += hunspell

- }

- 

-+#use system qtsingleapplication

-+CONFIG += qtsingleapplication

-+

diff --git a/app-office/texstudio/texstudio-2.6.2.ebuild b/app-office/texstudio/texstudio-2.6.2.ebuild
new file mode 100644
index 000000000000..e1fd586f0bd8
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.6.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.6.2.ebuild,v 1.1 2013/07/18 13:15:31 jlec Exp $
+
+EAPI=5
+
+inherit base fdo-mime qt4-r2
+
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="http://texstudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="video"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4]
+	dev-libs/quazip
+	x11-libs/libX11
+	x11-libs/libXext
+	|| ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
+	>=dev-qt/qtcore-4.6.1:4
+	>=dev-qt/qtscript-4.6.1:4
+	>=dev-qt/qtsvg-4.6.1:4
+	>=dev-qt/qttest-4.6.1:4
+	video? ( media-libs/phonon )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/-/}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-hunspell-quazip.patch
+# 441914
+#	"${FILESDIR}"/${P}-qtsingle.patch
+	"${FILESDIR}"/${PN}-2.6.0-desktop.patch
+# Get it from fedora
+	"${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
+	)
+
+src_prepare() {
+	find hunspell quazip utilities/poppler-data -delete || die
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64; do
+		insinto /usr/share/icons/hicolor/${i}
+		newins utilities/${PN}${i}.png ${PN}.png
+	done
+	qt4-r2_src_install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}