Fix building with GCC 4.4. Based on patch from Victor Ostorga in bug

#269239.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 58 insertions, 10 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 2eb97723693d..3cd6c091fc42 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nntp/pan
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.75 2008/10/06 20:45:56 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.76 2009/05/15 22:11:59 dirtyepic Exp $
+
+  15 May 2009; Ryan Hill <dirtyepic@gentoo.org> pan-0.133.ebuild,
+  +files/pan-0.133-gcc44.patch:
+  Fix building with GCC 4.4. Based on patch from Victor Ostorga in bug
+  #269239.
 
   06 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -files/pan-0.132-CVE-2008-2363.patch, -files/pan-0.132-gcc43-fixes.patch,
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 5f464bf03497..9453721bbd84 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pan-0.133-gcc44.patch 1109 RMD160 c2b4ef1f286328ff5c81128b0e07339c7e6eda97 SHA1 b2953a3f3ab936d946994c64c19a291457fcb005 SHA256 3b6c5c061b1e53be3051dc8972612ab2940b00f14d77b49463f2057ad97eb517
 DIST pan-0.133.tar.bz2 1452883 RMD160 cfa84e32d6d82731df582e1336f9deffc97aaabd SHA1 a0bd98ea1ba174800896611e3305a6b6d8dbde2f SHA256 e2494d89a5c3150d97f38af22ad6938f6ff29c64628c67e716d98a566f368e91
-EBUILD pan-0.133.ebuild 925 RMD160 35b85fc17386a440360ede377a0f1c7a4c90e95a SHA1 8062bec5ad484ba0b946c4c39a43459e332ea777 SHA256 f787f6e97c02d42cf6020b6419674f215b444714b8f21203bb79789252e07405
+EBUILD pan-0.133.ebuild 1026 RMD160 c2d5edf07c723d9848629abac1cc085ed6d18295 SHA1 adf879ba36a7214cd87cb4a699693f336b25e770 SHA256 6e490eb56143c5018d6427ac544fe5966b81f3409c9921c9279d2b3800b63820
 EBUILD pan-9999.ebuild 1233 RMD160 4b027d6c082bd1e2a098d7c78765b3b89d481c7f SHA1 8269d54b07499ac2e6a50aaf8214b341a0e481f8 SHA256 867c5671859aaf3c359a18bc1cbe59fc68805d1e29f6c3744f09ef48b5248e47
-MISC ChangeLog 16531 RMD160 70297e225bbb1e592acdf9fedcf0f5740efa5611 SHA1 1ea343cf8f800781276fd429a644988e26a9aeb4 SHA256 8259824ba5494ef9a53d682e4ec7a8aa4a60da3d20cefb7344747ea859ce001b
+MISC ChangeLog 16718 RMD160 9955f6f9393f46b3d1c44f91b982d2976d0732fd SHA1 0ee55584a7379eb88152864e2576cd5a5533f5f2 SHA256 fc99aaf8000b216c3682822281801d5f0e1adc4039bedfc4ebd43e590303f40b
 MISC metadata.xml 180 RMD160 797b69d3fd6f36d441bda500c1310c91837720a4 SHA1 e2e177f18436d4250aadeadfd6ec27639861290e SHA256 1bb112215f4f710d26b79a43b61ec93003963663cfdec7b3b7173cfdbf85f52c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjqeQkACgkQ1fmVwcYIWAYXwgCdHNnWdQvIXk8u+ggDz9egZOiS
-IwUAoM/hvQmO7OqN2F+bD/ot0GZDPXez
-=NGuk
+iEYEARECAAYFAkoN6TgACgkQiqiDRvmkBmKDXACgi/IcjmYjnLM95csFCDiA6piy
+CbwAoN1UsIbTtFsLafI+Jb8aR9V5WUjb
+=5JEJ
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/pan/files/pan-0.133-gcc44.patch b/net-nntp/pan/files/pan-0.133-gcc44.patch
new file mode 100644
index 000000000000..f2ccce50b829
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.133-gcc44.patch
@@ -0,0 +1,33 @@
+diff -Naur pan-0.133-orig/pan/general/log.h pan-0.133/pan/general/log.h
+--- pan-0.133-orig/pan/general/log.h	2007-08-01 11:00:01.000000000 -0600
++++ pan-0.133/pan/general/log.h	2009-05-15 16:03:53.699935401 -0600
+@@ -20,6 +20,7 @@
+ #ifndef __Log_h__
+ #define __Log_h__
+ 
++#include <cstdio>
+ #include <ctime>
+ #include <set>
+ #include <string>
+diff -Naur pan-0.133-orig/pan/general/progress.cc pan-0.133/pan/general/progress.cc
+--- pan-0.133-orig/pan/general/progress.cc	2007-08-01 11:00:01.000000000 -0600
++++ pan-0.133/pan/general/progress.cc	2009-05-15 16:00:06.843924198 -0600
+@@ -19,6 +19,7 @@
+ 
+ #include <config.h>
+ #include <cstdarg>
++#include <cstdio>
+ #include "progress.h"
+ #include "string-view.h"
+ 
+diff -Naur pan-0.133-orig/pan/usenet-utils/numbers.cc pan-0.133/pan/usenet-utils/numbers.cc
+--- pan-0.133-orig/pan/usenet-utils/numbers.cc	2008-07-04 09:01:53.000000000 -0600
++++ pan-0.133/pan/usenet-utils/numbers.cc	2009-05-15 16:04:48.354310199 -0600
+@@ -22,6 +22,7 @@
+ #include <pan/general/string-view.h>
+ #include "numbers.h"
+ #include <algorithm>
++#include <cstdio>
+ 
+ using namespace pan;
+ 
diff --git a/net-nntp/pan/pan-0.133.ebuild b/net-nntp/pan/pan-0.133.ebuild
index b9ed1435b7d0..f3406820eed2 100644
--- a/net-nntp/pan/pan-0.133.ebuild
+++ b/net-nntp/pan/pan-0.133.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.133.ebuild,v 1.8 2008/10/06 20:23:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.133.ebuild,v 1.9 2009/05/15 22:11:59 dirtyepic Exp $
+
+inherit eutils
 
 DESCRIPTION="A newsreader for the Gnome2 desktop"
 HOMEPAGE="http://pan.rebelbase.com/"
@@ -22,6 +24,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_compile() {
 	econf $(use_with spell gtkspell)
 	emake || die "emake failed"