fix hunspell detection by using pkgconfig, by René 'Necoro' Neumann <gentoo@necoro.eu>, bug #229729

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

4 files changed, 31 insertions, 20 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 1796193db30e..3b34d50af5f1 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,11 @@
 # 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.44 2008/05/13 20:34:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.45 2008/07/02 15:07:22 aballier Exp $
+
+  02 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  files/texmaker-1.71-hunspell.patch, texmaker-1.71-r1.ebuild:
+  fix hunspell detection by using pkgconfig, by René 'Necoro' Neumann
+  <gentoo@necoro.eu>, bug #229729
 
 *texmaker-1.71-r1 (13 May 2008)
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index d42bcc8a8d55..aad605c31cf5 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX texmaker-1.71-hunspell.patch 1628 RMD160 8630443938a52f42ec1ee32ade1ee6b389739c3c SHA1 79868896cec3bf6c77debaea95b5cce6b9c5b29b SHA256 a02d0c1c1930bd384f36210756ec31cc531292397147a343865eb3e82195cebb
+AUX texmaker-1.71-hunspell.patch 1701 RMD160 23feb35af205ad2439a994ceed3a041461de318e SHA1 589ee8691da9a8daf2a4c4ff76209db70eccd3e7 SHA256 0e0cf0106209f320c68b7c3670504d6f71f0b9d36f75bd87854a3df9dace9eb9
 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-r1.ebuild 1863 RMD160 885e0f4899ea0f6ca8c115c9f2948ed34fcadb6e SHA1 e7a80f498eb219b17dec6142b7a0e81a39489233 SHA256 8ac7c19d4c1e395d50b4f396000a13b9f04bcddead5d90e98af126df7c6296b0
 EBUILD texmaker-1.71.ebuild 1688 RMD160 23a4b6c084cc4ea7448f31e8c40d5c7dbae78504 SHA1 9617bea5a5f51d7aa16424520e0867155002d378 SHA256 630bd8ec50abf63090d90ba12ccb1d078b3f593206e77933c256347d40559073
-MISC ChangeLog 6168 RMD160 bf99acb4d2e870b26aed0662d51dc3baca266622 SHA1 7f1c1061a527bc03e5f499ef8e1bacacb82e146f SHA256 eea2f6f35ba8715e8508d76491e6f1a11e64e60e789f0ea93ea8a81ae8c6db58
+MISC ChangeLog 6389 RMD160 02f0cb22613e85e7e1581b0f6a4a122a5a09f590 SHA1 d0db1e09ca00e899b10354b2b34fa7a538f1f4ce SHA256 13baa35c752d63afedf3d83b77c908bfd06ffdbecb136e2ab9934e19d0cbaa93
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgp+10ACgkQvFcC4BYPU0r0/wCgqvwHLxjq+1hOv6v+wEldSKoZ
-i0EAoMUkPPfG3xqCTCpTPwuAn7NVhZmP
-=XQV4
+iEYEARECAAYFAkhrmbIACgkQvFcC4BYPU0pcOACfbAttdL1ROdBU0y3ByDxxu57X
+bdwAn35+fVlGWvlZztKIwgPfJV0l2CmC
+=SQHg
 -----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
index 39e1712633bc..2845196476bc 100644
--- a/app-office/texmaker/files/texmaker-1.71-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-1.71-hunspell.patch
@@ -1,5 +1,6 @@
---- spellerdialog.h.old	2008-05-13 09:55:46.000000000 +0200
-+++ spellerdialog.h	2008-05-13 09:56:06.000000000 +0200
+diff -r 9450ca28545a spellerdialog.h
+--- a/spellerdialog.h	Fri Jun 27 20:29:16 2008 +0200
++++ b/spellerdialog.h	Fri Jun 27 20:39:29 2008 +0200
 @@ -13,7 +13,7 @@
  
  #include "ui_spellerdialog.h"
@@ -9,18 +10,20 @@
  
  #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 @@
+diff -r 9450ca28545a texmaker.pro
+--- a/texmaker.pro	Fri Jun 27 20:29:16 2008 +0200
++++ b/texmaker.pro	Fri Jun 27 20:39:29 2008 +0200
+@@ -1,7 +1,8 @@
+ TEMPLATE	= app
  LANGUAGE	= C++
  TARGET	 = texmaker
- CONFIG	+= qt warn_off release
-+INCLUDEPATH += "/usr/include/hunspell"
-+LIBS += "-lhunspell"
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
  ###############################
  HEADERS	+= texmaker.h \
  	symbollistwidget.h \
-@@ -32,22 +34,7 @@
+@@ -32,22 +33,7 @@
  	webpublishdialog.h \
  	spellerdialog.h \
  	pstrickslistwidget.h \
@@ -44,7 +47,7 @@
  SOURCES	+= main.cpp \
  	texmaker.cpp \
  	symbollistwidget.cpp \
-@@ -77,16 +64,7 @@
+@@ -77,16 +63,7 @@
  	aboutdialog.cpp \
  	webpublishdialog.cpp \
  	spellerdialog.cpp \
diff --git a/app-office/texmaker/texmaker-1.71-r1.ebuild b/app-office/texmaker/texmaker-1.71-r1.ebuild
index a9fc618083ee..46bf478bbdd8 100644
--- a/app-office/texmaker/texmaker-1.71-r1.ebuild
+++ b/app-office/texmaker/texmaker-1.71-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.71-r1.ebuild,v 1.2 2008/07/02 15:07:22 aballier Exp $
 
 EAPI=1
 
@@ -31,17 +31,20 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE=""
 
-DEPEND="x11-libs/libX11
+COMMON_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}
+RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	app-text/psutils
 	virtual/ghostscript
 	media-libs/netpbm"
 
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"