app-office/texmaker: Version Bump

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

4 files changed, 236 insertions, 7 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 3460ebe82234..1c47dec8f383 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.110 2012/09/05 14:58:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.111 2012/11/02 08:52:17 jlec Exp $
+
+*texmaker-3.5.1 (02 Nov 2012)
+
+  02 Nov 2012; Justin Lecher <jlec@gentoo.org> +texmaker-3.5.1.ebuild,
+  +files/texmaker-3.5.1-hunspell.patch:
+  Version Bump
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> texmaker-3.5.ebuild:
   Avoid double prefix
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 683902919022..2d04ff2111b1 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,23 +1,25 @@
 -----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
 AUX texmaker-3.3.4-hunspell.patch 4478 SHA256 4d3b6dbbe829140e224bfa0cdceefef29c3ff012aa86d68b248d93bee564cd84 SHA512 4d9fc23fef2e6497f25a32cfcb3c1832527a684fedd70005fe990f234bfb90e68e752e06ba887acd84c4856d3c9f34f0aca631117a1537e49cba817e890b7f11 WHIRLPOOL 6deb23a437628c9cf69c0a7361497035b6bd923379cd4975cedcbe0222127f8f2e20b4244ace79d8d52f670aaea37b8dd2290d969f7090610edcb7fbaeaf0f09
 AUX texmaker-3.5-hunspell.patch 3841 SHA256 c886be8ca7c624ee0b61f57e4d23404882a4b142e6b7b3b02262c42829aef069 SHA512 fed81729a3e0a61caa4417aa28d39ffced6e5a728715760725d7bec8c9a8848bf56c0f82c160cfa20ccf10294d88e91c4a60589b695c549273620b419ee13960 WHIRLPOOL 5a048ea581184a84af1cf31858590940e5f799ae136578376e4ceb74e82d12b4238c62b0bada4ed1a42d56b9fcee0435c2a617c70bb47fa2f54f4d151f238501
+AUX texmaker-3.5.1-hunspell.patch 3843 SHA256 5bbd61ba62d87797230887afc3e6f618b90ae38009fd3c44eefba16b53fea1f3 SHA512 18efa8484ce05e3809fcc45f3b8a2c0ab83faaacc010c7beeb4069c68c67d24acba0ab5a0bea2896538f5b81e02c1d303fc4a3f679b8f611a51be7203e37cf94 WHIRLPOOL ef0c32261cc214a6efc9c7cd4eac1a23569a9d2d097a32eaaeaf6512771cb110b3248939a9c5bd84eb39889925d37aa527d2a16cdf959b286e78c67bc8bb3711
 DIST texmaker-3.1.tar.bz2 6018840 SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 SHA512 5fa2ad28198f712a73b41b1bc296ad8267182a59e1d5631336c20f527c8f88178e6fbd9fc8a40ef8559283c0b6e548c9d29c9e038c0b382cf60ad28a4057d811 WHIRLPOOL 94e80c3d345e478ace202f9c3b8af17b2966681f5dd94361704d48d1c2617f72596f75b769a8baed4bf06692dae8ca651da34e75751e03316077b178d16e864b
 DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
+DIST texmaker-3.5.1.tar.bz2 13168917 SHA256 2477ec15d4b3a3c442735504deddd50f17f9194708013e690ebcc8b278d7b659 SHA512 0c0eb5e58cba3e88da1ed98bbeee547ad2ad9e0c2502c1b236bccbc98b5cf66c92b9656f290965ee0f0e28365ada6bdf239fa0a377037d30a13f130da31cc45b WHIRLPOOL 927579dfedea9d998cc0130a519dea32aa4fc587e300f1126ab1ab612e2b704ae5237a01d9a54ee328bbb05b2fecc3c2372f8f72d992163db9975aec451eb2df
 DIST texmaker-3.5.tar.bz2 13144036 SHA256 eddc8a60afc5f53d1f31154a2f0b6a60b8a1c3bd09dad1e8eaf5868231dfbcf0 SHA512 ae1c6491ed91863a7ecf2bcdcdf19832fb53a0c82e66e79825ef0d3e21300b3239550117aba75373303ca0eea448487434afce311c3a37d57a5ccb3f892d232a WHIRLPOOL 174c8ff38f643216b1367d60c6f48dcc684e3b409e37bcba534dbc5c84cfc52c75978f68652d6743c644ec8764409946ef9e7fd0e555cec0aadd5e84a1318d3f
 EBUILD texmaker-3.1.ebuild 1727 SHA256 86856efc65c522f8ba0c106702055ceef51932a486a8c3f71d2be61530f6dc0a SHA512 b640aa8213b83f9de39b0650932d643fe5b0d56e394330cc115efa0c8c4e90d12cf7795abb8e328241939581b56965bee1585689277053e0dd1c511de5829504 WHIRLPOOL 1a1c9edacc6f1b3f05f6a4fc9e0f35c4a2b19a80e8927049091512086e953591d7369e32679fa427e0f392a235ab4afc3a6ad69904c1664e85c0667239fec534
 EBUILD texmaker-3.3.4.ebuild 1677 SHA256 dd282dcc521b1f4823dd56ab142878a566532525120c29823db5dc072f8bedf2 SHA512 206237df056ed9705d5d4ca4d6a7212d8d9ad9ebc68b1b89e0b26476c002c4f5b06f9b89b81c3e05768ae2b88e6ee315b9161e1cbe214acba0324dae1b398988 WHIRLPOOL 8b5703eb349c66bf74a53f8504bbdbcd00fe1355eb8dc4f4b1d8edd73d05c833bc5c906da65a3555cbcfc09139c88e9951aaf86ac3780d3b0ea8c86e506f5cc3
