Version bump, readd wrongly dropped ppc* keywords, readd wrongly removed minimal qt versions

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

4 files changed, 208 insertions, 2 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index ac27dd92797f..841a47b58503 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.71 2010/10/23 14:48:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.72 2010/10/30 21:36:24 aballier Exp $
+
+*texmaker-2.10 (30 Oct 2010)
+
+  30 Oct 2010; Alexis Ballier <aballier@gentoo.org> +texmaker-2.10.ebuild,
+  +files/texmaker-2.10-hunspell.patch:
+  Version bump, readd wrongly dropped ppc* keywords, readd wrongly removed
+  minimal qt versions
 
   23 Oct 2010; Raúl Porcel <armin76@gentoo.org> texmaker-1.80.ebuild,
   texmaker-1.91.ebuild, texmaker-1.92.ebuild, texmaker-1.99.ebuild,
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index be05682dd51a..a60f9067981e 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,16 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX texmaker-1.80-hunspell.patch 1942 RMD160 1f216bad188d8bafca6cbc7aaa2c31e987833006 SHA1 49be4ba143f40919fe9509cafa77d02abfc381ae SHA256 cdf839246c4af288acbed132ea1f0c4ad1bd3d69b4ce575e51459143c359852c
 AUX texmaker-1.91-hunspell.patch 1948 RMD160 35e3b78a1e9b9b9a8a76c0d67768e11a6b790554 SHA1 4c33150af01a9f3143040bf5f781de7e322b9ac0 SHA256 b12042c07b14633972869c6ded769bed0b546eabb291e8b770ede874f474b113
 AUX texmaker-1.99-hunspell.patch 2003 RMD160 d55780ceb6bcf3eb42ea298212ccc1334adacfd4 SHA1 8d109522237e16d5139979a7b044cb95d4e37ce7 SHA256 33ab95d13cf9d390b7c7d9fd465fd2c55163c3541228dfaa7eb33861c69977d0
 AUX texmaker-2.0-hunspell.patch 1886 RMD160 e5e99324b5a7f4c04b35b3a3fc78a3ea477a8be3 SHA1 b1ff9dcfd474104bc601b3476dbbddf5eb3ed5b5 SHA256 6aeca44554c71227fc56475de544a72968540d6c3b7cf527caf8d9296ebac42e
+AUX texmaker-2.10-hunspell.patch 3482 RMD160 44b800d3db6c7ef5ed80d7093a3febdbd9a1b881 SHA1 13e060ce53b88a4391318db4c600a6f2cba2ffcb SHA256 d0e53e8c900b7e711692ad713028bd7c720083819d1498a4107a8d8b8e6f0100
 DIST texmaker-1.8.tar.bz2 1767680 RMD160 b3bdfa7838f486f0969da472ff08c2d30825421e SHA1 d5f188c0d207c637a445cec984d79ee017de6e1a SHA256 1268f43a548c6c194ea848d5c70c429386b962f5685f16eb427267921f7ad944
 DIST texmaker-1.9.1.tar.bz2 3090445 RMD160 37b34ea22708e22829867dd80756896f4373ff58 SHA1 31267f9ce7bf1aba7bab8605a7608a135e897ae8 SHA256 baf5a82131b2a592cc558cb2604945d5340cb28d88677d463190ac1f282c4999
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
 DIST texmaker-1.9.9.tar.bz2 3171903 RMD160 4b3bae8b91b65b7b1a16a7e316c901d474451cdf SHA1 947811ff7ba6385c24f51188c65492949ef76731 SHA256 4896ef933b06d0518e281bb46654a028fd2a1db14e7bc16964b9e6a3bc47ea4d
 DIST texmaker-2.0.tar.bz2 3235821 RMD160 843d3447ddc86c1ef359df42815100269741dfe5 SHA1 810687fa1a7ec80ce0ee9ffccafe91ba7284cabc SHA256 638d48909ffe0b3b23d6502c3b85e7e311af707cc9344f6b33eff0ea31f599ab
