Closes bug #135360

Package-Manager: portage-2.1.1_pre2-r6

5 files changed, 146 insertions, 11 deletions

diff --git a/net-im/gabber/ChangeLog b/net-im/gabber/ChangeLog
index bc199edf2a4e..cb8056d4e4ac 100644
--- a/net-im/gabber/ChangeLog
+++ b/net-im/gabber/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gabber
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.34 2005/09/16 00:20:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/ChangeLog,v 1.35 2006/07/13 00:25:19 pvdabeel Exp $
+
+  13 Jul 2005; Pieter Van den Abeele <pvdabeel@gentoo.org> gabber-0.8.8.ebuild:
+  gcc-4.1 patch - closes bug #135360
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gabber-0.8.8.ebuild:
   Mark 0.8.8 stable on alpha
diff --git a/net-im/gabber/Manifest b/net-im/gabber/Manifest
index 9012afd5c402..80b63ed5f45f 100644
--- a/net-im/gabber/Manifest
+++ b/net-im/gabber/Manifest
@@ -1,14 +1,60 @@
-MD5 e70c297e90595ae6039448e27b7cada3 metadata.xml 434
+AUX TCPtransmitter.cc-gcc3-gentoo.patch 584 RMD160 58fa48a730f776bcf207ec4e916ff2b5da1379b4 SHA1 a5c7e58c1241bb2442058396b7afcea30c0f3ef4 SHA256 14a0256d09a37dc6628986bd6bafc44dbd0f8a1bf2f265444c6249cea343aa41
+MD5 3c26fdd6bd493036699f43145aad0613 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
+RMD160 58fa48a730f776bcf207ec4e916ff2b5da1379b4 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
+SHA256 14a0256d09a37dc6628986bd6bafc44dbd0f8a1bf2f265444c6249cea343aa41 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
+AUX gabber-0.8.8-gcc.patch 3732 RMD160 8f5747c5e08c7434e529408686b4724057976c3a SHA1 9fb99ee94e2197a5d3234ffec92bffc84bc57fa0 SHA256 3790f2d2a0e944c0d2b091fbc43410a01e8ff3a88dd7d59f7fc5b819718390dd
+MD5 385ac29899eadd0b8da4bebf2455efae files/gabber-0.8.8-gcc.patch 3732
+RMD160 8f5747c5e08c7434e529408686b4724057976c3a files/gabber-0.8.8-gcc.patch 3732
+SHA256 3790f2d2a0e944c0d2b091fbc43410a01e8ff3a88dd7d59f7fc5b819718390dd files/gabber-0.8.8-gcc.patch 3732
+AUX gcc-4.1.patch 3644 RMD160 b5d335c39e8bd4fc55d5732da47c33b92e300213 SHA1 0f730009bedba63ce5b5a4d33c177717e97633c6 SHA256 6b421de4a1283dd945212872c2a376d156cee8af6335a3284ad30ab369d28556
+MD5 fc5a3989d15a965dca4b2fce78848221 files/gcc-4.1.patch 3644
+RMD160 b5d335c39e8bd4fc55d5732da47c33b92e300213 files/gcc-4.1.patch 3644
+SHA256 6b421de4a1283dd945212872c2a376d156cee8af6335a3284ad30ab369d28556 files/gcc-4.1.patch 3644
+DIST Gabber-1.9.3.tar.gz 523954
+DIST Gabber-1.9.4.tar.gz 605025
+DIST gabber-0.8.7.12.tar.gz 2184712
+DIST gabber-0.8.7.tar.gz 2141334
+DIST gabber-0.8.8.tar.gz 2206079 RMD160 ccd1f4ebe774eeca531791c4ab786f5f147d91ac SHA1 d2443b056404640bb5b360966b9c6223802617db SHA256 0f5c8f8a411a15794e441a4eaa7a7a65adada8bb813e2fe1a06246f1a1418f35
+EBUILD gabber-0.8.7-r3.ebuild 1493 RMD160 a6de50bcaa5e0e21e6f6b7c9802953fad96a4a3f SHA1 849840862e49289d42a6d5ca51b009826bce2620 SHA256 ffccc83ed4b036c000cec581e5d9998b7947e09572ce564c83db0cbb64be9442
 MD5 71db522040274cce9041860848d7e568 gabber-0.8.7-r3.ebuild 1493
