app-office/texstudio: Version BUmp, #474428

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 200 insertions, 6 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index bc290211e53c..72d1e25a0099 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2013/04/25 06:35:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.13 2013/06/26 13:51:59 jlec Exp $
+
+*texstudio-2.6.0 (26 Jun 2013)
+
+  26 Jun 2013; Justin Lecher <jlec@gentoo.org> +texstudio-2.6.0.ebuild,
+  +files/texstudio-2.6.0-desktop.patch,
+  +files/texstudio-2.6.0-hunspell-quazip.patch:
+  Version BUmp, #474428
 
   25 Apr 2013; Justin Lecher <jlec@gentoo.org> texstudio-2.5.2.ebuild,
   texstudio-2.5.2-r1.ebuild:
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 9aab7b986877..9c6474828202 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -11,15 +11,19 @@ AUX texstudio-2.4-hunspell.patch 2082 SHA256 03a008032e98000e5584a3ada954750d6c4
 AUX texstudio-2.5-hunspell.patch 2808 SHA256 f741a32e0de76001c11b97ee60361f1fbe7edecd533175c7fe518bc9e3576432 SHA512 fdee8eff91d8629a447d912c838e3ae0bc6fc3cdedf36292ba89d65d90aed164561572a5e145343bb45389f6e3bdf4a4bba7ba5f88513e6ecc5235b53a54874a WHIRLPOOL 47018c56e14afecf8ad84add30b26f1938d4e94d4475240f40df781b890b02c3a2958075ec361e91503844c4d20ad6004186dd5b10e18a5a8dfdfa1d50eb2a4a
 AUX texstudio-2.5-qtsingle.patch 597 SHA256 7b87dce38ed023feaa08cceabbba3c0b8e32223e859bccfec45c9f5288fad17e SHA512 518e31bbcd4303e6f0c998ee7645ee1dc56d9d1f8d11dfc1a18a7e728afa351258530b000524ed2361cee8ef5b6c860c3d20efe41daf24f464b0f016e4bdad07 WHIRLPOOL 416e5d00978c64b29383a5a48536440da0a833bcf1f01b2c3151805ce252945e4a8caa8bd99f178da5acbc2064f754dd6f20148b7c68e53b79a2036c1c90c621
 AUX texstudio-2.5-viewers-use-xdg-open.patch 1311 SHA256 ee8a441cef57db995e3a1e8d3f8abd198c8689717b54bfaca5393bed3fc50790 SHA512 4e8084f7a0eaf75b8828bb6f3f2dbcc18f63c0d750f319347fc427af0ee2f858316c23f34aee396838dcff95610801b300e1a7941db747c1d2a6222a8e27ac81 WHIRLPOOL 93726ae1aed601e01a171f2995b4cd6dc7ece54d5c11456244fa9bc0cc0efb07999eba35fe102c4f2bb7570b2c0f247cdd8a146146358b82dd94f35dfd0f9213
+AUX texstudio-2.6.0-desktop.patch 699 SHA256 65c15ba516d444a51118839cc98abf66fc9f7fbe8a25760577ec0c645ae471c2 SHA512 91432aa75a61f17873e8358f60a1b10a4c7334c4b2d44f9b8b1b03abd64f728a856828b3c45e11d91380bf23dd4a62053fff4d2810ce64ac165741e213dda7c6 WHIRLPOOL b880b968eb8014f84802f578fe85bbddbc9ac25f5baddcdd72c7ff98bd20b4770cb1c7648cecb5066e9031fe8fb0cca4ca085a8a8b6db4ff33a38b490a9c99d6
+AUX texstudio-2.6.0-hunspell-quazip.patch 2545 SHA256 aff0970530a4761bd2c4d1d581b036955c9cc8ba9057a1ef3d017b3dd1685dbb SHA512 e04eccb4341769f61fdbba59244db0c42553ac0a889bde01a85b4596a9c0b4603121c26e048cb95c1f725ade0bbdfcb6c5b81b76b4ac553d676862298b26fc6a WHIRLPOOL 77fbe1899de42d2088ad63656c76cd2a9514457a0b897d1af6ed9bca5ae97d0e2c0fbce237b26d265515055cc41f0205698a9ebdce46966dcec706f01fa67cca
 DIST texstudio-2.5.2.tar.gz 20731701 SHA256 50cc2163b872590c0af8edd22f1795aaa424a821956c38db24e5d72ecdad4f08 SHA512 d85cb4375a6828bac17e9d0cf97158e54fcd492ddfbc5e632dec9ca52616b3a2fd83f9ec696285d2ebe8627b78b26fd2a37fc9f0d10c96f2ec87b0c6de1bd061 WHIRLPOOL 183ebf3f4b97917449ceea991288ddc1f4a8b6c383d5ed2592ba8de2a05048df2eae5b69a4e0f57db87ef661b7b8086ac9c4ec55bff13ab8236ee81a95d7c64c
