Move all agents into kdepim-common-libs, bug 494754

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

9 files changed, 298 insertions, 48 deletions

diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index 65fc96a30264..66a075c17c76 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.127 2014/01/20 15:00:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.128 2014/01/27 23:24:51 dilfridge Exp $
+
+*kdepim-common-libs-4.12.1-r1 (27 Jan 2014)
+
+  27 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-common-libs-4.12.1-r1.ebuild:
+  Move all agents into kdepim-common-libs, bug 494754
 
   20 Jan 2014; Michael Palimaka <kensington@gentoo.org>
   -kdepim-common-libs-4.12.0.ebuild:
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index cb2ec78a4946..9aca88b6f672 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -9,24 +9,26 @@ DIST kdepim-4.12.1.tar.xz 14072572 SHA256 a357d1da332b294b8d2fbf29177a65eded9d9a
 EBUILD kdepim-common-libs-4.11.2-r1.ebuild 1502 SHA256 bb030cb7a98293d9af2ad190908abc17657e5e0acf2255d2fe281b67fb2ea918 SHA512 5b7f98c2bc2ab8048e99505a97c7e73faa2a468da670d239040d31305dbe256dcbfbb5433884d34417fb92f451ec92674514d5dc34466d7589b3968839db8ba5 WHIRLPOOL ae54be9d95c50817084bff1738951cbc87834fbe76e855cf9f45be2cd6e4fd86c536bed5146102a65f61cc22a51ae5fb1a2322d811e0050b4274adab2b1ca6e6
 EBUILD kdepim-common-libs-4.11.2.ebuild 1449 SHA256 ec1580b9799b2d7de8e0b2da712eb2168edf19280e8d28688c6adabfd74f0da9 SHA512 7828bf3e85f2d178bbc6dec3129b5de1f57743a0d3fc768a7cd8d09b33fadd3233616b517ed339f86ee007356d47cd58a7e7843f878cd7ea2ee8660cefe8fb32 WHIRLPOOL f6c96ee132b2cf051110be7f66bc5b3588f8c875ba7b72cac72892fdf35423b5e38155771d0af1c62efbaabcb928b4d1ea7600b7cab5c5aa9db214dd4c5a4742
 EBUILD kdepim-common-libs-4.11.5.ebuild 1460 SHA256 0913eeeea619fe75daf22ee6c777c2e885078c546b658caf2580c560ad369ddf SHA512 c2c67c0a56c226933a933b3be18174a53a9315bc456ff8a4a6b5d05e7e6f00e76e1c7dc4e75c12f4d14a76eae7bc2e77ae51bf2cbe61d88d7956d85a3210baed WHIRLPOOL b484a7f58c82ae6291834ab06d5229c62ef68ef736c699c02356cae3c82f9172aca847400cb93de920e33767b7f0ad2e09d6c96b73015f663ded206afadf2013
+EBUILD kdepim-common-libs-4.12.1-r1.ebuild 1541 SHA256 c402508f5b0a5fcab57e74ec93d68fbd28826ce478becb11697be0811cfaa64d SHA512 7ee8fdaf236348a257d78b14048eda54991fd8d5405cc839861a633103b02e672aae776df214230ee9ebd7a49b120bda38d1132bec3a9ceee0ae6450a3e31547 WHIRLPOOL afb0857514fb91ea2b43f4c372006159622270aedb85f1acb95336f2fbfb9a0f98df911bfc6bddc4e4c8d6c8f371632f95955b938c3f73e7f46eb35f0d2a918c
 EBUILD kdepim-common-libs-4.12.1.ebuild 1484 SHA256 0919253e1ab2bbd8791163663a1db73be2a1ddc3f5e6d78aee8eb87db945e6fd SHA512 21bdaec993bef24ea25045472c75d355b86cac58db9533024562026716d1f515f3348ea113ef555b72f5c1c819452a78fd19b38216fa078d6a58f5b457b9c746 WHIRLPOOL b4440e435d6d43528b53fadcee193711f3abf3959de4adb8580f5f987543aa2107bbb2b87c843cf82d81701a46c226154486df5c6b9170ef43ef9b16bb0d3a28