-MD5 887e2ef15e2fa66ab0674deda94ca357 ChangeLog 5029
-MD5 7c52a192f2bf224286426302c452cc1d gabber-1.9.3.ebuild 1233
+RMD160 a6de50bcaa5e0e21e6f6b7c9802953fad96a4a3f gabber-0.8.7-r3.ebuild 1493
+SHA256 ffccc83ed4b036c000cec581e5d9998b7947e09572ce564c83db0cbb64be9442 gabber-0.8.7-r3.ebuild 1493
+EBUILD gabber-0.8.7.12.ebuild 1432 RMD160 2a81eb062993b6a30db0d257be0b4f51e95048e9 SHA1 33f3e3fefb3b63a5c07f5858065602747f777b59 SHA256 53c05631b94fc5fa6f79863386df508d8bfe9b54f1bee1a35cd20a6e634c4322
 MD5 43e018f8bcb6dedaa63b08745c594566 gabber-0.8.7.12.ebuild 1432
+RMD160 2a81eb062993b6a30db0d257be0b4f51e95048e9 gabber-0.8.7.12.ebuild 1432
+SHA256 53c05631b94fc5fa6f79863386df508d8bfe9b54f1bee1a35cd20a6e634c4322 gabber-0.8.7.12.ebuild 1432
+EBUILD gabber-0.8.8.ebuild 1509 RMD160 ca255b7ee188aa397824dcce630ae910504c9cc4 SHA1 18455279315c458650e6c346d32253309fb16c5e SHA256 bdcd59d57d5dec26502ddc017b04ff2f8f4531f1ea0b066c9b7f0d2973e82383
+MD5 9302117b9609840834169b42211d605b gabber-0.8.8.ebuild 1509
+RMD160 ca255b7ee188aa397824dcce630ae910504c9cc4 gabber-0.8.8.ebuild 1509
+SHA256 bdcd59d57d5dec26502ddc017b04ff2f8f4531f1ea0b066c9b7f0d2973e82383 gabber-0.8.8.ebuild 1509
+EBUILD gabber-1.9.3.ebuild 1233 RMD160 aded437e0d94938b79ef9d8bc720b8ecea66303d SHA1 d74c2480f3e7d10b53196a5117a9e2fcbec9558b SHA256 169bae038e3398d1268c5982aef8108205139a9600d43c25debe01879ab8990c
+MD5 7c52a192f2bf224286426302c452cc1d gabber-1.9.3.ebuild 1233
+RMD160 aded437e0d94938b79ef9d8bc720b8ecea66303d gabber-1.9.3.ebuild 1233
+SHA256 169bae038e3398d1268c5982aef8108205139a9600d43c25debe01879ab8990c gabber-1.9.3.ebuild 1233
+EBUILD gabber-1.9.4.ebuild 1233 RMD160 d518451963823723952079f83664c8d676bdb71a SHA1 161ea1085826ac38911e538222698c1da40f4ba3 SHA256 a2258fd54597c5ade47430ce8e68555c038cb4ab6731b468a7d539f10990260e
 MD5 99501cfd09e29bd760554fa03a6a5c08 gabber-1.9.4.ebuild 1233
-MD5 aaa963edc077674c7feadb674e4f32bf gabber-0.8.8.ebuild 1475
-MD5 3c26fdd6bd493036699f43145aad0613 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
-MD5 7b501a37a16efd3cbc0903c924105f30 files/digest-gabber-1.9.3 64
+RMD160 d518451963823723952079f83664c8d676bdb71a gabber-1.9.4.ebuild 1233
+SHA256 a2258fd54597c5ade47430ce8e68555c038cb4ab6731b468a7d539f10990260e gabber-1.9.4.ebuild 1233
+MISC ChangeLog 5147 RMD160 921dd22d27eaa0eb9ac32d6f83d111c24dc860eb SHA1 c35b8929e45e6ecc05b73fdf52a352ff4d1503ff SHA256 d40fa1557a05be535246d65dcfdd8a25a9db949ed9b7f4be515b9bc481dc646b
+MD5 2c6b5deef9428aedd0fd86edd991ac6e ChangeLog 5147
+RMD160 921dd22d27eaa0eb9ac32d6f83d111c24dc860eb ChangeLog 5147
+SHA256 d40fa1557a05be535246d65dcfdd8a25a9db949ed9b7f4be515b9bc481dc646b ChangeLog 5147
+MISC metadata.xml 434 RMD160 65ec7cd84751d131112476ba94e9bcc4787bad20 SHA1 0f6f1948f1588af19905c19f32597fa86c1f21c2 SHA256 ceb4fbd45670309c899d06b0d395b08939edc17d21536d14d00f59f8bc40f737
+MD5 e70c297e90595ae6039448e27b7cada3 metadata.xml 434
+RMD160 65ec7cd84751d131112476ba94e9bcc4787bad20 metadata.xml 434
+SHA256 ceb4fbd45670309c899d06b0d395b08939edc17d21536d14d00f59f8bc40f737 metadata.xml 434
 MD5 13fd2ef7cc09c0d0e358f639c31f687e files/digest-gabber-0.8.7-r3 65
