app-office/texmaker: Version Bump

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

4 files changed, 257 insertions, 6 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 2921ea5f9c81..17316411b73f 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.133 2013/05/11 12:27:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.134 2013/07/29 12:54:54 jlec Exp $
+
+*texmaker-4.0.3 (29 Jul 2013)
+
+  29 Jul 2013; Justin Lecher <jlec@gentoo.org> +texmaker-4.0.3.ebuild,
+  +files/texmaker-4.0.3-hunspell.patch:
+  Version Bump
 
 *texmaker-4.0.2 (11 May 2013)
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index dabf4da12578..e092c1bb270f 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -9,16 +9,29 @@ AUX texmaker-3.5.1-hunspell.patch 3843 SHA256 5bbd61ba62d87797230887afc3e6f618b9
 AUX texmaker-3.5.2-clang.patch 771 SHA256 3aece614446a324270a8c9e05ca0830d4a0686f43f3fd94b033d0ecace62b946 SHA512 1043085f81338981ac931d34f0b1d5cb96c6bcbd0df4a8e2a8d46636514ffa0df8dec8623fd106867cffae161a099b45facc11778a2ec054031cbd7a75794266 WHIRLPOOL 32fc27128d8c7b5ee35953395e253a782be96b87fe60dd19141162a85fefae82659f7b39a5ff7b313e80822a441df8c15f2d5b0b5e9397329e5305dec449d632
 AUX texmaker-3.5.2-hunspell.patch 4791 SHA256 5f872ffd7d6cab80269c969bbf5875400be0e9df6fb1086f0634299ec0d77a9c SHA512 e1f2460dfbd42bb028980fa58d7482b49a554fe88204985c56a851a850e2d5249b66f034cdc2314b75f9a370920c74e08c260ecfccfc7ee0c10fe608581019e1 WHIRLPOOL fc4d5c4678f3cd9cf894ca552b4b98ae70c1f52e9e50ff77b8114d58c247216252e24c6660d28ae345e018fe3583fdc38aa39facf167756361f5f29308ab302e
 AUX texmaker-4.0.1-hunspell.patch 4772 SHA256 0536834012cff3adea139890152d0ba5e247732a9c09b7dd45d3bb4165f460d7 SHA512 ae2bc758aab3ef1a6c464ade40a84e1c0aba7041622041168b7e3daaeba5cf646bbe7a895ca217dc860dabc000976ab3205b12518e36b73d915d19e0d47a1988 WHIRLPOOL 901485c88e92bcca02a5ba4f6ad7970346fca52d96b2f59a8e943ca05b9671fc14a11b6406afba71de968e724582ac5376bde3a0b00c9c7df0c8967d1d97d26e
+AUX texmaker-4.0.3-hunspell.patch 4384 SHA256 084b5c8ba1497f5cd23eed82af2a53dc1987f1f3036874900022bf0ef8856673 SHA512 cef040973f3d6c5ef59189c0867e1ab0c54542cc2cdc0dc2c4593853d68430ae4bc996f532e09985ccbf5da244031005a10abef80424399b95de60bcbdf7c9e6 WHIRLPOOL c1f60d4062d392fc8aaa321e0cd84deec5ee15e8ad583f75f592132c325d1441b5fcb24ac5e67d6e366883f816804fd26432f5d68ac257670498a13e07137424
 DIST texmaker-4.0.1.tar.bz2 13065488 SHA256 7ef9a5e1e24e734bfb7edb084ec6574fa3fc61b31685ca5402d6649a53a4e12d SHA512 85db34f670cad7d39c7acea5eefd61a9985f183277ddf758a3216dd322c0e43c21f94d2659fbe7dbcbf8f25d5df7c8c1408172214080d9234f4048499fbb8c4b WHIRLPOOL f24b1d0a9e79b18ef4a69bb1965827f1dd9cc75df1f36cfa2caacaf8686d08d78be9b2cf54edc939bbe700506428aa76f9b0daa144acfe8bb49c8b07f5729730
 DIST texmaker-4.0.2.tar.bz2 13676919 SHA256 a0a81b65b8aede12f0a7bbc303374fd910f39976db68b4035d7f1d69c2276b45 SHA512 0e7f36ee2b3c18e2367aed78f377f959750bfe43112f8fbc1aa7055cb965f227674121bd6de4ab4ee69c3a6165f742acfc4b4aa3f474f8e7f5dad928fd5cf15a WHIRLPOOL a511d846d35a8dd4b434c7109a553f692b5726a66afa06d161e6f76b93fe501968a7c8b6288029538b28977c8c4e2e594555fd9db04ca9a7d3e0895affd0d5ca