+EBUILD texmaker-3.5.1.ebuild 1724 SHA256 aa45ef26532f02ea5a0e7c045ec82467fd6ac63197f791ab1f5bce8789381ac9 SHA512 086e998aeb77fa8080995f5b1c8499c98cfcbb91f371bfb46f3e16800f2ba4d70320ab23c8cc5125fb918bab824b579cb5d36a90e09353733f579a336749cb46 WHIRLPOOL 42615f35501fe601c7602418a3eae1e8ab63a466a14b107f8dad18c0c26f1a25df8e3c408bf90ddb1e9101633a0b91bc061af29732486ad67deac35365ec3b29
 EBUILD texmaker-3.5.ebuild 1722 SHA256 394b54320e2f787f82952b8926f88c42a4befd491ff47f932c42d3ad3f794497 SHA512 ac602a2b07a7764d433cd6b723e0a7332bd2b38994963839b686fa83e370365b4ce2d3b1c1ac06f85153c7859b93f9cf12856e590688949c9ea01c388436c928 WHIRLPOOL cd7a5b498fec39625d13a1584cd769063b9b3443e4355cab8cb646be8242f046714478e5824d5bb7d55405af018f79fa5faa3221736e59cbfc99f39ca85af3f4
-MISC ChangeLog 16841 SHA256 e961c2e677751add88f0bbd9ba9edba98017db1fc6214a49a518d2a8358a7197 SHA512 d8fde7ddadb5a0df304ac0bdcb5abbbc21326720578c2d032f7feed5b33fbbda76415eb0baff9d731e2609a617f61a5d70afea10743eb8a73eeb8cd775253ed9 WHIRLPOOL 4543c66a1b5d0dd0480b233c11b95d5641db93f8b5d8d0d03aae87165578029f50d595cb3e7f66fdac91e9cb3a90781481145e324941565ed851da612dd3e73f
+MISC ChangeLog 16999 SHA256 f68d8e85483042587718970b0c0aaa1d4c42bf859c31b88bfad11b50ded4a834 SHA512 258f78a589a45311af43384fd954bce74c527c8aeca432c52fac29de242339a200771af7692bc3b0e9bfca770a5035563bc1ea618be5d5321b796dfc218fafcd WHIRLPOOL b461c7c56ebd9107d00f3c6d90d7fd82d68776e745cc56ad7cf023cbd89eb4b1011e93bc7a46665982eff78ece5f97a23bf686b00d259b2ee808f89c8f4d716d
 MISC metadata.xml 274 SHA256 1c59f208af91e0b13109901b6ceed3fcc2f64f47280631ce6552b083256555b1 SHA512 fc5a21876a0480a25b45900f0be1e9fa883db1c401af7039644b80fa634f50d4430f31dd82b240f397b543ba755e8cafdf06c60d8f884a6c86a271b4d15e8c3d WHIRLPOOL aaf6fcf7b0291f7c7a1a5ef674c171eb20eeeac04184b5a21055ecd5f4bab492c5f0c6d7fd7dd126254688e892075195430780c18e2b9638154ae42700067029
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBHaKEACgkQgAnW8HDreRavfgCgmnLda3WZu4pLvSo1Zx+VrKd5
-Dh8AoMMnsssZHbIB+B8/eIMQ/ImxkYrB
-=ZwER
+iEYEAREKAAYFAlCTicUACgkQgAnW8HDreRZYPwCfU+XuvtNL5JK3K23nXKdvaVGa
+8O0An04Cfo+EIkzQ4QNXLyTxtNy/4grW
+=oHZu
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch
new file mode 100644
index 000000000000..f5bdda522922
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.5.1-hunspell.patch
@@ -0,0 +1,148 @@
+ latexeditor.h      |  2 +-
+ latexeditorview.h  |  2 +-
+ latexhighlighter.h |  2 +-
+ spellerdialog.h    |  2 +-
+ texmaker.h         |  2 +-
+ texmaker.pro       | 40 ++++------------------------------------
+ 6 files changed, 9 insertions(+), 41 deletions(-)
+
+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 5951656..796eb28 100644
+--- a/latexeditorview.h
++++ b/latexeditorview.h
+@@ -22,7 +22,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.h b/texmaker.h
+index 83093d7..7f44645 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 3c0986a..a26295a 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -4,7 +4,8 @@ TARGET	 = texmaker
+ QT += network \
+       xml \
+       webkit
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell poppler-qt4
+ TEXMAKERVERSION=3.5.1
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -67,25 +68,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 \
+@@ -171,18 +153,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 \
+@@ -277,13 +247,11 @@ isEmpty( ICONDIR ) {
+     ICONDIR=/usr/share/pixmaps
+ }
+ 
+-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
diff --git a/app-office/texmaker/texmaker-3.5.1.ebuild b/app-office/texmaker/texmaker-3.5.1.ebuild
new file mode 100644
index 000000000000..3e555f01f26c
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.5.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.1.ebuild,v 1.1 2012/11/02 08:52:17 jlec Exp $
+
+EAPI=4
+
+inherit base 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/poppler[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/qt-gui:4
+	x11-libs/qt-core:4
+	x11-libs/qt-webkit:4
+	app-text/hunspell"
+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
+	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
+	)
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX=/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"
+}