3 files changed, 132 insertions, 17 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 4744262408ba..6e7efc8b7102 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.387 2014/01/27 23:26:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.388 2014/01/31 13:21:02 dilfridge Exp $
+
+*kmail-4.12.1-r2 (31 Jan 2014)
+
+  31 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmail-4.12.1-r2.ebuild:
+  Build all mail-related agents here; bug 499538
 
 *kmail-4.12.1-r1 (27 Jan 2014)
 
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 4f2b0d6190cf..6b63e5ef7c1e 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -14,26 +14,25 @@ DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0
 EBUILD kmail-4.11.2-r1.ebuild 2499 SHA256 7bfb2de9efb0401a1d41beab0c70f7db063cc7bed55b9226f5b83ed0216f3340 SHA512 7e997dd0b60925016dfdc3259dbb4f5e66fe5caa431745f227925f1c3c6bb930a2de6a09407a5e80edd61847aa0abead17d6d515df7f83902b3e5a099dc91d76 WHIRLPOOL 7b567a06c1c3d82b354609b006ca870e87dc668eeb5883be8b98e631095059aa159cca04ba382c01aba2aaad98dacea4c33900676782f7f204ec7759352e485f
 EBUILD kmail-4.11.5.ebuild 2457 SHA256 059a6e0e0f7d2052ea8d95b1e33d6242eda5da8f0563cfc81f3bee6661376ff9 SHA512 40dbc8d1e30fccf4e447ae778da49d002019bcf2771614215efd3ad2eeb2e739991a01ce888a42656f8b34ee39a25761c995e4268e478138525d74f404602f01 WHIRLPOOL 9b76f0481f33bc2e624463bd1f427bcd6e2b9400f025b8a399e0288ca5d22d01e7570198ac3c5960e08e79ac15d4593e764a6e449ac65a629aa44719da5eef94
 EBUILD kmail-4.12.1-r1.ebuild 2469 SHA256 55eb3b92120b82665eb88139c220efaa302181ce4dc47584cf18f31f082aac01 SHA512 c936f59a5c7c187719b1313e36513c55c6fccc4d8eeb803cf996029ce33e8c92a7f9dd390fc776d4df9adc0df5f32738b478fd63d37876ac55d837e0c95b6c52 WHIRLPOOL 670cb9c6ad4965d29f10e5882dabce56b724cdb7b6fae4eb1c90388309217fabeb755200d76255772ec89e556544ca937bfc3ae72f9d01d5f8d8ea253578d75b
+EBUILD kmail-4.12.1-r2.ebuild 2607 SHA256 c9b6d9c657552d584f47bee0de972f2c01dccd25e6da25918da506bddbd86cff SHA512 9ec21e1fa028eabb709253731fce883092297f9371bc8df3be49e1a18522ca637d29b81c8d960776bf670a6a8de7030afb5cbc0d99c01382e0165d7a6a3d5287 WHIRLPOOL 8b640ef01fd6568b503ff47916afda5f8d3c5856252c9d6ba01c7077d881cb856fae0b2130ace95a9cbb8a9f428685ea187f949ef32db7cf0fbd6779897f4f5e
 EBUILD kmail-4.12.1.ebuild 2453 SHA256 c890284131d37cdbf9f3af23a7f3f13ea634a8531763fed4fdbac49410085584 SHA512 3d02a87f2ce7448c96631340208f9e3819610a40378baf2b468496c6e559f0d1219717c98cee3ec9acdf702186f3ec44a31100a6dd5c827f148279097edcf233 WHIRLPOOL 24614aeaa8194ae6321666b57044f1aab192541a77f099305cf913ad773a80caf2ec02d20bef90cf09356158548e4d8312b2da5d6b3a3f8d8f9587a44ecb710c
 EBUILD kmail-4.4.11.1-r1.ebuild 1830 SHA256 284a0531e463f7796f5d842cf293c7f9287cd1eeb9217e448a4164f100276ed9 SHA512 3aae45b573288490468922c3051103a356d6b5e5bf2f45d2498aaf8bdf93600fa8ec1ba5b05005d4162ffdbff7343de7a923ed76f91dd3bb223b14d6aa4b81d6 WHIRLPOOL adc5fa7d9935776d377c06a0f6456c628253a4d859cf49c2a11c67ac979a80f81906df1815da184681a303ee3febc825aa4464d6b143eb371816627bb5fe7cd5
