Apply patch for clean compile on >=gcc3.4. Closes #65400.

4 files changed, 90 insertions, 6 deletions

diff --git a/net-mail/vmailmgr/ChangeLog b/net-mail/vmailmgr/ChangeLog
index 2ccd82f95a08..8f8cdc9b0b04 100644
--- a/net-mail/vmailmgr/ChangeLog
+++ b/net-mail/vmailmgr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/vmailmgr
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.12 2004/07/01 22:37:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.13 2004/09/30 12:15:10 ticho Exp $
+
+  30 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/vmailmgr-0.96.9-gcc3.3.patch, vmailmgr-0.96.9-r1.ebuild:
+  Apply patch to fix multiline strings so we compile cleanly on >=gcc3.3.
+  Closes #65400, patch provided by Christophe Saout <christophe@saout.de>.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   vmailmgr-0.96.9-r1.ebuild:
diff --git a/net-mail/vmailmgr/Manifest b/net-mail/vmailmgr/Manifest
index 7e542f957e6b..dbcc74a046da 100644
--- a/net-mail/vmailmgr/Manifest
+++ b/net-mail/vmailmgr/Manifest
@@ -1,9 +1,20 @@
-MD5 c05b360c94d349c39d3e33ff388d5c59 vmailmgr-0.96.9-r1.ebuild 1505
-MD5 48615f4dc3deef9da0b45bd7102d7c1e ChangeLog 1573
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39c86a5ae51ee84c1bfb222a62b4a645 ChangeLog 1832
+MD5 b305197b5f2abad839c8fbb6ffc471e5 vmailmgr-0.96.9-r1.ebuild 1588
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 9c31bdc6361d69e632bda1dc65587fb9 files/vmailmgr-0.96.9-gentoo-r1.diff 4249
-MD5 0279b46d6d44e209fead5769b6fdea30 files/checkvpw-loginfail 45
 MD5 3a361d677a497af106a197e48acbc129 files/separators 3
+MD5 fcb3e0b872a5f1719f7b9aa76eac8eba files/vmailmgr-0.96.9-gcc3.3.patch 3494
+MD5 0279b46d6d44e209fead5769b6fdea30 files/checkvpw-loginfail 45
+MD5 c9005c51279499d79e056a5bbab5cac5 files/vmailmgr-0.96.9-gentoo.diff 1349
 MD5 dada9de263c4a08a0d043350821a42b4 files/digest-vmailmgr-0.96.9-r1 67
 MD5 bf55605617fc5acfdca3a28a796e82a4 files/socket-file 35
