[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/

2021-03-16 Thread Sam James
commit: 42c9f517ca717f351533d38a57b816e4440a46c2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Mar 16 17:58:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 18:50:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c9f517

app-office/texstudio: remove unused file

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19957
Signed-off-by: Sam James  gentoo.org>

 app-office/texstudio/files/texmakerx_my.pri | 18 --
 1 file changed, 18 deletions(-)

diff --git a/app-office/texstudio/files/texmakerx_my.pri 
b/app-office/texstudio/files/texmakerx_my.pri
deleted file mode 100644
index 06426fc6a9c..000
--- a/app-office/texstudio/files/texmakerx_my.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-CONFIG   += link_pkgconfig
-
-# System Quazip
-INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/quazip
-LIBS += -lquazip
-#INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/qt4/QCodeEdit
-#INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/qt4/QtSolutions
-
-# System hunspell
-PKGCONFIG += hunspell
-
-# System qtsingleapplication
-#QT += solutions
-CONFIG += qtsingleapplication
-
-# System qcodeedit
-# Not working currently
-#CONFIG += qcodeedit



[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/, app-office/texstudio/

2021-02-23 Thread Andreas Sturmlechner
commit: 76147231ad2fcf672561c209c480bd2636f2cd61
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 20:53:11 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76147231

app-office/texstudio: Support build with >=dev-libs/quazip-1.0

Drop prefix.eclass, using pkgconfig for dev-libs/quazip:0/0 instead.
Raise minimum dev-libs/quazip version to first w/o IUSE=qt5, cleanup usedep.
Raise minimum media-libs/phonon version to first w/o IUSE=qt5, cleanup usedep.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../texstudio/files/texstudio-3.0.5-quazip1.patch  | 19 +++
 ...tudio-.ebuild => texstudio-3.0.5-r1.ebuild} | 37 --
 ...tudio-.ebuild => texstudio-3.1.0-r1.ebuild} | 37 --
 app-office/texstudio/texstudio-.ebuild | 30 +-
 4 files changed, 74 insertions(+), 49 deletions(-)

diff --git a/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch 
b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
new file mode 100644
index 000..a2a9033abd6
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
@@ -0,0 +1,19 @@
+Fix build with QuaZip-1.0.
+
+--- a/texstudio.pro
 b/texstudio.pro
+@@ -369,11 +369,9 @@
+ isEmpty(USE_SYSTEM_QUAZIP) {
+ include(src/quazip/quazip/quazip.pri)
+ } else {
+-message(System quazip5)
+-isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
+-isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
+-INCLUDEPATH += $${QUAZIP_INCLUDE}
+-LIBS += $${QUAZIP_LIB}
++message(System QuaZip)
++CONFIG += link_pkgconfig
++PKGCONFIG += quazip1-qt5
+ }
+ 
+ include(src/pdfviewer/pdfviewer.pri)

diff --git a/app-office/texstudio/texstudio-.ebuild 
b/app-office/texstudio/texstudio-3.0.5-r1.ebuild
similarity index 66%
copy from app-office/texstudio/texstudio-.ebuild
copy to app-office/texstudio/texstudio-3.0.5-r1.ebuild
index feb15564ad1..17c7377b06e 100644
--- a/app-office/texstudio/texstudio-.ebuild
+++ b/app-office/texstudio/texstudio-3.0.5-r1.ebuild
@@ -3,22 +3,23 @@
 
 EAPI=7
 
-inherit desktop git-r3 prefix qmake-utils xdg
-
 MY_PV="${PV/_/}"
+inherit desktop qmake-utils xdg
+
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
 HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio;
-EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git;
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="video"
 
