app-office/texmaker: Import changes by Ben de Groot

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 33 insertions, 47 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index d3f0680033ee..2ba2a2ac66a9 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,9 @@
 # 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.142 2015/01/28 12:23:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.143 2015/01/28 12:36:02 jlec Exp $
+
+  28 Jan 2015; Justin Lecher <jlec@gentoo.org> texmaker-4.4.1.ebuild:
+  Import changes by Ben de Groot
 
 *texmaker-4.4.1 (28 Jan 2015)
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 7bb02059f42b..5803cf052a70 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -24,25 +24,25 @@ EBUILD texmaker-4.1.1.ebuild 1973 SHA256 88fa33f5fca080b024dbde3d84cd37648d5c90b
 EBUILD texmaker-4.1.ebuild 1962 SHA256 c1f9f29626d00a26bd6972ed3c2c365e48a8b71344e83944257427d0deb50593 SHA512 1036858c1cc73e84489d73a58ef777cb9d4eda171bd7eb03628ebaf011bddafb01bc75eb99737cc815a310bfd89cddf99f33cf968903e970fa73f8896b54e4a3 WHIRLPOOL b9677259a88c05ca799fbff43d7abecf0b021e538c794594601c7e85d8fece6a61fd941858c96f8582253ecf85f25cb46225faafce9b640e0f8cddab4fd4639c
 EBUILD texmaker-4.2.ebuild 1990 SHA256 998a442d06572918b044469042e8fc19fb0eafe57c60640e13b107cf53cfe0e9 SHA512 175ad093e2f15d8645f6f7613a15aa33e54a80eeac6fc2b1245827e7fe5105e2dcf825f5f0a6ce4d26cbbcd94859adadc015b1393f3c60376e25eeb00368502d WHIRLPOOL e5d2bd5a7b3f0a6f30b8ec1571678a8b4328f33dd70ddcdbc6d9546d8c5016b4e67ad17b42dd796a2005c6d5499b592c942273db6e840e9a51754c71b7323ce9
 EBUILD texmaker-4.3.ebuild 1990 SHA256 e6cba65c954a3f5b4da970c73627bf4f81454c20698c11538d5e3f9e00ad85fe SHA512 b0cd9d3e78233d3b74564b5fd8e71efd1388eb199f9350b8d50c5e4f1541b6135fbaefb2486f4b9e157e7d1a660bdf0d405f256c2a05cde76714306f6b79f9e8 WHIRLPOOL 0ad5ddc1ff7349263a6856f59597139ceafee33b5190ac52cae941c026308e430e92400f1946eadd8b6f6563ee6dd2ee5f35f15e3f058f3f0df5293b59273715
-EBUILD texmaker-4.4.1.ebuild 2429 SHA256 8ce4a8860e0108a69f56db1a996284fe29f90a0e5bf4f2bdc5b66021eaae8984 SHA512 d6a4c38a35869cd158f40f4cab3534f5641f6b0d749609dadb2b99a9e7df88ddaa00092f0c2ce728a3970c68a9bd687b6d7b78e7b6bf1697420ae97dd2934c5c WHIRLPOOL d2819453c1f1956a75470aeeb5769f18aa6d743ad6dd7e7d1870bb2e07f6532d6b0186e936c0db46b79a573faa9d0aa08127f44bea318777e983ca99d4de0d91
-MISC ChangeLog 21210 SHA256 3ace34339f1cda051a8e6e6329c59b4f1d6cc57cdbc8a7729d34ac3bf32b05b6 SHA512 140177217d784bb28c55f70e69e14bd918dea3baaf327b0ea38404e84d7186d0942f9a8436de8a430c41c2b733f71e4d76a026ddf2e9819fed235fb8acd23b27 WHIRLPOOL e109a8f28f80644d027030d18fc7c0a9bad2a6ddea515ea58f232fbcf8b67a15b2acdc2a64e0717a5a4eab91c93023ded8a7dd22f8321da5c0ca7f354ac01d0b
+EBUILD texmaker-4.4.1.ebuild 2055 SHA256 034d76572fe64fd312ba63437eaa862f039c8a5a858d159e351e3eb350b1ff50 SHA512 f74058f7cea3139fe3de8fdc6e93b4a02e97196945204195f34e5a9b7e83d2f25336be5749823b08a59f9f5dfb7637a48fbb05a3cf46ab17ab3a4b4b0742cbc2 WHIRLPOOL 9be45de10f9fa38d65523cfb445b2382fc65cde38d22b21595eb33c8dd8c6a08b68ae5dc520d7e9e65cc7c11593597c539f188a0ecbd612b75b5bb781d0601b5
+MISC ChangeLog 21314 SHA256 a4e142ffb08250f2a80b9943ba5eff2eef739e09c4c39f212d2e037b610f1c86 SHA512 87f785421ce16338f004e120c7de7a52071de2ca19ee28c5b130842073fc0c5f65909c5ac31c5e5611907e8e28976e460fb424322aca74d3d6b064f823fd94e2 WHIRLPOOL 9732f0e98966137bc615c2ee3616d08bb22739863d10fb436357b54b0aafe9f925cbbdaf8e5dc909bfe4b71bc426fb7662586a5642da0fe0f3a62274ac0ba5c4
 MISC metadata.xml 281 SHA256 2c7a572c26bbf24b0de55efe3ef0be56a2d9280869ffb4647791ce66f78a01bf SHA512 793f7f982c959f54c1af0f96a433837d031cf619190e57d784a5bb1f05503de72bf59329774c9efde5bf52c286eacd8032b366e1cc0ebaba94e110c326faa93d WHIRLPOOL f5324da1385ba50007e7f01f5d34f767f1cebefec780de74ade5c980c4d05e7e36590c6a8d79f5608201831daa6597e4a679b4e6a4e4ac33c2e09d94e554f5a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUyNSzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUyNezXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGuQQAJhzHDWLP8Rpe/vlDWoGlWyN
