Add support for multiple styles in Qt5, thanks jorgicio for the patch; http://code.google.com/p/texmaker/issues/detail?id=1511

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 143 insertions, 19 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index b2374e86c624..9ff43b68d979 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.152 2015/05/10 13:01:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.153 2015/06/24 06:28:53 jlec Exp $
+
+*texmaker-4.4.1-r1 (24 Jun 2015)
+
+  24 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  +files/texmaker-4.4.1-modern-styles.patch, +texmaker-4.4.1-r1.ebuild:
+  Add support for multiple styles in Qt5, thanks jorgicio for the patch;
+  http://code.google.com/p/texmaker/issues/detail?id=1511
 
   10 May 2015; Davide Pesavento <pesa@gentoo.org> texmaker-4.3.ebuild:
   Add missing usedep for qtsingleapplication.
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index edf750eb31cb..beee507e932b 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX texmaker-3.1-hunspell.patch 4493 SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87 SHA512 212cb763cdca5e4b3ba8f0893927df7e6dfeb11be8a52861b323fa415827e6d8d91402f7ce5a90ffe49d8681a78ea84abf4c339a4c2973b8bf38d5f14fba7780 WHIRLPOOL 4034fd261ace8d1cbbcfba376b8d576f16d13181e2aef39a294fa2e44517a24137a7b806a6167ffe0520f7aa7d028e2d545bdf7f127e36b4a1dac2e183397f0e
 AUX texmaker-3.3.3-qt48.patch 294 SHA256 28da547538b5ccff6fa60e0f3b7d77749991d62174c97f9f637db12c7a3365aa SHA512 28d85b799b81150748b4483b6cc514472aabf646da9ef88eedad6f4347b85e848b8e1c36608ccfdd667f7fca32cfffc619343af31f1364e0f2b134cf84ced80c WHIRLPOOL bd42204ac3e6c09d5f660cd07d595cc6f51878c2fd523ffbf5d1ac13256fbbdb4f1f8ec3b519f2d186e0a7e7d1d6f6c346114c58b67e3742880ba3a7219810bc
@@ -12,29 +12,31 @@ AUX texmaker-4.0.1-hunspell.patch 4772 SHA256 0536834012cff3adea139890152d0ba5e2
 AUX texmaker-4.0.3-hunspell.patch 4384 SHA256 084b5c8ba1497f5cd23eed82af2a53dc1987f1f3036874900022bf0ef8856673 SHA512 cef040973f3d6c5ef59189c0867e1ab0c54542cc2cdc0dc2c4593853d68430ae4bc996f532e09985ccbf5da244031005a10abef80424399b95de60bcbdf7c9e6 WHIRLPOOL c1f60d4062d392fc8aaa321e0cd84deec5ee15e8ad583f75f592132c325d1441b5fcb24ac5e67d6e366883f816804fd26432f5d68ac257670498a13e07137424
 AUX texmaker-4.0.4-unbundle.patch 3039 SHA256 de35c321e1cd88c70a3ce305936011c3400ea9a117eaf8940091feaab51f43cf SHA512 ee5fc05fa33d4081e1cf83e6b4c50a6446ccbed0330a88143bb8494bde14d2a07a78535bf061770a5e177d2aed0603a173f027f2c750f3bfc85b99478751c5b8 WHIRLPOOL 3f6b42374445038b29d2cf5becfb9af272bd37f560b160701fe6480e02ab41ced400ee6fd064d61450cd167eb4c368756e826b5d5f218fb11531be65cbeea03f
 AUX texmaker-4.1-unbundle.patch 2910 SHA256 2d529e87569090d9de128c5f3ccc7e8227e04b373a1e29b7ffe5ee463c38328a SHA512 92333459ef6ca928dc68add5a5f3456e687e5a3ddea63768bbccc001f59347fd66915150c14a2b34e8a30eb5e33dec6bc8ff0f3299d3e81db575dbcc1b8b5170 WHIRLPOOL c12bfea0b257a66a71f79f0ca9831ce7b8d071ff233be138a7d04b18db9fc6fe64183a2850df0e4f702af23985489d9c0ecc012e1e1d16f4fb64af56ef60d8bc
