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

Add virtual/iconv depend. Add header patch for GCC 4.3 from Debian.
(Portage version: 2.1.2.7)

3 files changed, 62 insertions, 12 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/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
 }