Fix gcc-4.1 patch by Gene Seto <geneseto AT hotmail DOT com>; bug #118734

(paludis 0.1.0 svn 68:104M)

3 files changed, 56 insertions, 13 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 309bac0798c3..464e02094dd3 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/wvstreams
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.78 2005/12/31 08:17:54 mrness Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.79 2006/01/15 22:14:42 halcy0n Exp $
+
+  15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  files/wvstreams-4.2.1-gcc41.patch:
+  Fix gcc-4.1 patch by Gene Seto <geneseto AT hotmail DOT com>; bug #118734
 
   31 Dec 2005; Alin Nastac <mrness@gentoo.org> wvstreams-4.2.1.ebuild:
   Replace eautoreconf with autoconf (#116947).
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index f949e99f2287..cac2a277f46f 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8e76b95dafedbb2060cf1184bf447d6d ChangeLog 11949
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r1 68
 MD5 722051cdd8d4e8747f83c0d512f3ec2a files/digest-wvstreams-4.0.2-r2 68
@@ -14,7 +11,7 @@ MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
 MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
 MD5 637930659665610f5bfe52f077fe5112 files/wvstreams-4.2.1-MOC-fix.patch 496
 MD5 7325e9c7f69a6d03560dc3b2c5700f7e files/wvstreams-4.2.1-external-xplc.patch 1213
-MD5 ea4c5b90b703bcd05c3629093614f433 files/wvstreams-4.2.1-gcc41.patch 482
+MD5 661c717a39715ecdc27330245f08c61f files/wvstreams-4.2.1-gcc41.patch 2221
 MD5 fe54c7dbb4770aad4ef9a5dcb44106ec files/wvstreams-4.2.1-linux-serial.patch 1649
 MD5 b44c2e240e03736bc5acc41ce7069455 files/wvstreams-4.2.1-ptr2int-cast.patch 356
 MD5 dcb8a3f592baa616e6123867b2fdced8 files/wvstreams-4.2.1-tcl_8_4.patch 1022
@@ -23,10 +20,3 @@ MD5 227de7f678ad662524292836709de75f metadata.xml 313
 MD5 e594922148c5a6f7087f083cf392e55c wvstreams-4.0.2-r1.ebuild 2558
 MD5 1176f09d8109b258ee1bbbe54919df5c wvstreams-4.0.2-r2.ebuild 2597
 MD5 c3f188d12bf345985f947c6066d92cc9 wvstreams-4.2.1.ebuild 2529
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtj7NjG8pv1lIUX4RAh+cAKDGTStKCMMuaCfSWoFhgFKm0/EbGgCfUQvy
-JECsk8G5Mj4+9/DAigt1bcE=
-=xq57
------END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch
index 673343d99710..20b40b741aee 100644
--- a/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.2.1-gcc41.patch
@@ -10,3 +10,52 @@ diff -Nru wvstreams-4.2.1.orig/include/wvhttppool.h wvstreams-4.2.1/include/wvht
  	: linkname(_linkname), url(_url)
      {}
  };
+--- wvstreams-4.2.1.orig/include/uniconfkeybak.h	2006-01-06 19:52:09.000000000 -0400
++++ wvstreams-4.2.1/include/uniconfkey.h	2006-01-06 19:52:48.000000000 -0400
+@@ -113,7 +113,7 @@
+     bool iswild() const;
+ 
+     /** Returns true if the key has a trailing slash. */
+-    bool UniConfKey::hastrailingslash() const;
++    bool hastrailingslash() const;
+ 
+     /**
+      * Returns the number of segments in this path.
+--- wvstreams-4.2.1.orig/include/wvx509bak.h	2006-01-06 19:55:47.000000000 -0400
++++ wvstreams-4.2.1/include/wvx509.h	2006-01-06 19:58:51.000000000 -0400
+@@ -349,19 +349,19 @@
+      * Set the Certificate to use X509v3, since that's all modern
+      * PKI uses anyways :)
+      */
+-    void WvX509Mgr::set_version();
++    void set_version();
+ 
+     /**
+      * Get and set the keyUsage field.
+      */
+-    WvString WvX509Mgr::get_key_usage();
+-    void WvX509Mgr::set_key_usage(WvStringParm values);
++    WvString get_key_usage();
++    void set_key_usage(WvStringParm values);
+ 
+     /**
+      * Get and set the extendedKeyUsage field.
+      */
+-    WvString WvX509Mgr::get_ext_key_usage();
+-    void WvX509Mgr::set_ext_key_usage(WvStringParm values);
++    WvString get_ext_key_usage();
++    void set_ext_key_usage(WvStringParm values);
+     
+     /**
+      * Return the Subject alt name if it exists, and WvString::null if
+--- wvstreams-4.2.1.orig/include/wvstringbak.h	2006-01-12 00:28:17.000000000 -0400
++++ wvstreams-4.2.1/include/wvstring.h	2006-01-12 00:28:39.000000000 -0400
+@@ -393,7 +393,7 @@
+     
+ protected:
+     void copy_constructor(const WvFastString &s);
+-    inline void WvString::construct(const char *_str)
++    inline void construct(const char *_str)
+         {
+             link(&nullbuf, _str);
+