Version Bump

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 274 insertions, 5 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index f11c633bc35b..1bdaae2e4b2b 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.89 2011/12/20 20:49:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.90 2011/12/22 11:22:26 jlec Exp $
+
+*texmaker-3.2 (22 Dec 2011)
+
+  22 Dec 2011; Justin Lecher <jlec@gentoo.org> +texmaker-3.2.ebuild,
+  +files/texmaker-3.2-hunspell.patch:
+  Version Bump
 
   20 Dec 2011; Justin Lecher <jlec@gentoo.org> texmaker-3.1.ebuild:
   Add dep on sys-libs/zlib requested by ago
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index a9cba61a9889..8f5e227b77d5 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -7,24 +7,27 @@ AUX texmaker-3.00-hunspell.patch 4119 RMD160 6357d2f7bc6d3099685b6b9b86974f50d3b
 AUX texmaker-3.01-hunspell.patch 4121 RMD160 b515e10c18a0ead767c4a3cd972c7597a478a266 SHA1 6e02b722f1ca9d49700a62371a33b6974248a519 SHA256 d5655a39383add7ac44a0b0ce6390e256ab9679f2b2ba6cbe0abe0ec217d240f
 AUX texmaker-3.02-hunspell.patch 4121 RMD160 6f6e618e6746c808fb783523b4a640d53b2cc0ec SHA1 233739743f7830f0fe6d454a13248201581b5805 SHA256 1c7a598e627ec023d32f79187de304b0254ba1e9fa697bd3210e0c3921656e30
 AUX texmaker-3.1-hunspell.patch 4493 RMD160 15457c250680fb905b5b14cb89ad935966fdc816 SHA1 3a338e267b7991228ca0a688fc1c8e93def1af2b SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87
+AUX texmaker-3.2-hunspell.patch 5082 RMD160 26f7baf4efefc09cb34d6e5acfda690a410aed64 SHA1 fe567f1fad5fa3c84cc3a260f98dbf3dd191e3b4 SHA256 451aa708f1b6b16d41330eaf6dcf69b108b87668264f1042687bcd94d471cdd3
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
 DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8
 DIST texmaker-3.0.1.tar.bz2 5180509 RMD160 18b26895ab46c6f9781e806c1b79335d626e3e70 SHA1 a160eda2e56fd9dba9f68499e4d5dd62f8b66a69 SHA256 badde87708a95bd54e65d3d17595f790486053000052926f860ad5b7e03cf6e7
 DIST texmaker-3.0.2.tar.bz2 5207700 RMD160 795deca96ffba36d9b744c915310cac21885b20d SHA1 24aa9e6cdbb8b33c38979fddab4ff5598f1467f1 SHA256 612ed98ddc6a889a10624a111ea99f6ed5aed9eb813e4b55eabb3c2a711d7026
 DIST texmaker-3.0.tar.bz2 5158725 RMD160 a2458b095b92d1ecc4b463009c5903089c8e3db3 SHA1 d187b826d520390d9164a2e435bc37127a6dd59a SHA256 4957d1e5f84bf928fa2a16bd094247a55f4fe405457b0738fc7bfbae84b85db2
 DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78
+DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675
 EBUILD texmaker-1.92.ebuild 1753 RMD160 d11d85d185e9d3f6cefa58759e3be8d0a2c0a3ee SHA1 a5fd127b284b16e28e5d4d1c1147eaa15c3a398b SHA256 e09d891802ebe1aa034f0a4d5e34dfcb33637c98e07613d9580c84424292b6a9
 EBUILD texmaker-2.30.ebuild 1668 RMD160 6878937cbfa64570f592d3b884b29b1e0a38a813 SHA1 dfeab7a1dd653cd8145b5bd77720492eaeae8e07 SHA256 a41f6ced19f138a38e2e1086c40d1d184299fd6ba943c2732dd66c6ad1ebc96f
 EBUILD texmaker-3.00.ebuild 1666 RMD160 774a05034e7db63edb1a6ccc8a5d24f96593443c SHA1 dbb8891ebb0e0ce1e930f6de2103b7fc859f2f8c SHA256 80793ae348e579a2941c141a0e989e7408f0f48889d5cb939d17f72ee11982d7
 EBUILD texmaker-3.01.ebuild 1666 RMD160 868dc0aea06657e7c39524e455c224fa9564349b SHA1 2d1d78d68312c9e6414673c806db44257a77b3a3 SHA256 033b0c64332e300fa04e0827faaaa0d11824dcd5d58d6c7d68b97c7423529533
 EBUILD texmaker-3.02.ebuild 1666 RMD160 88b0971e52c76086bf980641748fad1b54edf816 SHA1 25b0549d0eb6ea1bdd49f56e43bfb0cbff6ec4fb SHA256 2b4d1ab43a7f90ce553c70b78ff87aa3d76d22a2553e875e4b0d56afe9b00bbe
 EBUILD texmaker-3.1.ebuild 1812 RMD160 011f88fc7f1a09501225e5a5fccbfd179af202f5 SHA1 461eb0df16ba70c35a5e48a03a440b31bd089292 SHA256 f6f906fda8b034422df9ba3ea0d9911de6fe7ca6eb206ff740fc5f986c1ac884