+RMD160 c770f532981cbe9c2c740d62f7a5d255bb1797bb files/digest-gabber-0.8.7-r3 65
+SHA256 e94b34182f761a711550c98cc7a74a541efbc2456983311728cbaa4bcf7e07ea files/digest-gabber-0.8.7-r3 65
 MD5 2305451d3c724090f81f2cf91551a581 files/digest-gabber-0.8.7.12 68
+RMD160 65841de1934efc45c68831f47825981607ec8678 files/digest-gabber-0.8.7.12 68
+SHA256 e8a63140c03ed6f133154fd4253db62e5aa6d8aa5e5870604337dc40160ed382 files/digest-gabber-0.8.7.12 68
+MD5 27b3b516f4400c4186f0754eb016ef48 files/digest-gabber-0.8.8 241
+RMD160 48dd83270724e7e3f5016020ba876a9451286c93 files/digest-gabber-0.8.8 241
+SHA256 1f0bb956b61d59050c00e8ead812dab314bc96ab0c4bfd34572f77c6bd2e9e38 files/digest-gabber-0.8.8 241
+MD5 7b501a37a16efd3cbc0903c924105f30 files/digest-gabber-1.9.3 64
+RMD160 40b4beeaf50fda9881a0b693224be016603db6f7 files/digest-gabber-1.9.3 64
+SHA256 efc9c71f64a1c67e1f265312c1cc62e925f982773ea9c7d902b6ffda8e31e1a0 files/digest-gabber-1.9.3 64
 MD5 b78005cf0d1a439bbe1d94ef54eb4712 files/digest-gabber-1.9.4 64
-MD5 385ac29899eadd0b8da4bebf2455efae files/gabber-0.8.8-gcc.patch 3732
-MD5 0a38010d37d90d61bd8189dc33986ffa files/digest-gabber-0.8.8 65
+RMD160 bbe1e9d4e03ed4315065fd600abf59d8a4a2849a files/digest-gabber-1.9.4 64
+SHA256 1a11390e59972a6eca7519b3121b7ea060539d86a3f6b3354e8b0105270abae5 files/digest-gabber-1.9.4 64
diff --git a/net-im/gabber/files/digest-gabber-0.8.8 b/net-im/gabber/files/digest-gabber-0.8.8
index 46f8f300e198..e9d7fc4c1fe1 100644
--- a/net-im/gabber/files/digest-gabber-0.8.8
+++ b/net-im/gabber/files/digest-gabber-0.8.8
@@ -1 +1,3 @@
 MD5 e0748960c47982c1d6d17525c42efe41 gabber-0.8.8.tar.gz 2206079
