app-office/texmaker: Version Bump

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 267 insertions, 5 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 782492981f39..a05e1203c6c7 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.125 2013/03/17 12:25:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.126 2013/03/18 13:10:10 jlec Exp $
+
+*texmaker-4.0.1 (18 Mar 2013)
+
+  18 Mar 2013; Justin Lecher <jlec@gentoo.org> +texmaker-4.0.1.ebuild,
+  +files/texmaker-4.0.1-hunspell.patch:
+  Version Bump
 
   17 Mar 2013; Justin Lecher <jlec@gentoo.org> texmaker-4.0.ebuild:
   Add subslot operator for app-text/poppler, #462020
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index e8007dc74df9..ca4d7dbe42b5 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -8,16 +8,19 @@ AUX texmaker-3.5-hunspell.patch 3841 SHA256 c886be8ca7c624ee0b61f57e4d23404882a4
 AUX texmaker-3.5.1-hunspell.patch 3843 SHA256 5bbd61ba62d87797230887afc3e6f618b90ae38009fd3c44eefba16b53fea1f3 SHA512 18efa8484ce05e3809fcc45f3b8a2c0ab83faaacc010c7beeb4069c68c67d24acba0ab5a0bea2896538f5b81e02c1d303fc4a3f679b8f611a51be7203e37cf94 WHIRLPOOL ef0c32261cc214a6efc9c7cd4eac1a23569a9d2d097a32eaaeaf6512771cb110b3248939a9c5bd84eb39889925d37aa527d2a16cdf959b286e78c67bc8bb3711
 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
 DIST texmaker-3.5.2.tar.bz2 13165580 SHA256 5ffc96d64befa07656ee82e4f3cfc95a84d73759607d0229e864899d7629f312 SHA512 e81d553938102ec895641fbda364a5ad3d0cd09ddf0a0c3cc6c9034da67477711c01bcd13ca0b4daad78030513b5a2957dee021646efd4b9f2a22b9aea0fbe5b WHIRLPOOL 19ee0b138579f759f7eac29fe1976d5e8354c30719c4f0d29941f5d0aad41d29b4010c7eba77461f2051554dc05415feeead02d0d41637aa14bf757416293954
+DIST texmaker-4.0.1.tar.bz2 13065488 SHA256 7ef9a5e1e24e734bfb7edb084ec6574fa3fc61b31685ca5402d6649a53a4e12d SHA512 85db34f670cad7d39c7acea5eefd61a9985f183277ddf758a3216dd322c0e43c21f94d2659fbe7dbcbf8f25d5df7c8c1408172214080d9234f4048499fbb8c4b WHIRLPOOL f24b1d0a9e79b18ef4a69bb1965827f1dd9cc75df1f36cfa2caacaf8686d08d78be9b2cf54edc939bbe700506428aa76f9b0daa144acfe8bb49c8b07f5729730
 DIST texmaker-4.0.tar.bz2 13120378 SHA256 7e8dd8ebf7ed2102c32b46640e3b030d9d8d4899067d50873cd9f9f6eabd2c21 SHA512 d25ebedb0a5d4f268c511af5ffbe850288d84bba70786d92ca5812b2b5f780441e51bdccad43f2af80b1d3f2a3cfb61eb42f8279c17cc1dbdd9e881a7660a9be WHIRLPOOL 5e21261253835c02487ac056600cdf5568ad0ea3b06f1c51679a5a8b4f619e427e9e2d986a5c8d102a7bf0469eb76cab63175cc8908078b203210ee0e5df5ef8
 EBUILD texmaker-3.5.2-r1.ebuild 1720 SHA256 2d3b87351e963089b9670e2ec4c1f054b3b4a374f228fd62282888f0a970cde1 SHA512 fb1b98f683123cdbc9eaa405951a18a48f9a4a5ac5e7d0fa50aef9f3f9e8c235f09935133374ca8ae3fadccf82c94c12a13e1069a685b94fb167ca2a9693a677 WHIRLPOOL 12c57194e87ea020bbe3c3309b03172df9155fe142ae6425a297a8359f41eb16af4f13239201162bd8ca3fb70d760fa814fd7d2e92813ec4d84731b5bc0b0ca0
+EBUILD texmaker-4.0.1.ebuild 1687 SHA256 3fd6f98a440062147fa3505a8bd4f74af6b1c998ccdded6d62a53920bce82924 SHA512 7a39555d44173364defbd2ba60172a668aacd73814467781792acfb131f7f52b25b6456f2e564436a9e7185ff02e0b3fc3575d1760ea0bceaf705a2cd3ecd3bc WHIRLPOOL f41b81f4f9c5155fcdac8654cef9ea2925fd381e3f26120d1fa06cfa1c73bb87a6b2f4a805f019f510e0ae04587da20c131b4ae923d7e1733f64b2903fd59850
 EBUILD texmaker-4.0.ebuild 1692 SHA256 474ccc2760dbaf680789de2815fb5d77f11297932f4f40535f6827fbc3a06617 SHA512 22f65c414694e46c5ac65f58d54c6393d1e224d5440c8a77918bf7ca14d8d178f8f01bb8148d1c0d86785490b3121e7d0432667b68f6b5b7c002fca4aa2168bc WHIRLPOOL 6de5de7b62f68044252d4092270909087dc3105e7af6a2a27f1a62703607a72b99d102b9b129004e9511eb40e9695f5d519ed700fda4aba5694bdad6152068af