-oWcEFeDB2A8sgzWB8Pofh0NAuA5sN9owSCVtHzcwaKQy3N0GQW4dhO+eilXopg0B
-vTTnADvlwBCoAvspwyjAQJA7cRJ+o3a+2ofxpwU4qMJT7RjS00w1f7UTAfBseeqM
-/G6WqKX5sLWsY0Kymxt9V+CZ6YVwQiDJqouIIh8RAh9y62qp5VrClf/Ppw59T+ej
-KmM72if0NMSTDC1qPvvPzl7QTDyFJyxDqlkmX6Bf49EX6hM2YrqEYkOom5Zg9gCD
-ahUwayfsVQWY/wyCYStNwXXWcs0LFwKcrMhPOxc3dXtnrZw0BN4q5iR8I1Y2uh4p
-w9ZYwO2dMFp05ui2Lxa5kPJUAIFAnT8BK6zyll4rmDvGp4iype0r72c+5mwsBKyk
-E1F49e5ytqg2qrgLogk+fqurpcXa6jjWdIGp2qqQpAUvMiXilFAroP+J023u/fls
-YnzLbapYx3zFGJg4IgUGeuB8O1+wyYIOdVeh9Yg2vqFLwM5hWXZJWZOCNZf6M8o1
-6VNy81gBr/f3QKwqb+jCn5c3WGiFnr7ASr6o29ZTGaa4FXYCKoPzOO845IMigSOi
-jQ1tnh0wJem88p1FAzr7RRPF64CKYm573gfumoBD7/MG2wozgoe5rr6Fcalb5DnZ
-aMAnn9SEhXqLbQxUQrpU
-=2Drq
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVira2kQAJfHLuY0JI5Uyf4ZVpIL7bzR
+6IkaUxRhO0ad77t/R0LoMj3udR4uZcRgyrFxd0s6ddW4GkBkQpByAorbxWJh6MRn
+G0iTLvKLVti/8Yb11QaG0jU0Bs14iWHISTW5y1NS+Y1UEuhhCAOsYz/gCXougQjU
+UQsNlhPCrsnf0uwUo6glrJS6XF1B4E/vbj+/RDNXs1a38DLXlQPZQD1aZuxv77/A
+3THoaGZK37ff6pYf+EqinbKqJKc8IKqrknKhmVkbvvSevH57csQvXTSr0U0hxH6k
+MI9YLiBjyBGPFqzfFQ0wuQNCcRWUaOBvuvn3th9hTnKlHwlh3vSTFZAf4sQLWYkE
+KFic5DMqXH5qiFkuCFVrYsEex/gPtsrf1D2P4YKXKKc4DJhp3PJVjaeRGM9969Ey
+dBUBIl7lpJ/DVyaskfeqR0/J6GSVzACgfvznMtACTySAU6/+lnCah2ThFFRv546I
+tkvil+xiN5NI0p6FPgj2Airq0gK3yQQ7sElGyxbWft6hMmfqdwh7CSUf2PXAdTQk
+jkZFqrNEWNJZ6BM1mIXaSLmT/f1ebFh94mJHF8J6eQJ948fgemMKTj+RSjoXg2H+
+LZ6FTUceTi42823ZfBC3BCNPG0iqA5yZb9iKaWq7utLOE/GRqUjOxxwJOxZjTDjF
+P3G8kzrhwuQP723P3Mi9
+=gcK7
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/texmaker-4.4.1.ebuild b/app-office/texmaker/texmaker-4.4.1.ebuild
index 5426968deeb7..3cad4c17487c 100644
--- a/app-office/texmaker/texmaker-4.4.1.ebuild
+++ b/app-office/texmaker/texmaker-4.4.1.ebuild
@@ -1,27 +1,14 @@
 # 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.ebuild,v 1.1 2015/01/28 12:23:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.4.1.ebuild,v 1.2 2015/01/28 12:36:02 jlec Exp $
 
 EAPI=5
 
-inherit qmake-utils versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
+inherit eutils qmake-utils readme.gentoo
 
 DESCRIPTION="A nice LaTeX-IDE"
 HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,8 +17,6 @@ IUSE="qt4 qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
 
-S="${WORKDIR}/${MY_P}"
-
 COMMON_DEPEND="
 	app-text/hunspell
 	app-text/poppler:=[qt4?,qt5?]
@@ -51,16 +36,17 @@ COMMON_DEPEND="
 		dev-qt/qtcore:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtscript:5
-		dev-qt/qtwebkit:5
+		dev-qt/qtwebkit:5[printsupport]
+		dev-qt/qtwidgets:5
 		dev-qt/qtxml:5
 		)
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
-	app-i18n/ibus-qt
 	app-text/psutils
 	app-text/ghostscript-gpl
-	media-libs/netpbm"
+	media-libs/netpbm
+	qt4? ( app-i18n/ibus-qt )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
@@ -84,6 +70,9 @@ src_prepare() {
 		-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() {
@@ -100,14 +89,8 @@ src_configure() {
 	fi
 }
 
-src_install(){
+src_install() {
 	emake INSTALL_ROOT="${D}" install
-	dodoc -r ${DOCS[@]}
-	docinto html
-	dodoc -r ${HTML_DOCS[@]}
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+	einstalldocs
+	readme.gentoo_src_install
 }