patches as per bug #144008 thanks to Carsten. old versions removed

Package-Manager: portage-2.1.2_rc1-r2

7 files changed, 343 insertions, 1 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index 0398eea5173a..6839c3959002 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-embedded/gpsim
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.22 2006/09/12 18:39:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.23 2006/11/04 05:14:23 dragonheart Exp $
+
+*gpsim-0.21.11-r1 (04 Nov 2006)
+
+  04 Nov 2006; Daniel Black <dragonheart@gentoo.org>
+  -files/gpsim-0.20.14-gcc2_fix.patch, +files/gpsim-0.21.11-eXdbm.patch,
+  +files/gpsim-0.21.11-gtk2.diff, +files/gpsim-0.21.11-ktechlab.patch,
+  +files/gpsim-0.21.11-nogui.patch, -gpsim-0.20.14-r1.ebuild,
+  -gpsim-0.21.2-r1.ebuild, +gpsim-0.21.11-r1.ebuild:
+  patches as per bug #144008 thanks to Carsten. old versions removed
 
   12 Sep 2006; Markus Rothe <corsair@gentoo.org> gpsim-0.21.11.ebuild:
   Added ~ppc64
diff --git a/dev-embedded/gpsim/files/digest-gpsim-0.21.11-r1 b/dev-embedded/gpsim/files/digest-gpsim-0.21.11-r1
new file mode 100644
index 000000000000..d1c4ba086373
--- /dev/null
+++ b/dev-embedded/gpsim/files/digest-gpsim-0.21.11-r1
@@ -0,0 +1,6 @@
+MD5 2acd268dc2dd69d1ad687253bde8dd21 gpsim-0.21.11.tar.gz 1218332
+RMD160 36001180948fc2394043d8283dc1dd028ee4f922 gpsim-0.21.11.tar.gz 1218332
+SHA256 65d1a6a867cf0ee9a030e89b928d633ce7019b275b2683d6126fe8597e87fe84 gpsim-0.21.11.tar.gz 1218332
+MD5 2ce9012fa4970ac64573d21e7d708cba gpsim-docs-0.21.2.tar.bz2 177642
+RMD160 48f5914f898db2179f2abacee1054a57cb504d0a gpsim-docs-0.21.2.tar.bz2 177642
+SHA256 600ee25c937f2332e837fc84597139436ecb1a271ec578d0f96020f1e36fa459 gpsim-docs-0.21.2.tar.bz2 177642
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch b/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
new file mode 100644
index 000000000000..a4d19bd35739
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-eXdbm.patch
@@ -0,0 +1,31 @@
+--- gpsim-0.21.11.orig/cli/Makefile.am	2005-04-27 10:55:13.000000000 +1000
++++ gpsim-0.21.11/cli/Makefile.am	2006-11-04 14:00:26.000000000 +1100
+@@ -46,6 +46,7 @@
+ 	cmd_version.h misc.h cmd_disasm.h  cmd_list.h  cmd_quit.h \
+ 	cmd_stimulus.h cmd_x.h symbol_t.h cmd_frequency.h cmd_icd.h \
+ 	cmd_macro.h ui_gpsim.h
++libgpsimcli_la_LIBADD = $(LIBREADLINE) ../eXdbm/libgpsim_eXdbm.la
+ 
+ 
+ AM_YFLAGS = -dvt
+--- gpsim-0.21.11.orig/gui/Makefile.am	2005-09-19 23:54:21.000000000 +1000
++++ gpsim-0.21.11/gui/Makefile.am	2006-11-04 14:02:02.000000000 +1100
+@@ -17,6 +17,7 @@
+ 	preferences.cc preferences.h \
+ 	settings.h settings_exdbm.h
+ 
++libgpsimgui_la_LDADD = ../eXdbm/libgpsim_eXdbm.la
+ libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
+ 
+ pixmapdir = $(datadir)/gpsim
+--- gpsim-0.21.11/gpsim/Makefile.am.orig	2006-11-04 14:57:41.000000000 +1100
++++ gpsim-0.21.11/gpsim/Makefile.am	2006-11-04 14:58:03.000000000 +1100
+@@ -9,6 +9,6 @@
+ gpsim_SOURCES = main.cc
+ 
+ gpsim_LDFLAGS =  $(shell gtk-config --cflags)
+-gpsim_LDADD = ../src/libgpsim.la ../cli/libgpsimcli.la ../gui/libgpsimgui.la \
+-  ../eXdbm/libgpsim_eXdbm.la @GTK@ @GDK@ @GLIB@ -lstdc++ -lpopt \
++gpsim_LDADD = ../src/libgpsim.la ../eXdbm/libgpsim_eXdbm.la ../cli/libgpsimcli.la ../gui/libgpsimgui.la \
++  @GTK@ @GDK@ @GLIB@ -lstdc++ -lpopt \
+   @X_LDFLAGS@ @Y_LDFLAGS@ @LIBREADLINE@
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-gtk2.diff b/dev-embedded/gpsim/files/gpsim-0.21.11-gtk2.diff
new file mode 100644
index 000000000000..277599eb9cba
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-gtk2.diff
@@ -0,0 +1,105 @@
+--- configure.ac.orig	2006-08-15 15:46:22.000000000 +0200
++++ configure.ac	2006-08-15 15:47:30.000000000 +0200
+@@ -33,71 +33,21 @@
+ 	AC_DEFINE([HAVE_GUI],[],[True if GUI is being used])
+ fi
+ 
+-dnl --enable-gtk1 : link with GTK+ 1.x
+-dnl    The default is to link with GTK+ 2.x
+-
+-AC_ARG_ENABLE(gtk1,
+-     [  --enable-gtk1           Use GTK+ 1.x for the gui (deprecated)],
+-     [case "${enableval}" in
+-       yes) use_gtk1=yes ;;
+-       no)  use_gtk1=no ;;
+-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk1) ;;
+-     esac],[use_gtk1=no])
+-
+-if test "$use_gtk1" = "no"; then
+-        echo linking with GTK+ 2.x
+-else
+-        echo linking with GTK+ 1.x
+-        [
+-         use_gtk1=yes
+-        ]
+-fi
+-
+ GTK=
+ GDK=
+ GLIB=
+ 
++AC_PATH_PROG(PKGCONFIG, pkg-config, no, ${PATH})
++if test $PKGCONFIG = "no"; then
++  AC_MSG_ERROR(Cannot find pkg-config)
++fi
+ if test "$use_gui" = "no"; then
+-  dnl glib checks
+-  AC_PATH_PROG(GLIBCONFIG, glib-config, no, ${PATH})
+-
+-  if test $GLIBCONFIG = "no"; then
+-    AC_MSG_ERROR(Cannot find glib-config: glib is needed even for non-gui version.)
+-  fi
+-
+-  X_LDFLAGS=`$GLIBCONFIG --libs`
+-  X_CFLAGS=`$GLIBCONFIG --cflags`
++  dnl glib2 checks
++  X_LDFLAGS=`$PKGCONFIG --libs glib-2.0 gthread-2.0 gmodule-2.0`
++  X_CFLAGS=`$PKGCONFIG --cflags glib-2.0`
+   Y_LDFLAGS=
+   Y_CFLAGS=
+ else
+-  if test "$use_gtk1" = "yes"; then
+-    dnl gtk checks
+-    dnl note that the gtk12-config is the name of gtk-config on BSD
+-    AC_PATH_PROG(GTKCONFIG, gtk-config gtk12-config, no, ${PATH})
+-    dnl  AC_PATH_PROGS(GTKCONFIG, gtk-config gtk12-config, no, ${PATH})
+-
+-    if test $GTKCONFIG = "no"; then
+-      AC_MSG_ERROR(Cannot find gtk-config)
+-    fi
+-
+-    AC_PATH_PROG(GTKEXTRACONFIG, gtkextra-config, no, ${PATH})
+-
+-    if test $GTKEXTRACONFIG = "no"; then
+-      AC_MSG_ERROR(Cannot find gtkextra-config)
+-    fi
+-
+-    X_LDFLAGS=`$GTKCONFIG --libs gthread`
+-    X_CFLAGS=`$GTKCONFIG --cflags`
+-    Y_LDFLAGS=`$GTKEXTRACONFIG --libs`
+-    Y_CFLAGS=`$GTKEXTRACONFIG --cflags`
+-  else
+-    dnl gtk2 checks
+-    AC_PATH_PROG(PKGCONFIG, pkg-config, no, ${PATH})
+-
+-    if test $PKGCONFIG = "no"; then
+-      AC_MSG_ERROR(Cannot find pkg-config)
+-    fi
+-
+     $PKGCONFIG --exists gtkextra-2.0
+     if test $? != 0; then
+       AC_MSG_ERROR(Cannot find gtkextra-2.0 package)
+@@ -110,8 +60,6 @@
+     GTK_VERSION_T=`$PKGCONFIG --modversion gtk+-2.0`
+     echo linking with gtk-$GTK_VERSION_T
+     AC_DEFINE_UNQUOTED([GTK_VERSION],"$GTK_VERSION_T",[gtk version])
+-  fi
+-
+ fi
+ 
+ wi_LIB_READLINE
+@@ -124,7 +72,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_RANLIB
+ AC_PROG_YACC
+ AM_PROG_LEX
+ AM_PROG_LIBTOOL
+@@ -227,6 +174,5 @@
+   C++ compiler:         $CXX $CPPFLAGS $CXXFLAGS
+ 
+   gui:                  $use_gui
+-  GTK+ 1.x              $use_gtk1
+ 
+ ])
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-ktechlab.patch b/dev-embedded/gpsim/files/gpsim-0.21.11-ktechlab.patch
new file mode 100644
index 000000000000..f48cb39f5011
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-ktechlab.patch
@@ -0,0 +1,64 @@
+diff -U 3 -H -d -r -N -- src/os_dependent.cc src/os_dependent.cc
+--- src/os_dependent.cc	2005-08-25 22:57:41.000000000 +0100
++++ src/os_dependent.cc	2005-12-27 01:00:16.000000000 +0000
+@@ -229,6 +229,11 @@
+   }
+ }
+ 
++bool bHasAbsolutePath(string &fname)
++{
++  return fname[0] == FOLDERDELIMITER;
++}
++
+ //---------------------------
+ //OS agnostic library loader
+ 
+diff -U 3 -H -d -r -N -- src/processor.cc src/processor.cc
+--- src/processor.cc	2005-10-01 22:12:55.000000000 +0100
++++ src/processor.cc	2005-12-27 01:00:00.000000000 +0000
+@@ -2244,9 +2244,12 @@
+   return -1;
+ }
+ 
++extern bool bHasAbsolutePath(string &fname);
++
+ int FileContextList::Add(string &new_name)
+ {
+-  string sFull = sSourcePath + new_name;
++  string sFull = bHasAbsolutePath(new_name) ? new_name : (sSourcePath + new_name);
++//   string sFull = sSourcePath + new_name;
+   push_back(FileContext(sFull));
+   lastFile++;
+   if(CSimulationContext::GetContext()->IsSourceEnabled()) {
+@@ -2261,6 +2264,9 @@
+ 
+ int FileContextList::Add(char *new_name)
+ {
++  string sNewName(new_name);
++  return Add (sNewName);
++  /*
+   string sFull = sSourcePath + new_name;
+   push_back(FileContext(sFull));
+   lastFile++;
+@@ -2270,6 +2276,7 @@
+          << "  id = " << lastFile << endl;
+ 
+   return lastFile-1;
++  */
+ }
+ 
+ FileContext *FileContextList::operator [] (int file_id)
+diff -U 3 -H -d -r -N -- src/symbol.cc src/symbol.cc
+--- src/symbol.cc	2005-09-07 14:34:24.000000000 +0100
++++ src/symbol.cc	2005-12-23 19:26:05.000000000 +0000
+@@ -697,9 +697,8 @@
+ 
+ void Symbol_Table::clear() {
+   iterator it;
+-  iterator itEnd = end();
+   int i = 0;
+-  for(it = begin(); it != itEnd;) {
++  for(it = begin(); it != end();) {
+     Value *value = *it;
+     if(value->isClearable()) {
+       delete value;
diff --git a/dev-embedded/gpsim/files/gpsim-0.21.11-nogui.patch b/dev-embedded/gpsim/files/gpsim-0.21.11-nogui.patch
new file mode 100644
index 000000000000..d2609b7b5960
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.21.11-nogui.patch
@@ -0,0 +1,65 @@
+--- cli/input.cc.orig	2006-08-15 16:17:37.000000000 +0200
++++ cli/input.cc	2006-08-15 16:18:21.000000000 +0200
+@@ -259,7 +259,9 @@
+   if( !g_thread_supported() )
+   {
+     g_thread_init(NULL);
++#ifdef HAVE_GUI
+     gdk_threads_init();
++#endif
+   }
+ 
+ #endif
+@@ -771,7 +773,7 @@
+ }
+ 
+ 
+-#ifdef HAVE_GUI
++//#ifdef HAVE_GUI
+ 
+ //============================================================================ 
+ //
+@@ -790,7 +792,7 @@
+ 
+   return TRUE;
+ }
+-#endif
++//#endif
+ 
+ //============================================================================
+ //
+@@ -840,9 +842,12 @@
+ 
+ #ifdef HAVE_READLINE
+   rl_callback_handler_remove();
++#ifdef HAVEGUI
+   g_io_channel_unref(channel);
+ #endif
+ 
++#endif
++
+   CSimulationContext::GetContext()->GetContext()->Clear();
+   stop_server();
+ 
+@@ -899,8 +904,10 @@
+   win32_fd_to_raw(fileno(stdin));
+ #endif
+ 
++#if defined HAVE_READLINE && defined HAVE_GUI
+   rl_getc_function = gpsim_rl_getc;
+   channel = g_io_channel_unix_new (fileno(stdin));
++#endif
+ 
+ #ifdef _WIN32
+   /* set console to raw mode */ 
+@@ -913,7 +920,9 @@
+     g_io_add_watch (channel, G_IO_IN, keypressed, NULL);
+   }
+ #else
+- g_io_add_watch (channel, G_IO_IN, keypressed, NULL);
++  #if defined HAVE_READLINE && defined HAVE_GUI
++    g_io_add_watch (channel, G_IO_IN, keypressed, NULL);
++  #endif
+ #endif
+   rl_callback_handler_install (prompt, have_line);
+ 
diff --git a/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild b/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild
new file mode 100644
index 000000000000..2d637d30d408
--- /dev/null
+++ b/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/gpsim-0.21.11-r1.ebuild,v 1.1 2006/11/04 05:14:23 dragonheart Exp $
+
+inherit gnuconfig eutils autotools
+
+DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
+HOMEPAGE="http://www.dattalo.com/gnupic/gpsim.html"
+SRC_URI="mirror://sourceforge/gpsim/${P}.tar.gz
+	doc? ( http://dev.gentoo.org/~puggy/files/gpsim-docs-0.21.2.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc gtk"
+
+RDEPEND="dev-libs/glib
+	dev-libs/popt
+	sys-libs/readline
+	gtk? ( >=x11-libs/gtk+extra-2.1.1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/flex"
+RDEPEND="${RDEPEND}
+	>=dev-embedded/gputils-0.12.0"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-eXdbm.patch"
+#        epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/gpsim-0.21.11-ktechlab.patch"
+	epatch "${FILESDIR}/gpsim-0.21.11-nogui.patch"
+	epatch "${FILESDIR}/gpsim-0.21.11-gtk2.diff"
+	eautoconf
+}
+
+src_compile() {
+	gnuconfig_update
+	econf $(use_enable gtk gui) || die
+	emake || die
+}
+
+
+
+src_install() {
+	emake DESTDIR=${D} install || die
+
+	# install boring documentation
+	dodoc ANNOUNCE AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS PROCESSORS
+	dodoc README README.EXAMPLES README.MODULES TODO
+
+	# install interesting documentation
+	if use doc ; then
+		cd ${WORKDIR}/gpsim-docs-0.21.2
+		dodoc gpsim.pdf gui.pdf
+	fi
+}