+AUX texmaker-4.4.1-modern-styles.patch 658 SHA256 2c63016f43427d8b927dae8686afeb0996aa1eb76be48f8201942b1cc4af4a54 SHA512 2b9a5577f7f385eabacb3ed1fb8ebb9665395021fcbf2dab9f960f2607b54bb62eae230e38df8686f3196ab8f1366bee6a012663a9a415a8a133658c3ca8ce27 WHIRLPOOL 08033c87ea892722892cba3832b741c89a379912e8b46bf03d4c130fd4ab5af09f7db07ebf97f5886bb15931322349fb96c57f7e49e904a0f0f0413d74eae999
 AUX texmakerx_my.pri 128 SHA256 b358c02f52abdaf6031729c6eac03301992534ba52153e598ff6c8d1d1108138 SHA512 ce03623e219b43eca4bcd07b78566d55af78f41483a2659479a9118ffd1a987b77e38c32fa3a9ff2b35556191b708f198668956181e01272f2bc39a828f9277e WHIRLPOOL 540e18f3d473be6aee644c0b134ebe4e37ad94e4cbc8fab8eb3b563e6601449972d2b3935db59da0afc798bef30cba2960aeb7db995755fb7e1e069a19ad2a13
 DIST texmaker-4.3.tar.bz2 11334013 SHA256 670eef7c51630342c87f1c2a77da0b36798fdb971c7893841e13c9342b18da51 SHA512 9bb94a104c6324d2c712b522c60513189575d01d8ea24a6eeef4201ff17c719ab816775eae5239637f5ef2084d7beb8c1d76addc10d5000a1ae53ab33c1adc3d WHIRLPOOL 5942f0262b02746a4fa6ec77c2944b1165fadaf060b8a7248bc4a32b5c74334745c21b221c234e0ddc66d0bb7250a6cdc1a3eb12043de4f19471cf0ce4bb7844
 DIST texmaker-4.4.1.tar.bz2 11274997 SHA256 80939493ffb6c92f47c47109dff6de4c91259244247e90ddfb1bb6153559b4b4 SHA512 a165b7757f2170d42f3d48d644cb351efd4d308b1a0601105952c3253084ae4a3d0bbfb7915207ff60d0ba7036283c6c8305a901d7ac8aab4e79c1bb78f68ddd WHIRLPOOL 3b00a894a194659d64ea8058ca1f0d04a68904f4eb638121f935ab83583b83c57bae3d1abb8d1e0541bed4bbaa44336e9733e8de3d346098dafae319437909f2
 EBUILD texmaker-4.3.ebuild 2007 SHA256 70ef77ba2213da8ba07ea2587dcb064959d5e27e8d5a188c30cce9e034104abe SHA512 766813bfdf8be27daaaf989dded4bd2427418d0ecae6ab91c583b93f2e69a611fda3bdbdcbe61750732fd33327ad899b5af9ccaf0a657f2c6052a50ca52fef1e WHIRLPOOL 7040e40da4ff301af7800deefdad5cab6c53faae516333f24859e15ffa11cd62b3d78bfcc3e7dd7cf6b67cd635451b77c239b73433423ef3f0218033db63e39e
+EBUILD texmaker-4.4.1-r1.ebuild 2112 SHA256 3018a0e6868848ba56635f7e4443ff08a94dc8e7832d8b44f02a65212a03fcee SHA512 99da8e0b10822e323f783577803a5dd411defad92409beae22d70ab80fbc201f5b56236e8a89f4859a5f9bd097f4d42c2354a460576c88ddc76d58e7e78e2ec4 WHIRLPOOL 07cc6bb525f8e42428af1ca3e3defc98dca31b8c4cdad4a5f053c42e2ee8fa9df5f58d1d2e66b6a2821962810bf6011df9b3da827f4c0be56a5153b10325461d
 EBUILD texmaker-4.4.1.ebuild 2067 SHA256 cfbdd39251f9a3460bdcc344e4b319264d8b485e0af83e0129c07f3a821bd25b SHA512 e4e57dc791cca351c09323091cb418d854cdd99be5e038bfa7068d7d2ed15c93be068b18b6f4723a80b5536b714a161e0c70e68d33d1006507cfb79a6e408ae0 WHIRLPOOL 2bc3cbb32a05d39d6d906dd1d1ca82fff0aaa85f36ff093de2b383e360ab3332f8ae03b29a4b3dee0e5ef7d272341136297d649100ec8188a3faa458e86b7fb9