-MISC ChangeLog 18229 SHA256 797f56467fbd580529ce2a8d3d2c7f05003a9ebd27179f6a92bbcb2410a1eb04 SHA512 10b248c90ad1496aa8895256353ddcafeec02f8d2c65d2ecdf76f6335340314144e1aae54cdc00f2493c22318cda96da8678267c6314ea249ff38bff300d0f48 WHIRLPOOL 21c3f4e0420ba32ca8d2c1d0d0cd9a71a43d19eac2dc5ea18efbe5332996265df3bf437176a7ba5697e392c650ba9e3aca8aad51cc155b3d86da74813257bedd
+MISC ChangeLog 18425 SHA256 956ef926941f6171c2b18c57990f67424e6ce6126f36bc0a42e96bb5c7eb62ba SHA512 77305b68277f65e921893ce68c15abcdcbd4315846f7443ab321b5873c9864072aef34b4915833eca41113b79c9933c428a62a6e20d8ad782872953e79789eea WHIRLPOOL ef1566706e27c393d522d0d5acef470a8eabe6a30bf617f138bcf67190b22e72d9b969ab39d9c8a06edd7ceb6d23c3161f9817d9a34b6f855d8afa21cf76c35d
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJS3TpTRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7ANKD/9XDKTWjd5tQCjwiGdMBHfx+fT8IHptX3y8o5Q5vMDeGuTdleWg1H9rcynU
-pomzxHWlP+0T3wkcEbeQqCjTavLrrHf2zUnhJQmuDLyQVBvQGK/ZAuKjoSTWnbwC
-Vz7Bjey/AaTtCu2CBjN4j//fmMv8P5QdMqZ2MzXyKgZh0GSxzeUKULQwoz3ahnt5
-tuu3IPgy/snaHEONR7bdNK9qByVhqEeXGi2jF9aeot+AqNx8/JTxNqzIv2YXrZaY
-GIXllTnGF8SNOlePNRgRpM2uEoWBs5WqzSHXGH6M9bd2TG3Kficrw/z2AkqM+EdL
-KvQ0/h2I6nWLq7YCiA2TRiV2OwBqjLG1AG83hISYcmP3tQqGhlb/K9moNCS74ktV
-IUkkw5V6Vxvuo5/LMrnV/ViENCE0r24450EcPCqVsEiv+rvJT+lByAJIPQ2AIUoH
-S41cNMCBMumCDCKpH0CXraVU4jxXQ6h6NXMzb3k3g4okZX3/3/zACts1Vu3+PpUJ
-MXGWv4T9YLCjW2gOE57vMra5UWQDyx8Jb2+MDk7OSyXi+Sm8KpJYYEChr28MGRwx
-ADYDEq59MkPJnDoulM1QwW+2g3c3Mf0kmgW3QrtDDjwKij7t3buasotPF8jxKG7Y
-j73MgZxEIYrPfEB3Kr9IY0XfjiXA4rd8K5x3r0hHyFN8gwaQtw==
-=/dKY
+iQJ8BAEBCABmBQJS5usoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc71UP/RF+WacNgknluCEzTqNIUBsM
+Bgjc+xUytCcudN4ntSNshHLRopcDIVHSW+78yabOr4Lul+u5ho0qV8+Ck8ZhIUSq
+lF/HUyu75vlLvmtDiufUpqMbRF2kLC8JrT4xcknTC7uVQQThYvr4hzSUovj7W7jT
+I2fOL4VoVuDNvGZdKe1GYzIr1ymfd7sNYt1Wr1AG4ugg8eTcW0vLY7+ICzYoSx9F
+E0wEdSoCrxuHyJuW3IQkj93IksMNjHTQO6tbq4h2TJ845/sofydjtz/eFao6qqE+
+feNdy+0SIuCgRhFbUwcH7t1D4S4PnHT2j9UwJUjlxefia3f4tcKJHl+mj8TECYoz
+zhqhEzn5inBT6WfJIQ51lb4/CE24AJ8GBJFMzDYI/9AtW4wYLeT3ZI2eUgHnKpoS
+iSzPqs/5fOlo0CYw/69olDJ2l6OsJrc6zX9jFfm2hx1AS+/VgzHVnRVAWSGxjlN2
+PX+wxrET1NBV4D/XE5DOlYS/6kagaiWsa/+Tuj2JryfS6tVMcIl3oMTFWGFOXCCJ
+uSAeLlBUq0o4X7VY7r9r5r3OY0//Rpp4I0571Dw6yRYukRBFpO6FeD08flNes8Nh
+2ybTHk7d87EIMtg8m8rl4zoOjFt6mHZhikv72P17OMUagEgolDZME5SLceB/CAF2
+uo8212I3pNFqdTuNVFxg
+=fzDl
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.1-r1.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.1-r1.ebuild
new file mode 100644
index 000000000000..81b60fc4da9d
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.12.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 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.12.1-r1.ebuild,v 1.1 2014/01/27 23:24:51 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	>=app-office/akonadi-server-1.10.43
+	dev-libs/grantlee
+	>=dev-libs/shared-desktop-ontologies-0.11.0
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	!kde-base/akonadi:4
+	!kde-base/libkdepim:4
+	!kde-base/libkleo:4
+	!kde-base/libkpgp:4
+	!<kde-base/kaddressbook-4.11.50:4
+	!kde-base/kdepim-wizards:4
+	!<kde-base/kmail-4.4.80:4
+	!=kde-base/kmail-4.12.0
+	!=kde-base/kmail-4.12.1
+	!=kde-base/kmail-4.11*
+	!<kde-base/korganizer-4.5.67:4
+	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+RESTRICT="test"
+# bug 393131
+
+KMEXTRA="
+	agents/
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	composereditor-ng/
+	grantleetheme/
+	kaddressbookgrantlee/
+	incidenceeditor-ng/
+	libkdepim/
+	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
+	kdgantt2/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	ontologies/
+	pimcommon/
+	templateparser/
+"
+KMEXTRACTONLY="
+	kleopatra/
+	kmail/
+	knode/org.kde.knode.xml
+	korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/org.kde.korganizer.Korganizer.xml
+	mailcommon/
+"
+KMSAVELIBS="true"
+
+PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 161fea5b1763..4744262408ba 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.386 2014/01/20 15:00:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.387 2014/01/27 23:26:25 dilfridge Exp $
+
+*kmail-4.12.1-r1 (27 Jan 2014)
+
+  27 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmail-4.12.1-r1.ebuild:
+  Move all agents into kdepim-common-libs, bug 494754
 
   20 Jan 2014; Michael Palimaka <kensington@gentoo.org> -kmail-4.12.0.ebuild:
   Remove KDE SC 4.12.0
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 12dd10bfc24f..4f2b0d6190cf 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -13,25 +13,27 @@ DIST kdepim-4.12.1.tar.xz 14072572 SHA256 a357d1da332b294b8d2fbf29177a65eded9d9a
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 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.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 49934 SHA256 5ab86539f153dfccca1c4d793a89e247835910a05567d96d66ddfe40ab08a709 SHA512 f575873d29ce8a00bb016f229b7090d165f1bc9c44208064ea05142ac5ca3c3ad5b4ee73297443947a8043130abebc2b58cb8563468a4a98bda733c297263f9a WHIRLPOOL 707ddc58bbba940e23fa728304b859bf561e5c66231eaa21a9837eecf513e6bb3b861995f3840d7d41bd2e8591fe2ca23e378babaac5b7c177cae76399c8f30b
+MISC ChangeLog 50104 SHA256 b8babf13ec52d98fc6289c830743e7be9bcfe6277aaea0eeb0f1feff84bf35b4 SHA512 bfefa3de63502b4bcc37a3a00b19320a94dfbc6816f62f0c46eaa3a630ab0a32bec49360f13b4850fa1c210f3c6787aa137e42e69944cc006b654bcc14bd87a4 WHIRLPOOL a3e9f82123cf1de31c85b0aee6ec1479d3bf0e378b78c048d22e30c5c652672ba674338106f1dd4916469a96e6a8f221c10602f66b57989da068f2f70fba2c56
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJS3TpbRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7G41D/45loxbwCjUkSZvKCanP12ZXWLTgLxpPoBOFTzM61ugV+wKMSLLt4e5dmMp
-bbxpw3u+n5+aID+0B6lct0jp1NMLzimimKTcJuDS6EaTMrFAB7uJ6giU/kIl7NT6
-PUeEVB2vfZst9zd/HxIo/nQBgMt6IabosSyXhPZBH5RFB1c4idb+SUpvglNqk7M0
-rMArBwcvV5Ar8mC5KtHLGjGDIX2GR7ng5/SE94WP7WMT8HBGSi6HIXWvssy55a9D
-csbULRO9Z9MXOscUnqXRYCT7cuVY98Ufut1B2CE/zjVJrrI8b42HJGJIoCsZBNDv
-kpkuF/Te3gQD8tLkFdrs6BZYxqYc+a/3O+IMXRqTIP6FSR8g7+tisiawFORr4jit
-hNZwL/KeqtrT8PItA2ZzHWV0Vg97mcRvm0hhIggy5EZamwyYZsP8ZHojf6KGxC6b
-5JMAWBwQzovIMe3HSHZqf7l5KkR0sat50Ych0pvPWrruUP8LSE3jSJkivbx2tkJU
-kvynFta+6Bc0wUJg8pRi1KGW5XkIWZeQt5hTT6xNQjAv8rq1l/wrTio0RacxcrAc
-A8t1zskfW7gSOTuaUDpmltzMRm1MGNbegmeyEAa69L02c89wgx1fGg5hv+3G1oeu
-h1/y39mPPnnREbJoV+YerMv+wFyZ2ELzdqH2yunWnFyYeczy3w==
-=FBmk
+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
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/kmail-4.12.1-r1.ebuild b/kde-base/kmail/kmail-4.12.1-r1.ebuild
new file mode 100644
index 000000000000..aba8190f4ead
--- /dev/null
+++ b/kde-base/kmail/kmail-4.12.1-r1.ebuild
@@ -0,0 +1,104 @@
+# 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-r1.ebuild,v 1.1 2014/01/27 23:26:25 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-r1)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+# bug 393147
+
+KMEXTRACTONLY="
+	agents/
+	akonadi_next/
+	calendarsupport/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	pimcommon/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+"
+KMEXTRA="
+	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
+}
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index 76369f7dd5f2..a603227b8f05 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.293 2014/01/20 15:00:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.294 2014/01/27 23:27:44 dilfridge Exp $
+
+*knode-4.12.1-r1 (27 Jan 2014)
+
+  27 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +knode-4.12.1-r1.ebuild:
+  Move all agents into kdepim-common-libs, bug 494754
 
   20 Jan 2014; Michael Palimaka <kensington@gentoo.org> -knode-4.12.0.ebuild:
   Remove KDE SC 4.12.0
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index e3ccbdbdaf8d..0a5b8de661a5 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -7,25 +7,27 @@ DIST kdepim-4.12.1.tar.xz 14072572 SHA256 a357d1da332b294b8d2fbf29177a65eded9d9a
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 EBUILD knode-4.11.2.ebuild 814 SHA256 a6284860fc32815925fd85e5d88f40615d4df6f7c2d07788baa7839f890aee5e SHA512 e2bca30c0bfa5a1154fac32630f93dd8fe6bbf3fb73c3b1d94d560d4eca921cf91088eb1494b87f8254be7c515007674570cfbfeb4a093c624c6a23d183d507e WHIRLPOOL 191d617ecacebd8bc7c309d6dd622586dedcc2f8e4cf5d18b98af29bd10beafe8fc3333faeb45f5dd96ded6cc2b29cbc2f9e7c3663f251d34a71c80d42d44585
 EBUILD knode-4.11.5.ebuild 825 SHA256 ee4651f693f0dce22719e8a873d1b659c97fd67430966719d12b3c8d8f368d04 SHA512 ef791ffc69f579a0f39c923b2fa44de194c0d68f0caffe6641df7e973b7c1f0f620f1ccce6e5c45b0fcf416ee49982adfcd661f03ab06fc8ea220d1b5f85bdb4 WHIRLPOOL 696a855cdbe1712bbd1a488d63dc2efe1317be98713664141f8a131498f7b801c519c20750452e108d3a08e3222ca0219c18821302e201e212e77a8421404b05