-MISC ChangeLog 12799 RMD160 04d2147b9894418a0124200f2c563a70afebc85a SHA1 9f2e4f19ea2c72068d99598721a903eb52e273a4 SHA256 c863e1e865e162e2223cf6dc4fc4e6b3a26861b04bf0c86b004a600057d0779d
+EBUILD texmaker-3.2.ebuild 1813 RMD160 7da336204b49cc74b0f5025b1f9a04a119c9586f SHA1 4bd0749b7d6caf92f73c7c347d21d34147739e63 SHA256 b51530c2c97d79fc7a941dd9761861e8fae4daa59b513893ac9884028fa20d34
+MISC ChangeLog 12951 RMD160 17ea394b74775ec5ab21055fd91672a284b2fd75 SHA1 c322758a05a10218b413861a923fa7653cc29dc1 SHA256 3de5993e76d480571d063ea11339bd0706ed97e210c59527feab3e54f91d5260
 MISC metadata.xml 274 RMD160 e2fb5cd41e542fe16d8cc8204d04110bf23bce3e SHA1 a957d8f40e49b70695325e66693bf622b42f6a39 SHA256 1c59f208af91e0b13109901b6ceed3fcc2f64f47280631ce6552b083256555b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7w9PIACgkQgAnW8HDreRb/ZwCfcfXBuBfMp5IchlbLj9g2iPV6
-tl8An1z7VHib222WpqxqQOLgaXC687+t
-=YZbL
+iEYEAREKAAYFAk7zEvgACgkQgAnW8HDreRZl3wCbBJ+4Ta2zsm3+rt4gEhEmB9cP
+ZfMAn1WnJ2BrATCCMameAJutkmf4exhU
+=zUg2
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2-hunspell.patch
new file mode 100644
index 000000000000..722b32288b36
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.2-hunspell.patch
@@ -0,0 +1,190 @@
+From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
+Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Thu, 22 Dec 2011 12:09:32 +0100
+Subject: [PATCH] 3.1-hunspell.patch
+
+Conflicts:
+
+	latexeditor.h
+	texmaker.pro
+---
+ configdialog.cpp   |    4 ++--
+ latexeditor.h      |    2 +-
+ latexeditorview.h  |    2 +-
+ latexhighlighter.h |    2 +-
+ spellerdialog.h    |    2 +-
+ texmaker.h         |    2 +-
+ texmaker.pro       |   44 +++++++-------------------------------------
+ 7 files changed, 14 insertions(+), 44 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index 144bddc..89e4059 100644
+--- a/configdialog.cpp
++++ b/configdialog.cpp
+@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
+ #else
+-QDir spelldir(PREFIX"/share/texmaker");
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
+ #endif
+ #endif
+ 
+diff --git a/latexeditor.h b/latexeditor.h
+index 40cc2f6..d46150f 100644
+--- a/latexeditor.h
++++ b/latexeditor.h
+@@ -28,7 +28,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 283fd8a..1ba39cc 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 029c7ad..9fbb532 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 b1a2c65..0806731 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -47,7 +47,7 @@
+ #include "symbollistwidget.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 5d017ad..87fac99 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
+ TEXMAKERVERSION=3.2
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
+ 	scandialog.h \
+ 	synctex_parser.h \
+ 	synctex_parser_utils.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 \
+@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
+ 	encodingprober/nsSJISProber.h \
+ 	encodingprober/nsUniversalDetector.h \
+ 	encodingprober/qencodingprober.h \
+-	encodingprober/UnicodeGroupProber.h
++	encodingprober/UnicodeGroupProber.h 
+ SOURCES	+= main.cpp \
+ 	texmakerapp.cpp \
+ 	texmaker.cpp \
+@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
+ 	scandialog.cpp \
+ 	synctex_parser.c \
+ 	synctex_parser_utils.c \
+-	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 \
+@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
+     ICONDIR=/usr/share/pixmaps
+ }
+ 
+-INCLUDEPATH  += /usr/include/poppler/qt4
+-LIBS         += -L/usr/lib -lpoppler-qt4
+-LIBS         += -L/usr/lib -lz
++INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
++LIBS         += -lpoppler-qt4
++LIBS         += -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+ 
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+ 
+ 
+ INSTALLS = target
+-- 
+1.7.8.1
+
diff --git a/app-office/texmaker/texmaker-3.2.ebuild b/app-office/texmaker/texmaker-3.2.ebuild
new file mode 100644
index 000000000000..4d040507ad46
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.2.ebuild,v 1.1 2011/12/22 11:22:26 jlec Exp $
+
+EAPI="3"
+
+inherit base prefix 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.6.1:4
+	>=x11-libs/qt-core-4.6.1:4
+	>=x11-libs/qt-webkit-4.6.1:4
+	>=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+	eprefixify ${PN}.pro configdialog.cpp
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install || die "make install failed"
+
+	insinto /usr/share/pixmaps/texmaker
+	doins utilities/texmaker*.png || die "doins failed."
+	doins utilities/texmaker.svg || die "doins failed."
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}