Fix compile issues with gcc-3.3.

4 files changed, 52 insertions, 14 deletions

diff --git a/net-irc/epic4/ChangeLog b/net-irc/epic4/ChangeLog
index 98ccf011f5dd..75e1212baf43 100644
--- a/net-irc/epic4/ChangeLog
+++ b/net-irc/epic4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/epic4
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.14 2003/07/13 12:54:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/ChangeLog,v 1.15 2003/07/18 18:47:41 azarah Exp $
+
+  18 Jul 2003; Martin Schlemmer <azarah@gentoo.org> epic4-1.0.1-r2.ebuild,
+  files/epic4-1.0.1-gcc33.patch:
+  Fix compile issues with gcc-3.3 - macro handling related to spaces in
+  front of the ## operand changed.
 
 *epic4-1.1.11 (13 Apr 2003)
 
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
index eacadccf678d..7aaf86e2b34f 100644
--- a/net-irc/epic4/Manifest
+++ b/net-irc/epic4/Manifest
@@ -1,14 +1,15 @@
-MD5 03a79394216d45e22c33ba93ac2cd364 files/digest-epic4-1.0.1-r1 129
-MD5 bec8cf892d8ff8ac39c9518af074a288 files/digest-epic4-1.0.1-r2 134
-MD5 2289cb86bb8dc556621d35033fe11471 files/digest-epic4-1.1.10 136
-MD5 1a7ec7aadf77db45a41d52234bd5bef6 files/digest-epic4-1.1.7 130
-MD5 2e444ba876c4db6cd445faba18dc5bd6 files/digest-epic4-1.1.7-r1 135
-MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
-MD5 aa8d68a42c147390f37438a6e8171fd1 files/digest-epic4-1.1.11 136
+MD5 ae12e3b922cbdfe8b3131347d3c7e2d1 ChangeLog 3423
 MD5 75544b79d292a2ff9be99c4c50d9bfad epic4-1.0.1-r1.ebuild 1068
-MD5 8f20db4ad2544034beab4e99de66ec0c epic4-1.0.1-r2.ebuild 1551
+MD5 8ba4ab73d80b324a49ecb94ec8f82198 epic4-1.1.7.ebuild 1454
 MD5 1bf12e87afe4258b9f0e11ca31a11791 epic4-1.1.10.ebuild 2091
+MD5 6af2fc262952ad088d7886c4853f0993 epic4-1.0.1-r2.ebuild 1771
 MD5 6b5e83ef842d46128b50379f424a2454 epic4-1.1.7-r1.ebuild 1939
-MD5 8ba4ab73d80b324a49ecb94ec8f82198 epic4-1.1.7.ebuild 1454
-MD5 eb07616580e4bf2277160f4efb3967ab ChangeLog 3205
 MD5 616e041798d3bcb508fe77f44c0ffba1 epic4-1.1.11.ebuild 2054
+MD5 03a79394216d45e22c33ba93ac2cd364 files/digest-epic4-1.0.1-r1 129
+MD5 1a7ec7aadf77db45a41d52234bd5bef6 files/digest-epic4-1.1.7 130
+MD5 1d5075abb862c8b98c2b16df96e37407 files/local 21043
+MD5 2289cb86bb8dc556621d35033fe11471 files/digest-epic4-1.1.10 136
+MD5 bec8cf892d8ff8ac39c9518af074a288 files/digest-epic4-1.0.1-r2 134
+MD5 2e444ba876c4db6cd445faba18dc5bd6 files/digest-epic4-1.1.7-r1 135
+MD5 aa8d68a42c147390f37438a6e8171fd1 files/digest-epic4-1.1.11 136
+MD5 33df45dcbc3a9e94246c4ee10474f332 files/epic4-1.0.1-gcc33.patch 850
diff --git a/net-irc/epic4/epic4-1.0.1-r2.ebuild b/net-irc/epic4/epic4-1.0.1-r2.ebuild
index c3b37d80974f..2d38ffd28314 100644
--- a/net-irc/epic4/epic4-1.0.1-r2.ebuild
+++ b/net-irc/epic4/epic4-1.0.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.0.1-r2.ebuild,v 1.3 2003/03/24 09:37:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/epic4/epic4-1.0.1-r2.ebuild,v 1.4 2003/07/18 18:47:41 azarah Exp $
 
-IUSE=""
+IUSE=
 
 DESCRIPTION="Epic4 IRC Client"
 SRC_URI="ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.gz \
@@ -15,9 +15,19 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc sparc"
 
-inherit flag-o-matic
+inherit eutils flag-o-matic gcc
 replace-flags "-O?" "-O"
 
+src_unpack() {
+	unpack ${A}
+
+	# Macro's in gcc-3.3 and later changed slightly ...
+	if [ "`gcc-major-version`" -eq 3 -a "`gcc-minor-version`" -ge 3 ]
+	then
+		cd ${S}; epatch ${FILESDIR}/${P}-gcc33.patch
+	fi
+}
+
 src_compile() {
 	econf --libexecdir=/usr/lib/misc || die
 
diff --git a/net-irc/epic4/files/epic4-1.0.1-gcc33.patch b/net-irc/epic4/files/epic4-1.0.1-gcc33.patch
new file mode 100644
index 000000000000..551eb819f55c
--- /dev/null
+++ b/net-irc/epic4/files/epic4-1.0.1-gcc33.patch
@@ -0,0 +1,22 @@
+--- epic4-1.0.1/source/status.c	2003-07-18 20:16:45.000000000 +0200
++++ epic4-1.0.1.gcc33/source/status.c	2003-07-18 20:17:24.000000000 +0200
+@@ -36,7 +36,7 @@
+  * Maximum number of "%" expressions in a status line format.  If you change
+  * this number, you must manually change the sprintf() in make_status 
+  */
+-#define STATUS_FUNCTION(x) static Char * ## x (Window *window, int map, int key)
++#define STATUS_FUNCTION(x) static Char * x (Window *window, int map, int key)
+ #define MAX_FUNCTIONS 40
+ #define MAX_STATUS_USER 39
+ 
+--- epic4-1.0.1/source/info.c.sh.in	2003-07-18 20:17:00.000000000 +0200
++++ epic4-1.0.1.gcc33/source/info.c.sh.in	2003-07-18 20:17:13.000000000 +0200
+@@ -20,7 +20,7 @@
+  */
+ 
+ #ifdef __STDC__
+-#define my_paste(x, y, z) x ## y ## z
++#define my_paste(x, y, z) x y z
+ #else
+ #define my_paste(x, y, z) x/**/y/**/z
+ #endif