Hopefully fix compilation with gcc-4.4, bug 396343

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

4 files changed, 119 insertions, 16 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 8b19a97d642f..32634a2c1757 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.268 2011/12/12 01:17:55 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.269 2011/12/30 22:18:06 dilfridge Exp $
+
+*kmail-4.7.4-r1 (30 Dec 2011)
+
+  30 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmail-4.7.4-r1.ebuild, +files/kmail-4.7.4-gcc44.patch:
+  Hopefully fix compilation with gcc-4.4, bug 396343
 
   12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
   -files/kmail-4.4.10-asyncako.patch:
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index eb5c2f445b60..49cd1580493c 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -2,28 +2,30 @@
 Hash: SHA512
 
 AUX kmail-4.4.9-nodbus.patch 3922 RMD160 3bca508b6b8934a1c5f0e84788f7fab5f382b143 SHA1 18e8579fafce9c0685b7285c0acfe40c56834a93 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0ec6bf989cb7674461ae114e68
+AUX kmail-4.7.4-gcc44.patch 492 RMD160 f71183b405d1ff724fd021fb7133b89e8b184af2 SHA1 67fc6ab3e45db38de8e7fad9c9f83b54ccde3881 SHA256 6407d434616d32194c2b58b357dd11d9b427b62d20dd31671da5b1e0881e51f6
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
 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 kmail-4.4.11.1.ebuild 1748 RMD160 39e2d7882ecc1cfcbbe4d9d4a0eb94d495e3c359 SHA1 05ac974f4b9d7e7e18ca1a14443eb5b3ef1b892f SHA256 c9ec26ac522775bba74fc17395bc0aac16bb9c1bba5b5b8d1cf7a7a9976f4742
 EBUILD kmail-4.7.3.ebuild 1643 RMD160 8e410df8f597203df7fb1e8a975f7588a1fc5b44 SHA1 25b4c2009514b15386c1043825c59c31e23fd93f SHA256 c83eaeae3f27ecfdb116334e5cedd94408060a00a13e31eb02bfbee93054e01e
+EBUILD kmail-4.7.4-r1.ebuild 1653 RMD160 40087c86b2e8d34ad02384336b0bb06f78a2669f SHA1 dfa9320235179b3e8c3d3676498414114359eb34 SHA256 ab6de4a00ccfc00417e4c1ae160195043d4d30ec51629b983bc00881142f12b2
 EBUILD kmail-4.7.4.ebuild 1643 RMD160 c8533fcad87e9fa387c099f52e66bc6415b268d0 SHA1 961e063882a845f71147c7ad6f3b02312ec7e493 SHA256 dbbc3761496893f1155df4401d5e0bb6fa350796999cdd135feb384e3874f580
-MISC ChangeLog 35319 RMD160 2a64b78204520cdaab445b2adfde9d962fa8e537 SHA1 f6245c918e6363ba9a0ad9555797b63a30f8bad4 SHA256 93605828bfc239a71ee6e224679b7575970daa78964c6892646a7293fe6f3c6a
+MISC ChangeLog 35524 RMD160 d6da37e8a35fc3993d42421dcc26699f86ef1aa3 SHA1 29db4423c477450d94c239574d5f90bcb40fe780 SHA256 56d701269473ce959e51d0486d64730ae347abdde32c538648c724c0033d3463
 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)
 
