Fix building with GCC 4.4 wrt #274315, thanks to Victor Ostorga.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 44 insertions, 8 deletions

diff --git a/net-libs/gloox/ChangeLog b/net-libs/gloox/ChangeLog
index 5f82071d3747..4effbb2dc9f4 100644
--- a/net-libs/gloox/ChangeLog
+++ b/net-libs/gloox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gloox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/ChangeLog,v 1.10 2009/01/31 21:33:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/ChangeLog,v 1.11 2009/07/30 15:48:17 ssuominen Exp $
+
+  30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> gloox-0.9.9.5.ebuild,
+  +files/gloox-0.9.9.5-gcc44.patch:
+  Fix building with GCC 4.4 wrt #274315, thanks to Victor Ostorga.
 
 *gloox-1.0_beta4 (31 Jan 2009)
 
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 4fe8e54ba9ab..7e44480f41d9 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,10 +1,11 @@
 AUX gloox-0.9.9.5-gcc43.patch 618 RMD160 d975d684e180731e940e2d5e03366b07065f1342 SHA1 407b77073f2348a8501b0b9ca4e2cb56b374d593 SHA256 8ee09d27f131125d638cdb37b83f48f363e0b1180045aafa6887a7cfea4df48a
+AUX gloox-0.9.9.5-gcc44.patch 804 RMD160 b4d057953b497cc10fef8f245b6fc89b205553d3 SHA1 2ad43900307ab239917d254f6f5c61b4dcdfc161 SHA256 95cecfb8f2d6b270b2315dbfca8d47ea0685bfbc5bec4aa4ee7440acee897a95
 AUX gloox-res_query-check.patch 566 RMD160 0d4c2091556dd516ec43c97ff2eb475da0e95357 SHA1 ebba1b6ce89f15745c5a6973d8ad5165c22863be SHA256 9c49803fbb75513bc60372b1dc264c6051432c537dfdbd6306ae6ef95d624bd5
 DIST gloox-0.9.8.tar.bz2 438638 RMD160 413fd04581da13cd443a40d9e7fc51e90cbe0461 SHA1 03af5a5525bc014a6d84b5c92bfd4a2a12ec50a6 SHA256 d253ef7f3eb1eb9f7a1fe5263cb09b439b35567d1628c8b050e71ce5220cbf2a
 DIST gloox-0.9.9.5.tar.bz2 439468 RMD160 e217ef6d84881923ad3bee3fd18e1bee357db5d3 SHA1 b8196d918a23ec519dac101c6e97321506247c3a SHA256 feffed16209fc109dc2e2d06a42e8d00942e9a00bcae0ee23abcf6a9b07923c4
 DIST gloox-1.0-beta4.tar.bz2 566298 RMD160 ec660c71961a6c870cc59104ae14e4af7b35dd8f SHA1 feb0a9d630006532a5f8ade985a3b6d6a01e8a29 SHA256 592be44c6f4ac20e2c0d69e1f460184905816decf73fe22d31a7a9d0997a20fe
 EBUILD gloox-0.9.8.ebuild 907 RMD160 9abd38c71d34e4e37df03a2dcb9741ccfb63d84e SHA1 a512f1ec2f794df6f29cb53ecf68ca62db2d92bb SHA256 be309d863479854589c61861cd67d3940b7bd36d5b8157e5dd58b483c93a4a4f
-EBUILD gloox-0.9.9.5.ebuild 982 RMD160 c714df67c618a424e4b4bd7016ef3cc7c9241400 SHA1 4e629a2df1d3039e8648ab6f50c213800826d1c6 SHA256 f1a4c46c04b87b325f1ae3ffc1c9f71d67e93ddddcca8ca65cbf164ad5be77cf
+EBUILD gloox-0.9.9.5.ebuild 1021 RMD160 14294266005e531f7b8ff53e3c621940282afd98 SHA1 9524f2d52e29d919ddf8787720b6ae6dc6b45e76 SHA256 35e8846aaf252f25311b42a18b514b9d0c8bb7d0ae893859ed4e33034afcd1b3
 EBUILD gloox-1.0_beta4.ebuild 926 RMD160 b43139f7af7de5d95e45cc7292f83758c3031533 SHA1 d63bf2e61e9affcf7062179d7091b0f00366b5ce SHA256 d7a02b11db63c682bbd1d4302e0a7a89e2421f08d282ee3c2fa67b85416a9f51
