Fixing GCC4 wrt bug #140482 thanks to Ahmed Ammar for the patch

Package-Manager: portage-2.1.2_pre3-r4

5 files changed, 56 insertions, 15 deletions

diff --git a/net-irc/xchatosd/ChangeLog b/net-irc/xchatosd/ChangeLog
index 9b11e0f2c233..20224b7bc0a2 100644
--- a/net-irc/xchatosd/ChangeLog
+++ b/net-irc/xchatosd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/xchatosd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.19 2006/02/19 17:32:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/ChangeLog,v 1.20 2006/10/19 23:46:22 jokey Exp $
+
+  19 Oct 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/xchatosd-5.19-gcc4.patch, xchatosd-5.19.ebuild:
+  Fixing GCC4 wrt bug #140482 thanks to Ahmed Ammar for the patch
 
   19 Feb 2006; Sven Wegener <swegener@gentoo.org> xchatosd-5.19.ebuild:
   xchat-gnome and xchat are currently no longer compatible.
diff --git a/net-irc/xchatosd/Manifest b/net-irc/xchatosd/Manifest
index ae623991e505..ce0e13da47f6 100644
--- a/net-irc/xchatosd/Manifest
+++ b/net-irc/xchatosd/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bcad233d4efb2d1eed4332e462691501 ChangeLog 2643
-RMD160 df19bda3d3642082a1f33bc2adf51f8e2f4bbde9 ChangeLog 2643
-SHA256 0b0889f1c12630336805534cd72752653ab15be399e7bccfa64d237678d0e2f5 ChangeLog 2643
-MD5 7c7bda25fddb101d0ca9ced34251e234 files/digest-xchatosd-5.19 64
-RMD160 d58b71d45b32bbe4b09607d9f64a7409a3843d06 files/digest-xchatosd-5.19 64
-SHA256 3c69e517f0996784340e7c4ab79f47bc0f7d0ba9ca763df5784f828d2acc44ff files/digest-xchatosd-5.19 64
+AUX xchatosd-5.19-gcc4.patch 654 RMD160 c9eea64027c3d2e9a566c83a434891e6f90558ab SHA1 26ea37a28a8e7372832eaadff9b68546faa85b71 SHA256 bb0364dc85b3f58996f39fd0882756e431f403efc1c855f9380b6922b5201c7b
+MD5 4365b1cf7af841ac7f5249a66dbb32a0 files/xchatosd-5.19-gcc4.patch 654
+RMD160 c9eea64027c3d2e9a566c83a434891e6f90558ab files/xchatosd-5.19-gcc4.patch 654
+SHA256 bb0364dc85b3f58996f39fd0882756e431f403efc1c855f9380b6922b5201c7b files/xchatosd-5.19-gcc4.patch 654
+DIST xchatosd-5.19.tar.gz 10778 RMD160 dc5c1aa226144cf77c1039d7f86112cdd3e3cb76 SHA1 5472365872f47fd6c9fd46dea33461c9d1a88816 SHA256 664c769a01fa52226b8a8dd45ee28f26caf8dc4d4ecf88f5d66623f701480f6f
+EBUILD xchatosd-5.19.ebuild 1172 RMD160 1434bce52081c436ddc794ea51d3cd521f297290 SHA1 ec01f43379de35ea526f6a3ce816ab5e963cc066 SHA256 80c91576ad78e1dfc54d172a1bb54d176144d2cae1e4dd41b5a9855bb5b9f499
+MD5 3c39653d4b3d7a5a5c29b79dfcdfa75b xchatosd-5.19.ebuild 1172
+RMD160 1434bce52081c436ddc794ea51d3cd521f297290 xchatosd-5.19.ebuild 1172
+SHA256 80c91576ad78e1dfc54d172a1bb54d176144d2cae1e4dd41b5a9855bb5b9f499 xchatosd-5.19.ebuild 1172
+MISC ChangeLog 2813 RMD160 2a734c12075aef3ca6b2ca9f750a4b40b61a54cb SHA1 bafd765f155a8c6101022eaf75b2e0e7a148f507 SHA256 6639a695112e00c26600f390376355f466bc6d730b358c6bc23be46aadcf1e8d
+MD5 af9b771d076a702d965d90a70a2f4e24 ChangeLog 2813
+RMD160 2a734c12075aef3ca6b2ca9f750a4b40b61a54cb ChangeLog 2813
+SHA256 6639a695112e00c26600f390376355f466bc6d730b358c6bc23be46aadcf1e8d ChangeLog 2813
+MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 2451431407e3dfc44654efa8f253b496 xchatosd-5.19.ebuild 1137
-RMD160 f4b749d456842cc7c30cdb1c9841215c9fb5f209 xchatosd-5.19.ebuild 1137
-SHA256 ab761236e4b45646ad0ddf96a0ec8ac94e052c277cb71d833d1a99aa3929cc65 xchatosd-5.19.ebuild 1137
+MD5 4b051edab82b870bacc908a9d38df772 files/digest-xchatosd-5.19 238
+RMD160 9f3c4fcbbcb613ed2c1d0f9232b59078954c4e9a files/digest-xchatosd-5.19 238
+SHA256 1f60f8947829f3d7745d503bc635e188b8f9fa8bdcc7ff7c53b71f3d24de2b54 files/digest-xchatosd-5.19 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFD+KvJI1lqEGTUzyQRAg6YAJ9SvrEg/aySfsYZPhjMJS9DMQQKLgCgyqtk
-DcaIvLmaYjmaxVGJf9y8KD8=
-=KdAP
+iD8DBQFFOA4Zz974XjDVpbkRAoD/AKDKwLaQP0OHK0FwTUy5lbiBRIF3LQCgupHq
+t5kiM/pbbnE7b9Wrj0BG9vc=
+=w87c
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchatosd/files/digest-xchatosd-5.19 b/net-irc/xchatosd/files/digest-xchatosd-5.19
index ff846e84be3f..fe44f016218b 100644
--- a/net-irc/xchatosd/files/digest-xchatosd-5.19
+++ b/net-irc/xchatosd/files/digest-xchatosd-5.19
@@ -1 +1,3 @@
 MD5 d95091553dc19e32aefb03ec46ab641d xchatosd-5.19.tar.gz 10778
