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

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

7 files changed, 134 insertions, 63 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/Manifest b/app-office/texstudio/Manifest
index 3653f305cc36..2e8105c20894 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -6,18 +6,19 @@ AUX texstudio-2.3-gcc47.patch 1190 SHA256 3db83d5da15dda7114b4048f95fd4444d2e5cb
 AUX texstudio-2.3-hunspell.patch 2067 SHA256 43d54f375e16e6075b0b82b99062172642d8b7ec0d4c81454e14957113d5e5b4 SHA512 dfc7d8fbf4a582d36670f1df267a867cd052087e9bb0ec6875ffa1a01b363e97d7111e35a8e57c15d86814dd01932e94ce2079343c53ae8964b7ee4f586135c1 WHIRLPOOL 04e675a1cb06c09a72845dfd3eb97168f492e452d3eca734e5eaaf15627dc14f42d6a27259db5e1bdf3f36cbfe7aee30ced443013f9c09c04179273e3c9e4a0e
 AUX texstudio-2.3-test.patch 1471 SHA256 a2c6b84a8706fc45a9b481ffd4213860eef9d74f22f45dd2bfd9474e990c69da SHA512 5478e4b2f94702b525249eb74849dad0761f1c474e14aa4f29375754961067eab3da6599dbf2342f8666bb00f3c981d12850192ede98f7e4f30e19d27c44b40e WHIRLPOOL 98fa91d6701070361eb01bc1827b033c223c3f01a4ac1a6a88eab5ce42da3440260b6e1673b8a00de0dec130d1cbcda6647209c5543d75ec8f265240c873c722
 AUX texstudio-2.3-xdg-open.patch 2216 SHA256 39c1d0039416cd19d1f6848fe0bdfbfb95ae76c5944287c51ebb450eadac5801 SHA512 99b46379553d4fa6bd7a3bc11865c650204237c00dd7acfcea877b3cb92840fc7b4ffb643a11b16603bf197acf9ab20d0f2adb4499e402752747a85c70a76ea4 WHIRLPOOL b9c8b3eb42d52cb0126666ed4de20a3b1da5f1c9de737211c81696c60fc05ee40135a1e5b71a005ab3888fc65ea86b6bb1c5c6aea2fcaff26a458c5fc5974150
-DIST texstudio-2.2.tar.gz 12522002 SHA256 89533783f95428e91d84926b720bb8972241bd7b5be1e3d2b8cffab742bc6749 SHA512 49dccf188ec8a99a2225509209a927ddf0dbe7ddc0336f96cd544c61779e7686783cccf0b4d08d9b05bd95443ef1e77ab6db7ab3b19a7ae1dde71b382841c9e0 WHIRLPOOL 7a20a6869e55b97688e4fe00f6cafef64fa3cc059bbb4e8c9bba07526553f84d1944da6832cf1964e1a2d91277e84fecc73e8a54129060b3e2fe8835e7023c96
+AUX texstudio-2.4-desktop.patch 704 SHA256 ef2e3ed91f56f9d9945216d036b0e5cca4cdfb6b3a310bbee02a25a7ebaabe95 SHA512 fa21dfc3a5e4e4192c120a57bcbeb6937ca5985774c2ca5f66e7d6decacf1311b45b4ce12979a708fabf8fca542f60244547d760eb2a5f7897fd149f215f5bab WHIRLPOOL a772fda463cc2c918ef9891ed9768ac037d71f5f8494c62a2498218c0e7f5b505c2ebdac1e4c7d57d652185a0d1010d3cfc32fe5a230ee30bcc8cbb2595162f8
+AUX texstudio-2.4-hunspell.patch 2082 SHA256 03a008032e98000e5584a3ada954750d6c41f12ec5dbae6fbf174c64b9b2f4ca SHA512 18dcaf6333a8b805d9e53eb3d8c07271aff55a4f5d6ef7e268f8d20efb9d2acba84ca0f1ebf6910d05bb2b52e4c4111189ed261b8c569c294e18943b57e100a7 WHIRLPOOL 818a92defab7c371d461cc773698350a482f2720027dfa2b70d4abbabe9895f573161899d2db8c3b7a1318998192d388d52b89d0198fd9b5fa10733939189020
 DIST texstudio-2.3.tar.gz 25524647 SHA256 ace47800118d3bdeb80dedcda6e659142f4ed5e5c2d8e9eb945ebd7ae8293d93 SHA512 c43864f51be4344adc10140b75a78f11e75f32afdea4c3310efd5897a6e628192dd4335b8250f2a2de8e287d9533864dca26e0a65d6d0f16322a4b3c18e81f86 WHIRLPOOL 4bcaff04bdabd7cb6156330c8e1e66d68fc9f781797eca8ef00198a48d509eed724b3c05a78bcce579f1c1fdbb76a25b6fd4708c05134ed251dcf2585daac955
