app-office/texstudio: Version Bump; Update desktop mime db; drop old

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

6 files changed, 125 insertions, 55 deletions

diff --git a/app-office/texstudio/ChangeLog b/app-office/texstudio/ChangeLog
index 0041603cecb3..6f3c0491b935 100644
--- a/app-office/texstudio/ChangeLog
+++ b/app-office/texstudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texstudio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.6 2012/07/18 18:24:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/ChangeLog,v 1.7 2012/09/05 07:28:12 jlec Exp $
+
+*texstudio-2.4 (05 Sep 2012)
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> -texstudio-2.2.ebuild,
+  -texstudio-2.3.ebuild, texstudio-2.3-r1.ebuild, +texstudio-2.4.ebuild,
+  +files/texstudio-2.4-desktop.patch, +files/texstudio-2.4-hunspell.patch:
+  Version Bump; Update desktop mime db; drop old
 
   18 Jul 2012; Justin Lecher <jlec@gentoo.org> texstudio-2.3.ebuild:
   Drop patch for gcc-4.7 from all but last revision
diff --git a/app-office/texstudio/files/texstudio-2.4-desktop.patch b/app-office/texstudio/files/texstudio-2.4-desktop.patch
new file mode 100644
index 000000000000..33f0a5bf51a3
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.4-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/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
new file mode 100644
index 000000000000..208cc8ecf217
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-2.4-hunspell.patch
@@ -0,0 +1,70 @@
+ 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/texstudio-2.2.ebuild b/app-office/texstudio/texstudio-2.2.ebuild
deleted file mode 100644
index 195a37870500..000000000000
--- a/app-office/texstudio/texstudio-2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.2.ebuild,v 1.2 2012/05/03 20:00:40 jdhore Exp $
-
-EAPI=4
-
-inherit base 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]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-script-4.6.1:4
-	>=x11-libs/qt-test-4.6.1:4
-	>=x11-libs/qt-webkit-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.patch" )
-
-src_prepare() {
-	find hunspell -delete
-	sed 's:hunspell/hunspell:hunspell:g' -i *.h || die
-	if use video; then
-		sed "s:PHONON =:PHONON=true:g" -i ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}
diff --git a/app-office/texstudio/texstudio-2.3-r1.ebuild b/app-office/texstudio/texstudio-2.3-r1.ebuild
index 1e27dccc7000..70de712dad66 100644
--- a/app-office/texstudio/texstudio-2.3-r1.ebuild
+++ b/app-office/texstudio/texstudio-2.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3-r1.ebuild,v 1.1 2012/07/15 09:31:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3-r1.ebuild,v 1.2 2012/09/05 07:28:12 jlec Exp $
 
 EAPI=4
 
-inherit base qt4-r2
+inherit base fdo-mime qt4-r2
 
 DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -53,10 +53,14 @@ src_prepare() {
 }
 
 src_install() {
-	make_desktop_entry texstudio "LaTeX Editor" texstudio "text/x-tex"
+	make_desktop_entry texstudio "LaTeX Editor" texstudio "text/X-tex"
 	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
+}
diff --git a/app-office/texstudio/texstudio-2.3.ebuild b/app-office/texstudio/texstudio-2.4.ebuild
index 2d0793682a3a..10ebb88d5faf 100644
--- a/app-office/texstudio/texstudio-2.3.ebuild
+++ b/app-office/texstudio/texstudio-2.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.3.ebuild,v 1.4 2012/07/18 18:24:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texstudio/texstudio-2.4.ebuild,v 1.1 2012/09/05 07:28:12 jlec Exp $
 
 EAPI=4
 
-inherit base qt4-r2
+inherit base fdo-mime qt4-r2
 
 DESCRIPTION="Free cross-platform LaTeX editor (former texmakerX)"
 HOMEPAGE="http://texstudio.sourceforge.net/"
@@ -37,7 +37,10 @@ DEPEND="${COMMON_DEPEND}
 S="${WORKDIR}"/${P/-/}
 
 PATCHES=(
-	"${FILESDIR}/${P}-hunspell.patch"
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${P}-desktop.patch
+# Get it from fedora once they have bumped
+#	"${FILESDIR}"/${P}-xdg-open.patch
 	)
 
 src_prepare() {
@@ -48,3 +51,15 @@ src_prepare() {
 	fi
 	qt4-r2_src_prepare
 }
+
+src_install() {
+	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
+}
\ No newline at end of file