ripped off the patches from netbsd

5 files changed, 44 insertions, 49 deletions

diff --git a/games-emulation/generator/ChangeLog b/games-emulation/generator/ChangeLog
index d27ab780f08b..b0df39097cb1 100644
--- a/games-emulation/generator/ChangeLog
+++ b/games-emulation/generator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/generator
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.4 2004/03/20 09:17:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/ChangeLog,v 1.5 2004/03/20 11:43:42 mr_bones_ Exp $
+
+  20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> generator-0.35.ebuild,
+  files/logging.patch, files/netbsd-gcc-3.3.patch:
+  ripped off the patches from netbsd for generator to get the logging working
+  again.
 
   20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> generator-0.35.ebuild:
   fix bug #44709 by turning off logging
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index 9176cddb08a7..e256b9308a23 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,5 +1,5 @@
-MD5 a293a2dd839c6426b4c730775b15d18a ChangeLog 913
-MD5 b0a45ecafbd9dd5c33c937a3cf1cba35 generator-0.35.ebuild 1889
+MD5 57d26a2fee226d79ce84b5820cca4456 ChangeLog 1130
+MD5 a9dddbef0cf72358c9b29dcb7b47f713 generator-0.35.ebuild 1854
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 d73801e7e799ac3e7e15ef54889b76ba files/logging.patch 1564
 MD5 693c422146d7001565fb916cbb84faf5 files/digest-generator-0.35 66
+MD5 9ad78ba06412ba4a6b57b93e759e1016 files/netbsd-gcc-3.3.patch 1345
diff --git a/games-emulation/generator/files/logging.patch b/games-emulation/generator/files/logging.patch
deleted file mode 100644
index 295d55126d0f..000000000000
--- a/games-emulation/generator/files/logging.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur generator-0.35.orig/main/ui-console.c generator-0.35/main/ui-console.c
---- generator-0.35.orig/main/ui-console.c	2001-10-19 15:35:32.000000000 -0700
-+++ generator-0.35/main/ui-console.c	2004-03-20 01:06:59.000000000 -0800
-@@ -1204,6 +1204,7 @@
- /* logging is done this way because this was the best I could come up with
-    whilst battling with macros that can only take fixed numbers of arguments */
- 
-+#ifndef NOLOGGING
- #ifdef ALLEGRO
- #define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \
- { \
-@@ -1243,6 +1244,7 @@
- LOG_FUNC(normal, 2, "---- ");
- LOG_FUNC(critical, 1, "CRIT ");
- LOG_FUNC(request, 0, "---- ");  /* this generates a warning, such is life */
-+#endif
- 
- /*** ui_err - log error message and quit ***/
- 
-Only in generator-0.35/main: ui-console.c.orig
-diff -ur generator-0.35.orig/main/ui-gtk.c generator-0.35/main/ui-gtk.c
---- generator-0.35.orig/main/ui-gtk.c	2003-05-03 17:09:51.000000000 -0700
-+++ generator-0.35/main/ui-gtk.c	2004-03-20 01:06:59.000000000 -0800
-@@ -739,6 +739,7 @@
- /* logging is done this way because this was the best I could come up with
-    whilst battling with macros that can only take fixed numbers of arguments */
- 
-+#ifndef NOLOGGING
- #define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \
- { \
-   va_list ap; \
-@@ -761,6 +762,7 @@
- LOG_FUNC(normal,   2, "---- ");
- LOG_FUNC(critical, 1, "CRIT ");
- LOG_FUNC(request,  0, "---- ");  /* this generates a warning, such is life */
-+#endif
- 
- /* *INDENT-ON* */
- 
-Only in generator-0.35/main: ui-gtk.c.orig
diff --git a/games-emulation/generator/files/netbsd-gcc-3.3.patch b/games-emulation/generator/files/netbsd-gcc-3.3.patch
new file mode 100644
index 000000000000..2cedcf838bac
--- /dev/null
+++ b/games-emulation/generator/files/netbsd-gcc-3.3.patch
@@ -0,0 +1,32 @@
+--- hdr/generator.h.orig	2004-02-14 00:23:16.000000000 +0100
++++ hdr/generator.h	2004-02-14 00:23:46.000000000 +0100
+@@ -185,11 +185,11 @@
+ #  define LOG_DEBUG3(x)   /* ui_log_debug3 ## x */
+ #  define LOG_DEBUG2(x)   /* ui_log_debug2 ## x */
+ #  define LOG_DEBUG1(x)   /* ui_log_debug1 ## x */
+-#  define LOG_USER(x)     ui_log_user ## x
+-#  define LOG_VERBOSE(x)  ui_log_verbose ## x
+-#  define LOG_NORMAL(x)   ui_log_normal ## x
+-#  define LOG_CRITICAL(x) ui_log_critical ## x
+-#  define LOG_REQUEST(x)  ui_log_request ## x
++#  define LOG_USER(x)     ui_log_user x
++#  define LOG_VERBOSE(x)  ui_log_verbose x
++#  define LOG_NORMAL(x)   ui_log_normal x
++#  define LOG_CRITICAL(x) ui_log_critical x
++#  define LOG_REQUEST(x)  ui_log_request x
+ #endif
+ 
+ typedef struct {
+$NetBSD: patch-af,v 1.1 2004/02/13 23:41:28 kristerw Exp $
+
+--- main/ui-gtk.c.orig	2004-02-14 00:30:00.000000000 +0100
++++ main/ui-gtk.c	2004-02-14 00:30:20.000000000 +0100
+@@ -626,7 +626,7 @@
+ /* logging is done this way because this was the best I could come up with
+    whilst battling with macros that can only take fixed numbers of arguments */
+ 
+-#define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \
++#define LOG_FUNC(name,level,txt) void ui_log_ ## name (const char *text, ...) \
+ { \
+   va_list ap; \
+   if (gen_loglevel >= level) { \
diff --git a/games-emulation/generator/generator-0.35.ebuild b/games-emulation/generator/generator-0.35.ebuild
index 97fd45da0925..7e0184966aab 100644
--- a/games-emulation/generator/generator-0.35.ebuild
+++ b/games-emulation/generator/generator-0.35.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35.ebuild,v 1.5 2004/03/20 09:17:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/generator/generator-0.35.ebuild,v 1.6 2004/03/20 11:43:42 mr_bones_ Exp $
 
-inherit eutils gcc flag-o-matic games
+inherit eutils gcc games
 
 DESCRIPTION="Sega Genesis / Mega Drive console emulator"
 HOMEPAGE="http://www.squish.net/generator/"
@@ -40,14 +40,12 @@ src_unpack() {
 			-e "s/-malign-jumps/-falign-jumps/" configure \
 				|| die "sed configure failed"
 	fi
-	epatch "${FILESDIR}/logging.patch"
+	epatch "${FILESDIR}/netbsd-gcc-3.3.patch"
 }
 
 src_compile() {
 	local myconf="--with-gcc=$(gcc-major-version)"
 
-	append-flags "-DNOLOGGING"
-
 	[ "${ARCH}" == "x86" ] \
 		&& myconf="${myconf} --with-raze" \
 		|| myconf="${myconf} --with-cmz80"