-MISC ChangeLog 22453 SHA256 668f79a564f092dfd88f439bb65f7f153b6b747215765c9d4028a97671caf0b6 SHA512 b1f52db3f614507358da86eaa86f4b0b90a6acda637ddb2d210e0912f4782abef111dae49ccf4bdbde8a59654f5af109812edb610892f0ae337d0c39e35be2a6 WHIRLPOOL f0d12474dc1a1330f9364523d79ddb745d225df0ebdfaa238865a2b84407be832e5f6e88745dfb79f0f5ccf3ae465cdae43450ae1f782c1a724cc9b27e32d3df
+MISC ChangeLog 22738 SHA256 591e3d8b380ca336fea0430c90109ec27a08f04089124e38e34d17915a201558 SHA512 274ed6a3b1ef8c8e3fadf2249b98d5c895ab4ab205ae92110094e86fa41a80a8b9c2f89b706e130a9a480e003e456a2ee9c523df3f6442d0e199cf2181ed2d80 WHIRLPOOL e5c83c2fbd11c2bff8904a90c6406af7285ec1330915d39115515bd6e8704cc4d6bf34a1cde3e3d453456b99fe2beb8ed0655fbf54449a5cb6d35cd5a7e64a7a
 MISC metadata.xml 281 SHA256 2c7a572c26bbf24b0de55efe3ef0be56a2d9280869ffb4647791ce66f78a01bf SHA512 793f7f982c959f54c1af0f96a433837d031cf619190e57d784a5bb1f05503de72bf59329774c9efde5bf52c286eacd8032b366e1cc0ebaba94e110c326faa93d WHIRLPOOL f5324da1385ba50007e7f01f5d34f767f1cebefec780de74ade5c980c4d05e7e36590c6a8d79f5608201831daa6597e4a679b4e6a4e4ac33c2e09d94e554f5a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVT1aRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9AOIQAK0AidD6XrmitWMs90XK1MNd
