Fixed bug #150696. Thanks to impulze at impulze dot org for reporting it.

Package-Manager: portage-2.1.1

4 files changed, 50 insertions, 13 deletions

diff --git a/net-nntp/klibido/ChangeLog b/net-nntp/klibido/ChangeLog
index 3b8211bf2796..f4a3498bfa5b 100644
--- a/net-nntp/klibido/ChangeLog
+++ b/net-nntp/klibido/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nntp/klibido
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/ChangeLog,v 1.18 2006/08/23 19:15:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/ChangeLog,v 1.19 2006/10/10 12:01:13 deathwing00 Exp $
+
+  10 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/klibido-0.2.5-gcc4.1.diff, klibido-0.2.5.ebuild:
+  Added a patch that Fixes version 0.2.5 so that it can be compiled with gcc 4.1.
 
 *klibido-0.2.5 (23 Aug 2006)
 
diff --git a/net-nntp/klibido/Manifest b/net-nntp/klibido/Manifest
index 563ac3fe52fb..2e3cf6abd035 100644
--- a/net-nntp/klibido/Manifest
+++ b/net-nntp/klibido/Manifest
@@ -5,6 +5,10 @@ AUX 0.2.3-availablegroups.patch 680 RMD160 1c2fd82ecce80c0754faadb9d1e9e2ae8156d
 MD5 562c45d10b93fb7abdb28bf180066e82 files/0.2.3-availablegroups.patch 680
 RMD160 1c2fd82ecce80c0754faadb9d1e9e2ae8156d03b files/0.2.3-availablegroups.patch 680
 SHA256 1eb4ccf2e4b10a14bdd832cfce0faeda863f58d4129c2cf9a446ecf135e7b580 files/0.2.3-availablegroups.patch 680
+AUX klibido-0.2.5-gcc4.1.diff 1232 RMD160 0b2beca08f045af12cb15ae68bc40fbccbba463f SHA1 a070fb2afdb94339d52a61116a5f9405c824c087 SHA256 382f5d4ad736be9536b67be3a189cb73ce6077004d088f16c2e2990e97ce7d77
+MD5 c013b5e3ebf894f5e8675d63379165f0 files/klibido-0.2.5-gcc4.1.diff 1232
+RMD160 0b2beca08f045af12cb15ae68bc40fbccbba463f files/klibido-0.2.5-gcc4.1.diff 1232
+SHA256 382f5d4ad736be9536b67be3a189cb73ce6077004d088f16c2e2990e97ce7d77 files/klibido-0.2.5-gcc4.1.diff 1232
 DIST klibido-0.2.3.tar.gz 718043 RMD160 e43cbe053ee25b39f5caee100d57ac2cc7e3a57a SHA1 6629ba73e39bc96c6d16e5edbc44e3657280cba1 SHA256 a7af6c5b0d04d64ba177d892c6fa452f498060badc90cb3caeb5e66fefc0441c
 DIST klibido-0.2.4.1.tar.gz 798084 RMD160 52b09d4af13ab261677204ff68fb5c94445c5a41 SHA1 05f9c7fcec121752391115bf193d434c72e6ad8a SHA256 c8a1d015b929490cb18fa9deff876a3ce4b3c17ea4ed91783d83302782efcaf1
 DIST klibido-0.2.5.tar.gz 720741 RMD160 cf1dd3acb4bf30343489ae1dcd3034ec6e3a94c3 SHA1 ff6abf45ee7ba8e9b02aeb4eea9ead4049523cae SHA256 7bd35c5cf6f1b9b26f802e78d63e9ae7a66763ca4c0c4a78ecc87d45a20b1d22
@@ -16,14 +20,14 @@ EBUILD klibido-0.2.4.1.ebuild 1080 RMD160 6bb74745d82c8f388138567a2ac0b0f1cdf315
 MD5 4125e50d730a8764f3906d0f76e748c0 klibido-0.2.4.1.ebuild 1080
 RMD160 6bb74745d82c8f388138567a2ac0b0f1cdf3153c klibido-0.2.4.1.ebuild 1080
 SHA256 1e11cbd2db7d6aa9944d2c587302cc8c43f78e5f4cd6f315d549b7bd43e960ff klibido-0.2.4.1.ebuild 1080