-iQIcBAEBCgAGBQJO5VZJAAoJELHSF2kinlg4KyAP/isZFSAPNp2DgMcQpShLu2f/
-7HbJcg2F5GijYM3IZhrhsHDF5ZPwa8RG/OcMDhTSuxItxhRYI8QLCSDYhLXEmcul
-qsKWlILvZNXXVI1mFpgnT2d+ZgdZy/Waq1WIDFry9Nd+p204lTy8IJgOXOYvqf2s
-qcbjjhLdMHLU26jzd3SDrin0Tfd1gEqHnrxbRUDBkVCCVkyNTarc9u0zUaZZWUUt
-3ooMHdQr2Hi1jH35SSvfvTmbcBiiv/jPfnvcemvz9nqiqsMnmPWS8W4YF7ZtlJab
-2m/D0fPOFXXfeKKbuFznzCTTE7eqpQtlWgqbK8lvRzD47G7BohM44wtnqXYvQxXI
-MTWm7i1kFDCV9onNDZehMdtZFzjUeaHMyGmCZKIeSmcUcS6SwSuUnqyB7vukCPlI
-ZoouODUTRPbRILAR4dfAq5PN6u+zS/K1UkzJ/7pT7QjmzmUjQ0fAPqic5D0mZquY
-deCJ9IZzmSrXlnIKeapC92Jfb2sAdjp6QlMvi4ckVr385DKQ6HdbNPzxeDP/vzve
-u/6f4k7LJQ4P2YNAM3gCfuS70PNoqJShuwgOHNPSGO+QSk7ZXh5K7JQVD59kk6Pj
-FUigLT6w3sDdlGgoO2tCKH9k/wXffoCSYu7jVUyMv2+vnxkhu2AeUgY3hAXFI8Dg
-VqdvngQX444flWAz4nLa
-=LPYH
+iQIcBAEBCgAGBQJO/jkgAAoJEEb+UGWnxTyHBs8QAJbbFcfVS48SeNV09ZHv9i1f
+24ypgvP/LsneAcIq7nbP6zvsLJEKWJ2NEIDqk/ggTLECp+G92cAnR+DXmKm2rUag
+O8zVB9umIhwBqOy5eEN3oRw7Jofy0xzTFNb8WPPuzjD5LE5UEGMkIu6gLknk3INj
+Nvd6mIN9S02W7BA28lBjRbWBj1wC4mXgj7oSrfyfm8nuWAWBArDhy4OBgdw7YBfm
+stIxXxEb9wOmKqjclaY1vXF9oU18+ZkzJzQZLS64/GL1OButyQzcCwhk6o/z8nAD
+lPVgxRzCVEva2MA19VsU3FPfcP5vmlIfICS5ti6ZdhzHfa8oeYvKrOzqeQ+zaEOJ
+cygE5aRbdfeZMFz1aaAYFS3DaDQwLV8RLrJvjNV/K/zGfBbff7pf1MeQJR2uQjtD
+1+bA04+kGSzgFUj3HlDcB7a9vhLyqxbk8laoNGaDaDLQQHq8TwzdUPcWalLfZt6j
+i4KkiH7ij6zB0Z0zFGndGj3ctKbO6UlAM2W3VAXoIE7d80UTs2dDZGfr3IE3xJoZ
+kHUcWmSrI8RFyM9em+CWR3cuQSj0lLtjRvLo4y3snaSUGP8IUyWZ7Wssin0zURVI
++8kQilABgtmia/lGQP8XUcd8hh90ZXzMzeaEgzhh9RQg3DCx3Ct8vPHxWVj+sXiy
+LmiEAPNsPToqgNmqZ8rL
+=FiSe
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch b/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
new file mode 100644
index 000000000000..363620292c70
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
@@ -0,0 +1,11 @@
+diff -urN kmail-4.7.4.orig/messagecomposer/akonadisender.cpp kmail-4.7.4/messagecomposer/akonadisender.cpp
+--- kmail-4.7.4.orig/messagecomposer/akonadisender.cpp	2011-12-02 00:25:40.000000000 +0100
++++ kmail-4.7.4/messagecomposer/akonadisender.cpp	2011-12-30 23:10:05.151509937 +0100
+@@ -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;
diff --git a/kde-base/kmail/kmail-4.7.4-r1.ebuild b/kde-base/kmail/kmail-4.7.4-r1.ebuild
new file mode 100644
index 000000000000..a3f55a6b4451
--- /dev/null
+++ b/kde-base/kmail/kmail-4.7.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.7.4-r1.ebuild,v 1.1 2011/12/30 22:18:06 dilfridge Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	mailcommon/
+	ontologies/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.4-gcc44.patch" )
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}