From: Andreas Hüttel <dilfridge@gentoo.org>
Date: Sun, 25 Dec 2011 21:23:22 +0000 (+0000)
Subject: Backport compilation fix for gcc-4.4, see bug 394531.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7a108d357a40f0b5ebc890f767ce23678337b7fe;p=gentoo.git

Backport compilation fix for gcc-4.4, see bug 394531.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
---

diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index 6598d6200b44..3cfeff971e15 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.17 2011/12/11 18:52:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.18 2011/12/25 21:23:22 dilfridge Exp $
+
+  25 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdepim-common-libs-4.7.4.ebuild,
+  +files/kdepim-common-libs-4.7.4-namespace.patch:
+  Backport compilation fix for gcc-4.4, see bug 394531.
 
 *kdepim-common-libs-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index f15cbcd560b7..9268a0518550 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX kdepim-common-libs-4.7.4-namespace.patch 749 RMD160 61bd56e59158ad259f35d838e2f680e38faadfff SHA1 2da00181c13e38bbe7083c7e0cbd8a5fb6ba4316 SHA256 5f7d529609d1b939293a42b935a9a4661d4a51761e85cd3dcfecf6e5f2e76af3
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
 EBUILD kdepim-common-libs-4.7.3.ebuild 1353 RMD160 ededb819af1d901dc61cd039259f65839a99143c SHA1 a292092efc56c8036434a284c5dbf3b644ded9ef SHA256 513f8c1fe832545ff4857bb491d94b3798f6c0975638b17dee9cc56ef063b6f9
