Version bump wrt #220759 with GCC 4.3 and -Wl,--as-needed fix, thanks to Peter Alfredsen.

(Portage version: 2.1.5_rc7)

4 files changed, 250 insertions, 2 deletions

diff --git a/app-editors/geresh/ChangeLog b/app-editors/geresh/ChangeLog
index 3b768cef3a71..efd1922d9d75 100644
--- a/app-editors/geresh/ChangeLog
+++ b/app-editors/geresh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/geresh
-# 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 $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/ChangeLog,v 1.10 2008/05/12 05:22:07 drac Exp $
+
+*geresh-0.6.3 (12 May 2008)
+
+  12 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/geresh-0.6.3-asneeded.patch, +files/geresh-0.6.3-gcc43.patch,
+  +geresh-0.6.3.ebuild:
+  Version bump wrt #220759 with GCC 4.3 and -Wl,--as-needed fix, thanks to
+  Peter Alfredsen.
 
   11 May 2007; Ryan Hill <dirtyepic@gentoo.org>
   +files/geresh-0.4.1-gcc43.patch, geresh-0.4.1.ebuild:
diff --git a/app-editors/geresh/files/geresh-0.6.3-asneeded.patch b/app-editors/geresh/files/geresh-0.6.3-asneeded.patch
new file mode 100644
index 000000000000..1f35edbc5691
--- /dev/null
+++ b/app-editors/geresh/files/geresh-0.6.3-asneeded.patch
@@ -0,0 +1,127 @@
+diff -NrU5 geresh-0.6.3.orig/configure.in geresh-0.6.3/configure.in
+--- geresh-0.6.3.orig/configure.in	2004-10-02 22:19:10.000000000 +0200
++++ geresh-0.6.3/configure.in	2008-05-11 22:11:11.000000000 +0200
+@@ -1,6 +1,7 @@
+ AC_INIT(main.cc)
++#AC_ARG_PROGRAM
+ AM_INIT_AUTOMAKE(geresh, 0.6.3)
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+@@ -8,18 +9,16 @@
+ AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+ 
+ AC_LANG_CPLUSPLUS
+ 
+-AC_ARG_PROGRAM
+-
+ debugging_support=no
+ AC_ARG_ENABLE(debug,
+ [  --enable-debug          Enable debugging support],
+ [   if test "$enableval" = yes; then
+ 	debugging_support=yes
+-	AC_DEFINE(DEBUG)
++	AC_DEFINE(DEBUG, [], [Turn on debugging])
+     fi
+ ])
+ 
+ dnl ---- fribidi ----
+ 
+@@ -35,11 +34,11 @@
+ if test "x$FRIBIDI_CXXFLAGS" = x-I/usr/include; then
+     AC_CHECK_HEADER(fribidi/fribidi.h, , [CXXFLAGS="$CXXFLAGS $FRIBIDI_CXXFLAGS"])
+ else
+     CXXFLAGS="$CXXFLAGS $FRIBIDI_CXXFLAGS"
+ fi
+-LDFLAGS="$LDFLAGS `$FRIBIDI_CONFIG --libs`"
++LIBS="`$FRIBIDI_CONFIG --libs`"
+ 
+ AC_CHECK_FUNCS(fribidi_log2vis fribidi_log2vis_get_embedding_levels, ,
+ 	       [AC_MSG_ERROR(A required FriBiDi function doesn't exist)])
+ 
+ AC_MSG_CHECKING(your FriBiDi library using a short test program)
+@@ -153,11 +152,11 @@
+ 		[
+ 		wchar_t ch;
+ 		waddnwstr((WINDOW*)0, &ch, 1);
+ 		], ,
+ 		[AC_MSG_ERROR(I can't find ncursesw's header file! please check config.log)])
+-    AC_DEFINE(HAVE_WIDE_CURSES)
++    AC_DEFINE(HAVE_WIDE_CURSES, [], [Can link to ncursesw and use its functions])
+ else
+     curses_lib=ncurses
+     AC_CHECK_HEADERS(curses.h ncurses.h)
+     AC_CHECK_LIB(ncurses, initscr, , [curses_lib=])
+     if test "x$curses_lib" = x; then
+@@ -171,18 +170,18 @@
+ 
+ # test for the existance of particular curses functions
+ 
+ AC_CHECK_FUNCS(use_default_colors start_color curs_set)
+ if test "$ac_cv_func_start_color" = yes; then
+-    AC_DEFINE(HAVE_COLOR, 1)
++    AC_DEFINE(HAVE_COLOR, 1, [Enable use of use_default_colors start_color curs_set ncurses functions])
+ fi
+ 
+ dnl ---- gettext ----
+ 
+ # rudimentary gettext check, till I utilize automake's gettext support
+ 
+-AC_CHECK_HEADERS(libintl.h, [AC_CHECK_FUNCS(gettext, [AC_DEFINE(USE_GETTEXT)])])
++AC_CHECK_HEADERS(libintl.h, [AC_CHECK_FUNCS(gettext, [AC_DEFINE(USE_GETTEXT, [], [Use Gettext])])])
+ 
+ # locale support
+ 
+ AC_CHECK_HEADERS(locale.h)
+ 
+@@ -191,11 +190,11 @@
+ AC_MSG_CHECKING(for nl_langinfo and CODESET)
+ AC_TRY_LINK([#include <langinfo.h>], 
+ 	    [char* s = nl_langinfo(CODESET);],
+ 	    [
+ 		AC_MSG_RESULT(yes)
+-		AC_DEFINE(HAVE_LANGINFO_CODESET)
++		AC_DEFINE(HAVE_LANGINFO_CODESET, [], [Has nl_langinfoCODESET])
+ 	    ],
+ 	    [AC_MSG_RESULT(no)])
+ 
+ dnl ---- iconv ----
+ 
+@@ -267,18 +266,18 @@
+ 				iconv_const=const
+ 		    )
+ 	)
+ 	AC_MSG_RESULT($iconv_const)
+ 
+-	AC_DEFINE(USE_ICONV)
+-	AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const)
+-	AC_DEFINE_UNQUOTED(INTERNAL_ENCODING, "$internal_encoding")
++	AC_DEFINE(USE_ICONV, [], [Will we use iconv])
++	AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const, [Does your iconv need const])
++	AC_DEFINE_UNQUOTED(INTERNAL_ENCODING, "$internal_encoding", [internal encoding])
+     fi
+ ])
+ fi
+ 
+-AC_DEFINE_UNQUOTED(DEFAULT_FILE_ENCODING, "$default_encoding")
++AC_DEFINE_UNQUOTED(DEFAULT_FILE_ENCODING, "$default_encoding", [Default file encoding])
+ 
+ AC_CHECK_FUNCS(wctob btowc)
+ 
+ dnl ---- misc ----
+ 
+@@ -289,11 +288,11 @@
+ 	       AC_MSG_ERROR([A required function does not exist]))
+ AC_CHECK_FUNCS(vsnprintf vasprintf)
+ AC_TYPE_MODE_T
+ 
+ dnl AC_TYPE_SIGNAL - fails on some systems, so:
+-AC_DEFINE(RETSIGTYPE, void)
++AC_DEFINE(RETSIGTYPE, void, [Return signal type])
+ 
+ dnl ---- print out the results ----
+ 
+ cat <<MSG
+ 
diff --git a/app-editors/geresh/files/geresh-0.6.3-gcc43.patch b/app-editors/geresh/files/geresh-0.6.3-gcc43.patch
new file mode 100644
index 000000000000..82d991ae2c9e
--- /dev/null
+++ b/app-editors/geresh/files/geresh-0.6.3-gcc43.patch
@@ -0,0 +1,81 @@
+--- geresh-0.6.3.orig/basemenu.h
++++ geresh-0.6.3/basemenu.h
+@@ -1,6 +1,7 @@
+ #ifndef BDE_BASEMENU_H
+ #define BDE_BASEMENU_H
+ 
++#include <cstring>
+ #include "widget.h"
+ 
+ struct MenuItem {
+--- geresh-0.6.3.orig/dialogline.cc
++++ geresh-0.6.3/dialogline.cc
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <stdarg.h>
+ 
+ #include "dialogline.h"
+--- geresh-0.6.3.orig/editbox2.cc
++++ geresh-0.6.3/editbox2.cc
+@@ -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"
+--- geresh-0.6.3.orig/editbox.h
++++ geresh-0.6.3/editbox.h
+@@ -768,7 +768,7 @@
+ 			    int para_num
+ 			);
+ 
+-    void EditBox::redraw_unwrapped_paragraph(
++    void redraw_unwrapped_paragraph(
+ 			    Paragraph &p,
+ 			    int window_start_line,
+ 			    bool only_cursor,
+@@ -780,7 +780,7 @@
+ 			    bool eop_is_selected
+ 			);
+ 
+-    void EditBox::redraw_wrapped_paragraph(
++    void redraw_wrapped_paragraph(
+ 			    Paragraph &p,
+ 			    int window_start_line,
+ 			    bool only_cursor,
+--- geresh-0.6.3.orig/io.cc
++++ geresh-0.6.3/io.cc
+@@ -16,6 +16,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstdlib>
+ #include <stdarg.h>
+ #include <fcntl.h>  // file primitives
+ #include <unistd.h>
+--- geresh-0.6.3.orig/transtbl.cc
++++ geresh-0.6.3/transtbl.cc
+@@ -16,6 +16,8 @@
+ 
+ #include <config.h>
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <stdio.h>
+ #include <errno.h>
+ 
+--- geresh-0.6.3.orig/dispatcher.h
++++ geresh-0.6.3/dispatcher.h
+@@ -17,6 +17,7 @@
+ #ifndef BDE_DISPATCHER_H
+ #define BDE_DISPATCHER_H
+ 
++#include <cstring>
+ #include "event.h"
+ 
+ // class Dispatcher represents a class that receives GUI events.
diff --git a/app-editors/geresh/geresh-0.6.3.ebuild b/app-editors/geresh/geresh-0.6.3.ebuild
new file mode 100644
index 000000000000..70ae0b5f3b08
--- /dev/null
+++ b/app-editors/geresh/geresh-0.6.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/geresh-0.6.3.ebuild,v 1.1 2008/05/12 05:22:07 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="A simple multi-lingual console text editor with bidi & utf support"
+HOMEPAGE="http://www.typo.co.il/~mooffie/geresh/"
+SRC_URI="http://www.typo.co.il/~mooffie/geresh/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell"
+
+DEPEND="virtual/libiconv
+	dev-libs/fribidi
+	sys-libs/ncurses
+	spell? ( virtual/aspell-dict )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS README THANKS TODO
+}