+EBUILD knode-4.12.1-r1.ebuild 932 SHA256 12abeb9360d17fc1de06b437c4ee89c45a0154764cba24671f36a2fb26bc1fb4 SHA512 3c4933131acc461013c8f8a68c3ec37bbb94479965598c33befee09571e1f6b10794a2ce95fa98eb3a1adb71527dd923e4cf4440fa043108f2b7e6adf9057cba WHIRLPOOL ba2e2624b0bc94af35016f06bfadba9f60ae08809b1015a9996274151f07c34efc1caeda5fbd0d1b4b305dd79acec0209b91b1e1ee1fe4d2f70a945c6924d002
 EBUILD knode-4.12.1.ebuild 931 SHA256 caf45511964d5014dfb47d365c3ac4677e7210c0a045fb99eab13f49c05be6ed SHA512 86b0e81a40dc22eb0c7578059ae5d845b0f53cc9164f10ffde8f8e2ea92835a70a71a37549bfb131c0863d659577fcdcd7f921b3944fd6bb24327f7592bc808a WHIRLPOOL 35d545b27d16a17c5f5ae995b69c60be8a0eb64747c6c2905c2a1a37dce16b341a0ba87452e49b6db41552c7d11fc8bb1645cb9d7a379a1a0e82c09d448b9e91
 EBUILD knode-4.4.11.1.ebuild 710 SHA256 932a8b547bce94f4f3a7b00f9d320b18f75ab7ea001918261c35a69e32287a65 SHA512 876c82d396af60dc3b2dcfc8319bcf2a55b963d992aa5def89aeb6c19423142ee7a5a71dfe3b3e950b2bdcc5412b1b9f6a4bb95c091127d0e12f8497caa5d17b WHIRLPOOL f381b196fbb930464d43d42e3a5b3692cf11e0d33d0873cc4650a95f1eafd572136e9d37b2b3669b2cdb616e77cd3a39f873175c101d9043460bfe8f5a1a8f5f