+DIST texstudio-2.6.0.tar.gz 22913723 SHA256 23899dc7d57352f84deb375fefea33e3394f3fc497998abcdba003ef1856fc30 SHA512 e958c8e6bb73d3432cd54610c2ece3120c824c53c0fe2d367f2026fc3149bd837638f803706eacac44f48905032f39ad6792e3afbe721f6664a2b551dfdb47a2 WHIRLPOOL c16c4555ed63addb024b279589db09cd5d70f3af9940c4ae57394a04bc66b0be2bf22702bdba21342ed56be859db4b8943b832f6ec6d44ec96e6215bea2a0d93
 EBUILD texstudio-2.5.2-r1.ebuild 1541 SHA256 473672075ef8d216790675e21cfdbc3c06059fd7d23169aed419234a50384ec6 SHA512 85fc4f590e1a64feba6913ffc467ea6ec44a6bf7addbe6d2aafc885e209401418d6007b81cc28dc7b0ad7cc20e512f2071b139a347efdda82543e269bf7ce7f4 WHIRLPOOL a8c821379bff8ec7e4d59bcc4933400d800c7730845b8553749e9776dadd241b7a3abaf2cd8e5a22c47b7397178ee13da18787e0a1913ba06f70dc3418e580e5
 EBUILD texstudio-2.5.2.ebuild 1536 SHA256 e6513ea4e8b5a9a533df2b0e3a4aa9ee032c011e57687cc05a1e59c9be4d2004 SHA512 056fe7c90e16908adab59c7d2966f8811446e5ab466e5756cf0898cedd0c13147c549980c57d4bc16d62628b2f90d5dd675edfac1c7790c728384d0d37433f82 WHIRLPOOL d0e6f048b2ff68253a9b6f005e29768f3ceef5b952d366dad38709023f6ad87150bad9916d8c5d15b5a3f1f9ff777bf29c59070fb965230523049acead094afe
-MISC ChangeLog 2906 SHA256 cdf4c1e31e922bf57fe0f4e70b3cc173d70cd2c8c5d266f4b2dabebda8ef8ed8 SHA512 1dd92e90e6f06b756e7dfa922ba4e5f7ffb38bd1b6a1758f520fcad34802db6cb7d1f9ac0561fb36389353a3b910d196c40bcc7c264f581ab564a1b05ac5a806 WHIRLPOOL 4cdbe70299f4b589257959e84c03c6253cd6e85bdc0555741dc0537f12fc08e4c512323c19e811ed7d9bf7b6e2a4591be1e56f4bdf76bec0c883ceda4c66c8d0
+EBUILD texstudio-2.6.0.ebuild 1592 SHA256 3605e2c860bce35cab5983ec72088b418bc7f16f43c3dc48bb68786d837b47df SHA512 8442aa1218b4fa790c9728f5f764586181d52a4042068a158fa47d175e1115034374081a30fd8d52e6da7a6553aff7d8399f43054c8e4367681b8b7303506a2b WHIRLPOOL 32798bdd621d010edbeb859af543a7792dbe0990a1e0240adc0953fc9b98031d288d101cd57ef87cd695aae81301dcf5c8d364e8b266b1d332b7d41672799856
+MISC ChangeLog 3123 SHA256 75c1b31783bb33ad465922a2f327ccef829ff7f3999e8ea2be27986f8e78b4e1 SHA512 17861ca05f125573479726df99067c70017104968b90b37f239fa4381bdeee959e0efc13616e8264beff56426b5724d9198bc6bf337049c8f95621fcd19a3867 WHIRLPOOL dff3d37508acb962330c072e62c6b2f973a6c884486045bc1e427f655f716605aa30bfd50f1835e97c9d79f01166d1afc8d0966adfcd1300f91968640c1deb0a
 MISC metadata.xml 283 SHA256 0c64e26ba93ec0d8dd149b088c63e4448174b2f843c91e1f74ac17c2a5feea27 SHA512 74ce72ee9b32eb81077907416c71890c37d20055481df15f0e056e083fe300701dabf6d8df11aa1ecbed13c1ea167305417050ca2e41f4e1b63e2a434f18c821 WHIRLPOOL ac0ac10f27910c9beb29ab731afbe9bce6c4811fb0a1f787036ae1b0638dbdb6ba2a744b3ad4ca6fa5a649a4a8be082969cbe99c8bcd0cdceea8252a5268df4d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlF4ztAACgkQgAnW8HDreRa+TwCghnz0ia4W4pZ0mQchnbUGi6mm
-f+YAn0GUfRjCtlCp3K1gTsvG6e1UY+RA
-=TQdP
+iEUEAREKAAYFAlHK8gAACgkQgAnW8HDreRa7JACgnURorGbzyRM7dFAR69D9Wkqr
+7KQAmJVR+oiRaWhxUHhudWXSUAzX630=
+=MLzN
 -----END PGP SIGNATURE-----
diff --git a/app-office/texstudio/files/texstudio-2.6.0-desktop.patch b/app-office/texstudio/files/texstudio-2.6.0-desktop.patch
new file mode 100644
index 000000000000..6d23788a3486
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.6.0-desktop.patch
@@ -0,0 +1,22 @@
+ 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
new file mode 100644
index 000000000000..2cf2ec07dca3
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.6.0-hunspell-quazip.patch
@@ -0,0 +1,93 @@
+ 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 <hunspell.hxx>

+ 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

++}

diff --git a/app-office/texstudio/texstudio-2.6.0.ebuild b/app-office/texstudio/texstudio-2.6.0.ebuild
new file mode 100644
index 000000000000..65be01afe39c
--- /dev/null
+++ b/app-office/texstudio/texstudio-2.6.0.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.0.ebuild,v 1.1 2013/06/26 13:51:59 jlec Exp $
+
+EAPI=5
+
+inherit base fdo-mime qt4-r2
+
+DESCRIPTION="Free cross-platform LaTeX editor (former 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.6.1: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
+	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}"/${P}-hunspell-quazip.patch
+# 441914
+#	"${FILESDIR}"/${P}-qtsingle.patch
+	"${FILESDIR}"/${P}-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
+}