Use system hunspell, by Dustin Surawicz, bug #220617

Package-Manager: portage-2.1.5_rc10

4 files changed, 149 insertions, 5 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index a2be54a36555..1796193db30e 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.43 2008/05/11 19:38:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.44 2008/05/13 20:34:18 aballier Exp $
+
+*texmaker-1.71-r1 (13 May 2008)
+
+  13 May 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/texmaker-1.71-hunspell.patch, +texmaker-1.71-r1.ebuild:
+  Use system hunspell, by Dustin Surawicz, bug #220617
 
   11 May 2008; Alexis Ballier <aballier@gentoo.org> texmaker-1.60.ebuild:
   switch to latex-base, allow split qt4 deps
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 1ef82ce70515..d42bcc8a8d55 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX texmaker-1.71-hunspell.patch 1628 RMD160 8630443938a52f42ec1ee32ade1ee6b389739c3c SHA1 79868896cec3bf6c77debaea95b5cce6b9c5b29b SHA256 a02d0c1c1930bd384f36210756ec31cc531292397147a343865eb3e82195cebb
 DIST texmaker-1.6.tar.bz2 853418 RMD160 ffa72545cab6bcec2974e081609260344ba84ef0 SHA1 8da3a6370214f97b568126439408a7774b017c1d SHA256 d49e7df506ef79e02a2382ad261760976f1e16cd5f42eea8308bb6710aaf832e
 DIST texmaker-1.7.1.tar.bz2 1522280 RMD160 37bca67d049fb064b45e09cfbb3453d4cb8bb8da SHA1 055aabf865e8d9baafe2762594469cd2b7d75183 SHA256 e814c68c20663792ca56ba3fb9600841e390463f96dac4f1ba034a35ec454a90
 EBUILD texmaker-1.60.ebuild 1701 RMD160 1f85639059a3bfd0987c16e8e9bb2d426ff2d3a8 SHA1 aee8150ccc36602d48a9fbe3547c87a66c440e1e SHA256 89329666239452ad73b64cec94c446f1bab9736d9f24da4ef15fcdf2a0307a26
+EBUILD texmaker-1.71-r1.ebuild 1802 RMD160 11a76f1f342ef6b4404d1c2bd63af46fcee124fc SHA1 a88cfa279dd376252245120500278edb14b820b3 SHA256 69fda436a3dc7bdfb848f6fb91f3b3f3106b92ec00d53a516b2c5109eb138723
 EBUILD texmaker-1.71.ebuild 1688 RMD160 23a4b6c084cc4ea7448f31e8c40d5c7dbae78504 SHA1 9617bea5a5f51d7aa16424520e0867155002d378 SHA256 630bd8ec50abf63090d90ba12ccb1d078b3f593206e77933c256347d40559073
-MISC ChangeLog 5962 RMD160 2a7e129a5ba63b0ce1ff6d86e54528c8f567c0dd SHA1 8eaf4a81748fd8328ff69be12517611a016327b2 SHA256 9d3ebe7b7d728a9978ef15029ec1918e59f81ab13771e8e87a3f5e4012e5917d
+MISC ChangeLog 6168 RMD160 bf99acb4d2e870b26aed0662d51dc3baca266622 SHA1 7f1c1061a527bc03e5f499ef8e1bacacb82e146f SHA256 eea2f6f35ba8715e8508d76491e6f1a11e64e60e789f0ea93ea8a81ae8c6db58
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgnSy0ACgkQvFcC4BYPU0qjHwCgwNhOJtG1kQ59FqtUg0dH6MN4
-Ps8AoMHIaGl90Xn4s8dHKQBByZHYCJNi
-=9wfO
+iEYEARECAAYFAkgp+10ACgkQvFcC4BYPU0r0/wCgqvwHLxjq+1hOv6v+wEldSKoZ
+i0EAoMUkPPfG3xqCTCpTPwuAn7NVhZmP
+=XQV4
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-1.71-hunspell.patch b/app-office/texmaker/files/texmaker-1.71-hunspell.patch
new file mode 100644
index 000000000000..39e1712633bc
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-1.71-hunspell.patch
@@ -0,0 +1,64 @@
+--- spellerdialog.h.old	2008-05-13 09:55:46.000000000 +0200
++++ spellerdialog.h	2008-05-13 09:56:06.000000000 +0200
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+--- texmaker.pro.old	2008-05-13 10:09:23.000000000 +0200
++++ texmaker.pro	2008-05-13 10:11:15.000000000 +0200
+@@ -2,6 +2,8 @@
+ LANGUAGE	= C++
+ TARGET	 = texmaker
+ CONFIG	+= qt warn_off release
++INCLUDEPATH += "/usr/include/hunspell"
++LIBS += "-lhunspell"
+ ###############################
+ HEADERS	+= texmaker.h \
+ 	symbollistwidget.h \
+@@ -32,22 +34,7 @@
+ 	webpublishdialog.h \
+ 	spellerdialog.h \
+ 	pstrickslistwidget.h \
+-	blockdata.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 
++	blockdata.h 
+ SOURCES	+= main.cpp \
+ 	texmaker.cpp \
+ 	symbollistwidget.cpp \
+@@ -77,16 +64,7 @@
+ 	aboutdialog.cpp \
+ 	webpublishdialog.cpp \
+ 	spellerdialog.cpp \
+-	pstrickslistwidget.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
++	pstrickslistwidget.cpp 
+ RESOURCES += texmaker.qrc
+ FORMS   += findwidget.ui\
+ 	gotolinedialog.ui \
diff --git a/app-office/texmaker/texmaker-1.71-r1.ebuild b/app-office/texmaker/texmaker-1.71-r1.ebuild
new file mode 100644
index 000000000000..a9fc618083ee
--- /dev/null
+++ b/app-office/texmaker/texmaker-1.71-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.71-r1.ebuild,v 1.1 2008/05/13 20:34:18 aballier Exp $
+
+EAPI=1
+
+inherit eutils versionator qt4
+
+DESCRIPTION="A nice LaTeX-IDE"
+
+# 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
+
+S="${WORKDIR}/${MY_P}"
+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 ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	|| ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.3.0:4 )
+	>=app-text/hunspell-1.2.2"
+
+RDEPEND="${DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	virtual/ghostscript
+	media-libs/netpbm"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-hunspell.patch"
+}
+
+src_compile() {
+	eqmake4 texmaker.pro || die "qmake failed"
+	emake || die "emake failed"
+}
+
+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"
+
+	make_desktop_entry texmaker Texmaker "/usr/share/pixmaps/texmaker/texmaker48x48.png" Office
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "/usr/share/${PN}/usermanual_en.html"
+	elog
+}