-MISC ChangeLog 33521 SHA256 66fb791cb8be9f87012b94944be9ffb4dab8a40226e3454bcd6948c14bbc99e0 SHA512 a7ec67df199e9695cc023ca34763524f1a7bb4bcc288a16eca30e64169f8bdb03f0b10b750cca7a2f714f6790970b714a90886d7563936dfc0bb890b785ee719 WHIRLPOOL 87fa768d88fbc43b0a6bc14ce11c7c5bb794f72ab974fd6f4313ce2fb21d12f5b8d7b317b3612ed2fe0fc436c23b54c28aaef95afae31706b4c6f40e1b62c970
+MISC ChangeLog 33691 SHA256 41cf96a46f7d059622e41030ac315e608abc524dbe35f9b3a505a442c3eadf2c SHA512 7fa8fe1a70dc2057a4a513eec46972d20bda2afd32a64d455f93bc8b4896193b8f34ffacecaa379b6988b1b25881e8f29079e11a20358ba62dc1dc149b9365b0 WHIRLPOOL c84b387a658c8b91f1408f37b85ca9eed3400093e1d93af23144810287312b1a3e6fff63c06ba6a73d832e394fd0cba82a3ef1a34a76adbbd8619ff1c6d7f334
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJiBAEBCABMBQJS3TpdRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7FSuEACc459SDU6pSyplN4y//0rYQ/QM6qs6hcVv/TBcI/TtXBu+1U0WAvk5NpSB
-aadEdA6s8zINY81a8xZQPtrrD5pAFj+pe197yrt/6DZct4S4KBhd8bOuH71fz5gO
-Za+Un++wEw6CbvcR2rFvQCLDsCCxZcqIECO2a2juhMCCU1niyjh6TQ06mAtZgYG0
-STvJT2aYw+vIzNxxdgZplwbIS27kmgULoI8fuKvo6y/V56AVH1SXWU+LEsNLDQoE
-N5iYdjBJKuJvzFoNFweuDyXjMifKw6WJNBQSYMIMjMbOJIUbzqaaTgu8FomDckzB
-3lIZ7qgW+qEbsjqcM06FlQ8yeQgz5vFyfLJM12cvZHFLcoX2RWBTmKDWG+LryfFd
-+elKWtwJj6qq55lZfAaY3lb2KWN2p3r3Is2u1zxFQsjsSjFtIFXQj1BcMLboLbQv
-V29LIm8zq5WqHxpC27mk4123WtTe0NRSDEL4dB8TL3pk4tSIxCIUViVBlxQeWkHC
-hQSl65M2vsMjJcHhEbNpLtZVmsQcXJxI/TybYdQ7iURvYut3b2APiSyGNQKf3y5S
-rpABr9wR+gkltloG4Y3W+gKq/VNFC8PF0bCzV4HqvJ4B34nVm8A2bxjBiCRpBFRV
-IJyM91T0XQXpSg5IkJ/2saPyoSgfB22qR2lkw53Om8JmuzGwaQ==
-=9srZ
+iQJ8BAEBCABmBQJS5uvMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc0ZwQAJb7QkfRZT3GXynYq/mRqKM5
+4ou2nIArDM8IKGKVAKgjxQD2DNDsLy1VPGZUmCowI/+QFP8W1Rijzjcklr/0o3hl
+5haHxXM7EzlTfJLBuv+CpTI00YViaxelOd+BhW2Mf6DtdVELfEqYLRE+jHlfxzm3
+tVNu/iY97WrgwUCK2mDk7rxtpKhs8QKilRkc8D29apot9dEKCVLaTmQI/2hV5M8k
+mCiXcTsROPGDjMyDncp73iwM8T74YvhJIT2ji8BCEY40JOuXoBBbMgAD2Gon16xU
+bIIMLqaQtnKkf54QVqnxHMcSaNGDLVzSj/1f1qXgqivNhmdc/jc+2SachU2WpoNH
+qI9+PpyjH+CX5cgwiTfBesCF1iAudlkp5a0c7uqK09UEw/yHEWgGFSfqDohhYaCP
+bLDCTyRUPV6RGs+2eIaHtqqnDXqrP2AfdeEnRtZn0xW9TAJ8Ll5k5L6f4c9Nzn3S
+SnxlrxjLZa/XdASwUMi3AEX6JECK+WobNrx4yEtpqH96JSPyzQ08vrTUyvKwtZo+
+PxRxErzJZi+SaSMm0w/Rg4Ev1MUkPVDK8X1CG2Pc1+ghAYBMQD4Fi+X3p2F2rOG9
+DM5K0gCbrC0bft7f/DrQ8DB45z8sbUEuXPkHbnl7BEP2hIBn+pW7b+vnNyqUX1S0
++oL/yrpJSzsJhySnWYxj
+=clQd
 -----END PGP SIGNATURE-----
diff --git a/kde-base/knode/knode-4.12.1-r1.ebuild b/kde-base/knode/knode-4.12.1-r1.ebuild
new file mode 100644
index 000000000000..c8758cc3d073
--- /dev/null
+++ b/kde-base/knode/knode-4.12.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.12.1-r1.ebuild,v 1.1 2014/01/27 23:27:44 dilfridge Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE"
+HOMEPAGE="http://www.kde.org/applications/internet/knode/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs "" 4.12.1-r1)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	agents/
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+	messagecore/
+"
+KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+	pimcommon/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kioslave/news
+		"
+	fi
+
+	kde4-meta_src_unpack
+}