+DIST texmaker-4.0.3.tar.bz2 9697288 SHA256 7b157645914fcb8ad4475c2c6010ffeb52a6547a8ee17bcfdcf720369bbb24bd SHA512 8c91ce920f7a828a3e1e78123fa4464c7b826c37343a009cbb70b1d4ce7cd3fd3e3ddea7e9b2b2c0235ddf6280e18ca3844b9ccaaa577d28f76e1a12e76d551f WHIRLPOOL 65a7413f3c727b495cdde6aefb7448b61818b3409ec2e727258c210bad7e5e10a6a88cdf50508e2b2f367fa7c1c8c0a3a3cf4b53ea34c1409bac15b77fc1a476
 EBUILD texmaker-4.0.1.ebuild 1596 SHA256 9af39dffb6e7e3a8b7e7f235cf24b91c076ddf8234cb10312c145957a411e21f SHA512 5d9ee702dab8f128f43bcace0eec7ee8ab5e3f536faffe3688f2d633a41a5156f823bf993c4c2d1fd0a724e0efad86b75bbe22b9d658d02bd9325e8109f267be WHIRLPOOL a1fb4ed093cb551651e7f46c7a02fe8a9e1f41cb5846cba41bd9aff679afea3070ea114fb973040c67a1abe04c509508d4594f52dbff1bcba87f2f0e87f50b73
 EBUILD texmaker-4.0.2.ebuild 1619 SHA256 60cd5927ba3149a1b2cd42c81e90afe363b1ed72d65a1ee0af46b5b9bb1b8d52 SHA512 4f7e41caa3df38fdd157d30137c6c78536d7d7dda1e45a2ee4d5001728bcbf0e132bd0ffa529412ea6ca8b6dbfab7e6972e94d073775db2c0fdff61223e82eb7 WHIRLPOOL 7f547b87977071aacdf36b36d135ddee68eb6c7ef68b01ddb42ee29fbd60aeec9268ab05ec4053711328b36e9cc0fae19fa9dd502707716522fdc43850a40869