-COMMON_DEPEND="
+DEPEND="
app-text/hunspell:=
app-text/poppler[qt5]
-   >=dev-libs/quazip-0.7.2:0[qt5(+)]
+   >=dev-libs/quazip-0.7.3-r1:0=
dev-qt/designer:5
dev-qt/qtcore:5
dev-qt/qtconcurrent:5
@@ -34,30 +35,32 @@ COMMON_DEPEND="
sys-libs/zlib
x11-libs/libX11
x11-libs/libXext
-   video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
+   video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}
app-text/ghostscript-gpl
app-text/psutils
media-libs/netpbm
-   virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
+   virtual/latex-base
+"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-quazip1.patch" ) # TODO: upstream
+
 src_prepare() {
-   default
-   # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication 
-delete || die
+   xdg_src_prepare
+
+   if has_version "https://www.texstudio.org https://github.com/texstudio-org/texstudio;
-EGIT_REPO_URI="https://github.com/texstudio-org/texstudio.git;
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="video"
 
-COMMON_DEPEND="
+DEPEND="
app-text/hunspell:=
app-text/poppler[qt5]
-   >=dev-libs/quazip-0.7.2:0[qt5(+)]
+   >=dev-libs/quazip-0.7.3-r1:0=
dev-qt/designer:5
dev-qt/qtcore:5
dev-qt/qtconcurrent:5
@@ -34,30 +35,32 @@ COMMON_DEPEND="
sys-libs/zlib
x11-libs/libX11
x11-libs/libXext
-   video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
+   video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}
app-text/ghostscript-gpl
app-text/psutils
media-libs/netpbm
-   virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
+   virtual/latex-base
+"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.5-quazip1.patch" ) # TODO: upstream
+
 src_prepare() {
-   default
-   # TODO: find hunspell quazip utilities/poppler-data qtsingleapplication 

[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/, app-office/texstudio/

2017-02-25 Thread Justin Lecher
commit: 2dbd8abbd8e62fa1a63820ee8ba450ec7e9fc555
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Feb 25 20:05:13 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Feb 25 20:42:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbd8abb

app-office/texstudio: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 app-office/texstudio/Manifest  |   2 -
 .../texstudio/files/texstudio-2.10.6-desktop.patch |  18 
 .../files/texstudio-2.6.4-hunspell-quazip.patch|  16 
 app-office/texstudio/texstudio-2.11.0.ebuild   | 101 -
 app-office/texstudio/texstudio-2.12.0.ebuild   |  92 ---
 5 files changed, 229 deletions(-)

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 087c97471b..0716e73a13 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,4 +1,2 @@
-DIST texstudio-2.11.0.tar.gz 26263749 SHA256 
170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307 SHA512 
773010bfa25de17e4deb0ae32325c26b5ff737bea837fba34fde28ec00d8e9a4d2c816d1f431c3c4e5a506354d1ff541e6b74bd36323e0fd3f20f4d389aab3be
 WHIRLPOOL 
3f7b6feeeccef41f78da14a5f483a2f435ccc575b9ace3c4a3ab774426cd6ff5811ad662a5e210b7ae5223435b509392c634cb30e547535fe475b83e0ee84142
 DIST texstudio-2.11.2.tar.gz 24143941 SHA256 
d88ecfef92e38710563294079645fbfa19829ceebd9a109a68f6959c51ae94ad SHA512 
774cea12339b19c7d33d034e75386415b89c59de1e149f3973bd0cf789a28c4cb1cdb026a897228303071dc05f985d4798924c6b253e964d6bdced877ab9f1e7
 WHIRLPOOL 
8b54419db50640abb0fc03ce3b1206c01bc1d245d0a5b605ccc44cfd6e2821651a18a00bfef7622f6c47bf79da23315704b50febe645373feb161f6f68d809a9
-DIST texstudio-2.12.0.tar.gz 26334251 SHA256 
165e00de19a964d377bc46dfce23e33e30a9f071acfeb5ee9b55ba1c1221 SHA512 
6ce7d2fe2bda46463577eefa1881f5a98db20d7b03f63fe8bd3b87f3727b60d25ef08b7ae074ccd070c373950b698e0683de34cf5eb091250c2a1c8d8472b3ee
 WHIRLPOOL 
1e5b3ae047e5281bbfafa6040e35eae35e91d37b5ebe2c56f3ab7949bf2fafd45c9b3d9d845496e881cb6058694507b2232b39596246c48de6f499004dd2c7f6
 DIST texstudio-2.12.2.tar.gz 26311798 SHA256 
3ffdaf0a3cb8bb9801e68ecba7641778b94121b4320de8751b79f2d8718cdcb1 SHA512 
255b211fe715ffc91706ab20877ffaa4b8e0710d3e6f381e7a6b8eed19bb889d89d0913756839c1f0c427029c0da9713b78bd1e21769ccc46cf976b65c91c6f6
 WHIRLPOOL 
84b309579c31dfc77b9e0f86cb1c80381e65f295d27222fd54a471e3d3f12acdaaad21587fa788143db27f651617b566937c35a0de9de470e65192522e98b7d3

diff --git a/app-office/texstudio/files/texstudio-2.10.6-desktop.patch 
b/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
deleted file mode 100644
index ab2822f6b2..00
--- a/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 utilities/texstudio.desktop.old2016-01-17 16:38:44.283878626 +0100
-+++ utilities/texstudio.desktop2016-01-17 16:39:08.374876711 +0100
-@@ -1,6 +1,5 @@
- [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
-@@ -8,7 +7,7 @@
- Comment[fr]=Environnement de développement LaTeX
- Icon=texstudio
- Keywords=LaTeX;TeX;editor;
--MimeType=text/x-tex;
-+MimeType=text/X-tex;
- Name=TeXstudio
- StartupNotify=false
- Terminal=false

diff --git a/app-office/texstudio/files/texstudio-2.6.4-hunspell-quazip.patch 
b/app-office/texstudio/files/texstudio-2.6.4-hunspell-quazip.patch
deleted file mode 100644
index 0ddcccb061..00
--- a/app-office/texstudio/files/texstudio-2.6.4-hunspell-quazip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- spellerutility.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spellerutility.h b/spellerutility.h
-index 7e1b980..b0bc8b8 100644
 a/spellerutility.h
-+++ b/spellerutility.h
-@@ -13,7 +13,7 @@
- 
- #include "mostQtHeaders.h"
- 
--#include "hunspell/hunspell.hxx"
-+#include 
- class SpellerUtility: public QObject {
-   Q_OBJECT
- public:

diff --git a/app-office/texstudio/texstudio-2.11.0.ebuild 
b/app-office/texstudio/texstudio-2.11.0.ebuild
deleted file mode 100644
index b5da2ac276..00
--- a/app-office/texstudio/texstudio-2.11.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit fdo-mime prefix qmake-utils
-
-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 qt4 +qt5"
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-COMMON_DEPEND="
-   app-text/hunspell
-   app-text/poppler:=[qt4?,qt5?]
-   >=dev-libs/quazip-0.7.1[qt4?,qt5?]
-   

[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/, app-office/texstudio/

2016-10-10 Thread Manuel Rüger
commit: 70450d2900eb9ba60fe16c4c53f6f9f11d5fdefd
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Oct 10 22:34:30 2016 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct 10 22:34:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70450d29

app-office/texstudio: Remove old

Package-Manager: portage-2.3.1

 app-office/texstudio/Manifest  |   1 -
 .../files/texstudio-2.5-viewers-use-xdg-open.patch |  42 
 .../texstudio/files/texstudio-2.8.2-desktop.patch  |  22 
 app-office/texstudio/texstudio-2.10.2.ebuild   | 113 -
 4 files changed, 178 deletions(-)

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 291a661..ecf563f 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,4 +1,3 @@
-DIST texstudio-2.10.2.tar.gz 25669897 SHA256 
0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 
3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c
 WHIRLPOOL 
e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
 DIST texstudio-2.10.8.tar.gz 26003322 SHA256 
0a569544ceb0ff92e52ed57a34e8eb12e7a16eef1209320737aef5d5b81b3404 SHA512 
3faa278f785dc1de34c5a502191430989f078d5301da93f1df13d70287e01322618fd146e1ee7c4c6714233a53affdbb92e3e67f5717b978d2fbe126c59da949
 WHIRLPOOL 
626d56e68df767e1b02a34f2abe9316c2d237d6e368294d7389c46394f3735d633bb0019da78da3194699cf3fbc3d257c489bbc63829b04199c681c11a688e8f
 DIST texstudio-2.11.0.tar.gz 26263749 SHA256 
170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307 SHA512 
773010bfa25de17e4deb0ae32325c26b5ff737bea837fba34fde28ec00d8e9a4d2c816d1f431c3c4e5a506354d1ff541e6b74bd36323e0fd3f20f4d389aab3be
 WHIRLPOOL 
3f7b6feeeccef41f78da14a5f483a2f435ccc575b9ace3c4a3ab774426cd6ff5811ad662a5e210b7ae5223435b509392c634cb30e547535fe475b83e0ee84142
 DIST texstudio-2.11.2.tar.gz 24143941 SHA256 
d88ecfef92e38710563294079645fbfa19829ceebd9a109a68f6959c51ae94ad SHA512 
774cea12339b19c7d33d034e75386415b89c59de1e149f3973bd0cf789a28c4cb1cdb026a897228303071dc05f985d4798924c6b253e964d6bdced877ab9f1e7
 WHIRLPOOL 
8b54419db50640abb0fc03ce3b1206c01bc1d245d0a5b605ccc44cfd6e2821651a18a00bfef7622f6c47bf79da23315704b50febe645373feb161f6f68d809a9

diff --git 
a/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch 
b/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
deleted file mode 100644
index 667ee31..
--- a/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
-From: hannes 
-Date: Sun, 9 Sep 2012 10:56:06 +0200
-Subject: [PATCH] viewer
-

- buildmanager.cpp | 18 +++---
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git buildmanager.cpp buildmanager.cpp
-index ac7027a..ac913d0 100644
 buildmanager.cpp
-+++ buildmanager.cpp
-@@ -762,25 +762,13 @@
- // xdvi %.dvi  -sourceposition @:%.tex
- // kdvi "file:%.dvi#src:@ %.tex"
- QString getCommandLineViewDvi(){
--  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";
- };
- QString getCommandLineViewPs(){
--  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";
- }
- QString getCommandLineViewPdfExternal(){
--  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";
- }
- QString getCommandLineGhostscript(){ return ""; }
- 

diff --git a/app-office/texstudio/files/texstudio-2.8.2-desktop.patch 
b/app-office/texstudio/files/texstudio-2.8.2-desktop.patch
deleted file mode 100644
index d464e8a..
--- a/app-office/texstudio/files/texstudio-2.8.2-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
- 

[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/

2016-09-30 Thread Patrice Clement
commit: 3fecf7db505b68c6a25517193e29e4c3328d3591
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Sep 30 17:33:44 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Sep 30 17:34:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fecf7db

app-office/texstudio: remove unused patches.

Courtesy of Michael Mair-Keimberger  gmail.com>.

Closes: https://github.com/gentoo/gentoo/pull/1916
Signed-off-by: Patrice Clement  gentoo.org>

 .../texstudio/files/texstudio-2.6.0-desktop.patch  | 22 -
 .../files/texstudio-2.6.0-hunspell-quazip.patch| 93 --
 2 files changed, 115 deletions(-)

diff --git a/app-office/texstudio/files/texstudio-2.6.0-desktop.patch 
b/app-office/texstudio/files/texstudio-2.6.0-desktop.patch
deleted file mode 100644
index 6d23788..
--- a/app-office/texstudio/files/texstudio-2.6.0-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/texstudio.svg
--MimeType=text/x-tex;
-+MimeType=text/X-tex;
- Name=TeXstudio
- StartupNotify=false
- Terminal=false

diff --git a/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch 
b/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch
deleted file mode 100644
index 2cf2ec0..
--- a/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch
+++ /dev/null
@@ -1,93 +0,0 @@
- spellerutility.h |  2 +-
- texstudio.pro| 45 -
- 2 files changed, 13 insertions(+), 34 deletions(-)
-
-diff --git a/spellerutility.h b/spellerutility.h
-index 7e1b980..b0bc8b8 100644
 a/spellerutility.h
-+++ b/spellerutility.h
-@@ -13,7 +13,7 @@
- 
- #include "mostQtHeaders.h"
- 
--#include "hunspell/hunspell.hxx"
-+#include 
- class SpellerUtility: public QObject {
-   Q_OBJECT
- public:
-diff --git a/texstudio.pro b/texstudio.pro
-index b073255..3d4ee64 100644
 a/texstudio.pro
-+++ b/texstudio.pro
-@@ -53,25 +53,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 \
--hunspell/replist.hxx \
- qcodeedit/lib/qeditorinputbinding.h \
- qcodeedit/lib/qeditorinputbindinginterface.h \
- qcodeedit/lib/qformat.h \
-@@ -171,18 +152,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 \
- qcodeedit/lib/qformat.cpp \
-@@ -537,10 +506,14 @@ SOURCES += qcodeedit/lib/qnfa/qnfa.cpp \
- # ###
- 
- # ##QUAZIP###
--DEFINES += QUAZIP_STATIC
-+#DEFINES += QUAZIP_STATIC
- 
- # Input
--include(quazip/quazip/quazip.pri)
-+#include(quazip/quazip/quazip.pri)
-+unix {
-+  INCLUDEPATH += $${PREFIX}/include/quazip
-+  LIBS += -lquazip
-+}
- 
- # ###
- 
-@@ -677,3 +650,9 @@ else {
-   QMAKE_LFLAGS_RELEASE -= -Wl,-s
- }
- 
-+unix {
-+  CONFIG   += link_pkgconfig
-+  # use system quazip
-+  # use system hunspell
-+  PKGCONFIG += hunspell
-+}



[gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/, app-office/texstudio/

2016-01-17 Thread Manuel Rüger
commit: a95ec810e9abe928e0e07b84ce8837b473489c77
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Jan 17 15:46:16 2016 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Jan 17 15:46:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95ec810

app-office/texstudio: Version bump

Gentoo-Bug: 571950

Package-Manager: portage-2.2.26

 app-office/texstudio/Manifest  |   1 +
 .../texstudio/files/texstudio-2.10.6-desktop.patch |  18 
 app-office/texstudio/texstudio-2.10.6.ebuild   | 111 +
 3 files changed, 130 insertions(+)

diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 4486699..25a51b1 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,2 +1,3 @@
 DIST texstudio-2.10.2.tar.gz 25669897 SHA256 
0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 
3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c
 WHIRLPOOL 
e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
 DIST texstudio-2.10.4.tar.gz 25810583 SHA256 
87e7b7c52d51791178fac4c48feeded7a920bc39bcfb710a745b467d80111c3c SHA512 
13c6624bf38ee2633f9a86eb9c7ba03503b63de1f954c3f7c4a24182127b9d4db1e8524a122552412a2ceccb288a0dad3d70e9368fd897d6ec123a16e37816e5
 WHIRLPOOL 
357796f638d3e558a9560a62d972555474850ebd6b5a61bdaa14037b728113222ce9c9f2438b851fdaa20687e1444a8913cd222d5849de67293b0589085a6dc9
+DIST texstudio-2.10.6.tar.gz 25956475 SHA256 
16368d7334f809aebe7a656f9bfa97f0ececb09d437fdb35ae7fc1888f1525e1 SHA512 
061bad8530503aa611a09e5e2013fb5e956f436de00e2cd773fbd5e76c7a198fc9a628e4785e45f63dae5a2d0fed3e7f88d4a1a4a1f6fd0babdc44cc51eee0ab
 WHIRLPOOL 
42d34dcae31f941b4d43af948e91a00be34d002bc85476f12e8e38b83d518f439b012c0c53aeb22728de984a55d2ee6a9139ff96c4aa1fe993059c935727a780

diff --git a/app-office/texstudio/files/texstudio-2.10.6-desktop.patch 
b/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
new file mode 100644
index 000..ab2822f
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.10.6-desktop.patch
@@ -0,0 +1,18 @@
+--- utilities/texstudio.desktop.old2016-01-17 16:38:44.283878626 +0100
 utilities/texstudio.desktop2016-01-17 16:39:08.374876711 +0100
+@@ -1,6 +1,5 @@
+ [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
+@@ -8,7 +7,7 @@
+ Comment[fr]=Environnement de développement LaTeX
+ Icon=texstudio
+ Keywords=LaTeX;TeX;editor;
+-MimeType=text/x-tex;
++MimeType=text/X-tex;
+ Name=TeXstudio
+ StartupNotify=false
+ Terminal=false

diff --git a/app-office/texstudio/texstudio-2.10.6.ebuild 
b/app-office/texstudio/texstudio-2.10.6.ebuild
new file mode 100644
index 000..668b92a
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.10.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime prefix qmake-utils
+
+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 qt4 +qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+   app-text/hunspell
+   app-text/poppler:=[qt4?,qt5?]
+   >=dev-libs/quazip-0.7.1[qt4?,qt5?]
+   dev-qt/qtsingleapplication[X,qt4?,qt5?]
+   x11-libs/libX11
+   x11-libs/libXext
+   qt4? (
+   dev-qt/designer:4
+   >=dev-qt/qtgui-4.8.5:4
+   >=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
+   )
+   qt5? (
+   dev-qt/designer:5
+   dev-qt/qtcore:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtscript:5
+   dev-qt/qtsvg:5
+   dev-qt/qttest:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   )
+   video? ( media-libs/phonon[qt4?,qt5?] )"
+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.4-hunspell-quazip.patch
+   "${FILESDIR}"/${PN}-2.10.6-desktop.patch
+   )
+
+src_prepare() {
+   find hunspell quazip utilities/poppler-data qtsingleapplication -delete 
|| die
+
+   if use video; then
+