-MISC ChangeLog 18881 SHA256 2113915d14f8a6083efe1d6890b1148b907c8bdc243f32553502e9d39a551e31 SHA512 cf839fc6b974d1485e81000b8ba64464948b8de39c13099fe401cee2cbeec5d4815818e11f8df23097f4ae3e6db88cb9545221fd24448652abc7caccdc3e5ea2 WHIRLPOOL bd60f6483d092963f4d7bb844e1e3f3c7fc9ae6e8de733570cf1cae030a227d5e06eced0df32a4072e270b8abab2c8d360d6b1afa6f51e0f97d1fcccf0b2e197
+MISC ChangeLog 19039 SHA256 7d593b0e285d8671113ae6343f502512a2cf1a5ec67f5e096314ccc8f209a127 SHA512 97c8745d405e08ad3cc2efe1cc2d04822661d23916b877176075a4ab98dfd63644ef4a7af86aa996d0414d882aac58266cd421b213e533fb4ebafca25ea6a8a6 WHIRLPOOL 72c6bde64dfce5a5e4a636023b57faf1d060f996337582a9341015e36188c14955abfff7ecc23d55dc58046aef6bec29e92585cf76b11879aac3c230a4574d23
 MISC metadata.xml 281 SHA256 2c7a572c26bbf24b0de55efe3ef0be56a2d9280869ffb4647791ce66f78a01bf SHA512 793f7f982c959f54c1af0f96a433837d031cf619190e57d784a5bb1f05503de72bf59329774c9efde5bf52c286eacd8032b366e1cc0ebaba94e110c326faa93d WHIRLPOOL f5324da1385ba50007e7f01f5d34f767f1cebefec780de74ade5c980c4d05e7e36590c6a8d79f5608201831daa6597e4a679b4e6a4e4ac33c2e09d94e554f5a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFFtkIACgkQgAnW8HDreRa60ACdGODlsX7sy948Y1iL7SmCAjQ9
-4boAoLE1cl4PArHRUMjsrbNw6jXlg02s
-=OEbo
+iEYEAREKAAYFAlFHEjMACgkQgAnW8HDreRagjgCfWCQ9ndKuqlb7ABkSt+wYp+ma
+xfUAoKz4dpwKkat+LcXQrZF3ZOEXvaVV
+=K6oU
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch b/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch
new file mode 100644
index 000000000000..b271ea82d2e9
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-4.0.1-hunspell.patch
@@ -0,0 +1,180 @@
+ configdialog.cpp   |  2 +-
+ latexeditor.h      |  2 +-
+ latexeditorview.h  |  2 +-
+ latexhighlighter.h |  2 +-
+ spellerdialog.h    |  2 +-
+ texmaker.cpp       |  4 ++--
+ texmaker.h         |  2 +-
+ texmaker.pro       | 40 +++++-----------------------------------
+ 8 files changed, 13 insertions(+), 43 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index 8a73c4d..6b94401 100644
+--- a/configdialog.cpp
++++ b/configdialog.cpp
+@@ -216,7 +216,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 1ad4195..8f43b61 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 603d82e..844386c 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 a364143..c4f7d50 100644
+--- a/texmaker.cpp
++++ b/texmaker.cpp
+@@ -4328,7 +4328,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
+@@ -10786,4 +10786,4 @@ if (singlemode && currentEditorView())
+ 	    UpdateBibliography();
+ 	    }
+ 	}
+-}
+\ No newline at end of file
++}
+diff --git a/texmaker.h b/texmaker.h
+index 9680c8f..c8f1f24 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 32c3463..e5db444 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -70,25 +70,6 @@ HEADERS	+= texmaker.h \
+ 	synctex_parser_utils.h \
+ 	usertagslistwidget.h \
+ 	addtagdialog.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 \
+@@ -175,18 +156,6 @@ SOURCES	+= main.cpp \
+ 	synctex_parser_utils.c \
+ 	usertagslistwidget.cpp \
+ 	addtagdialog.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 \
+@@ -283,13 +252,11 @@ isEmpty( ICONDIR ) {
+ }
+ ## QT5
+ #INCLUDEPATH +=$${QTDIR}/include/
+-INCLUDEPATH  += /usr/include/poppler/qt4
+-LIBS         += -L/usr/lib -lpoppler-qt4
+-LIBS         += -L/usr/lib -lz
++LIBS         += -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+ 
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+ 
+ 
+ INSTALLS = target
+@@ -720,3 +687,6 @@ INSTALLS += utilities
+ ICON = texmaker.icns
+ QMAKE_INFO_PLIST =Info.plist
+ }
++
++CONFIG	+= link_pkgconfig
++PKGCONFIG = hunspell poppler-qt4
diff --git a/app-office/texmaker/texmaker-4.0.1.ebuild b/app-office/texmaker/texmaker-4.0.1.ebuild
new file mode 100644
index 000000000000..f5a41bc14c2a
--- /dev/null
+++ b/app-office/texmaker/texmaker-4.0.1.ebuild
@@ -0,0 +1,73 @@
+# 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.1.ebuild,v 1.1 2013/03/18 13:10:10 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
+	)
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}"/usr \
+		DESKTOPDIR=/usr/share/applications \
+		ICONDIR=/usr/share/pixmaps
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	doicon utilities/texmaker*.png utilities/texmaker.svg
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}