+RMD160 ccd1f4ebe774eeca531791c4ab786f5f147d91ac gabber-0.8.8.tar.gz 2206079
+SHA256 0f5c8f8a411a15794e441a4eaa7a7a65adada8bb813e2fe1a06246f1a1418f35 gabber-0.8.8.tar.gz 2206079
diff --git a/net-im/gabber/files/gcc-4.1.patch b/net-im/gabber/files/gcc-4.1.patch
new file mode 100644
index 000000000000..9193ab2fa21a
--- /dev/null
+++ b/net-im/gabber/files/gcc-4.1.patch
@@ -0,0 +1,83 @@
+diff -urN gabber-0.8.8.orig/jabberoo/include/jabberoo.hh gabber-0.8.8/jabberoo/include/jabberoo.hh
+--- gabber-0.8.8.orig/jabberoo/include/jabberoo.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/jabberoo/include/jabberoo.hh	2006-06-03 09:27:43.000000000 +0200
+@@ -357,7 +357,7 @@
+ 		* be generated and sent.
+ 		* @return The delivered message event which should be sent.
+ 		*/
+-	       Message Message::delivered() const;
++	       Message delivered() const;
+ 
+ 	       /**
+ 		* Create a message event stating that this Message has been displayed.
+@@ -365,7 +365,7 @@
+ 		* be generated and sent.
+ 		* @return The displayed message event which should be sent.
+ 		*/	       
+-	       Message Message::displayed() const;
++	       Message displayed() const;
+ 
+ 	       /**
+ 		* Create a message event stating that this Message is being replied to.
+@@ -373,7 +373,7 @@
+ 		* be generated and sent.
+ 		* @return The composing message event which should be sent.
+ 		*/
+-	       Message Message::composing() const;
++	       Message composing() const;
+ 
+ 	       // Static class methods
+ 	       /**
+diff -urN gabber-0.8.8.orig/jabberoo/libjudo/src/judo.hpp gabber-0.8.8/jabberoo/libjudo/src/judo.hpp
+--- gabber-0.8.8.orig/jabberoo/libjudo/src/judo.hpp	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/jabberoo/libjudo/src/judo.hpp	2006-06-03 09:27:16.000000000 +0200
+@@ -317,7 +317,7 @@
+ 	   Delete the child Node designated by the supplied iterator.
+ 	   @param it Iterator pointing to the child Node 
+ 	*/
+-	void Element::erase(Element::iterator it)
++	void erase(Element::iterator it)
+ 	    { delete *it; _children.erase(it); }
+ 
+ 	Element* findElement(const std::string& name);
+diff -urN gabber-0.8.8.orig/src/AutoAway.hh gabber-0.8.8/src/AutoAway.hh
+--- gabber-0.8.8.orig/src/AutoAway.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/src/AutoAway.hh	2006-06-03 09:29:39.000000000 +0200
+@@ -44,7 +44,7 @@
+      void on_session_disconnected();
+      void on_session_last(string &idletime);
+      gint auto_away_timer();
+-     void AutoAway::update_statusbar_aatime_msg(unsigned long idle_time);
++     void update_statusbar_aatime_msg(unsigned long idle_time);
+ 
+      void set_away(jabberoo::Presence::Show show);
+      void set_back();
+diff -urN gabber-0.8.8.orig/src/GabberApp.hh gabber-0.8.8/src/GabberApp.hh
+--- gabber-0.8.8.orig/src/GabberApp.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/src/GabberApp.hh	2006-06-03 09:28:47.000000000 +0200
+@@ -87,7 +87,7 @@
+      void on_session_roster(const judo::Element& t);
+      void on_session_disconnected();
+      void on_session_version(string& name, string& version, string& os);
+-     void GabberApp::on_session_time(string& UTF8Time, string& UTF8TimeZone);
++     void on_session_time(string& UTF8Time, string& UTF8TimeZone);
+      void on_session_presence(const jabberoo::Presence& p, jabberoo::Presence::Type prev);
+      void on_session_my_presence(const jabberoo::Presence& p);
+ 
+diff -urN gabber-0.8.8.orig/src/GabberUtility.hh gabber-0.8.8/src/GabberUtility.hh
+--- gabber-0.8.8.orig/src/GabberUtility.hh	2006-06-03 09:26:56.000000000 +0200
++++ gabber-0.8.8/src/GabberUtility.hh	2006-06-03 09:29:17.000000000 +0200
+@@ -118,10 +118,10 @@
+      : public SigC::Object
+ {
+ public:
+-     FileSel::FileSel(const string& filename, const string& title, const string& log);
++     FileSel(const string& filename, const string& title, const string& log);
+ protected:
+-     void FileSel::on_ok_clicked();
+-     void FileSel::on_cancel_clicked();
++     void on_ok_clicked();
++     void on_cancel_clicked();
+ private:
+      const string& _log;
+      Gtk::FileSelection* _fileSel;
diff --git a/net-im/gabber/gabber-0.8.8.ebuild b/net-im/gabber/gabber-0.8.8.ebuild
index 0680ff7b5faf..15f40cff81e1 100644
--- a/net-im/gabber/gabber-0.8.8.ebuild
+++ b/net-im/gabber/gabber-0.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.21 2005/09/16 00:20:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.22 2006/07/13 00:25:19 pvdabeel Exp $
 
 inherit flag-o-matic eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	sed -i -e "s/-scrollkeeper-update.*//" Makefile.in
 
 	cd ${S}; epatch ${FILESDIR}/${P}-gcc.patch
+	epatch ${FILESDIR}/gcc-4.1.patch
 }
 
 src_compile() {