-MD5 c9005c51279499d79e056a5bbab5cac5 files/vmailmgr-0.96.9-gentoo.diff 1349
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBW/jY10xuJSrg3/sRAvcHAJ9e4fVG7GH6J90PoVDZOIu6GoqtagCcDizL
+fh2UsvOr2X0WRhxu/XeXI3M=
+=AKYJ
+-----END PGP SIGNATURE-----
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gcc3.3.patch b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gcc3.3.patch
new file mode 100644
index 000000000000..8ac557628df3
--- /dev/null
+++ b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gcc3.3.patch
@@ -0,0 +1,65 @@
+diff -ur vmailmgr-0.96.9.orig/commands/vcheckquota.cc vmailmgr-0.96.9/commands/vcheckquota.cc
+--- vmailmgr-0.96.9.orig/commands/vcheckquota.cc	2000-08-19 19:05:57.000000000 +0200
++++ vmailmgr-0.96.9/commands/vcheckquota.cc	2003-12-06 13:06:22.293442000 +0100
+@@ -31,10 +31,10 @@
+ 
+ const char* cli_program = "vcheckquota";
+ const char* cli_help_prefix = "vmailmgr quota enforcement program\n";
+-const char* cli_help_suffix = "
+-Warning: the soft-message is linked into the users maildir once for each
+-message that is received while the account is over its soft quota.  This may
+-result in multiple warning messages.\n";
++const char* cli_help_suffix = "\n"
++"Warning: the soft-message is linked into the users maildir once for each\n"
++"message that is received while the account is over its soft quota.  This may\n"
++"result in multiple warning messages.\n";
+ const char* cli_args_usage = "";
+ const int cli_args_min = 0;
+ const int cli_args_max = 0;
+diff -ur vmailmgr-0.96.9.orig/commands/vchforwards.cc vmailmgr-0.96.9/commands/vchforwards.cc
+--- vmailmgr-0.96.9.orig/commands/vchforwards.cc	2000-08-16 04:08:35.000000000 +0200
++++ vmailmgr-0.96.9/commands/vchforwards.cc	2003-12-06 13:06:06.349761000 +0100
+@@ -25,8 +25,7 @@
+ const char* cli_help_prefix =
+ "Change virtual user forwarding addresses.\n";
+ const char* cli_help_suffix =
+-"If no forwarding addresses are given, forwarding is disabled.
+-";
++"If no forwarding addresses are given, forwarding is disabled.\n";
+ const char* cli_args_usage = "USERNAME [DESTINATION1 ...]";
+ const int cli_args_min = 1;
+ const int cli_args_max = -1;
+diff -ur vmailmgr-0.96.9.orig/commands/vpasswd2cdb.cc vmailmgr-0.96.9/commands/vpasswd2cdb.cc
+--- vmailmgr-0.96.9.orig/commands/vpasswd2cdb.cc	2000-08-16 04:02:01.000000000 +0200
++++ vmailmgr-0.96.9/commands/vpasswd2cdb.cc	2003-12-06 13:05:47.972435000 +0100
+@@ -26,10 +26,10 @@
+ 
+ const char* cli_program = "vpasswd2cdb";
+ const char* cli_help_prefix = "Converts text password tables to CDB format\n";
+-const char* cli_help_suffix =
+-"Reads in a standard virtual password table in the current directory,
+-and writes it out to a CDB table.  The file names for the text and CDB
+-tables are determined from the configuration file.";
++const char* cli_help_suffix = "\n"
++"Reads in a standard virtual password table in the current directory,\n"
++"and writes it out to a CDB table.  The file names for the text and CDB\n"
++"tables are determined from the configuration file.";
+ const char* cli_args_usage = "";
+ const int cli_args_min = 0;
+ const int cli_args_max = 0;
+diff -ur vmailmgr-0.96.9.orig/commands/vpasswd2db.cc vmailmgr-0.96.9/commands/vpasswd2db.cc
+--- vmailmgr-0.96.9.orig/commands/vpasswd2db.cc	2000-08-16 04:02:04.000000000 +0200
++++ vmailmgr-0.96.9/commands/vpasswd2db.cc	2003-12-06 13:06:36.300404000 +0100
+@@ -26,9 +26,9 @@
+ const char* cli_program = "vpasswd2db";
+ const char* cli_help_prefix = "Converts text password tables to current vpwtable DB format\n";
+ const char* cli_help_suffix =
+-"Reads in a standard virtual password table in the current directory,
+-and writes it out to a table.  The file names for the input and output
+-tables are determined from the configuration file.";
++"Reads in a standard virtual password table in the current directory,\n"
++"and writes it out to a table.  The file names for the input and output\n"
++"tables are determined from the configuration file.";
+ const char* cli_args_usage = "";
+ const int cli_args_min = 0;
+ const int cli_args_max = 0;
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
index 8812322e6707..1ab6fdf80b53 100644
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
+++ b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.20 2004/07/15 02:31:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.21 2004/09/30 12:15:10 ticho Exp $
 
 inherit gcc
 
@@ -29,6 +29,9 @@ src_compile() {
 
 	if [ "`gcc-major-version`" = "3" ]; then
 		export LIBS="-lcrypt -lsupc++"
+		if [ `gcc-minor-version` -ge 3 ]; then
+			epatch ${FILESDIR}/${P}-gcc3.3.patch
+		fi
 	fi
 
 	if [ "`gcc-major-version`" = "2" ]; then