version bump, bug #352792

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

4 files changed, 202 insertions, 7 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index ae050d02e825..610a288eaf6c 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.73 2010/10/30 21:51:46 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.74 2011/01/26 11:18:28 aballier Exp $
+
+*texmaker-2.20 (26 Jan 2011)
+
+  26 Jan 2011; Alexis Ballier <aballier@gentoo.org> +texmaker-2.20.ebuild,
+  +files/texmaker-2.20-hunspell.patch:
+  version bump, bug #352792
 
   30 Oct 2010; Alexis Ballier <aballier@gentoo.org> -texmaker-1.80.ebuild,
   -files/texmaker-1.80-hunspell.patch, -texmaker-1.91.ebuild,
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index a223db6084ff..210bed5ed988 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -3,16 +3,19 @@ Hash: SHA1
 
 AUX texmaker-1.91-hunspell.patch 1948 RMD160 35e3b78a1e9b9b9a8a76c0d67768e11a6b790554 SHA1 4c33150af01a9f3143040bf5f781de7e322b9ac0 SHA256 b12042c07b14633972869c6ded769bed0b546eabb291e8b770ede874f474b113
 AUX texmaker-2.10-hunspell.patch 3482 RMD160 44b800d3db6c7ef5ed80d7093a3febdbd9a1b881 SHA1 13e060ce53b88a4391318db4c600a6f2cba2ffcb SHA256 d0e53e8c900b7e711692ad713028bd7c720083819d1498a4107a8d8b8e6f0100
+AUX texmaker-2.20-hunspell.patch 3474 RMD160 e38120716f9d5b3f60695b64fbb9042ab2d3b488 SHA1 af983cefb4101e751420740e44a22f2b237fdfb2 SHA256 3c038e52500fae3c71d739c5f43a9d800c4abbe366882bbd9c8a8f0c43dc13da
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
 DIST texmaker-2.1.tar.bz2 3270064 RMD160 1b247a7dabaab5d5f03a384aade83438179f9c28 SHA1 4338bf1ccd24c1644ad65c1a8a40b6741a4e68ed SHA256 e90457448409f2b091bfd28b4be2315048e6a99d5668998be4d08fccfb0904e4
+DIST texmaker-2.2.tar.bz2 4061558 RMD160 35c7366fc1ee0794f02ef748bd8f5036e8bb518c SHA1 422f0942dd1eed861e62debadd7e7620ba220fa8 SHA256 56f0569639a2083cb52b0bd08970340063d6b199283dbf3d76a28ae231af8eaa
 EBUILD texmaker-1.92.ebuild 1753 RMD160 d11d85d185e9d3f6cefa58759e3be8d0a2c0a3ee SHA1 a5fd127b284b16e28e5d4d1c1147eaa15c3a398b SHA256 e09d891802ebe1aa034f0a4d5e34dfcb33637c98e07613d9580c84424292b6a9
 EBUILD texmaker-2.10.ebuild 1670 RMD160 65dda95c59e6234cddd69554410a4e7a56bc9aff SHA1 f683b3a044614485fbbfda2cdb53c4a50f0e58b6 SHA256 8f38a5401aa3a2e2f3364eab37d08fb917600f76f657307c18d33f56847115fb
-MISC ChangeLog 10276 RMD160 50869ae13d9933f415630e840eb1180830cc3128 SHA1 a062d1748ee967d4de6a0d12a8f01e7af94f334d SHA256 9569e7fe11e3196db3186c1bbd911d41c79ba8fef69cc4fb38c70482a21224bb
+EBUILD texmaker-2.20.ebuild 1670 RMD160 3ce628ab0ba4b80e9d28c033120987b5a718b001 SHA1 d0e83f0114927b2931094e9cb9d984e2058a500c SHA256 45aa5e4f4e1babcc4d9a8a2ba512267cf12762f49e3e48d47c482e8cabc17bd0
+MISC ChangeLog 10449 RMD160 df823671c1e69284c9d06d5fdc3966df727ce966 SHA1 6c480b1de14db6a5ccde0a11f9db8e6e8a1faf10 SHA256 d46af0123cfeae5c5f3311f42b826238d5a71745b571b31149fd6097dd15b28f
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzMk3cACgkQvFcC4BYPU0r1aQCfWT0cXEZA6zfDiKmLgvw6O+i6
-QssAoMOt9cD16LSc+fDIZRjydy35AY3I
-=dvbO
+iEYEARECAAYFAk1AAxEACgkQvFcC4BYPU0pqTgCffCxUunshi/kzxCCzetTfDQxI
+y7AAoI89haKrUZK5KuLZ6v5/FQ5LrTcv
+=vQcd
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-2.20-hunspell.patch b/app-office/texmaker/files/texmaker-2.20-hunspell.patch
new file mode 100644
index 000000000000..bdab17fddd86
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-2.20-hunspell.patch
@@ -0,0 +1,124 @@
+Index: texmaker-2.2/latexeditor.h
+===================================================================
+--- texmaker-2.2.orig/latexeditor.h
++++ texmaker-2.2/latexeditor.h
+@@ -22,7 +22,7 @@
+ 
+ #include "latexhighlighter.h"
+ #include "parenmatcher.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ //class QCompleter;
+ //class ParenMatcher;
+Index: texmaker-2.2/latexeditorview.h
+===================================================================
+--- texmaker-2.2.orig/latexeditorview.h
++++ texmaker-2.2/latexeditorview.h
+@@ -18,7 +18,7 @@
+ #include "latexeditor.h"
+ #include "linenumberwidget.h"
+ #include "findwidget.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class LatexEditorView : public QWidget  {
+    Q_OBJECT
+Index: texmaker-2.2/latexhighlighter.h
+===================================================================
+--- texmaker-2.2.orig/latexhighlighter.h
++++ texmaker-2.2/latexhighlighter.h
+@@ -19,7 +19,7 @@
+ #include <QTextCharFormat>
+ #include <QColor>
+ #include <QTextBlockUserData>
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ 
+Index: texmaker-2.2/spellerdialog.h
+===================================================================
+--- texmaker-2.2.orig/spellerdialog.h
++++ texmaker-2.2/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+Index: texmaker-2.2/texmaker.h
+===================================================================
+--- texmaker-2.2.orig/texmaker.h
++++ texmaker-2.2/texmaker.h
+@@ -43,7 +43,7 @@
+ #include "logeditor.h"
+ #include "gotolinedialog.h"
+ #include "replacedialog.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ #include "browser.h"
+ #include "pdfviewer.h"
+ 
+Index: texmaker-2.2/texmaker.pro
+===================================================================
+--- texmaker-2.2.orig/texmaker.pro
++++ texmaker-2.2/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=2.2
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -54,25 +55,6 @@ HEADERS	+= texmaker.h \
+ 	userquickdialog.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 \
+@@ -121,18 +103,6 @@ SOURCES	+= main.cpp \
+ 	userquickdialog.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 \
diff --git a/app-office/texmaker/texmaker-2.20.ebuild b/app-office/texmaker/texmaker-2.20.ebuild
new file mode 100644
index 000000000000..651cb166e320
--- /dev/null
+++ b/app-office/texmaker/texmaker-2.20.ebuild
@@ -0,0 +1,62 @@
+# 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-2.20.ebuild,v 1.1 2011/01/26 11:18:28 aballier Exp $
+
+EAPI="3"
+
+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
+
+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"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/poppler[qt4]
+	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_install() {
+	emake INSTALL_ROOT="${D}" 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 "/usr/share/${PN}/usermanual_en.html"
+}