Remove hspell dependency for bug #177707, handled through aspell instead.

Add virtual/iconv depend. Add header patch for GCC 4.3 from Debian.
Package-Manager: portage-2.1.2.7

4 files changed, 74 insertions, 20 deletions

diff --git a/app-editors/geresh/ChangeLog b/app-editors/geresh/ChangeLog
index 92ef9775280b..3b768cef3a71 100644
--- a/app-editors/geresh/ChangeLog
+++ b/app-editors/geresh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/geresh
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/ChangeLog,v 1.8 2006/12/10 13:55:11 dirtyepic Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/ChangeLog,v 1.9 2007/05/11 19:03:12 dirtyepic Exp $
+
+  11 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/geresh-0.4.1-gcc43.patch, geresh-0.4.1.ebuild:
+  Remove hspell dependency for bug #177707, handled through aspell instead.
+  Add virtual/iconv depend. Add header patch for GCC 4.3 from Debian.
 
   10 Dec 2006; Ryan Hill <dirtyepic@gentoo.org>
   +files/geresh-0.4.1-gcc4.patch, metadata.xml, geresh-0.4.1.ebuild:
diff --git a/app-editors/geresh/Manifest b/app-editors/geresh/Manifest
index 258bd9e1d4e1..065687b83609 100644
--- a/app-editors/geresh/Manifest
+++ b/app-editors/geresh/Manifest
@@ -2,15 +2,19 @@ AUX geresh-0.4.1-gcc4.patch 625 RMD160 8c8f3e40c72b6b7b3e60c0c8dd7e24c31f0add85
 MD5 c621fe661bfa965a1d4f762634acff0f files/geresh-0.4.1-gcc4.patch 625
 RMD160 8c8f3e40c72b6b7b3e60c0c8dd7e24c31f0add85 files/geresh-0.4.1-gcc4.patch 625
 SHA256 93c24f77e23dca559b4325031788a9f0e1a9d78a742d90f7188da7d8f80d593a files/geresh-0.4.1-gcc4.patch 625
+AUX geresh-0.4.1-gcc43.patch 1372 RMD160 4e1b9a610988d74ad46471390398516728afccbd SHA1 184eb3be271e71ed9c5201b31cb1e7887f20084e SHA256 e3a2f48e89193a3d358f121930568d0d00f814889bd28674b3449bcd591e85b7
+MD5 2d65dc1e9fc9e2d3dc5c0d89b9a14bb8 files/geresh-0.4.1-gcc43.patch 1372
+RMD160 4e1b9a610988d74ad46471390398516728afccbd files/geresh-0.4.1-gcc43.patch 1372
+SHA256 e3a2f48e89193a3d358f121930568d0d00f814889bd28674b3449bcd591e85b7 files/geresh-0.4.1-gcc43.patch 1372
 DIST geresh-0.4.1.tar.gz 160030 RMD160 df7688de34eb5fff93e55962b22feac83ec8fd08 SHA1 c34ad5290a0954912ef47ab2ddb494350f2cdfcb SHA256 510070fd0521783dbc210bd47452fb22c965ded4dc687793e8624503d52b2ff2