+RMD160 dc5c1aa226144cf77c1039d7f86112cdd3e3cb76 xchatosd-5.19.tar.gz 10778
+SHA256 664c769a01fa52226b8a8dd45ee28f26caf8dc4d4ecf88f5d66623f701480f6f xchatosd-5.19.tar.gz 10778
diff --git a/net-irc/xchatosd/files/xchatosd-5.19-gcc4.patch b/net-irc/xchatosd/files/xchatosd-5.19-gcc4.patch
new file mode 100644
index 000000000000..cba347224e63
--- /dev/null
+++ b/net-irc/xchatosd/files/xchatosd-5.19-gcc4.patch
@@ -0,0 +1,26 @@
+--- xchatosd-5.19/my_xosd.h.orig	2006-07-15 14:12:55.000000000 +0100
++++ xchatosd-5.19/my_xosd.h	2006-07-15 14:13:04.000000000 +0100
+@@ -8,8 +8,8 @@
+ 
+ class XOsd {
+ 	public:
+-		XOsd::XOsd(int);
+-		XOsd::~XOsd();
++		XOsd(int);
++		~XOsd();
+ 		int setPos(string);
+ 		int setVOffset(int);
+ 		int setHOffset(int);
+--- xchatosd-5.19/xchatosd_conf.h.orig	2006-07-15 14:05:09.000000000 +0100
++++ xchatosd-5.19/xchatosd_conf.h	2006-07-15 14:05:40.000000000 +0100
+@@ -11,8 +11,8 @@
+ 
+ class XOsdConf {
+ 	public:
+-		XOsdConf::XOsdConf();
+-		XOsdConf::~XOsdConf();
++		XOsdConf();
++		~XOsdConf();
+ 		int read(string);
+ 		int write(string);
+ 		int getiValue(string);
diff --git a/net-irc/xchatosd/xchatosd-5.19.ebuild b/net-irc/xchatosd/xchatosd-5.19.ebuild
index 8fa0c98ebc31..b6c9469e5e54 100644
--- a/net-irc/xchatosd/xchatosd-5.19.ebuild
+++ b/net-irc/xchatosd/xchatosd-5.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.19.ebuild,v 1.4 2006/02/19 17:32:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchatosd/xchatosd-5.19.ebuild,v 1.5 2006/10/19 23:46:22 jokey Exp $
 
 inherit toolchain-funcs flag-o-matic
 
@@ -23,6 +23,7 @@ src_unpack() {
 	# We have our own include file in /usr/include/xchat
 	einfo "Updating xchat-plugin.h from /usr/include/xchat/xchat-plugin.h"
 	cp -f "${ROOT}"/usr/include/xchat/xchat-plugin.h "${S}"/xchat-plugin.h
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_compile() {