-MISC ChangeLog 1803 RMD160 96e7552991f68101b6d62901fd6f7ff3e21c2e51 SHA1 0ee162c7fc4f3f6732d29b816a8e374b2be1014a SHA256 ad385596fe41f04d8d860fb9758ecd6fb9caeacfb3f59c93d44674c2039673ae
+MISC ChangeLog 1987 RMD160 ada5aaf5caef521a76ca98b2b9ae5b7c1e8d3966 SHA1 72367de4f193dd25766678fe91c030eac3f0b8c3 SHA256 18b73c19c1c23fad74c45a77b04ea70774e0779a0ef1aa69f00e128340cde1d2
 MISC metadata.xml 250 RMD160 b6e51a264e1584f783bd491505e99523d2ea6ebf SHA1 adf080dc000855fff7cb5595582e3b1acfe62dca SHA256 9f906a6688066a1ded86eb663ff87e162ac0d2e4c02a22f73fc158323bec0a61
diff --git a/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch b/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch
new file mode 100644
index 000000000000..27541033d85b
--- /dev/null
+++ b/net-libs/gloox/files/gloox-0.9.9.5-gcc44.patch
@@ -0,0 +1,31 @@
+diff -NrU5 gloox-0.9.9.5.original/src/md5.cpp gloox-0.9.9.5/src/md5.cpp
+--- gloox-0.9.9.5.original/src/md5.cpp	2009-06-18 15:19:28.000000000 -0600
++++ gloox-0.9.9.5/src/md5.cpp	2009-06-18 15:22:11.000000000 -0600
+@@ -70,10 +70,11 @@
+  */
+ 
+ #include "md5.h"
+ 
+ #include <string.h>
++#include <cstdio> 
+ 
+ namespace gloox
+ {
+ // #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
+ // #ifdef ARCH_IS_BIG_ENDIAN
+diff -NrU5 gloox-0.9.9.5.original/src/sha.cpp gloox-0.9.9.5/src/sha.cpp
+--- gloox-0.9.9.5.original/src/sha.cpp	2009-06-18 15:19:28.000000000 -0600
++++ gloox-0.9.9.5/src/sha.cpp	2009-06-18 15:31:29.000000000 -0600
+@@ -10,10 +10,12 @@
+   This software is distributed without any warranty.
+ */
+ 
+ #include "sha.h"
+ 
++#include <cstdio>
++
+ namespace gloox
+ {
+ 
+   SHA::SHA()
+   {
diff --git a/net-libs/gloox/gloox-0.9.9.5.ebuild b/net-libs/gloox/gloox-0.9.9.5.ebuild
index cf791ab6b2bd..766babc5adc4 100644
--- a/net-libs/gloox/gloox-0.9.9.5.ebuild
+++ b/net-libs/gloox/gloox-0.9.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.2 2009/01/31 21:33:45 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gloox/gloox-0.9.9.5.ebuild,v 1.3 2009/07/30 15:48:17 ssuominen Exp $
 
 EAPI=2
 
@@ -15,15 +15,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug gnutls idn ssl zlib"
 
-DEPEND="idn? ( >=net-dns/libidn-0.5.0 )
+RDEPEND="idn? ( >=net-dns/libidn-0.5.0 )
 	gnutls? ( >=net-libs/gnutls-1.2.0 )
 	ssl? ( >=dev-libs/openssl-0.9.8 )
 	zlib? ( >=sys-libs/zlib-1.2.3 )"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_configure() {