-EBUILD texstudio-2.2.ebuild 1206 SHA256 9611fd1980f30dbd61c67d324f421f0ee49b7844e544f3b4126a86913e222939 SHA512 80e6729979290159c453cd0179d0a22436be7fc8614f090cf4ff2221ad81cc29d138d645fe3d4274ca578e18520a9ae06081c4c206521431e9c8dc6be145341e WHIRLPOOL 0e8502ca08f07e4f6a80042f79cda1a68cdddba0ac7e6fa6f1e1cf9c1a9468d9d58a74826316d3b3f0df47e50f37cdd17668c268496f70065d218f43ac5d3975
-EBUILD texstudio-2.3-r1.ebuild 1542 SHA256 5a5ff74415ff4d15c2f29754dbb9ffe2f53b179ea2f877af6d96c24be1a950ff SHA512 43fbf97523d33008a02e372df3a51f433318ef07951a63a75c990017f2efd50048f8d0ab52eb41dfc7db648a85e59703f927eb3d4ceca8d688024ade4340c945 WHIRLPOOL ce517f4615994e357a465219062a6dd2325243c07c2c74139adeb8aa08a8a6f6a8972d83381fa9deab21fe82bc5f2ea2bc296f8f36ef97a6f20639357a3cd830
-EBUILD texstudio-2.3.ebuild 1201 SHA256 ec2e9ea69521f8917d991322d8117e4d5e94c505b8c744b0214198f06ab7023b SHA512 719dad582401e0f58c316c70a538100e20a28bae75aa54978c570c76ca5e500bf23ca74af39de34856896c9b134c1d72d5e9cba5daeb3168e6db2c7a91cb6c2f WHIRLPOOL 94d4a6caaf774f99b90f00005ebd32b3cb073d6b3e911b5a1c10af2196b42e5b19fc230d7f2c18802c86a9b9882fa9e455587477bca49d083f0e4703605ea12e
-MISC ChangeLog 1653 SHA256 36383748d03c4643d5eb05cbf62618091dc38615badf05fbe5d3a3564040a373 SHA512 b08acff05eeb86ece34f617acaf65904f5ae9327514c66fb523c89ef39bd13e03222babb3b0531dcabb47984888e7286e640a2d83bf18ab02a34b540f66beba7 WHIRLPOOL caa5451b797f889897b5bc614b923109cefb256a3e5a11597f9e35c7af1823c3cafac58f808f209962d142521e9da6058a7a3c5a1a0f9a21f8523c45cdbdda31
+DIST texstudio-2.4.tar.gz 13809336 SHA256 95ecd0e7aab5840b147c6bee68d3c5877d3cce0006117894b3056da211dc77a9 SHA512 394ddf6529284fced1db647db40b054490a49e01ed3b52515a880930f53a757a590b415c4b703442f89191e2be36d56ddb714ecc3445b3e49b37c1ad282a97e0 WHIRLPOOL 2373f9420c9d59d2c56d34c9485f699fe251785f366fb83ef03baa4a26a47fd81feaa287ca02fba55b92cd35e7ae6981254449d2f4916594b4bc292a887715dd
+EBUILD texstudio-2.3-r1.ebuild 1605 SHA256 a7d083fcbc1bacf985534897848c28572b85a955294aa52da1f392dc2e316a4a SHA512 b0a3d1284b96a7f9c94af7b7d549c2e4e362b9190730f83b01594b76bcd55b6ed7de3f4c58110972cc7fa251788ef397f42426b3dfa75fb43b19d04d1b6f5c13 WHIRLPOOL b933fd11b51bea97bd071364948235e50f658f61fbb472138b9ea34edbe7eaa5561801a0c916ec89003494534705348bca60ee49f876a8611e2d1240961a563e
+EBUILD texstudio-2.4.ebuild 1548 SHA256 148cc3b83535ad847e871ccaaaa84b2608605cdbbd624f222eb8f8acb1e20193 SHA512 3b41be8d77ba0bab549f22ee3cd8d861523c12a148b47eb7b4048ccfb8663f275531bec4d052d9c2dd22e351b143c501a1b644f79ccce5e3a74199d868efa491 WHIRLPOOL 6f2f29021c95e5d0661b7a036c1a517d3bd5fe77b50906cec17171b6a50e7de5f6780937ff9211be2d663bca869ac414d519aaf8024291049ae954517fea7c9c
+MISC ChangeLog 1951 SHA256 86c821f0f4d5343b5566f9b5480a6c0ec58f2f0f6cf2db01b79b082c51bda4d6 SHA512 ae48169e94793d8a780c593bcc0b5f9482b82adbae6113b4566def8f4afb7270ade7fab708665555575125d023af7dbdfe44e585f1370fe341d214eb19cd11be WHIRLPOOL 18967673dbc1efe8f424fca9fd157869f1719622bc5c8d00aa24ef1517759d3fb8a5aa1382068f6d4442abc1e465739cb3a391a63a3faec52190b790a0d62ae0
 MISC metadata.xml 275 SHA256 6851885211bfab97fa4313a9a8bb6f52754dbc718c636a0747313b534c0218d0 SHA512 75b017a3d042d95065f4329a39aec32e10575705ddbd86f07f1ad018cdbb05e1f088d66a66506b444eb90ab6aa67d9c30c4fe663e7e4dbcaa0afbc204ee089ae WHIRLPOOL 83a8c5fc8d4e08816db66da079a447df47485739f73fc7a104676ef438fecc61177c5b8be8d97917c288fa4deb6b2ecbc5f18ce121ea7d2751eb0c3f6c3e420a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAG/1kACgkQgAnW8HDreRbLnQCfZjogigUharO3EjNMGjOp4gJC
-YqAAn2dxND+wqOtHBa43cJbpiq7DRqyT
-=rfYk
+iEYEAREIAAYFAlBG/xIACgkQgAnW8HDreRbPqQCfS/3i6RComU7tPRPgD/A0VmXM
+LfsAoJDe74AXCh5SDbEC61F8zXlC5hHX
+=0HvJ
 -----END PGP SIGNATURE-----
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