-MISC ChangeLog 50104 SHA256 b8babf13ec52d98fc6289c830743e7be9bcfe6277aaea0eeb0f1feff84bf35b4 SHA512 bfefa3de63502b4bcc37a3a00b19320a94dfbc6816f62f0c46eaa3a630ab0a32bec49360f13b4850fa1c210f3c6787aa137e42e69944cc006b654bcc14bd87a4 WHIRLPOOL a3e9f82123cf1de31c85b0aee6ec1479d3bf0e378b78c048d22e30c5c652672ba674338106f1dd4916469a96e6a8f221c10602f66b57989da068f2f70fba2c56
+MISC ChangeLog 50270 SHA256 283f2ae73be1712e0f203549babc7f0195afcf3307154f3dff6abbf91e68beb6 SHA512 9e0e0413edaac258855a34ea7abec229a3d2e501d3f83155945d73943c5b6ce2fb7193ee54aec8ad4bf0c130106824a2adfe9a8e564affae712b8e6d92dddb08 WHIRLPOOL 1c391a97ebb152f85a696957617161c511e620345810ceefc20ca207b72d149af295b18dcc5366a8ee7d30d88d27a8439316b6cde8f6568f3e185bbc5be3724a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJS5ut+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcHsMP/0m+TCgweaTFXOtop5Kt6ENf
-5rRCpTmlkIarhCKS6AeJQpLtoSjV9ShtDuHc7wHNJh4+eiSVN/4RJRI4S7SkYTnx
-GNweEMJX0zuXBT3N7TGBv1Y1ILxsMnnpTqLv2k41L4uCO2v42FSn3U8sDha2uovb
-zIfZo9N+p/dX0gqYoUDTInhh7oRCBjAlqScKfNrXpD9R47mZq/lKryQcoo56atp5
-kcfGHFFd7jfCKjJrGUU5bpEp3xKlKNom+Ln5vEJPimGkvyz1dcRZxkmhl7271/vL
-Uye0L8Rtrqw7HxZJtQKE/07Bwe5DgOBmEqWYqijbdt3xFdBTCgxpG6sPWvDyvE6u
-1XffsNdOsgqirzDb6p0Ayvz1uSYaS3BgM5kFkOnGroBgBLVLlBJ3WbtJf4XdRKfN
-qGSNIQeB/1Q08SABmLDInXwW58ZMeXAB5sG1PuhKXLzq70a7HZHwKBPo4ySvtAPv
-Y2CIKy4PBOn4ZFSwjbQi+l4uxepqk0XDvd06Yi2eiry1XAop92Vt5dr5j50gSgCA
-pta3zVkWwKSQTR7hdQn86Ce5jbwAE0oJzdSr3gbYxZayDEiXySQ4+unn+eJXEbmB
-0sZT3gM6h8x7aP2jNvEu+lnlAZyyQxkFVSNhpoPuOJv2TwJ8UlIGcEu/tvHFtjDc
-z+gN2t9Ufb0h+RFZXqsb
-=rCfx
+iQIcBAEBCAAGBQJS66P0AAoJEJS/30SErRQvOW0QAI6YLrDbBZUrLnBDqJvmXgUd
+kbWvguAdjjSXTKhGYgB7So+uN/+t43pFrfLr19DHXsut1GY4K7tfmAKr3Nqt7LpP
+HzdLmOCsg5Ff29SLFbeEowN9JENpPuybg9USALWKhuJlX8f3u9Co4we+BKDstV78
+wY9BqLfjnOQ7gSzdJRwJgYMSkoA9YM6aFFexbOESvFb/y2JfoQGmHte7so1xGCCF
+VZOngbJHtfu3b24AYv99mJnCCQa/SPlbiTTp5L7sL9/BISQUVW3hBmv/9Z5pFpfr
+oHo4ZLpFcrtbFR2GEvqpnjWVgdGt07ISGkaXErZDhNhVMrA94LD1lbd0N4CvhZM7
+IqqridoDcGQXvi/GgWqRLtV8ZdVdwex8CRTEVxD3ihJnSI06keFStktF+ZzlWiFr
+2or8SfQgfCYDVP/QdCNHuU8fgLvEB40fGmBizGwqv4cZsIANmfToZXemyJhsEZe4
+ZqP96sZj4d+g4X3qGjZHYgr29ox4Sl0B1KmuZUqDxYiQbIrNXpNbPJDCLjGPKboL
+Rd7GHsuZQcn7a0yZHMTUUzvqyyRjQacdIqVMfmZjv8a92XWama5HpZvF0rB6zYIr
+cRIzErYZhl0PioWxm9G2dSHw6ZcMZWDCB28hVKeX6QZw8fQaOL+EzRsCsPIxvN1Y
+aDU44KI+tZn3XDR6IQLr
+=WXxI
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/kmail-4.12.1-r2.ebuild b/kde-base/kmail/kmail-4.12.1-r2.ebuild
new file mode 100644
index 000000000000..b4cc05d7c601
--- /dev/null
+++ b/kde-base/kmail/kmail-4.12.1-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.12.1-r2.ebuild,v 1.1 2014/01/31 13:21:02 dilfridge Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+HOMEPAGE="http://www.kde.org/applications/internet/kmail/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
+"
+RDEPEND="
+	${DEPEND}
+	!=kde-base/kdepim-common-libs-4.12.1-r1
+"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+	agents/sendlateragent/
+	akonadi_next/
+	calendarsupport/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	pimcommon/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+"
+KMEXTRA="
+	agents/archivemailagent/
+	agents/folderarchiveagent/
+	agents/mailfilteragent/
+	grantleethemeeditor/
+	headerthemeeditor/
+	kmailcvt/
+	ksendemail/
+	importwizard/
+	libksieve/
+	mailcommon/
+	mailimporter/
+	ontologies/
+	pimsettingexporter/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+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
+
+	if has_version "app-office/akonadi-server[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "Reports indicate that kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		if has_version "app-office/akonadi-server[-mysql]"; then
+			ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+		fi
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn
+	fi
+}