-EBUILD geresh-0.4.1.ebuild 767 RMD160 8c9ebc1c8f052a2dcbf3ceef547127940bf872be SHA1 dc4b52a8beae01a19dda63634266687607a44777 SHA256 b959aa45570331d830236f7cdf612e583b415ce8c36bf194e5d100e9f658075c
-MD5 b50c98d6b324a782510e4d304589864f geresh-0.4.1.ebuild 767
-RMD160 8c9ebc1c8f052a2dcbf3ceef547127940bf872be geresh-0.4.1.ebuild 767
-SHA256 b959aa45570331d830236f7cdf612e583b415ce8c36bf194e5d100e9f658075c geresh-0.4.1.ebuild 767
-MISC ChangeLog 958 RMD160 7f897acbda2fb1358c01b553944afc97649162c2 SHA1 12a931402e749da809a65159c279ca73b3b0b6a6 SHA256 4ca32fc43c0166e48932b42250458cdcdf3db5818d6b4cd84ac21e8da645d4eb
-MD5 64c5813bcd17a571bd4b953d65e94ad4 ChangeLog 958
-RMD160 7f897acbda2fb1358c01b553944afc97649162c2 ChangeLog 958
-SHA256 4ca32fc43c0166e48932b42250458cdcdf3db5818d6b4cd84ac21e8da645d4eb ChangeLog 958
+EBUILD geresh-0.4.1.ebuild 816 RMD160 9e37c3ee43e2ca5fa553bd16f785ddaf7f8133d8 SHA1 da2425f932daab5406b752b892b360bfdf17b02d SHA256 0873b2d3e001696fce3efd07d21bd22497c64c2ddd3cc6a13e8ed162c24e1ca5
+MD5 6fd8eb11d2acafb8b24449f46bec70f7 geresh-0.4.1.ebuild 816
+RMD160 9e37c3ee43e2ca5fa553bd16f785ddaf7f8133d8 geresh-0.4.1.ebuild 816
+SHA256 0873b2d3e001696fce3efd07d21bd22497c64c2ddd3cc6a13e8ed162c24e1ca5 geresh-0.4.1.ebuild 816
+MISC ChangeLog 1209 RMD160 7efc4830ec2398ba47bec0343b45d99f0fa1a2fe SHA1 6ef2267acb1566c2e0bf283822f79651b6a96f65 SHA256 4b5a32a0989da28074c07d6f367aaa545e46764c1b902fea1129999e2b9132f2
+MD5 2c2b85ff69c70edfcf9f0678b40208b4 ChangeLog 1209
+RMD160 7efc4830ec2398ba47bec0343b45d99f0fa1a2fe ChangeLog 1209
+SHA256 4b5a32a0989da28074c07d6f367aaa545e46764c1b902fea1129999e2b9132f2 ChangeLog 1209
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
diff --git a/app-editors/geresh/files/geresh-0.4.1-gcc43.patch b/app-editors/geresh/files/geresh-0.4.1-gcc43.patch
new file mode 100644
index 000000000000..c664e853cbb6
--- /dev/null
+++ b/app-editors/geresh/files/geresh-0.4.1-gcc43.patch
@@ -0,0 +1,44 @@
+diff -Naur geresh-0.4.1-orig/dialogline.cc geresh-0.4.1/dialogline.cc
+--- geresh-0.4.1-orig/dialogline.cc	2007-05-11 12:49:55.000000000 -0600
++++ geresh-0.4.1/dialogline.cc	2007-05-11 12:50:56.000000000 -0600
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <stdarg.h>
+ 
+ #include "dialogline.h"
+diff -Naur geresh-0.4.1-orig/editbox2.cc geresh-0.4.1/editbox2.cc
+--- geresh-0.4.1-orig/editbox2.cc	2007-05-11 12:49:55.000000000 -0600
++++ geresh-0.4.1/editbox2.cc	2007-05-11 12:51:31.000000000 -0600
+@@ -14,6 +14,7 @@
+ // along with this program; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ 
++#include <cstdlib>
+ #include <config.h>
+ 
+ #include "editbox.h"
+diff -Naur geresh-0.4.1-orig/io.cc geresh-0.4.1/io.cc
+--- geresh-0.4.1-orig/io.cc	2007-05-11 12:49:55.000000000 -0600
++++ geresh-0.4.1/io.cc	2007-05-11 12:52:13.000000000 -0600
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <stdarg.h>
+ #include <fcntl.h>  // file primitives
+ #include <unistd.h>
+diff -Naur geresh-0.4.1-orig/transtbl.cc geresh-0.4.1/transtbl.cc
+--- geresh-0.4.1-orig/transtbl.cc	2007-05-11 12:49:55.000000000 -0600
++++ geresh-0.4.1/transtbl.cc	2007-05-11 12:53:00.000000000 -0600
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <stdio.h>
+ #include <errno.h>
+ 
diff --git a/app-editors/geresh/geresh-0.4.1.ebuild b/app-editors/geresh/geresh-0.4.1.ebuild
index 357ac0c3d79d..2b73e035001a 100644
--- a/app-editors/geresh/geresh-0.4.1.ebuild
+++ b/app-editors/geresh/geresh-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/geresh-0.4.1.ebuild,v 1.9 2006/12/10 13:55:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/geresh-0.4.1.ebuild,v 1.10 2007/05/11 19:03:12 dirtyepic Exp $
 
 inherit eutils
 
@@ -11,14 +11,13 @@ SRC_URI="http://www.typo.co.il/~mooffie/geresh/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
-IUSE="spell nls"
+IUSE="spell"
 
-DEPEND="dev-libs/fribidi
-	sys-libs/ncurses
-	spell? (
-		nls? ( >=app-text/hspell-0.5 )
-		virtual/aspell-dict
-	)"
+DEPEND="virtual/libiconv
+		dev-libs/fribidi
+		sys-libs/ncurses
+		spell? ( virtual/aspell-dict )
+	   "
 
 src_unpack() {
 	unpack ${A}
@@ -26,8 +25,10 @@ src_unpack() {
 
 	# Bug #149758
 	epatch "${FILESDIR}"/${P}-gcc4.patch
+	# GCC 4.3 header fix
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	emake DESTDIR="${D}" install || die
 }