-MISC ChangeLog 19807 SHA256 b4960e9b0e66366af9654bd523b3d6d7144c6825429d5032cb4a293d8ab05bc5 SHA512 6bbfb2f61f2a337f12f0bc64b01855f0afa8ab792ce7753350a2caccbd50d508f8133c43b25d22aa0cc1c8ee9775a5d629cc04fe265fcbbb1d73817b7c2197a7 WHIRLPOOL b89c2cf4dd0d5fb90097b25a2a8a2e92259ad219a91846616daf9135f60f7b962cd559c5f27909a527ac6f4daa2b7989104fd75aa889bc46bf629bf5867940ba
+EBUILD texmaker-4.0.3.ebuild 1621 SHA256 2ccec9cadbacc85c791a416c5d037e389c293d69f289df2eb745cf765a0d8c3c SHA512 8f9c45e6156172fb8d0edd8167c880ca05ec22932c1e5ed1d0abc892ca4633577a233d92560a059f78b9a9e3943d6240029b7e5eb33cc9df9aa071c16b163000 WHIRLPOOL ac830aecd559beb6aadd55e4c4a1316d6ce3aaf8fba5c5286ded3c00a6e3d3a3c2c212ca09d6f83222a855abb6861b16821936f098b4c711cfe9a6b8c4220ec8
+MISC ChangeLog 19965 SHA256 787c5426266f52a47684eb29bb0501b9ca4f2ba500b211a7b931db724c1d7bbe SHA512 0bc668b8e9d7998b8413c8619306f8f931ca28ccb9de423cdd09fd6b4c0b373adf5b8320553b7bf770b9cbd1ee509f13c1c0c65d2bbcfd947a18ffdf8bcb089f WHIRLPOOL 17bbeb8b1d10c43bc49451804e6052ff0d357812c0c817d206f2618f0e62e2604743960387b2d793c63c8b4741972fdaacf1c14aebe50f6461d766ff7de8db60
 MISC metadata.xml 281 SHA256 2c7a572c26bbf24b0de55efe3ef0be56a2d9280869ffb4647791ce66f78a01bf SHA512 793f7f982c959f54c1af0f96a433837d031cf619190e57d784a5bb1f05503de72bf59329774c9efde5bf52c286eacd8032b366e1cc0ebaba94e110c326faa93d WHIRLPOOL f5324da1385ba50007e7f01f5d34f767f1cebefec780de74ade5c980c4d05e7e36590c6a8d79f5608201831daa6597e4a679b4e6a4e4ac33c2e09d94e554f5a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGOOTEACgkQgAnW8HDreRYQoACfRtVJXJLJMKAty/tcOqyJJgn/
