GCC-3.3 compile fixup.

4 files changed, 28 insertions, 5 deletions

diff --git a/sys-apps/console-tools/ChangeLog b/sys-apps/console-tools/ChangeLog
index be2af5ec2cc1..16e80d3e302f 100644
--- a/sys-apps/console-tools/ChangeLog
+++ b/sys-apps/console-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/console-tools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/ChangeLog,v 1.11 2003/04/02 20:16:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/ChangeLog,v 1.12 2003/05/18 19:56:09 dragon Exp $
+
+  18 May 2003; Nicholas Wourms <dragon@gentoo.org> console-tools-0.3.2.ebuild,
+  files/console-tools-0.3.2-multi-line-string-fix.diff:
+  Fix instance of multi-line string literals without newline seperator since it
+  causes compile failures with >=gcc-3.3.
 
 *console-tools-0.3.2 (07 Mar 2003)
 
diff --git a/sys-apps/console-tools/Manifest b/sys-apps/console-tools/Manifest
index 90b559fbc8b8..857981d46949 100644
--- a/sys-apps/console-tools/Manifest
+++ b/sys-apps/console-tools/Manifest
@@ -1,7 +1,7 @@
-MD5 f1455ed9f03775cc47815bee309a90ea ChangeLog 2051
+MD5 98ff11eb8d6cc58292b4898f3dff0e9f ChangeLog 2050
 MD5 56d2c12a7b27813c46ad40ac5da5cfd8 console-tools-0.2.3-r3.ebuild 1294
 MD5 669483d5c163f25c65d1d78cf6bc2aba console-tools-0.2.3-r4.ebuild 1494
-MD5 94eba8dfaaa1a04c2e623fca7c9ae76e console-tools-0.3.2.ebuild 1331
+MD5 596ecbcb74e48cb1481da46727fb5bbb console-tools-0.3.2.ebuild 1330
 MD5 712da8960916a9fbb50b013ccb5a1959 files/console-tools-0.2.3-po-Makefile.in.in-gentoo.diff 1301
 MD5 6a941837954187dd77f394a67eb1a5a0 files/console-tools-0.2.3.patch 35901
 MD5 10a186e8488d839341089ea610e946e2 files/digest-console-tools-0.2.3-r3 71
diff --git a/sys-apps/console-tools/console-tools-0.3.2.ebuild b/sys-apps/console-tools/console-tools-0.3.2.ebuild
index 4e4bd06fb2ab..b8819b9838da 100644
--- a/sys-apps/console-tools/console-tools-0.3.2.ebuild
+++ b/sys-apps/console-tools/console-tools-0.3.2.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/sys-apps/console-tools/console-tools-0.3.2.ebuild,v 1.2 2003/03/09 05:26:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.3.2.ebuild,v 1.3 2003/05/18 19:56:09 dragon Exp $
 
-inherit libtool
+inherit libtool eutils
 
 IUSE="nls"
 
@@ -24,6 +24,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	find ./ -name 'Makefile.*' | xargs sed -i "s:doc ::"
+
+	# GCC-3.3 Compile Fix
+	epatch ${FILESDIR}/${P}-multi-line-string-fix.diff
 }
 
 src_compile() {
diff --git a/sys-apps/console-tools/files/console-tools-0.3.2-multi-line-string-fix.diff b/sys-apps/console-tools/files/console-tools-0.3.2-multi-line-string-fix.diff
new file mode 100644
index 000000000000..e429868a7a8b
--- /dev/null
+++ b/sys-apps/console-tools/files/console-tools-0.3.2-multi-line-string-fix.diff
@@ -0,0 +1,15 @@
+diff -Naurp console-tools-0.3.2.orig/contrib/codepage.c console-tools-0.3.2/contrib/codepage.c
+--- console-tools-0.3.2.orig/contrib/codepage.c	1999-08-25 17:27:40.000000000 -0400
++++ console-tools-0.3.2/contrib/codepage.c	2003-03-07 18:51:22.000000000 -0500
+@@ -228,9 +228,8 @@ codepage=%d\n\t\tres=%6.6s nxt=%ld off_f
+ 	if (optc)
+ 	  return 0;
+ 
+-        fprintf(stderr, "\
+-Warning: CP format is a hack!\n
+-         The files produced may or may not be usable!\n");
++        fprintf(stderr, "Warning: CP format is a hack!\n"
++         "The files produced may or may not be usable!\n");
+ 
+ 	sprintf(outfile, "%d.cp", CPEntryHeader.codepage);
+ 	if ((out = fopen(outfile, "w")) == NULL) {