-EBUILD klibido-0.2.5.ebuild 912 RMD160 a8769abf762d2455c571f988205f0b2169250712 SHA1 e5ecd0ededf573da045ac5506d9d569977c9ee74 SHA256 9dff22f72a764af71e2787486bc055fade28a64f316a3a484c183665f3f65593
-MD5 ec4a24cb5ca867ff88e4522d66eb5398 klibido-0.2.5.ebuild 912
-RMD160 a8769abf762d2455c571f988205f0b2169250712 klibido-0.2.5.ebuild 912
-SHA256 9dff22f72a764af71e2787486bc055fade28a64f316a3a484c183665f3f65593 klibido-0.2.5.ebuild 912
-MISC ChangeLog 3089 RMD160 b8f9cfd2f60ec2ff4f397fd69227b86a24b3fbbc SHA1 894eefa95c4434a04b11c001e20cde34336c1be5 SHA256 4a7732b82369422d39ebd452872652c25ace5e112201a3be7db21b660b1a52f9
-MD5 fbc344411b35f6566d8499603c8de248 ChangeLog 3089
-RMD160 b8f9cfd2f60ec2ff4f397fd69227b86a24b3fbbc ChangeLog 3089
-SHA256 4a7732b82369422d39ebd452872652c25ace5e112201a3be7db21b660b1a52f9 ChangeLog 3089
+EBUILD klibido-0.2.5.ebuild 954 RMD160 d1a06a78f26d700aea4bf8a52bbf3123b8865a1a SHA1 a0f90bd876cc582a33c8cd02a4669f1d14599d24 SHA256 c284a7142de8df1cbaca63d923fc00f74916f5562c8984ba7a93d5348f6c6b48
+MD5 88c794e0397c25a679d87b8ee8a98710 klibido-0.2.5.ebuild 954
+RMD160 d1a06a78f26d700aea4bf8a52bbf3123b8865a1a klibido-0.2.5.ebuild 954
+SHA256 c284a7142de8df1cbaca63d923fc00f74916f5562c8984ba7a93d5348f6c6b48 klibido-0.2.5.ebuild 954
+MISC ChangeLog 3291 RMD160 23b1068b782692ece4b3cfb5158d91907cd56513 SHA1 22e8edc8b7718e80ff58979f5c8bc16aa5f8aecb SHA256 32f10783d0d31b8718c464c82cee8c3ad152e57f17b56a6247539c38bfbfeea5
+MD5 7f0a62fc88ec25566980cf4e5fb5b586 ChangeLog 3291
+RMD160 23b1068b782692ece4b3cfb5158d91907cd56513 ChangeLog 3291
+SHA256 32f10783d0d31b8718c464c82cee8c3ad152e57f17b56a6247539c38bfbfeea5 ChangeLog 3291
 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 metadata.xml 161
@@ -40,7 +44,7 @@ SHA256 d4a1ab678bfa66c9ea6022cd795965669fff459ccd1ba4ff1643c3c39d296bdd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE7Kl7I1lqEGTUzyQRAnUuAKDd5FxE2W4HOkGR4LBDCaOVlIWT9gCgkWr1
-dCuPmxL2PMBg3uc7n7LZFUA=
-=eGoB
+iD8DBQFFK4uQQVeVlgLp4x8RAmftAJ4rLfAJsTpt0hIm9CWq3FPToYcQPwCggrh5
+mB+mZc1VwKzRkOXjsVYzVcs=
+=qh+x
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/klibido/files/klibido-0.2.5-gcc4.1.diff b/net-nntp/klibido/files/klibido-0.2.5-gcc4.1.diff
new file mode 100644
index 000000000000..1d023fcd85cd
--- /dev/null
+++ b/net-nntp/klibido/files/klibido-0.2.5-gcc4.1.diff
@@ -0,0 +1,28 @@
+diff -U 4 -H -b -w -B -E -d -i -r klibido-0.2.5-orig/src/nntpthreadsocket.h klibido-0.2.5/src/nntpthreadsocket.h
+--- klibido-0.2.5-orig/src/nntpthreadsocket.h	2006-10-10 13:43:13.000000000 +0200
++++ klibido-0.2.5/src/nntpthreadsocket.h	2006-10-10 13:44:52.000000000 +0200
+@@ -233,9 +233,9 @@
+ 		bool getBody(QString group, int artnum); //Unimplemented
+ 		bool getHead(QString group, int artnum); //Unimplemented
+ 		int m_getError() {return error;}
+     	const char *m_getErrorDesc() {return (const char *) errorString;}
+-		char * NntpThreadSocket::m_findEndLine( char * start, char * end );
++		char * m_findEndLine( char * start, char * end );
+ 		void setHost(NntpHost *nh);
+ 		bool m_sendCmd( QString& cmd, int response );
+ 		QTime prevTime, currentTime;
+ 		
+diff -U 4 -H -b -w -B -E -d -i -r klibido-0.2.5-orig/src/yydecoder.h klibido-0.2.5/src/yydecoder.h
+--- klibido-0.2.5-orig/src/yydecoder.h	2006-10-10 13:43:13.000000000 +0200
++++ klibido-0.2.5/src/yydecoder.h	2006-10-10 13:46:02.000000000 +0200
+@@ -86,9 +86,9 @@
+ 	void crcInit();
+ 	
+ private:
+ 	
+-	inline void yyDecoder::charCRC(const unsigned char *c);
++	inline void charCRC(const unsigned char *c);
+ 	
+ 	QStringList m_fileParts;
+ 	QStringList::Iterator fileIterator;
+ 	
diff --git a/net-nntp/klibido/klibido-0.2.5.ebuild b/net-nntp/klibido/klibido-0.2.5.ebuild
index bc6ebf9620c7..3fafe059344e 100644
--- a/net-nntp/klibido/klibido-0.2.5.ebuild
+++ b/net-nntp/klibido/klibido-0.2.5.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-nntp/klibido/klibido-0.2.5.ebuild,v 1.1 2006/08/23 19:15:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/klibido/klibido-0.2.5.ebuild,v 1.2 2006/10/10 12:01:13 deathwing00 Exp $
 
 inherit kde db-use
 
@@ -32,6 +32,7 @@ src_unpack() {
 	sed -i \
 		-e "s,-I/usr/include/db4,-I${dbincldir}," \
 		 "${S}"/src/Makefile.{am,in}
+	epatch "${FILESDIR}/${P}-gcc4.1.diff"
 }
 
 src_compile() {