-PcwAoL1N2zdFJ/ugoh955MlsuZTTcTG0
-=4Z9Q
+iQIcBAEBCgAGBQJR9mYfAAoJELnU8jG9FVir09IP/iSMACx7shL19Oa7LYMtfjIK
+ciLBW9HTnMym6DAagkJ5fYgoCyd+46NeKShPVHb/K3YxsgDYCSnfCYIoPgSkUJYa
+bU2Shj4pPIA5gBM/C0U1//zqXy1SSjoiF3HYsXFSmyCPs4ZMgKHJQoDnVNCCmARq
+85+/eYeoH/a+tG58UMfWgO2g3zeWekLAgmMy02i9fqx8L52tVv6vusrgWRRUs4t6
+5O2FQEctPXaARWvmrtdd3+FtbUdZy0s/FQasAViEQQKKSgy3J23oNp8hMjZXk3c4
+up1LRg5uyC+r6k8w2xjiefUKRk2+UtHWBP271xEoHUk0LG++nihpjDH+6VFdQlhg
+8p4U32fZdTzh7jjGvWb2wyC56ZM6WzYcW+dD0cB56Z3w2/hTRxZlNSSrrl6tfu1c
+gxKYSWKhMegAPHriKN2V7RQlxwAdiHr4I8VzJJdGZfu0UcVdNh0Zk4wsjiYC8ykK
+wfdXd49B4TUhfNr3H/q5I4brsQrU8K5K5XT0OljrCKbv6Cm18lt5WTLO2650bT6r
+3Z4VWttTQWfXNHxUygiIftuPvZK7he/TpqD+5d5NeK2zd0gNYWP2ittK6zwgwZXp
+X5w/Ohy0vGvKZRu/ia4/WYUURbafVMQ5aWQ8lh6ibKa/PBf6RytOuBGV/ykPbVOg
+ZuDwYVbVZRhyHnOKBo0n
+=gOE6
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch b/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
new file mode 100644
index 000000000000..9cabfb2e6f51
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-4.0.3-hunspell.patch
@@ -0,0 +1,165 @@
+ configdialog.cpp   |  2 +-
+ latexeditor.h      |  2 +-
+ latexeditorview.h  |  2 +-
+ latexhighlighter.h |  2 +-
+ spellerdialog.h    |  2 +-
+ texmaker.cpp       |  4 ++--
+ texmaker.h         |  2 +-
+ texmaker.pro       | 37 +++----------------------------------
+ 8 files changed, 11 insertions(+), 42 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index e596a2c..3660429 100644
+--- a/configdialog.cpp
++++ b/configdialog.cpp
+@@ -220,7 +220,7 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
++QDir spelldir(PREFIX"/share/myspell");
+ #else
+ QDir spelldir(PREFIX"/share/texmaker");
+ #endif
+diff --git a/latexeditor.h b/latexeditor.h
+index 29b01f8..1db88ad 100644
+--- a/latexeditor.h
++++ b/latexeditor.h
+@@ -33,7 +33,7 @@
+ 
+ #include "latexhighlighter.h"
+ #include "textblockselection.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ typedef  int UserBookmarkList[3];
+ 
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 9809d86..adca0b2 100644
+--- a/latexeditorview.h
++++ b/latexeditorview.h
+@@ -23,7 +23,7 @@
+ #include "gotolinewidget.h"
+ #include "replacewidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class LatexEditorView : public QWidget  {
+    Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index e0b91b1..74ec42a 100644
+--- a/latexhighlighter.h
++++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include <QColor>
+ #include <QTextBlockUserData>
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 100644
+--- a/spellerdialog.h
++++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+diff --git a/texmaker.cpp b/texmaker.cpp
+index 51d2082..607f66e 100644
+--- a/texmaker.cpp
++++ b/texmaker.cpp
+@@ -4363,7 +4363,7 @@ geometry_options=config->value("Quick/GeometryOptions","left=2cm,right=2cm,top=2
+ QString dicDir=QCoreApplication::applicationDirPath() + "/";
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QString dicDir=PREFIX"/share/myspell/dicts/";
++QString dicDir=PREFIX"/share/myspell/";
+ #else
+ QString dicDir=PREFIX"/share/texmaker/";
+ #endif
+@@ -10835,4 +10835,4 @@ if (singlemode && currentEditorView())
+ 	    UpdateBibliography();
+ 	    }
+ 	}
+-}
+\ No newline at end of file
++}
+diff --git a/texmaker.h b/texmaker.h
+index f7e278c..e80d9e5 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -48,7 +48,7 @@
+ #include "usertagslistwidget.h"
+ #include "xmltagslistwidget.h"
+ #include "logeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index d2312d1..0009663 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -87,25 +87,6 @@ HEADERS	+= texmaker.h \
+	versiondialog.h \
+	unicodedialog.h \
+	unicodeview.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/replist.hxx \
+-	hunspell/w_char.hxx \
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -196,18 +174,6 @@ SOURCES	+= main.cpp \
+ 	versiondialog.cpp \
+ 	unicodedialog.cpp \
+ 	unicodeview.cpp \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/dictmgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/suggestmgr.cxx \
+-	hunspell/utf_info.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/hunzip.cxx \
+ 	singleapp/qtlocalpeer.cpp \
+ 	singleapp/qtlockedfile.cpp \
+ 	singleapp/qtsingleapplication.cpp \
+@@ -454,3 +420,6 @@ INSTALLS += desktop
+ icon.files = utilities/texmaker.png
+ INSTALLS += icon
+ }
++
++CONFIG	+= link_pkgconfig
++PKGCONFIG += hunspell
+\ No newline at end of file
diff --git a/app-office/texmaker/texmaker-4.0.3.ebuild b/app-office/texmaker/texmaker-4.0.3.ebuild
new file mode 100644
index 000000000000..0a1ce868a63f
--- /dev/null
+++ b/app-office/texmaker/texmaker-4.0.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-4.0.3.ebuild,v 1.1 2013/07/29 12:54:54 jlec Exp $
+
+EAPI=5
+
+inherit qt4-r2 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}"
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/hunspell
+	app-text/poppler:=[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	dev-qt/qtwebkit:4
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-hunspell.patch )
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}