-EBUILD kdepim-common-libs-4.7.4.ebuild 1353 RMD160 311aef2bca094fe9f708e573511ee4086586b566 SHA1 be3bdd5da2b364ed797e1daa6b61ed6d9c079811 SHA256 65654ed6e045485609d2ca29975dd44f0f84d167c54dd806d3236cb9ed62f254
-MISC ChangeLog 2780 RMD160 a9ebceb4864191d5d295e00446406f5f139f2cc0 SHA1 1efce649564f919cb3323d28e342584a6bc0d764 SHA256 aba47bb8a84f94e05f409232b0ed9fbe8aed8710fcd86a05828adb209aa97918
+EBUILD kdepim-common-libs-4.7.4.ebuild 1411 RMD160 f7b7008264301afc22a4091bbee4ccbdcf93be72 SHA1 395e56e18dc8a6f75c98a11c463e92fe820ec5d1 SHA256 c89d528be4c05fbf3929952ccc56a4e27a2b16017f3a91665c9c89b8fb5ba679
+MISC ChangeLog 2983 RMD160 c1771e3753abeeb582d2fbca9d5556bcb056cf78 SHA1 6546d953f1788d3611eae278e166229c513e470d SHA256 ee7c007c80a32ebd68b5b6490f709af0647155bf81a37ec08969fea0277153d3
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO5Py0AAoJEOf+E+/4L5LmrfgP/0UaX45X6d1lg6kb5YjrO5ot
-LOV2Ykpfa3s7C/T9ycP7TeDU9MVXKjeWvQ/ITjLwboS7EB7wGVc3gC8tit1g9P3j
-MkP69vO/+OCxyRY/w183AkbBACWhIJrLgFFoo00wFOHgAa+BJzj55u9fSYZZr3o4
-wNwnxmo1/RBHiwwgVMX9CIzGsIIbm68cIb2qKrgdM/lvno+GXCPV95R8jdNWzPqo
-NkExxTmWa8jYngXoMnsJPswdjAknG5+9Zk3U9X0kKGY+BRhBYiAEHKwQ6tH/nS7v
-KuIQvj56UgnzXslYeyUk/cP1uWYB8FWc5vzL/YwdXoDFs37qftBALcWOPAWbICgB
-srXxhE+runTVw4Sn4rtLsAqVUu6B529My9HwjNTTWLlMoZhuBds8i8ZXs90LuyBT
-bF1dQYzzagGjzSVcozMNpAAD5/IS3ugllzzIJBvtJmyViVQQ9VQ2SfQj17GtAxyE
-067Is8XpjKhPm8ZwdbuO+DXSaBeqPMIcbd/9lPj4Cw56IGgPEdsBykA2KoEuPQ92
-g0aviN617M9OUmINFazL3kaiYlYbWmWg6s/Z8K5eYZtsYH5HMZV12wkHKUBCo9vL
-DQCgXTCUKVSqtXPRVbwxbNhbgtGlT1Hv1LFYgQ/8qNZCjP66FN9r/INI5Fncgbpm
-PWD2Sr15LY2euj/hVrfl
-=2ohG
+iQIcBAEBCgAGBQJO95THAAoJEEb+UGWnxTyHdSAP/jv/6nWcZBvJsvDK+jbrgD9T
+mLc3kHJuutyWHae7ILgOFpAvsLoELRLjMsRoDyR4u+kY7zE64kpqEZUY5HwURyNL
+YDoYJO4kJhpiBuPBj+c7SR+k/57jJt3WmweOZbE9FGVXxpXR6J9iHPihqoCcEdjp
+iMD8hOxUpkklY9vUSM3mIPDvaZGdDMupQQlJQhEh9B1dFWaHYvlZxw3KTRktEOqn
+x/zbEhzU5BEDs1jQWJm2gfXAz5ciQycuoe65x9Pxqt1vsrBzJumggZbmUjKJx7v6
+DpgLSGPbEmzdUfuJ+IZjBnw8dGpd9NKk1OMayvQG1Dhon+N6qFpN2PEWampjqIZd
+fTrCqJ8XaqMMvqyb57QQ8q4KD1SIZfxoVwBJ4X+0HtmjGN2H32z39mT/XmIdJOCh
+Yz2dWcdz6OBgploS8IIpFZuQL6e18GiMurfHV2X8e6TLBqssc3Kg85Hg6GG1srs9
+I8ZMO6+kz1fDQGDXr7Z9899FQMvJx9bed8xKE94kes3BDXnGAf4W4iHNWrslvkAk
+Cjmo8I4JFQz68fFdvo938Qbc9wC17KciDP9oxsC0zXGFZa99AwtupdD3okviGS64
+3T/rsI1KS2PCuRGcLNtZsoRZm+8ZUKqsKBNoWi60NRa+WU5FucoTcW68NlQl+YmR
+pPonmEtbhgRhATf6v+Hb
+=66+E
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.7.4-namespace.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.7.4-namespace.patch
new file mode 100644
index 000000000000..c983c0689c0f
--- /dev/null
+++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.7.4-namespace.patch
@@ -0,0 +1,24 @@
+From 02544849c1ba657cca59908960a75e0f65b87aea Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sat, 5 Nov 2011 13:04:33 +0100
+Subject: [PATCH] Attempt to fix name clash between KMime::Message and namespace Message.
+
+---
+ messagecomposer/akonadisender.cpp |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/messagecomposer/akonadisender.cpp b/messagecomposer/akonadisender.cpp
+index c7b5e03..e9a4b7c 100644
+--- a/messagecomposer/akonadisender.cpp
++++ b/messagecomposer/akonadisender.cpp
+@@ -38,7 +38,6 @@
+ #include <messagecore/stringutil.h>
+ #include <messagecore/messagehelpers.h>
+ 
+-using namespace KMime;
+ using namespace KMime::Types;
+ using namespace KPIM;
+ using namespace MailTransport;
+-- 
+1.7.3.4
+
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild
index d69eba93c056..96dd8a7d50d4 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild,v 1.1 2011/12/11 18:52:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.4.ebuild,v 1.2 2011/12/25 21:23:22 dilfridge Exp $
 
 EAPI=4
 
@@ -36,6 +36,8 @@ add_blocker korganizer '<4.5.67'
 RESTRICT="test"
 # bug 393131
 
+PATCHES=( "${FILESDIR}/${PN}-4.7.4-namespace.patch" )
+
 KMEXTRA="
 	akonadi_next/
 	calendarsupport/