+DIST texmaker-2.1.tar.bz2 3270064 RMD160 1b247a7dabaab5d5f03a384aade83438179f9c28 SHA1 4338bf1ccd24c1644ad65c1a8a40b6741a4e68ed SHA256 e90457448409f2b091bfd28b4be2315048e6a99d5668998be4d08fccfb0904e4
 EBUILD texmaker-1.80.ebuild 1825 RMD160 699cef14302a113a2d33248d3043b1a75c7b19c4 SHA1 65e13dee95185dbdcc9754a17181e598991b9152 SHA256 3b03be961827d68ce0a2d182e5b6baf5ad9edd3b5f5654b26e0ebe9c62aee714
 EBUILD texmaker-1.91.ebuild 1751 RMD160 7ca590f8b37e943ab9aa28c5f0f9f720409678de SHA1 b2fd96aed0d7454fcce8feefdcfbe26d664725ed SHA256 7db607e43b711b4f45a1d837b09584e8c15d45b44fa9cbee5334595decbf9063
 EBUILD texmaker-1.92.ebuild 1753 RMD160 d11d85d185e9d3f6cefa58759e3be8d0a2c0a3ee SHA1 a5fd127b284b16e28e5d4d1c1147eaa15c3a398b SHA256 e09d891802ebe1aa034f0a4d5e34dfcb33637c98e07613d9580c84424292b6a9
 EBUILD texmaker-1.99.ebuild 1712 RMD160 cb7757f64870518b490e0c30a5ea73204dfb5425 SHA1 47df2eb133fddd3fccfcdefb88140bd0685be7f2 SHA256 79ed96c3b259d38eeed7bedbc1f4cabbae59dcef127964fe15f700462fad465a
 EBUILD texmaker-2.0.ebuild 1639 RMD160 1524e9ecb2b83d749193fcf15d8fbe11fb86d4dd SHA1 39c6d4dfa99dba193dedf812981a1f49275d8412 SHA256 38a3268bd9fa8a079e823c4503ff0a03211ab57493864b74020228a9a72e5f12
-MISC ChangeLog 9760 RMD160 16b33b18f8eb72fb5c6d8457a917c1017fcb8338 SHA1 78b8e9f9c17fb00cbea6ce3fbcc2f9507571949d SHA256 76c0505484c87a530165b627d05592e3915d411f08ea17118117598010cc91e6
+EBUILD texmaker-2.10.ebuild 1670 RMD160 65dda95c59e6234cddd69554410a4e7a56bc9aff SHA1 f683b3a044614485fbbfda2cdb53c4a50f0e58b6 SHA256 8f38a5401aa3a2e2f3364eab37d08fb917600f76f657307c18d33f56847115fb
+MISC ChangeLog 10003 RMD160 d6974063233ef6a059aca6954c9080971b2aa8cc SHA1 c520de694a544f27d38161a65c356826b18db3ee SHA256 16971c60e427cc290f3595f24058e1e6b5a6528547b632e99e2e1925f5ec6f1d
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzMj94ACgkQvFcC4BYPU0qzdgCeMHfBV9ifFCuWqB0707Xy3iqf
+jgAAoMrAB7pHafcsZNm49SYz5ng+YDal
+=e7S7
+-----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-2.10-hunspell.patch b/app-office/texmaker/files/texmaker-2.10-hunspell.patch
new file mode 100644
index 000000000000..cd15fe914018
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-2.10-hunspell.patch
@@ -0,0 +1,124 @@
+Index: texmaker-2.1/latexeditor.h
+===================================================================
+--- texmaker-2.1.orig/latexeditor.h
++++ texmaker-2.1/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.1/latexeditorview.h
+===================================================================
+--- texmaker-2.1.orig/latexeditorview.h
++++ texmaker-2.1/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.1/latexhighlighter.h
+===================================================================
+--- texmaker-2.1.orig/latexhighlighter.h
++++ texmaker-2.1/latexhighlighter.h
+@@ -19,7 +19,7 @@
+ #include <QTextCharFormat>
+ #include <QColor>
+ #include <QTextBlockUserData>
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ 
+Index: texmaker-2.1/spellerdialog.h
+===================================================================
+--- texmaker-2.1.orig/spellerdialog.h
++++ texmaker-2.1/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.1/texmaker.h
+===================================================================
+--- texmaker-2.1.orig/texmaker.h
++++ texmaker-2.1/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.1/texmaker.pro
+===================================================================
+--- texmaker-2.1.orig/texmaker.pro
++++ texmaker-2.1/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.1
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ ###############################
+@@ -50,25 +51,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 \
+@@ -115,18 +97,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.10.ebuild b/app-office/texmaker/texmaker-2.10.ebuild
new file mode 100644
index 000000000000..1a6588cdb124
--- /dev/null
+++ b/app-office/texmaker/texmaker-2.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-2.10.ebuild,v 1.1 2010/10/30 21:36:24 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"
+}