-EWVkwq53WkrtlMoU/3mfmtn/dyJ29sLqBCAAQ+u7w7Rl2Nyr4O8Dor7S+1hBrp5A
-rj7qDy2uUFK10Cn9yH1jJQibcAdZ7eluOHzqYuuUcdRCOc1TedCwt/BEXE7LGMBF
-8fiHfObqvec5fzsvw+LZHe6IMIKB85hJt4wbk+jqT2OhpAJcfm/u7N2tcvPo0huE
-YPGT+JYvxX8MRM4ZA0WSo0aiE0dazavcOAuS0nxpdEdcE5dsR27wAV8kx4DoSSb5
-mnKicxa/nnzfCli3zeojGN3uWmZfRUSpbHT146n1R48pTN7jZnEw+7HGAq/KHRys
-4reeETqyZVy9qd+yzt169Rr/1DzO8+LefTUNs6uL0mMMfT31mJFqQGgRynVUZCl9
-6Z+1v0un3QN/t5ywTSunIhJJJzfWk2P9kGVpCtEO7i27YptYizf/SVCjpv8Ez1Iq
-gEFb1OKbt3+ZNaZ93oT9vve3J5Y/3JUNurrcED1ZAc3MMBCruraQv3wOEVfC55P3
-awZcwrLx9uDLv/OQEls3/E4Ck2qJdqNmnEh6xAkjBYgvhFrttjXC2AzeL76FgF9T
-cLMLrn2gVusvYCyqaM3X9KXlOsKPGs/6I0B+xljMASI3LcSgtI8dZvw+Ix1z5Ces
-+PEVOwrIHv+6BfF52DVx
-=fTOq
+iQJ8BAEBCgBmBQJVik4mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLMAQAJguYGXoX8c2RAZvLOy62/RZ
+5I5PkZe71YMJHolcfM9FWfJjoizo8h71e/LlvoUvjw9PHHkEm7rlAIUtW8kN4Unb
+eT3m1kenu7AlJ/dQg8HHJEQ9Mhgn95sTIvoxpNY3js3hTQwbxeLmsFX/K3j2suNY
+3wqobG4v6917Q+SAYxlV6puuBaaEJDQtNTQI+beGwtzbLLWd1hIzv+sSdtxhyNLd
+cCxxODHWGPJ96qI8600ZpVF9ZIHPe/Tml0ymasdMDiw5Wbj+33YiUDNPVySt+djJ
+EKHWgJQfE/6Vbi1tFiSjcgxHd8RvGABf3TsAyXmSIcFdXLtNGNLflawr89BY4KWK
+OU32t+r5Jk0AE6oqKApWsa4ROddpm16lneoP6b6ZOQOW/4wCLK/yjxkv4ugiTgE3
+lVrdNPXdKJgXphSPLP+mp4ANluxAcvj8dB9WMi3mxn8/1nMaKC/2qFeBzdZFzIfz
+8W06PSaG9jR++2+UiV6b0K+//Pn6W+zzyNj25g1E4VuDziMffVpRgd6Da2i2E1ge
+Dujt7e8Pi9s/7j5tewYUjvbR5IQFfnGoL1yyrVK9LqFPOpQm4JAnenlVGtQmNmT0
+NlFuSHQWoRTSGghx1Pg9SOFpXsQvAACsvzO5gSZJ3WQScalooYJ1rXpdAwemV5p0
+ymUsIil7IfxQfX5wuiXE
+=G/yC
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch b/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch
new file mode 100644
index 000000000000..73c3b92f761b
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-4.4.1-modern-styles.patch
@@ -0,0 +1,16 @@
+--- a/texmaker.cpp	2014-11-26 09:06:56.000000000 -0300
++++ b/texmaker.cpp	2015-06-19 20:49:58.801377000 -0300
+@@ -4451,7 +4451,12 @@
+ #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ if (modern_style)
+     {
+-qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
++		if(desktop_env == 1){
++			if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle")));
++			else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows")));
++			else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
++		}
++		else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
+     }
+ // else
+ // {
diff --git a/app-office/texmaker/texmaker-4.4.1-r1.ebuild b/app-office/texmaker/texmaker-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..72e93fd166a2
--- /dev/null
+++ b/app-office/texmaker/texmaker-4.4.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1-r1.ebuild,v 1.1 2015/06/24 06:28:53 jlec Exp $
+
+EAPI=5
+
+inherit eutils qmake-utils readme.gentoo
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4?,qt5?]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	dev-qt/qtsingleapplication[X,qt4?,qt5?]
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+		dev-qt/qtscript:4
+		dev-qt/qtwebkit:4
+		)
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtgui:5
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtscript:5
+		dev-qt/qtwebkit:5[printsupport]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		)
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+	qt4? ( app-i18n/ibus-qt )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-unbundle.patch
+	"${FILESDIR}"/${P}-modern-styles.patch
+	)
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	find singleapp hunspell -delete || die
+
+	epatch "${PATCHES[@]}"
+
+	cat >> ${PN}.pro <<- EOF
+	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri . || die
+
+	sed \
+		-e '/^#include/s:hunspell/::g' \
+		-e '/^#include/s:singleapp/::g' \
+		-i *.cpp *.h || die
+
+	DOC_CONTENTS="A user manual with many screenshots is available at:
+	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
+
+src_configure() {
+	local myeqmakeargs=(
+		${PN}.pro
+		PREFIX="${EPREFIX}/usr"
+		DESKTOPDIR="${EPREFIX}/usr/share/applications"
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+		)
+	if use qt4; then
+		eqmake4 ${myeqmakeargs[@]}
+	else
+		eqmake5 ${myeqmakeargs[@]}
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	readme.gentoo_create_doc
+}