Version bump to Pali Rohar's noakonadi branch

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x0B08240A96F66571
author: Andreas Hüttel <dilfridge@gentoo.org> 2015-07-12 22:12:49 +0000
committer: Andreas Hüttel <dilfridge@gentoo.org> 2015-07-12 22:12:49 +0000
commit: ef323f69e0147f7fc0b77c59e1f011ec726fee6a (patch)
tree: 973075727ef514dbc2fbf0f99d5778f5b698595d /kde-base
parent: Version bump (diff)
download: historical-ef323f69e0147f7fc0b77c59e1f011ec726fee6a.tar.gz
historical-ef323f69e0147f7fc0b77c59e1f011ec726fee6a.tar.bz2
historical-ef323f69e0147f7fc0b77c59e1f011ec726fee6a.zip
56 files changed, 1207 insertions, 312 deletions
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index ed6d07c93967..1feada38c5da 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.359 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.360 2015/07/12 22:04:02 dilfridge Exp $
+
+*kaddressbook-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kaddressbook-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kaddressbook-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 8c4cf0f27972..23711bed6a67 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -7,29 +7,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kaddressbook-4.14.10.ebuild 1165 SHA256 609dfcc5189b6f989e2f9c7ceb3e2c8b1ce74a14eb22e022d4b797977ef84020 SHA512 0651ebac44ef58625b2d2c24581b315f210222c4ca603dd61fc00d9664332605722d8dc4e7463936e2cc63ae93a35d5604aff13cc2f64f55b6c617bebf61d797 WHIRLPOOL 33730cb50b744a8d8de00b84721af70942c21588ab72427510935f2e1357565ebc03f8236bb5bbab25a40b3cbddfbb1067025abad590c0eaad57db36bab38430
 EBUILD kaddressbook-4.14.3.ebuild 1131 SHA256 d1c57d58b17ac106e3f359862c6802a48eef7dd6d95745f522c4869b04ce1436 SHA512 044aa6a627ef89e313850d1782d9d6600d219a6af7c299d7d9b894a2207025ae5ce32fb9c4c880981e9e52e9a6e85e55931c2aa483c5d4747fbb03ec7ff941a3 WHIRLPOOL 474f080b12a42bb505e803b17d4dab2857df63e9c8831b8e50ea128ab12caba3f5fbede5419803950bff93f6eac7aaf376251d117a1e07edd6253734d73ccb6d
 EBUILD kaddressbook-4.14.6.ebuild 1129 SHA256 d305c9e2b204ec14d76d26c71d0db1deb286c509726ad71fca19b32508f4fda7 SHA512 9d6b7d9589fed986ad2e7cfb15771f701e05ad639ac05dbc10965869e849a4248d2a834c346baed4e393660afbc60db7716f98c08e66557c174252bd32fe3ff2 WHIRLPOOL 2b521201dc53074f1ac56afe792feba7366c202321e93939a2cba3d828d0d5a62afee13b74d9b031f1b69856b5fb2f776016f58fbdb5d4ed4e1659ba3a07e454
 EBUILD kaddressbook-4.14.8.ebuild 1152 SHA256 2ffc5da93282a7850e9d7b4ac3b96f5acda238822b528ec3fb9d47bbfc66afa9 SHA512 128b6819b813f20a389d03ca90b2cf81e57e805b494b5bb41ec40c8e5af85cafec010bff5623b86f6fb4cbefbb6119bea0f6cba6504359a33053a4ef1bbaad6e WHIRLPOOL 797f012097422283c55407a7b3a6a9cd17f295373bb3670e33182c66467d5357f25a1a4fd1c437d46f9d4048aee7a80a12be249b3c9941e31ba980f8e19482a4
 EBUILD kaddressbook-4.4.11.1-r2.ebuild 971 SHA256 8471d733e7dffa322509ba361f7a5f352dd52260c57545327f9afa258d188575 SHA512 da225d44c1fcb5ef12e052e40c04e0f53ee0df18c338ec7d51f8590cc674ec98c8bf82119bbfa42e468246c610ce458e94a426b23d087e10ea31b4e847cca34a WHIRLPOOL dd10b2f5173564a7ac5e98127c9b31a53108b8d4ce3b009a31a62f6746e17d2d9de266b56f0c3e6ba2093c038b6a77900fd71a630225b39df2df8f8fc97b138b
-MISC ChangeLog 45920 SHA256 bfab2b2d639526f5087de3389787525c8dffd5417158857ae12ff20c8ec86421 SHA512 bc6cacbb46707a8d80e6995b34f5c6afd598fb6ae3cf463e55cd7628818198f66b0e2fddd791b13f4a47379ca235a01f8d6843a9587a3eee58666ee31d254b45 WHIRLPOOL b4554354561b21056fe7be02111ce64002d5e3e06da5990e9bd0fb7b6071dbf3104f3f33d556f5414f74410e1bd9e9599100efb3905479519e4329a039e3a68f
+EBUILD kaddressbook-4.4.2015.06.ebuild 1242 SHA256 ad97a802231e7963a930e94c99d2fd1116f4d48bd43406793476373e722b1759 SHA512 e0718c46e6662bf4464959d7c1ebdb268db3f184a8406e446cffbd243de0b4440c1d2788a0598b46f05a1ec7fe9b399d892f2d24c233bd72788720dfff357025 WHIRLPOOL 449c24843766a78dbb264a03eaaa77ae08fefb311d16553aeaede07ba862ab7a7250fcef92f8935b1a27dc796cc4c9afa0000ebc3bf2f3e914d63ffcaa85509b
+MISC ChangeLog 46108 SHA256 ba54227ee840cdc6a9852c2da00cf5e5ad933bb461b5f8a02993248d9b39d512 SHA512 ba13362cd25cba25236523bc1c72b74c17fbd6e459e30dce87da828ef1ef9ecd75bd5ffd65079d02967369d0e5a608e93826c1f565d8baaa7023cff7967e4ad9 WHIRLPOOL 7da21a170637dbd06050427ec77357bf2d01a2ad4ea927e7b3e9701d65ee382ec2e1d8b411e1b27687e0fb53c11c9c9bbe9fcd28ff4a34d33b2d748e607ff2a1
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vzV8P/3rZWutUwW9o4OrMpC15PGgT
-dZfTQtpILZhJOfI8Z0cM7yzbWRO56YI3JA0oNH0K8izb0X3tCxqSNbuulQbatdTU
-Uh9XTzbXEaVaryAYXC2S94DIK3cGkS2GTfPRR/loQWgfEa/h0J5VA0qywotycmNr
-NgdNZmTRwtlSAjofRNOHgaSR8YY6fyoNui59d9BPdQUv1WcmbAKEzq6Dncjsxcr/
-ZOvo+dapXzCMo18NE/K3sN1NREhGLmIPAbauHxW75/4/vXOLS+V+KXp7UnpzDm/h
-oIqR8sVlC6bBVYYtnlteCTbFNRAJHnW/2FK/Yw+TGpfJckXvF7tI48FCcjXTRXLO
-TxpveESV0el5/KGKxCD/e/dMr5SO9Pbd6ZwP4wUMiUfvXMR4AfZA7NRFu1npfzGy
-C+TbKKMpdIOTAPO7+r/gjhqZ7Or5CSGNAr1uH22P6MmUXGEcfXm0OgBr0KBbgIZP
-Ft9/g9t31KmiZpXAiopuZJTi0XPrL2nTL+l4nDjWUzN1PCmhy2DRT+AUHCrKDjAa
-C0RkPqv8KhYPRfJwUbw365baMZLRRlON8i0kwN8jGuWicjkDTPaTArA7vqwftD5m
-g4HM6zdD94zSorRoW4KRPncxdr/hrQMYZC/nsVWqDHgBsXnpxi0qUWmhkREtoLZR
-ZKbwjq9PU60PkPT+/uHj
-=wUwn
+iQJ7BAEBCABmBQJVouRTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5ctQP9ikL/BYAhpWOppJJpju0iuYR
+q8GocLDAPxLvjN5H8RiTLRUgU6MjXDkOd0Is6JCjBj/IcIpiav6xcyb8nQoaSTOo
+LLDDHe5IDmfzt29c8AheQKP/LnFeeQ1IFyJN5S7deWH4rOiJFjUuWzcDXpOICgI3
+RStYXlz3qW/Ta75N7q4nn7qr62LzzOlgAshQ3xdvl5JXdRJc+HT2aacrBya3Ayio
+zBFBW5llu+Ox6wr/JkDANBhZeMqj91kQcMZwuwIyTuLpUd4jRAh51vui+1UXkEzb
+kVk/ylgtZV5+rCBXK2MOZRFFaPu617nNc4XeWAgEPGJaNSsbtmI/U1TbrFGpQ/ZQ
+VfcJ2SRTgmjwyUayqNeLMqx4DUgOT0+HD1JWXzYRVytYhRln/d4SV9crw1kdir7m
+irL4qZayUsIw5yzeQPQNdQ9ZO404ecFHTEJI4l0tTcqEuYdeq6SAkKQAT7UvDid1
+aVmuJkG8yNsJR3xIqZdKekGpvOsoOXts8gxYMaUTIniwMcOMUmD+lELvaNMXZXd4
+SKq6bCZD3mnRXHU0CdYnbD6j5x/ILPwz4bIt/wcUw+uo18TJ9NvHP4muVZFV1Ugd
++UiTFW1ORgTYRFeWi+Gs0vHk0MO1HH6uzFMjj8Yf3FQd0hmZntQTO6oYE/bYTXCs
+8zKaj/ML42nbMrAb7g4=
+=cA9T
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.2015.06.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..325250a9ad83
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.4.2015.06.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:04:02 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs '' 4.13.1)
+	$(add_kdebase_dep kdepimlibs '' 4.13.1)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+	libkleo/
+"
+
+KMLOADLIBS="libkdepim"
+
+src_install() {
+	kde4-meta_src_install
+
+	# file collision with kde-base/kdepimlibs-4.14.9
+	rm -f "${ED}/usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop"
+
+	# install additional headers needed by kresources
+	insinto "${KDEDIR}"/include/${PN}
+	doins "${CMAKE_BUILD_DIR}"/${PN}/common/*.h
+	doins "${S}"/${PN}/common/*.h
+}
+
+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
+}
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index 5c8764765c78..de8239e067f1 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.347 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.348 2015/07/12 22:04:28 dilfridge Exp $
+
+*kalarm-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kalarm-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kalarm-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index ca90f8dc4c3b..525980db0276 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -11,29 +11,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kalarm-4.14.10.ebuild 687 SHA256 b04a594eba438ea5d4b9ed813a2337cc211b43b32ed749af86373bbecf7d294a SHA512 ec2f3cbd22cc0025d743e01b377b8feaa46b8a4c46c3d98e9d07c4b161c56fc773492f533f02a3c90ce2e4f91d9434cce26b4529ed4ed0503322862bc094d8c6 WHIRLPOOL 34469e8ca5b3e9f1b8e6eb69a770261c376cde976e2f740ccdaf2e827aa745bed3cb27337a95d8be5eb4738c27e7cf254d4a6325ee48d92ba821cfe314de8b47
 EBUILD kalarm-4.14.3.ebuild 645 SHA256 7b19d0cf98a6e8983d1fbae46f34b78a3457b42a66dc9c91f5ce796df95801f9 SHA512 b7ba3142970db26df06643503735c7fb5861c88f978b080df6ddba8b4f37c3b43173f463654779a4f78bd4528660eb482bb0a905972f0f7b373a1a799e032476 WHIRLPOOL 1e94556664e61cf97c7e401a99a6124e6a945d37edc211fb10a051e90740754198485554b1de2e362d932541b837fb727e113ccdcf7ba1003a6909d09c43008c
 EBUILD kalarm-4.14.6.ebuild 651 SHA256 2f7aefe6164892db93de875db715aa06cb0a1668949ec9c7e321972466cc3607 SHA512 f925f5056521587bc5b575c07dd0baa869348ba66a0fffda87bf594087fed4cdb9b7f330f170da96f977cc7f5991ed30f5405d26ce9ff3c3df5008b283395c0e WHIRLPOOL 4fd06c1c67b6da735a8467bac04101fa1c89e0112908ba1ca16f1cb203c0d79b51f18a97678bf910233c2467992b441bc845fa9f2438f34fd1a208af4b8a88aa
 EBUILD kalarm-4.14.8.ebuild 674 SHA256 7d11572bb875bfb7879aef858fbc0ed4848561d13329760d4846aa29fecdff4a SHA512 96c8112f6569e8612b561350fa56a24392f9bf70cf7c57f69dab73a17d3ef98399001ee7470688856758addc32ddeee1d398af48fc5b33647cca6d849381bba8 WHIRLPOOL 8b69182d7110c9bbde9794cccc23a51258e67da57efa1bd31f0210fdc7aa1ef27fcc5d5978a8d0aa805ee91dfd122193c135a09347cfea751b2ea1ccb4ff4d6f
 EBUILD kalarm-4.4.11.1-r2.ebuild 852 SHA256 53946b15a65ff4160e6ffa54adbd41e4731e67b3814993eff9172b40dad48c8e SHA512 152c9ddd78b4e7411cb2b8853f499a4a2e035a7b10db9bbb1bcef3404af5163f3341d6d6585a5db512773f18af4e1b9882e27d10983b44f3d3a91e79bde426f7 WHIRLPOOL 0ea1491162f5032e280799d6ba1187597bfa8c9f070ce6be676c27054d5da3f5b83a92beb9cedee50f608af6b7986ddc2f682da15611a35bb07541379b7c5154
-MISC ChangeLog 40610 SHA256 71d4df9a37eb90695786c7e0ffc3be85c5e2c71426cc59831b7bd60698ab1844 SHA512 55324958b6b0273058221dabdd3230558218f45f921d20e934bc445383a2131de29d2e2b1e2e449daee6301a4b0f7b6637930cde7868328733e0484292ad0c18 WHIRLPOOL 554327a9f1f48f6c86f53080ced2d921cf09c97626ea26f44ce908378e41321da29ba38946bfbaf188904f3e134c0bbae8aa3431f6ac644ed1142bfb415060c4
+EBUILD kalarm-4.4.2015.06.ebuild 817 SHA256 f123799827041cbdf40bdc4e072f5207e368b5e3c12df59a0def56d8e022862e SHA512 ed3dcbacca9809810f83e42a18b22dc5a7ca29f82fbd8cdd707bbb6b567dfa7b3737faa33ee67f1cf784ec6a65cb72fe3dd5b214910bb8db8948de6cb2164617 WHIRLPOOL d6dcb1004b85f8e574f4344b5447631bb04d6aa06e9a369b0a1be4ff62ae8b39bbf379ab670683e1561e4bc7787f3eb84fa39c7f5aa6182b9d200459012bafce
+MISC ChangeLog 40786 SHA256 8567471b8de81057f8f782852ff613b3794c704336ff1353996324c7af390e10 SHA512 6a496474820f25b84a58a0057652fcd7fb407de81600cdbc9fbb153bcacb9e2263e764c214dbe28dad973d82738d8ac3b6a302772eacb4960bb4d9ce35f11c15 WHIRLPOOL 07c25d495d54fdb1931c4db86efb00862e0ddef156faf537b47f8af7f4555a1ad235569687b66a0eded2a55dc58e027856f2ba6c9c66eb8e6b72a3362f296a10
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vRmwP/1zJNX5VoDDD0YECAvRZTXQa
-5HNTu0/dqYsCt12NJsycILtXlSNsUxdDv/Q+yNRwg1yd/nVksD7EMY6yi0NFKm6s
-NAGjqukYKSoC7TTOB2dC/FIvRdciwa4mnLJDsZTMezY1JC87E133dI2wCqkUTVEe
-n3iHoseiZRzC4sPdYM8rKMZ+DQkeBun0pIlTyioDajoi7X8XENniDT3O4TNuSDeM
-0n5XXlesUkyxrTl10BFnwUd2JWKz6o47b6kVmFtgOp3bw9eF86is8nHyGH1tBs9y
-8SdOiV8ATGlpCtJPjK5U4VOZoOK2o0OAPrylmnY4BBtvk1L6KTVt/aA55SWV9gtb
-kPwR4BzOi8u3kLKOflKfUEBRG3d/aKM681C9CdglhEQa9e5mssj8westgemrYn6b
-pwxViHWOL0B/nd1owIRT10GlFOfRI/7E49lswpdOdz3SKFTv/0UhzbkcZ7Dg+YfP
-lfhdQz3P3kC+H6onE73NvRdChZPboN0rYSev3z3WnAU09tV6FeypJddAlrKsAnuG
-3PziynQcg4ShMUq61K/foT4kHhtofl91nBxxqUM2en4vacBpq9xqIO3cCrjn1J70
-oT0wpv3cIHgI3rMtbUELIfupEq9VAAbjPSV5RVVJ1F+rJQxoiLQFN3TEDozziQTM
-qv5JkozUM8koeJcpgEtz
-=MbZB
+iQJ8BAEBCABmBQJVouRtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5U84QAJZZH92sBdskEGmYyFysZ/EE
+QD7XsEeReRMYxWzctu99mlcfdhOzmarSZpV4WsnFfxE0wJSTBW8crBHVecSjoxKL
+/X1wsf4+VITe1ibh1MlaayhgTObhpfooDyc78lp7AAyewKN4W/HSOrdMHLZ0+Nhn
+0oXtvRfvFLDxjRv3U1FYxpjcNCyIr1IUuLri4VNdycOZ4D+dzymquPGhc1LoBDZ1
+REvxGL1IfqS+X8wjeBWQ6WdW7aV8U4kb1UMETphdrHvSvw3DgFv7IVVGl4tlTnop
+4qH9ouUqdctzmzbdyHMqUM7CCht6110mTwO6GwYU3kmgrrV/0QzsK0hs4baPFjQ+
+akasoggkwBeWxhTNIAgaCeWqaAJQ4Lct5TErr+pL/8GysgH7UYnV2wjqEWOQRQef
+gGYLVqi/5ewDThrpQtuIYdpBr6M0XvIMIgEoD9EzN/Q+/zTrXoC/6q5Qu130Q7xi
+zXbQWA/goc4uLm/X4gA58b3AaC36NZSntvs8nZYy48gLrZVeO+w1p/Svj0WMToEN
+SxS5K0mAkrsbpAXq0jaPBopH2lEYLH6xYU5NG57Dk4H0cMyYVUAaCbbCTdTgeZgf
++DNJjSG9Pe7Up9ZAXbPSqKy2BNaojq2wPGI1an87bRqdsXBvE2vwnb6bDuRdRLQc
+ZwZ4zyusESdDZINORp+O
+=/AFV
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kalarm/kalarm-4.4.2015.06.ebuild b/kde-base/kalarm/kalarm-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..57e03df2b2d8
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.4.2015.06.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:04:28 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	dev-libs/libxslt
+"
+
+KMEXTRACTONLY="
+	kmail/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.11.1-underlinking.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_akonadi=OFF
+		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdepim-icons/ChangeLog b/kde-base/kdepim-icons/ChangeLog
index 19ca079983d7..21e4fa960650 100644
--- a/kde-base/kdepim-icons/ChangeLog
+++ b/kde-base/kdepim-icons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-icons
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.236 2015/07/11 11:49:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.237 2015/07/12 22:04:59 dilfridge Exp $
+
+*kdepim-icons-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-icons-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kdepim-icons-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 81516b359e3b..3ce331f6fd8d 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kdepim-icons-4.14.10.ebuild 477 SHA256 d59776587d691fcc95b756ddccbd5d0d5a43f14ef1e074d8ce03cf783cd5a2b8 SHA512 ef44147d5e49687524f90f566a281ebca79e3cf0d2430028fa682a06fb78733aaf2082d41c4030a3a13eaef730dba4c6d66c53cbe039e4664dd5c7b5e8deecdb WHIRLPOOL 0e780580012a50c9f102c1d0ff9c166b085749acee7f53e87c6f8bc7db850d7c4403f73af9089e46fbcb89e4a2e1c41b8b53eb34fdd38decbbc8a296a12a38e9
 EBUILD kdepim-icons-4.14.3.ebuild 435 SHA256 1de27d9cfc5f13682ca029761ac9c2048a905fe425e2089c0e8b95d839b8fd6a SHA512 8cbdeabc85b350e4ed358bf3b12cd05b0eb99b0256988cab55a99e19421d52df5c12e6d21a21df6f60b6ef5f3cba3720b502816bc3e32c936df832f3b782fdc8 WHIRLPOOL 95d05ef3fe570adef2434f794e5ddeee172936fae0826c544b22073ddd0efec053e2f4b90adc02fdb3ab366bbbca6564458027ae65dba9eba9f299f34d9c9155
 EBUILD kdepim-icons-4.14.6.ebuild 441 SHA256 204f085cfc173e8afe31cd52105f7fd755c7af52ae4f4d6d66e8ead7a9344b83 SHA512 585f15f740e4480274123a55df4c1e85de98a8b1821e3a9e267b9ee7575dafcc343580360780a3f6c74c93e6e70ed910ae89d1de10d26af6c38de9c590cee330 WHIRLPOOL 5388c3ee7292103800f7a224426333fdba0fcd3c6be49b29157840ae4a9d071b365e50af83abb42e4eae56558a419f26e855469a06123693fa86e9102c271ff4
 EBUILD kdepim-icons-4.14.8.ebuild 464 SHA256 ff8c6f0d38396505a2c5936ea149bdbf7f50aee1893ef19e90b7d34a862de998 SHA512 4a7426b6c80e6c8bc6906fbf052bc89be6e2db0cfb37b76856bb2315f9706010efbb4c533874d773664c2da0492e91c835843063f26369ae96041d92f366f93a WHIRLPOOL 8d5702ee4ffe1d12c97cf9168d75af75106f5a8610d8b85c85e624637913983982f1ab913523e76717d55ed7cd3b445802ceb9275a21b0798ffbfff9024d01b5
 EBUILD kdepim-icons-4.4.11.1.ebuild 534 SHA256 d04ed78a3ae2cebc7c9f11e5a84520a6eb70969f12f0ac5269cd071656a2c2d2 SHA512 df9556266043fad994231ffad59dbf206a86102b2a7f2a40609649e391ed6a25085d85955ca8a011d91a8e0d2612a5f87660f696f16da2e827055f58e51f2a8e WHIRLPOOL 57462a8c0e55c69c11122bba63c3f479a51d0352d6de1130455c9ff9c647a81ef96d018537751f163b8371bd325c367f0922dfd83a05a50085c0ea812dd1d42c
-MISC ChangeLog 29198 SHA256 3e97864af891a3629c89327120b44072803677b823138d9b3ea93336214a3804 SHA512 41f693f09e102fccb4175a856e8006488e827763b0955342584f230f42470ea99140c80466a4b6e8e290e31cc975d383864234b13ff019d02235520a47e2f709 WHIRLPOOL f9bb8782f409162b47890a2e3026c9f3abc6a7c16b78f3cc5adffd48aacc2eb43bc4b8b505bd2a597ca9369621409026173ce57c9ec997887fc62c24fec4cd20
+EBUILD kdepim-icons-4.4.2015.06.ebuild 559 SHA256 514a82fc2107b20fa7ce87a769ed324f37f9dc47e873aa8b0a61e1f7118f7f99 SHA512 f0496930a45499f35565d96fc2686f3c1594a1746980ad9cc5cd3133c55c64c6e1d9c2bf49f202c06def2919837328ec59e012a990cc9da860949d92c6c4a415 WHIRLPOOL 276e595f4deb569ca44ba1c1f3fdbfc1b5cd3c1c71b32500e953756f3e6ed36a7b24b8d755096a5b3d90dc401f41c4b60cc17f366dabc10501c7f1ed378b148c
+MISC ChangeLog 29386 SHA256 4a37311ad705dac384abe1b17a326b32a7d5e75809d7c83795ed513cad115791 SHA512 34db503eaf0603f3f3b2cbb78551bd6c664a52ef670bddb7c872aec130bd9046d70fa25dd58a7ab4277e36d2db11a2c8f8246ea5ad7ce3ffffb1f7eeb324d817 WHIRLPOOL 53f0d32860f529879bc06c0877e0a3e9a89fda63b0462869d0f9c5ca204f8f81e877beead1cabc8a8fba6e1ab8213b266afb7d39de0ca4923c867a66217f8e1e
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vuNcP/2GRlxQhCRoI+RmQyGeaxHqE
-rRVYw93Utb715ROa41f7GZjl5VxdytkfMcnAxuWZvUxTO/RmnX24l52JXLzfxVFz
-y0qEb3IikRHrEEmFg38UYvNL9XW4atxV9sz5PrOdd6qo4osP03bPLjnSJVL1kmqn
-BlvYEN1Szpw3pdMP8ObhUlGlEUNkH/DvYV6Pv8KvWXrvLXCIiMaBbT9v0cX2JKry
-F+RHLXA0kHBR6JPr/fZY/5TJd9TILBCPmrCiF/uvt/NbrPoqtsRaDpilLhTdZywW
-x9vGfvDsyYTesmdUV58zBCaU01f0xTeMZ+0vGqK9ekOLtgOGmnSJqbd99CIa1lzX
-n3H6BMRXcPrL7Ykur279JaUwleBND6vsp7OlX3D3i2kjSz7g9BSIR6uuQXOAYq72
-xCMOianTkgGFXiaJxhh7mc0dXwc1JH0VEOUXNXAVoPgkUaGEc16tH4W6pJZXqZMX
-USONxrU4/ehHYTE986caU45Gqdhszq8arc69mmj4i04/pGqsltKE0GltgJZHUPnf
-9rCU+cJY3274YY4IAEJ/pvGAL7SjsUoDzKqcPhsw+rv5PIGf2WLQ793NExbu0Vrw
-TEk2WnOqwcc8DR9m/j6jRIR5V8hscPBA1XHyGMcty69hgEBd3YwwonUFyfaoFNGZ
-F5ymyGxc3/KRVsuzYbWi
-=JKlj
+iQJ8BAEBCABmBQJVouSMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5/6IP/RpAXvGdcvWN8NgxjWT+uO5S
+q1hE7/VaU+mYpwf5CqZcMZWNtel4ezhSOQvjhTDWkD/Zos+Y6ifhFDmslUMsvBa4
+a055MnGBzfdUU7U5FWNNQwGfcmSi0+JodNnnXOoK4o0y+VcBWjWjXIfq3YpWcISk
+/HMXzjyA4pIdnTnW4MVBbZmkVQZELgBqkLmHuNTCSVczdgOIC69iMm+u1ZxXqlyO
+5gwBYuxDAqCZfUoxznzaFJwl/4yiVyLfNskFLr74D7fvaX4gGyUMD0KOz4UO4Fj2
+EWLYm4Tp/BWQ1eNgW4IdRS8orx7PddiQA8DTExzezy+SdNHPQFSuYDWOOX2ueVRb
+dUylwC0sfzJIGxnrdtwLI6UD0Bl3I6IUDo9d1+Y6M1G/nwqVy7MegV9ZwjX4bw9Z
+iyDi1Usv2FnJC7aFgsG5BxOy+db6HGbt4uck4GhkD479mEsIFRAR39QlHY3AjvE4
+l7vJx7IECKrVQ3kEUU00RRVI5unwdJ2f71xSjoGdHDg6turRvYEP4Nt0jkjFjvuA
+ev04ouQk9E+d8O9oX4MS5KGIZLu3fF/NlN978n5sWuJbEz3d5os3qvUsqMNCJiLM
+LXuWKIDm53j5PuLQeZbW50qzNjqgLmZwP3Aobel8WVhh78kdphgL/CXJO5Q09OID
+t+JytJQ0VcGV8lAR5rQM
+=WIcW
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.4.2015.06.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..e279fcc00e9d
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.4.2015.06.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:04:59 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="icons"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons (noakonadi branch)"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+src_install() {
+	kde4-meta_src_install
+	# colliding with oxygen icons
+	rm -rf "${ED}"/${KDEDIR}/share/icons/oxygen/16x16/status/meeting-organizer.png
+}
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index 096563360f9e..1907dc8cfd36 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.347 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.348 2015/07/12 22:05:24 dilfridge Exp $
+
+*kdepim-kresources-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-kresources-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kdepim-kresources-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 563fc1b07c33..46c4716fad99 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kdepim-kresources-4.14.10.ebuild 661 SHA256 868921ff6b4bcd328ac8a89aba51d24343d31f3fd5d6c20bc2d450d585e1b967 SHA512 0b0609281d9c83c4a0fe8f7c2ef02efdcfa0ff3b02a9d21ec9501ec39dd0754d0b6fa7be4de459c4aaf9cbecf3fdb0c219f40a7c3e6b4218ee51962c26ccf14f WHIRLPOOL a382872b8816f8a95e183275bba61c8c190dad99c8bab71b48d45e6d85377d18a8024b3d8d1c813fafc4d6c5a71d107a218f7c627c1aa91d326dd2b1218f4741
 EBUILD kdepim-kresources-4.14.3.ebuild 619 SHA256 0ed3f5e15a4c7463cf14c7c4443fcab66ff58cb8ce6e05963624cfbac3967059 SHA512 449c01fb49e9dc2b2715de0ad7db81011feeea8593769d9ddf8b4389ce809082580f30f5748bdd2420f861df8867ae23e8d644d08c2e3eb651aee47d9ca1fa5c WHIRLPOOL d1ae9a34878bc65a46aa84422961c3596ad40fe424bda68f199a2598a7bdb522c165b18feff8f307c0c6e407f15c7d1574f2b9aadcae4e8b4b0853c069c71310
 EBUILD kdepim-kresources-4.14.6.ebuild 625 SHA256 2530a84947df4e011da8d2c53abeb576674e34d81dc90f91a8fb2d5b161b39ba SHA512 b72d289ecaf473bf35b8de243cf004a0dd9806a76fb9638f3997561377cb70dfea50d104ff197d3141838ffca99b445c62034587cfa16a2d0e3ebe052040a3f6 WHIRLPOOL f2b43a412b24c57ad121dc00e92cbe56cf3cac777a98b355b2db145264955b73c7a666d38882f965126c6d434b796fab98c105720ca3953f88fe39f31c79638e
 EBUILD kdepim-kresources-4.14.8.ebuild 648 SHA256 4343e217cc0cc96fb1b698a4206b5992ef60a37d551887fbb3954447d879a02e SHA512 d6843ab9b726bb4a833a46191065d82306fdd040a8d4bd86e5d3a6c11e8e9109dd9702489ee34a3d5b4290716d219df9b0a1620c5c2e8c54eee1423349402468 WHIRLPOOL 0314fbac4646b60304b2c38b2d175c5464135ddef4a9c2428366986c63de098ef7a3fe98d8b3a663fc2e4f374f304dbb37cd9ca33bdb9bdc896dc1178b083257
 EBUILD kdepim-kresources-4.4.11.1.ebuild 811 SHA256 e71386fe4bc189fac3e7d4484f7265c255b7d6e38a3a5a598722ac9cd9d43092 SHA512 e7f17bff78ff190856f20649ee36398caed5542371b8a6d77e7c98983ffff1f2fd26bd6e50ebe83e9baffc571403ce152eecb0c2115bd6dae0b5791b030d0f78 WHIRLPOOL 40c22b528cf8e253380cdb3bbf0b1e8129cdb5b4750cf325b58e5d846e3aa9047007e24628baf99b521cf230d12ccf9b57e4efecebc47f2e2e3e15b013188e93
-MISC ChangeLog 45662 SHA256 0c13a852568b5604f2cb8ac507bd98a8a03a33768d2feae5ad5ef305f0994196 SHA512 4632730c35d6482b9c1eccbaf451f49319069f8376bd551738e4cc5774975eaffb1ee25837dd05a2bc8ce33baf5de92c08c883b6eab35f3c2ef2605aca41eac4 WHIRLPOOL cee63a8f5da189e52f4e9125c589ed95684d6a7de0c8b9f6aa83b2134fb259b0f96500be8489d3417569085debf9d098969149dc73b3af8af579c24d8489c608
+EBUILD kdepim-kresources-4.4.2015.06.ebuild 1137 SHA256 c0a6909038dfe7add8262cec97aa986fd10bbe048d14c76d3f1a4a606cf76669 SHA512 7b057cfc40249fe7ee273c17861d10a489eab40f988a6872b290aa1fe63d747262a944996a424206de442bb0f1946e5f3b49541c5a9ab9dbb909416b068b1a88 WHIRLPOOL b8da50ac278dc14e8b4cce71d7061bfa7e3d19b96e6d7237f898ee4f066c23ae3066ec8f279a4ee3fb6609ed2b5c3484f498999d32e8498fc8e7947e4eb243b8
+MISC ChangeLog 45860 SHA256 46effc4fd9dc0cd58244e74db30a54aaa781e6651bb9a59facc0ae42190e6ac9 SHA512 30997b1827f18e1f02b4b60112fb4ebc80d56622f2d27117aff19c250bf41764f5ad168e991a61d7ac44eda6f43cd0d65a39744d91174b974f1fc35724e56c13 WHIRLPOOL 21694bbce1d9cced435f505629bf89f3887fe3c724f490da90be887a4b79ff688836cba86007d5e85e3098cc2dfc44314827390351afc1db7c902bcbefcaf19a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0v5/oP/3sYePEETtWs+A2GU9w6vYX9
-3bJDPKBTUM1kz8Y/zw/2KR7BwpD2NT9CsVrmSnBGpu5a8fxvM23eTp0fAvrBr/Bt
-ckRv1G01izIdc/DzFj2uGgQknWoa4XOeftl0tSIhnZ4APPGJAT3aMLM1cfKrD4W8
-5yIg9nSuhuj8ysVgOF9bIRI9cViAqjoI40lFOqYIp9x02Ocm7cfEHBg6zh8aPfsc
-axa1RsUP78n+7+HzoWEP2sUHBJ1o7qPcbdcV1cv0JhI6kGVKSscazNSe8YWpK/64
-DhP/pvO62SMcBnthVRF15neTujQgNLXWsScD+c98SKwC4Y7Yd4QCHN8VH1IGm93m
-96jc08tDt0mHWT2Zq46jdLPJYQrAytau4By+QJUtchqRzO914ZbW/0JUe/Mo38wv
-PJcFpmddZegxT9J37x10rVaXjyTL2IPnfOKCWPMI2VJTjgDlxP4W/aOpkGs+6x/d
-1Gt4D1PCgVYmJFJqDCllCjTtm3f2Aqr1SxKTP25TIAuMciwB1Eyq5Zs3YIYPrrOp
-DKsFStvD32Q9Nv4BmRTlTCb1JpWdY/En6pofDDuoqwNcrGRtHvO7s34Z2jgyeci7
-SjozOCCGFcFrB39n1WdmcZO3kArw5f+EsRo6JKxT2MOgeQGpWiKNbZsxOdlr5jO5
-P7XXU1hoLef0/bFfsNI4
-=5O3R
+iQJ8BAEBCABmBQJVouSlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5GZoP/iBCHGW5th5nb3iLmoSNR41M
+mobUJIU0WOiYY5Rfa27XPs10C4YvbUQBcu+uADOMDCKaG5T3ZdIWxOdWYHcEU/bN
+tJOZlQlAMzTZvBOJdF8AxxqtZjHmtuuqmMcJyxSXQsFNmzp3/9meo+V8haXYTj7q
+gii+bcu+W60E4fuuwK3SximNuC8GboIpE6NKvuA4mEvMHGUlOgdKRkLmCT3dSuwP
+T38/GZ6X6A92a0ESVPWVwjbwygksvn+rnZD8jDU8ny2O6u1Y+KsA6ci9CHv7X62m
+Yom1GLV70gskbQz4RP9WFtkR65QOD9jaxkEem9yauBBmIF3y8LujSH8nGWVyMMtU
+t102KQKPc+DHZUxdJ1HIsDLsjaGQl//7UOtiFanauXSaKQjf1bJBKMzTCveCMOxP
+U5MrEvhHXWa2XY0VImCXqEZHnjtE2Iu8wMf+U+CfzyLe/09QWKrE9X5J1CrOt5y0
+Coy+k/ni9MKAd4MrZAyEUUclsSbhA7LjslxGIXkLmDRzOQEqdxZI5XJex9Q0MymH
+Mfb8Z3ajkjwqr+j1Eljw5B5R7A32wiX2ukQ8ATuhTcTvDbh+hfqCUev6DbkFrC+2
+1Gtq0IsGHfOJR1gq7H9ZEsB1NlJOU7Pu2+mQvV5c0oZqd0AqZDIeiJqR5HTFjjPS
+MwehUluy5zbf/0BuUun9
+=+suB
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..190c92d38405
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:05:24 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection (noakonadi branch)"
+IUSE="debug"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim '')
+	$(add_kdebase_dep kaddressbook '' 4.4.2015)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kaddressbook/common/
+	kmail/
+	knotes/
+	korganizer/version.h
+"
+
+KMLOADLIBS="libkdepim"
+
+src_prepare() {
+	local kconfig_compiler="${EKDEDIR}/bin/kconfig_compiler"
+
+	pushd kaddressbook/common
+	# create the kabprefs_base.h file
+	"${kconfig_compiler}" kaddressbook.kcfg kabprefs_base.kcfgc
+	popd
+
+	kde4-meta_src_prepare
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	# Install headers needed by kdepim-wizards, egroupware stuff gone
+	insinto "${PREFIX}"/include/${PN}
+	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/{groupwise,slox}/*.h
+}
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index 21eaa87de50c..064179668f19 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.360 2015/07/11 11:49:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.361 2015/07/12 22:05:54 dilfridge Exp $
+
+*kdepim-meta-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-meta-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kdepim-meta-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kdepim-meta/Manifest b/kde-base/kdepim-meta/Manifest
index 52a564ba868e..44d0d786c898 100644
--- a/kde-base/kdepim-meta/Manifest
+++ b/kde-base/kdepim-meta/Manifest
@@ -6,24 +6,25 @@ EBUILD kdepim-meta-4.14.3.ebuild 1244 SHA256 27fb0879e45117f725c8910fa51c6c49bd4
 EBUILD kdepim-meta-4.14.6.ebuild 1249 SHA256 e62f0f39905b4b8ce8290c9a8d206ad2ac5baba268ac730f1726e7173d3b76a3 SHA512 2eeb6135ff7f726f8d615e0aef0d9afc31e056c6df6ca1dd0a5fbdf6f092f7a718d7f164616778880128904d9f7baea26d8fbac1aa6f51bb000053027b20ebe2 WHIRLPOOL a50f55931625115b536dc17a79bc688444c40e8cfcbc4fb7dfde0890ee62e3fc9df69bf060556ce4bb2c754564f0465e25f14678dcf5ff5aecd5d22a0150187f
 EBUILD kdepim-meta-4.14.8.ebuild 1243 SHA256 950d7a7890bf5cc06ad766f25769f60e6a819c804c2c71b454c23f38c38763e5 SHA512 c53ca4c1d073a131f8833ae0f6dbb05aabe39008efad4fa32ed0cb4f07bd5d7445a3aecd28c17d71e5a14298be7de71f310d7b6c579067772c5363173285a128 WHIRLPOOL 2a1858499b320aa175287db728ae869e05f52c102e43d8c77d7c8cdfc72e4d182591f0113f5cf77117abb31886fd1e134221d1ca87bd081d989d17980467ce13
 EBUILD kdepim-meta-4.4.11.1-r1.ebuild 1313 SHA256 66501792d60c5db3db53dc0ebaa6db1a6be07d44d23c3edb48b869a22604f1c9 SHA512 dbb4ec06c549633ac58ccc6e634e19eae2a8cf2877d633654fe05060eac1c7a7949cf9a901541720417370da613ba3700fdf32a9e3a3c721d7d7db4ba03785bc WHIRLPOOL ad01aceea87f7ae118d810581ac3850c2c6e2ba907720195fe99f6ba75f6cbd99502b836fa52fde1ff2c39b0ad31c1292240625ce0554f1a4f72d719137f9246
-MISC ChangeLog 44762 SHA256 73b64d6751fd07c8ad275c438df1f6ad369cc042f10028be88c211efdd4257ed SHA512 600ba2ad1e7104670018ad1f618c4fa2fcb9c8dd7cdc5483dbef97deb6a5cb2e315c8d3afbdffab719f807b9484ef04221f29121cf4ba05481a6f319f640d50b WHIRLPOOL 1e06684fb4bd4dd6324ee822603084c3533da30faa60ad67b4a6ed374f1bc70419f50611f1fb430dd22d5938f53b6332cb4867d1a1584702bae6cc9abc24c103
+EBUILD kdepim-meta-4.4.2015.06.ebuild 1214 SHA256 74c43ff1ed3b486f692d5c714448fe74c53d0428daa7fc4f134afa58416f3f1b SHA512 fb44533ec0eacc19e11ab352635941509796fd8e334d40419d218b0fed6d3e4e429b88b540883430f787ca42bb22430ebf15ac038e9e88bbdfd69cac278cb608 WHIRLPOOL b340fa17b2a042c0cf8104c753d95f3108a5efe0da95c85ef9f3039499e692a479b968987c867b3994830f14afd696861740bb93f18a9a021663f07401bff793
+MISC ChangeLog 44948 SHA256 359948d69d19c2b6a0608e1252ce6bcbb588fc72ccbbe57d688c78616f27809b SHA512 c3f9058d7789b4dccce32c7aa89d3650467543e5272802b689a5bb083a193764c6d6eaa12616d05a85fdceb805a00f4e88f8e6f295afbd90fe075d41551825dc WHIRLPOOL ca3cba096ec8393c6bfd9dcf3cd7185e6cdeb980ba0890be6e91c7beb988a4ea8e161e62b41cc1effb294413bf7bddc0a9b43e87dc47ef5a408929f8d5b308be
 MISC metadata.xml 250 SHA256 2408dde55db5121baf6ea40f9381b79210035703e98a4ce899cba12a47a692f9 SHA512 30aa58a653fa69ff5b9e770f34d701f3074757365d5232d059fd66ab3963dbd5d47bac2484142457e6b55995480ddb3372550bb5d770fa985fac226aea28f656 WHIRLPOOL 08f62759be103db937b21dc395dbd24d9a6b7c7473507cf3b421f955bef82c683d16d77ac7f2e9c37eb94653741554ea97f030e37212098ec3f59bb4bdf9be4c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vzNIQAJxHkpIup2kydlGXK0R85dC4
-kheCWOeA0XiIZDwOiOkKGyyIaFwJDXuZ9R/T9JwOW4N8heDYKHelZA7EYsEuABOF
-KxdnaHhA4UITBLgU4Bpa1bnp+uiIQhSTCXGLHYPa4Jp1M2e71fZmw8ui2IUV+VSB
-ODlinqNdZyNqjqmWYAXnaQ77yN9PYWaHvQlszJIexeawnDT+RCWuWU/LLhEsrnFZ
-s55p6jvZ63a/9M6hDBKw/lm8/s9wiImK0vqT6q5VR8EbB0h7aLogB5IlS2E+bnuV
-HwEvCN+v/kjiOO/AGGJ24eePuAzYQG7yH1pCakoINv9pAg+mwKJRe0+ReE6unjFU
-otTuWZHBzodc0xxSqbEQfBxURQRdcZJvW9hZAgpgrpomSSYaYnPXU0DL6NFX1P4T
-VvEcV/9+gNlq5zy62mGGvfjqpyf5KCITsTXafMtlDzLfSkTL9erUSuUs5KbBwWGX
-MGTdu1YX0iqDZGxSDEBx7n6pHMzwUUBgdUKCmHvSIeeEwvGjFYdrOpMKclogyMwh
-mwwqo+pBtQbLOqqLrU8wYnARIEMrudxGtdhd0OA2A2f/GeBvaT3gpoAPdkAntOsn
-oheoxtizu4bgLnmmspqBdOR8xzm2FVHtI1KcRx+XDsvCcSbTw+18KChANKvI9t19
-h5yRp1YPDGSgzR5RGvVE
-=aV2k
+iQJ8BAEBCABmBQJVouTDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5vtwP/2Ysjucx2siCqSPzwp+X64lA
+MMVsXdBMwFdTfa2ntaVan3THi+PtZbUKt05HAEvypTkC8xsAJ7aZSk6Cm5S/l2yd
+ertrLSaCmao/KJQ9bySWVPqy/xn2u7xXvOK45TKx08G9A0M/H7rV7cJJ8vm+SYyV
+ZUXdBqbIL+yEDbdQQIet8ni9y+ii1XIgAn815eMOedsNFzUzouO/qNQJb48wmrye
+Wb/NY94w7olZBH6njW+x9bPmSy/cczVapXSU2N2qXq/qxerwl/1GYEzXpePQRW+M
+ghRraX4vrkRx13222COZruzy+675AUH2LIpxoofINP7/jgWhOqe77jwBd5CxMLl9
+tAdJlhykbqPc5wwwh8uG7WAye1EHRj/5P8UeNU/9pOSKHQX/OO8gMNd/OHjk6xFj
+WxtkwBJPVz2bxxP0w/X82yTIFq4uDvAJ2eofbdb3FBYsNG/9AUQxBZItLgEr9ruG
+swArSTxeTyHSoTamI0p2aXptbwSG9RdZazF7oghu3EJUIEZi5DJTOiKMspLhUS7w
+jZ6raNxzKT6dB46eKquw+yAX9AkWbExyxZYNNddzY4DF/+bcrKrDVPaEveBk0+c/
+HsVpIlVfQNr+NJf0p2m+QAP83SK+GxlLfzNKDzBRbvyH040Bga4z2t0e7KDhat8w
+akpplKUaRv1DV9sOLDzm
+=wVvM
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..3ed9c4197029
--- /dev/null
+++ b/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:05:54 dilfridge Exp $
+
+EAPI=5
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="
+	$(add_kdebase_dep akregator)
+	$(add_kdebase_dep blogilo)
+	$(add_kdebase_dep kabcclient)
+	$(add_kdebase_dep kaddressbook)
+	$(add_kdebase_dep kalarm)
+	$(add_kdebase_dep kdepim-icons)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepim-wizards)
+	$(add_kdebase_dep kjots)
+	$(add_kdebase_dep kleopatra)
+	$(add_kdebase_dep kmail)
+	$(add_kdebase_dep knode)
+	$(add_kdebase_dep knotes)
+	$(add_kdebase_dep konsolekalendar)
+	$(add_kdebase_dep kontact)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep ktimetracker)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+	$(add_kdebase_dep libkpgp)
+	nls? ( || (
+		(
+			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
+		)
+		(
+			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+			$(add_kdebase_dep kdepim-l10n '' 4.4.11.1-r1)
+		)
+	) )
+	!kde-base/kdepim-runtime
+"
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index b337dc91178f..0a44d3ea1a3f 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-wizards
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.200 2014/04/05 18:10:57 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.201 2015/07/12 22:06:16 dilfridge Exp $
+
+*kdepim-wizards-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-wizards-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
   05 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   kdepim-wizards-4.4.11.1.ebuild:
diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest
index f387e8010737..07c69e918cb1 100644
--- a/kde-base/kdepim-wizards/Manifest
+++ b/kde-base/kdepim-wizards/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX kdepim-wizards-4.4.11.1-underlinking.patch 1990 SHA256 3aa49effdbd3db36c7585728a6d24366483a0c7441a627df72bea1a4c9b46b3f SHA512 da793d68ac795bee0d0fbc0797d01f3705e0e6e230cce38436573ba2ddb9b9f81a01e5edf0d185958ac21c8f2feaf810e8ab9ec7590a078d425553faae9186e7 WHIRLPOOL 7e89f14e4b769d9fea9e29a7839f5fffccf5beab66ade5e37f85df6cee28f70cc8d425f5a0c05e6c6f50a640db5e73822b05eb7c4d3f7129c5709cfedb6ff99c
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kdepim-wizards-4.4.11.1.ebuild 1037 SHA256 72cfb6c7f6ad5da55cf7ea35ca61a764c7ddc9c05e84b1beebb47fb1f7c055e6 SHA512 c8493c911626fca89e78a3db6781675ad6af962bf8d6b494ef2787930067702028e534d76c76a7e536bf1e27c356ccb2cd0428d0d54dc374200f0cc7f3648fa1 WHIRLPOOL 26f21d7e09dfcec4910dd086e00d8bee4064a4dd753b84b773ea4e4440d26f33b8578f70671f88a2a49466f46af8e2041f94d0d5d40ed8bd6ce22cfeb5031a41
-MISC ChangeLog 25975 SHA256 c7dbd97fc42b60f57bab20c508c9d38efa2e9b4ed46276919ef3576b85717556 SHA512 251dfb2a768eddad12535af292333a031356b2628b4c4e3d5662f6d060cc0f1b199f2f87be439c0ce2f05eaacad95f1f5cfc2eb31848ef26bb62656bedee44ae WHIRLPOOL d7bcfe4e35f4ff86ee1fdf90f9d624a40c5f462b5984ea52ec0102d08537a793f157c61e66560cbdc067bddd800ae58bf64a52bf3ba37ff8a67e2b400f2e0da6
+EBUILD kdepim-wizards-4.4.2015.06.ebuild 1071 SHA256 7962ff1782089773d11013a6201ec22a3fdf9076a9f7bc1ccca5ef4ee9de4bc7 SHA512 0c3a6cbcfc9254844712392154371f8136cc65a00e5e5054f52d2e679d2cee8156538a3be0343ba80ee9dac7fd0283118217de341858944bc34b780676d9bf90 WHIRLPOOL fe59e36ed3d18071780bde67109ac10f0a48c637e7ad9b05856645956c8e6e5fe39d60bee13b352a95de9d896c9979c76f18d16e96f162f16846f9ce03f70c80
+MISC ChangeLog 26162 SHA256 12604722e6373fe5eea482d2de268714f1cdd09ed792037c6e5de88ef86addfa SHA512 3a2907405dbb63e975ae90b0de2d9f0d1bfe6773745911a458190ca37e8f4e8c60cbcd8c98274fdd0e1c5265bd81740b54e133ac108c6874d80da22fd9c4203c WHIRLPOOL e5f269a4564c2df24c3a8516f5b7075633b079f339316b1cf6be455ff6996b85023c3d7f9f8d8725ec47cb04ca861315c0742fdba9a325aaeddfb1c84cee44c8
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTQEcyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcx/QP/ijeqs6pAqq1XMIvhqqwW4JP
-0yovX4v0wp+38zpgAoplu9GpKLU8UWXs8zcTR6Fk0cQBCJXw9AA8KGa45HRqC38x
-bFdnY2raVQA9nA+NIji7aRBPfTganV/yGrAfifNbCZDJI9FUgoX48zD5edvxWZeL
-ImFs5aTmbnycGFHCBo9980kvQHSMxytsecOYAwErZJI6hQN5YAuc/7qEjzYD29IP
-leYW9Y6Sd3b6EMCfo0HGIjpC4QLnm8okaxikqOH2/MsiEK8rdkT/rwlQFtZb3OTQ
-QA0MO+7UmICoBSdKD9RXswDt69KaLd0iIja1fKPVUGhDtoL+z/Em13ur4REfdjkY
-+fX9Fe2wYxKMoWtl/PDqs+JaEMr4T44dKvDAKTov/7NFUrjARh4VhwrsqKTYl4k3
-U+jr3QF73+eElWZ20SRDgdyT1NcDxltdSO5QZtJ6oRuDxzTEqo9SH36M4kgZPsuQ
-YQr2p2qcCi5TmM5BCSJxSrgL4Y3D2P4Najx6gxsN4/CAmeXqX89FWSbeIR2QKXgn
-fOTQTV5aSTnUJu2Spub4Au1MvsuKUtcvZXhPrp+GmCel4OsloxwDYx8Gk3rmFnJt
-aDEhfEySgKJVxHE64VjHuUcwT5CtgG3uX1rRPGknmnwAR+AIPRIU3mTO5CJKqsZ2
-GTdcDj3alwX0egyUKUXq
-=XMmp
+iQJ8BAEBCABmBQJVouTZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5b80QAK9csockD1UqcwukKw2dLJsJ
+xjJQPOtot0UwG/KtvCGjW3ma3457xzm94vwS0d/mAjMbpqU0Ai2CLFnPFc2KW//J
+KTLdHYxYeJqVvV3+lBmMXZcKHy8SOCe/bK5E0N8mQG9udIZ4JAmhWc7rynLOXG6j
+GjYwrs0ELNzywrkkt6tzJGZxoulMcJ05L7jkAQydvXuZJO5beue/k481Nn8Bj2nC
+bmxkbcLneUTNFvHdSYSuZVGc5c2VL7IksDRuq3Jbj70RUutbqNOITwcdm7hIP7z8
+MCRHmwPdP5jtvk/xnhK+0wvd/cmuvt+hBNDaBHx6CM7wAJjOgvX2mI3dMG0H2PFk
+I6SC88v1gGp/MmTn7TgNZE190z7NrHrzX2k3EiXZGaBxQ4+SAJZtnVwtR8h/4zyy
+tTdojyPaY6DISp93T3sroEuYDZfWcLiExGCfC04uhLLdTin3j+0JBeKo/QugAe/h
+j9Der+q35DBpOLl+GZBvKx/YmTmXJ1tAFtG5mKwJ/r4BS1M/X0H1FNRjVr3WCalQ
+hE9sqdIhRI7RkQiKtmVKm4yrAM8/wADjYAJpLD+MAO4kqQZ2DtsINxbICJvrwonJ
+4CkY+OKjqTei23NYs8BjNNCc66qRb3DX0E5hwxB2jOwUnmGcWCH3WZxelpa6J02t
+7Ea1mKlZkPe0aEFFJ3TT
+=liI/
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.4.2015.06.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..878e3f0e52c4
--- /dev/null
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.4.2015.06.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:06:16 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="wizards"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM wizards (noakonadi branch)"
+IUSE="debug"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep libkdepim)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	kresources/groupwise/
+	kresources/kolab/
+	kresources/slox/
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.11.1-underlinking.patch" )
+
+src_prepare() {
+	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \
+		kresources/slox/ \
+		|| die "Failed to link extra_headers."
+	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
+		kresources/groupwise/ \
+		|| die "Failed to link extra_headers."
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 53b5635e1706..eb5d1acb8903 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.337 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.338 2015/07/12 22:06:42 dilfridge Exp $
+
+*kjots-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kjots-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kjots-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index d2476deb7b4b..28a6718a8665 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-base/kjots/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kjots-4.14.10.ebuild 664 SHA256 26d9f5efc21f1a73933a32ce1d43a73e8161d5efa2eef98a5ae25a4c38ae5b09 SHA512 131127e1ec9d84a3b471079e5d0ab031236b34ed91c3fa54bae002a62093283992cb274730b8dbac63b829e3f25b4e97991633bdcb0190d28b431d4d5f621b4b WHIRLPOOL 36191109bcc10b79af1b844c9c35e703e99b91736fbdfca4360d462b46a282216c3daae838213ee56786de6bae09a5d80fd986091a2af906513bcb9d4f500c2c
 EBUILD kjots-4.14.3.ebuild 630 SHA256 1f2d4bba865a4726a0cc2308e180f4231a26b382ee4d45eba7c700bea4470e65 SHA512 0827f268bc100fdf8bc64aa88ce8eaa41192c19bbfe486a3b119b6640eb5421484ea395b07d5723aa980683b041195f120a95d7bfd74f60607fc8039a99270c8 WHIRLPOOL 266ff66cc91eaf5b803ca12e432140d5bb5a561771389217c86a569ff5e3dea31748b5bafa026ddfb0e4f84cf5c8029ba00dc10fb4e446e05d756f627dfdf67f
 EBUILD kjots-4.14.6.ebuild 628 SHA256 316c993e0b41cef0f3a2e57ebd7ef7630f1e2cef8e3a433989cfd4d69a1c4d88 SHA512 b6284cbf5fa74b211214bd7a4ebeb24f16269066e29826ad6e5dbbbfb8514e62e20c765e88a7347a78dc3cc3574e5737b90dfca1adfd07ae70c49b34f9c7415d WHIRLPOOL 5bd64dee2dfc51f83c86be277adcc9fa7570a05369ba48f610299219ffa8c99615b2ec6fd711eed3a4d9a768ba99bc60ad6b8825553526f9d2b94d456f90c3e1
 EBUILD kjots-4.14.8.ebuild 651 SHA256 60eeceb57f5a90d81d323509d0119601621e08d11a49def2c8a3c4c911bdbc4b SHA512 b3884cd04109dbb9346cf6af3c005ea3a6d39d2b486d6e2785b48d4d9a88db44a6fc1eedb3afa24656721e1d21854150e95bc1717f841b6f2008860227ee170e WHIRLPOOL 84f922e905cc8fb31727f45e4757c86428f62c5f4a9efad9dc0e0c6dd92dc94823a39d793d563836ddf455975439f3b4c255ea2e6e180f32051708fb37342e66
 EBUILD kjots-4.4.11.1.ebuild 475 SHA256 2e9639099452221dcbf132b09906a834391a5798e9ca53af7d8615f53faf47e1 SHA512 77ecb7c021ca9df4cc8179a73fa40b30af5100c37141857ec94a8785191717939c347807fdf8ef387dadf3e5478b7b41df151ca9fc1c1869181f8842350df800 WHIRLPOOL 60a09dd053b50d8d274a7b5a683723317c33e204121b299589de307eefef78b98b60a8146ba76dc8138efcf7634667a6b300d7b23a39996d4681640a3a9987cd
-MISC ChangeLog 38564 SHA256 2699642bc3ff388bceee2d8ab4610759e76a7851f9ea27f05cf937c697daa1f9 SHA512 63beb6853354f32f4720d353fd7c9dc5a9d98447055c7ad24281cb0e285ffb0ef1423056824f83d8ec5c6aff82d9ad887d4bc041a127a783d3cdf1ccb3f5b16e WHIRLPOOL c2aa1d7284874357e77b819dc89a5c8675a84c243d2788f4773361c35e7465ad2b8ffb67d2f15c16eb4d8bac90ca568b3328e4d5e25f153981dc63339c79af32
+EBUILD kjots-4.4.2015.06.ebuild 512 SHA256 71cc696d78f10a80c76323c7fc137f2c1333a1666465621b929e0083ac68fbbe SHA512 ece3cf8ab21c10c33eeb678d8294215fe41303d23b90eba251475b59021b102a3d48d7c0275b5c4d83ccc4588548ee66fa109f216370f931aa7eea51174288eb WHIRLPOOL 193f0fb09219cd3aed301c351bd76de222ab2d065ea753a1c82e41af6f48b4f74cf5df446d2b8bcc3752fd307d6d9268db94968b22e5fedd086a9fc508948d71
+MISC ChangeLog 38738 SHA256 db66b7c72e1e25d835462dbcb70bd35e75be755406ef30232e6ea8c56152121a SHA512 4bf2cbb8f4cd52bde06e51ff21ab4a214c5c4801591f3814c67404de6c5737cbd3b69f8e709b70a53e987112fa095695c32126cc761ad17d3c1cf57568b358be WHIRLPOOL 308b0956a1aaac3a38149a898903eea3b60ec34ca179afc393eaddbc45258de0ba5b223b9a4fd6ef8d48caf3d7ec0b8a9e4e7fb58356994bc325724da5cbe773
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0v5jEP/RX4f15SybqLWMv1ieSdDjQR
-rKoWhZuAhSrvicYeThh2pD81qk2kh5IZS18eCwoNg8oydqsdMvOe+p67FW2FXKeu
-XwFE8aj19eUaDCWjjKDAuZ0W2bkfbfFNRE+b9p0yMuQ9CID59jO8uK77tFKBCjLI
-14RcydPy4xehc0NpZrpzrSW4f5lYuZjqDtflHEcV4EwXCsiu/U02mCPYZl9G4q0R
-79z1wV2CcU3zL3JlKebr7WXSkSEUU91dQdcJEvZi8y9NFZYdntgIgkulWxyPr5HP
-GQLon4bl0fZWA4m300lEHePmuyy/ZaVZ8n66bhOyeGYQcjVaM6lOXgnMjlG7JqKw
-5sb6F+PpkU/1Og8hnjFK/RIvbhCxGP6T8OsGuI3vst/GtRdHYcUK89i/coBe8M8c
-d27hapTwEq5nKGI2HMxXbtrkAi8e82dONxPm379aosg9EdndJPFGW1OxJsp/LGWV
-iAs58ySL0mW0JjNVzPMLJhykbF6PigXwSiNA+c7VZLCnY5uxAojva3F5k5lfBZwb
-b6qXhR2E34mH1IS+bTO/H16vcONc5xO5SSc0cw2+ZbCwxfwi9DoFSVVzj+LpRHDg
-VoKwUygYI8Wntc/R7VAWG+DZlY9Zcg7nHC2hhsnDUDLiY3L4mUUUHVofA5EfpJZ9
-gO2BuDRULWO3JtCIZjTp
-=X/X2
+iQJ8BAEBCABmBQJVouTzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5tN0QALwh/g7b4kRyn7RWsMMakKlJ
+8gsLxeYX4UFOkcyJmcsAp9XGa+XzPdWjXDahNWUMUk/xoc6fuZJc45whsmUCVMoR
+xEMm1MIvx/9YzRAAIqK5nBoRcY46XXAhUDJlwTFyVwtZgj924YYIMvxatplLbcN1
+sBEYJH3ldt5N+7rKmhzojBRUMDe392A1e8Nc0HfAYp8Eti89u+EviqEK5qy0iXTB
+ug8bm59TDjfnxB080gEpm4wg5Yvgqi8DQZoFQyVbs3yLZuawXCl08TqjrgP4ORED
+hgRlTGVesabdbSNzEFblNJUBrT0dOkWq80hpxQg4PmVJv792MM1jNGtYJ8wIrtMT
+dXQ2f8uQ4gJMOEMzDHQWnybZ2Vdh3M5yE3VXFmpuirnkP+x4cHzaqectXOcg/8tu
+XQFiqS6qmzGzsvMqOiRD4S8JFuj4J/O/+YJv2nd6wew9Y6BclL7tBf99g6JjqbRW
+d/+Km/qIyOSfZPvR8/+itIyqfEDs3Qy6XlRssF5j20KkAH2b07zH0bV+zaF2Naqc
+9LFIZkm+CUCkSBxyrW2EvkKWNDn7Qx9U8Ro9P/7mYoDgnCKCMgDN6csKkANTyYUT
+QTQk5X5FDn+f0FRMYmKlGL6hQ5cPRRakk/v8R/8hZdV1cipVON1XrNI/3doOUe1O
+ZGuERm3AYuCoYep8pece
+=/6ym
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kjots/kjots-4.4.2015.06.ebuild b/kde-base/kjots/kjots-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..46ff3459990d
--- /dev/null
+++ b/kde-base/kjots/kjots-4.4.2015.06.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:06:42 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="KDE note taking utility (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index 42884ed9c566..dd9906fd5278 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.248 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.249 2015/07/12 22:07:10 dilfridge Exp $
+
+*kleopatra-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/kleopatra-4.4.2015.06-reenable.patch, +kleopatra-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kleopatra-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index 3e06eac14048..f2175bef9ede 100644
--- a/kde-base/kleopatra/Manifest
+++ b/kde-base/kleopatra/Manifest
@@ -1,36 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kleopatra-4.4.2015.06-reenable.patch 453 SHA256 84a183d45fb8074c34fbb4016260a7ce8f72550ffc37db63d661054e29053e4a SHA512 a209759d02238ddac6bb2192ea19ac794ffd91b4f25621213aa167bd12c5a198872b26d6fb0c97d2acb714477c4f711e2c3819be25c38d010486b26ebc9d3d9a WHIRLPOOL 06020d75c40fd33da9f6ae403989c369fd0a452cf3f2738e0cce90722a6336881e496a3af964e1c0a09a9377f92ac06093105e106c22cff5254539a267eeac30
 AUX kleopatra-install-headers.patch 1581 SHA256 9f3ac2b6018140d45622df40dba9d79f6f672f4b36c12d16e3dc16c040930cab SHA512 05b6f724e7b994c233e7b862ebc066cab7458064247505abe4a8d8b66efd16932d6611925c0afe042466d1357f49d63f948bdc68f03e678cf4e81568069e1e85 WHIRLPOOL b9edd88ede441726e07d67d36a7572fb4be45f91392c4e911fd509ae72bd735e940b34cf6495767b027fab20f3084af18f1b3c81c3457b403e08ad99e2e1a5ae
 DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
 DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 DIST kleopatra-4.4.11.1-libassuan2.patch.bz2 9404 SHA256 83d6930917e59450690394ee948b30fe138d631928d4afffc8be25d1a41e75c2 SHA512 4f514e6dfbe89d777604485d3144ada9a600b1c3c031a732b34b0cb7533eadae545e67a2819e43fafd4b7ada84845c25e1f93b01b06fc169daf48734684893de WHIRLPOOL f749ee88b13a905138a0c63a5833c71470f77923125f6c93e09fd83d399edfd1497342112ef420c7823d570d8676666117b5f821f46ed0d1ad961c9497142252
 EBUILD kleopatra-4.14.10.ebuild 909 SHA256 134d12c7e5577dc4c243148cd008465cf232ebb820c84576e1aa4ccfcccd6480 SHA512 9c755a74e0b3b85fb6428fe2143bf6ff1877938d3cd399a5cb7381ffe1ada9bc62c1e3b1210f2079b11035fb39c78f6e5785db22d3174c3ed29aea11fb7f1cb6 WHIRLPOOL 0f8e4940764511ca8d055965a2e0472e3fee879d1a390820b0e6a9cf07594da502c7f357fbc9a1d3b51518dec59ce7c4df21286d06d1c40aefb9bdb9b6c520e8
 EBUILD kleopatra-4.14.3.ebuild 812 SHA256 bfb6d469b269134987433904d0f6d31f9c492486d390a0f32965439d2d6e5d98 SHA512 fd8c44c7cbed904384454d149d72a77d631b35c25148d22d635bfaa3bd2a170aebd72d6b4ff3044eb539602b255a35598be975d652883048b03410105a3ef80e WHIRLPOOL 35ba78e9dba04c4bcc9cf65ea921d7dcf499a8d21feefade0e9c034311df4ea7547e3046cbf42e7be62cd8c27aef3a6116133ac78a502f9209c746a428180963
 EBUILD kleopatra-4.14.6.ebuild 818 SHA256 42ad01732ae4ab44a59dc55e44f1b16ff73c2515a05c80d14495b46e7d8acf7d SHA512 4476cb650ea22c272a68694dcf3e0281cc2f5bfb736435c0d3ec506078ec42a70f2a4d62889116cf81160724b9adf4071a4ae098263e2ac7af22acb2064206d1 WHIRLPOOL 5f5221ad5c5a2a27a1ef51ab0306be86bbce427e13a22c03803fc272c64ec93fc823e215afa0f3b88d5ecd0896b872e9add32c31097a5ded64cc1e3dfcce9ddb
 EBUILD kleopatra-4.14.8.ebuild 841 SHA256 820226014dd85c0b266922cfaa9d76a4fe869ea038b3d45b77b1600d4a49286e SHA512 0d74f0742f1fbe452311c5aaf737dfaf3f847c5dc4d6e48e1af250d2b8933213494b8a22bfd658ff4aa1ac58767b2377c6b2e01e5e749ceae21a5ef2e4d5372b WHIRLPOOL fea55c003ecb6c888dae0a934659a986723e4e08564af03ad8a4fe1833dd4964b8389a0e00f147b5f2e987197074e8604d2070981d8d30ec61d0808b9f6daa07
 EBUILD kleopatra-4.4.11.1-r1.ebuild 1041 SHA256 97c26c92778517185e9c763f4f70b84888e70770faf458ad93658d0d49df56fe SHA512 c3c8a8048ed85d007ff9112690dd264842a481f969356904e58a0f28bdde3672c3dd04e5a76aae136327681ff3254e15843c789ac1f8b6fa4f33494318fccfd0 WHIRLPOOL 06644933cf386e2a1ca2e2e1351435e89ef1a8e34ac730cfab268cd0c3ca40fd1df39bc258329463125f96014e75c9dd223971e7f7ddc628f057decd00860c1d
-MISC ChangeLog 30042 SHA256 2cf6c0ec89984f8a088d7c2b1aa2da4226004e6cf93288002b73c42dbd3547dc SHA512 4f7936e024e921ea02237fcbd529e8590753cf08d94958a77426bdb0c9c0631ff0ab59eeaf7640ec557762822b1556149d9cd65a805cba3e2571a96586505f3d WHIRLPOOL eacbe183bf7ca3236080e4cf5f5da3d3c9fe76a602912dc3d8c6d45aac20921dcca0948eb769a934e7a401a30f1c1644ab2bb5bee0e2f016861dad431a5be7eb
+EBUILD kleopatra-4.4.2015.06.ebuild 1111 SHA256 74d6d453a6036199b2f70824696ee2b4e83bb8d58f6258c1208168e98413d961 SHA512 2c92cec1de04be9d3be9c02dc82df67d8d9545a6b98a4a1ade0f76c7860ba13d0c19dfe7d560470d88f701a38ded3f554258aecc149ec20817079d13b6182133 WHIRLPOOL cf85aba4979a64cc6bc6192aa16fc135eed53a3ed2bedb8cc731147ccffbfabd4909c6f4a00b076c6335d276f558cfb2a2b4a2e9d6d96ac75711cf0f86600343
+MISC ChangeLog 30269 SHA256 2dc2f1a984b22f9e5b81b0d9d978bac93433a741e0e8cf69cfa9a4f4183b0857 SHA512 0573b3acbac8dbc5120fd0f93dd005a9ce47c4ca636504de491bdddc71dc16de322dc627f443685aa7def51faace9b2ca5aef4092ad16047790a787762a9a816 WHIRLPOOL 3dafd3d8f4ade5ec7fffd312f0e189f607caf8a1b9de36f95a8c1c353aa0a0e6671193b2e2966b28d2e1b60db11792156947a616d9f9dffa5f8f4cf32a41503a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vD+oP/iF8Y2u1UtFTXgxRxTw7hisu
-I10md67W3+uB84SunSy/Os3NXS+GXvjYJLkpD0iLq8X6h1hsA9yaU0r/0Ay8hFei
-Tc/z/fZXc5Kk1PEHuyoMNuiX1jRkAJcKKLrEqHee8Xk59BNdF5hjKqufERPuTuVI
-aiTxIZkri5KLMYBTHG+fSnoScrAGlUEV1UGjWPRHCCkOrLVxuLJktUanZkBNnSe1
-9HVrtbXuxHozVcrG+Cz/RlcRPfWJPan1cgaeSdabaiIYgq4XyEK1a6st0eDm4mEo
-tNx+gEpCQ+S1kqIGXxQXw4UzNj8kNFFv1Y/C3F6q3PWCLtVvR0+T6Q8dsZx/VXqC
-zL+EPqiiKLLnb6LvIyjJTWjof66sl1Ewcqn+xy5CymcmZOhIOa0OC2GCXp/fUrhL
-3dXOK7TEnSsL5IBxCAPyoA75XXpxKuzJdoqYXemYQxvq7I8xhFVyKoBNkQlA8eED
-r66bnJ2BXvEQy94LtlN8/4ggp0T0K2RkkvlSVdV+7pmz0bfMKH+gfAQRb5asndLW
-A4kYx6Skke2K7kMGAlr65vTiQSniPJ2VHluZkThiCZjoNBMjPXMh1velZe/7hbxe
-+oHKC5VcqpUBaDLxyPeuo9rkR3yb/qKt7r5UTMV8ldpuBjqZes00BDgewpxKQPvn
-KyeYdoXbN4ANWZyA1M7Y
-=DH8i
+iQJ8BAEBCABmBQJVouUPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5y4UQAJI3C26BI6SDqtik61mhoPCh
+Hz/e/FPwSA1dO01uo4IZSncc+e17nSsKkeZfVdsw3AcOzIbZph1l/dtWJVLEJnnn
+ErqicmnzvIFk4q/mZ9z/yRl8nOOVjhmbnbKmUq8IWnEid4eUydwjuHjAtuLZXFvl
+UTIEhqRoflQcfm5+BljChaxQ+Dir4x1Z1GfCbr9tZcDl8v6wsF+GdV+bBGFllVHG
+lxm1sLHHZzM9JGbRptxmD4A0eyX6mlR99ZqLXQtS5ii9WKLU0iDsh07nBdhSco7k
+4lLl4+HKYnK1Ss1auEscS4DmATv7kHZ/ZAiTv4PMDq1MWffqLkS6iM/7oh3nml7U
+j+TpfhYMd5i3EiYBx/j5MhujQqI1KpAmGpZdXnrqlLwPdYDfrdTzvWvpg4FWNWOs
+CjvxzNgMS4wqZDl5jk+f7X9OJLfUAm/YR6LN/MW+3UVYoRigvxpn2crXkz69O0ey
+e/7HTDKaPTsea5JaDKYqlj+UXQkV6kDZnwXTBT37MwlqQSjKy1sctGNl50MY848c
+huqkpMgjE7Nj7A0YL4+XSdXlwuieZ5yCK9LxnkmMdh2O3kHu70BIpAbZ2s4TSE9R
+ZSyrwG8VW+TheOozf9FlB0c43nhl5gNAk+If7t5o2flZKALfvedXxSkfC4x1BHqW
+4PKCUZTnTefunTIUNYa9
+=yWE3
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch b/kde-base/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch
new file mode 100644
index 000000000000..f8c934ef4003
--- /dev/null
+++ b/kde-base/kleopatra/files/kleopatra-4.4.2015.06-reenable.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8c450d3..b927ad9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,7 +190,7 @@ set(libkdgantt1_SRCS
+ 
+   if(QGPGME_FOUND)
+     if (Boost_TOPOLOGICAL_SORT_DIR)
+-#      macro_optional_add_subdirectory(kleopatra)
++      macro_optional_add_subdirectory(kleopatra)
+     endif(Boost_TOPOLOGICAL_SORT_DIR)
+     macro_optional_add_subdirectory(wizards)
+     # The following components depend on QGpgME.
diff --git a/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild b/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..62b7c411eae1
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:07:10 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/${PN}-4.4.11.1-libassuan2.patch.bz2"
+
+DEPEND="
+	app-crypt/gpgme
+	>=dev-libs/libassuan-2.0.0
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+RESTRICT=test
+# bug 399431
+
+KMEXTRACTONLY="
+	libkleo
+"
+KMLOADLIBS="libkleo"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-4.4.11.1-libassuan2.patch.bz2"
+	"${FILESDIR}/${PN}-4.4.2015.06-reenable.patch"
+)
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_QGPGME=ON
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 6bf4104516bd..2f8f226d638c 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.442 2015/07/11 11:49:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.443 2015/07/12 22:07:36 dilfridge Exp $
+
+*kmail-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmail-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kmail-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 353326fa9f8a..af2248a72417 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -12,29 +12,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kmail-4.14.10.ebuild 2731 SHA256 d40e28b91cda72d55e44b2794bf42d96ced8f2d444491849937c47af625a86c6 SHA512 a667a1313ce81476d64b50773431967e64ffd318fecc1e178cfb04dbc28378136ef7eb88e68fbbba826b4cae9a714a66c5b9c6b9a9b7c16d5dd3e7999c36c2b1 WHIRLPOOL 25fbdb276895b8e870a1452e6ea43fee0c2afc27b920fbc3e8ca96bf7c589bc45fed79bab5fb6a918548fdf6200a59831bb9d48c7e02cb5201bddfede5cfd8c1
 EBUILD kmail-4.14.3.ebuild 2692 SHA256 7f6b7fd1633e798c152a53cad719d7f31578780f33585e6fe02e515443909386 SHA512 81c6ba98199688e5493132eb7466bc373854751ea2e0658f39144a292f9327d7a3fd91044f604dfcbdb18fef0b1d244c7eb439363fad062b63853b0d62199046 WHIRLPOOL 0c17c89fe22318dd7487d8000ea0808369af5523bd31283e54e9849c7963569966da77a22d496f8bd2e5d2b916f9b5f9a5ed9215211e8394d99c9243a49ff9c5
 EBUILD kmail-4.14.6-r1.ebuild 2746 SHA256 b312ce6555d4afce0511427c0fdff820cfe2d62fea4d7fe07b79bb5d4b14f4f3 SHA512 4d3ef4575a651c88cba3b56bba0d6764b49fea7bbc883519d747b71863b342ac54a9a162c58bfb0b7fc57cb43606cc5cd8e4909f0637a5d230950c6b12b581bb WHIRLPOOL ef126f03a7fb5d8f2903ec1c90b5e10c37cf49418f4450283506e4daad10fa1aad70507b3a95b34af2646c225d4df730b25862d744c7a831c3b611a8ba1fb17c
 EBUILD kmail-4.14.8.ebuild 2718 SHA256 22ac34ab1f27520f8856ce8507926331a78e4beeebbb3076d07cd9d862e1ea94 SHA512 5f57fa062c9b705243753ba395f7dcd4e83c62e05f448a4624667ecf2ef65c9b4f74950a7d71b2b4ef5583023c477f01fcffe6031b5bbdaf839ef0f5e538eb30 WHIRLPOOL b1cbf497889b5a57e12327aadb875950e592414e562ec2176da3309b7fa48849cbb6768875a54770d499b610e0de7c72ef999cf918bdefa2213b715ce3c3f89f
 EBUILD kmail-4.4.11.1-r2.ebuild 1661 SHA256 7c5f88afae4b8780db6ffc517170bfbd790aecb6963ce5cab0fa01257df962fc SHA512 7481b48a2954dddca31c242273a42f40512ab849095cb9eb8f6173cb8a9b252c106bab44b4d97171a4a8fe7edbde5b8ed7ea43c9f0e94ec7350ce4075ed2e06f WHIRLPOOL b9b43ee19223061abac96b044b31254336b2a00065155766fa4652f26b7c7612116112f26ccac4863b05a37cf2450ff7bc17b0777836d7a8decad945dab5b19a
-MISC ChangeLog 56621 SHA256 a335866930907ca922c62c72d6f094bdabde4a436c4c9e078bc91d798c782b12 SHA512 3c8df3f2311a0e403924c8889b282e060fbefc542938b44de76a6811c9b3d3b90619d12824344bd03f7f6e7610eb9ea20a62c9c8ed8f5e87b477dbdb55dde090 WHIRLPOOL c862a7c3733d60e3ed783ccff0dd4942bfa993a5cf1e28a369bca994583794c5ddfd52e675f0b4b71448dd1b87655d2209ad76eec9220573b10d74eedfabc6a7
+EBUILD kmail-4.4.2015.06.ebuild 1595 SHA256 428532ef0565da1b31a6b8ce1fa85ca5e3965234ea1c56c79362f640ca52505f SHA512 e946d127111ed71e4d514a2324dbf10889555797da0ef5bdbdc6389ea984a91166fa81f3d93b3c18d51f254bd0dbe13f5161a216d83ece3c079997de159c0410 WHIRLPOOL 0e9e9a5e4d491f5284cdb96f67ddda00d734c1264591f99b460f835a67588df368c83300117fadd12f22f4f63f7ad1830e04c90be8cc1f74f606a6d7022b8ee7
+MISC ChangeLog 56795 SHA256 5af1db696cd4dece2846659d421917cd9a1aed565642885baa08732fff825a1a SHA512 f0fec84ec4039fe81a7ec028328d978d942339ebe03026eaad107023cc5d0bea9c30a72f8f86ec41ce467a1c0bd8c6c827284fc91ad3b4ab1602a463653ebfef WHIRLPOOL 6d468d171cfb95b067cd70def2ed66dcaf37c5d45e27e008a3095fb4704dab9cf62fcc55a4b19eff4f3904daeb1afb628cee4ce9633d3a3d03b597d1cf0f5acc
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vSLcQAMh2cIq7Nt8HUa7LttRIoB7A
-G41+xk4i9MFZZEPymwH/qotFrSH0g42iEdRzD4a7+6b8X9FCA120mfDtWa8YCKM+
-FJViCj7ycWIeJ0Bl3v/G80/PjgoQbjm4g+exBGwx0o1qy97rzW2JfIo4+zFDRNJl
-1Spl+2ZVCcas8LciSed1mKsLgcV51QZdCrgKZEG3NTFAHHm/t00JTHrzMyNpy5rb
-4wWhhuvKOp0vbDleGfDQnZwhyPEThMUdPoOZybsW/fOevRzIsg/EYdDCRrSQrEVh
-ctQU1i4qAe73SYulmckrqy3EyP4OSg4MDl7OOGOgL2klaba/DbfeYf983u8PIrny
-GPTbFHh1BaORbZtSimIBNoZNxCmJLBtv2zIxaK/elBZHHzl+2+M/YszfJJnKdIoy
-6erAfMdev4i1Xp12Dj/wCRRfMuEZ6p03FJ0I+eLUuovHkXBjrYqvgtwT8DCCnBgf
-FWs+qpHWs2bwKhSqER8eqErglgfIcwmEFSW3zMokSDDce49mrz2d4ngpW9G+09mR
-45fyFXRmtGJaNAgCCRtnZ+ZUEpPqXg9GFz6ALSuw7D6QAx8nNtOnJrKSsCTpRPsy
-HwswnwBAvUrz5630kFLangz3eYfhaJiiK96TRnOHi8G6DInaz8QROmWUSwLpHVzx
-Y4HfL2f379vq14apwtLs
-=Kb79
+iQJ8BAEBCABmBQJVouUpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5dm8P/2IRW7nOf+ezhMLZnJLdsfk9
+a3XwlvbJbYuaXFcNkudnHwhK6SV0NOcblkEX9pssuHBU+dEAAya4oWk/DMoKGwcy
+7dbaPMjYX+Ui+H2vRvE6puh4kNnQlGoXn2oVXVHuj/ppQ+RkAmGqDvpnoRcFGopd
+CNbUYtpczNIwjF3yw44Ir2WGZdgQ05HE5ZKHrY3jIMw3T2y4fBFAiSQuFkgwyGVy
+wC3o+n+f6zy7TL3Webs1cW8RuaVDb/elzQAk63MTUDvBRyVlvUmtgb9rs8Y4SfN9
+mfXCrdIyNvBXCXVVJn/sBCialV70KaTCIwD/inh/LKqLkssLpFxSNuvS3qat1uV+
+VF/faVa/WCseGd6/69I5RUu0YIb6bbHBOelx6xGS9z1uonJo9bXDhe4mESmV2VU2
+5YTauVAAPMl3ldogZNu+mLtUXdzd1DSq5VptlAZsWA6dkjl0L6qmGjI6tWxfjBKK
+2c6xJ2s9NykF98skrbejFe0rYNseo1sHX0xSNkHWxxIUOnn24/KVXPzv+YP667mR
+R4ZoSz0d3PVG0EHnohqIKToUPd7w67IRoOezZMBxXR4AuivUi2L5nQ0hrXVxO5yM
+PR4l/VP5PzV5oK0xvYr+Zf2HnV8w26cO2sTDX367F+zs0TubbvA7uMpRvhNo+4vO
+M+Z0L/X6cO0vHQg8fdlm
+=b15F
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/kmail-4.4.2015.06.ebuild b/kde-base/kmail/kmail-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..5f71570045c8
--- /dev/null
+++ b/kde-base/kmail/kmail-4.4.2015.06.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:07:36 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="Email component of Kontact, the integrated personal information manager of KDE (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs '' 4.13.1)
+	$(add_kdebase_dep kdepimlibs '' 4.13.1)
+	$(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
+	$(add_kdebase_dep libkleo)
+	$(add_kdebase_dep libkpgp)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo/
+	libkpgp/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	messagecore/
+	messagelist/
+	messageviewer/
+	mimelib/
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
+)
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		-DWITH_IndicateQt=OFF
+	)
+
+	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
+}
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index 600bc64de12e..fdcf5be1d53f 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.341 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.342 2015/07/12 22:08:00 dilfridge Exp $
+
+*knode-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +knode-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *knode-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index f36299355a70..dceb05ce3fea 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD knode-4.14.10.ebuild 949 SHA256 3cfa2155d79e39bfe27634bb9e3504f5873bd1698e92739a927a2f651bc4823e SHA512 5c21de9241965daf89b6863575459f4cc19d3266853886d303d093e193fe3176f46e602b0ede5b2d69b9c4b7c14b1acdd8497ee38abe1471d4afb4ccf77ae81b WHIRLPOOL ca5fb0ed53d6fca918dbdfb6abdb7f8c4de57acc709f81a367acc5a623e39a8e573471c4936910116d50d49615e37d851a51c58a14e55e7c365b0a9e31331ad7
 EBUILD knode-4.14.3.ebuild 907 SHA256 74d307e207a07a40f0719c70a678871bdf7852e6abfe330b2e6c3c1bc8d64760 SHA512 a524b324679c4a40e6336849f85e1ab746b90d0aed1e281403a4dc06711aaf63fa6c14ba02723080d39279568929ea0ef486289d048eaebc917bedac5e81e348 WHIRLPOOL 00bbcdcbdf944bb520b876d87fb2aee2fabddd8f2247860af79982f11917deac44a7d1ba627e8307dc8c2b8ca546feff8f5442e1a3f9642e4abc1dace506f54b
 EBUILD knode-4.14.6.ebuild 913 SHA256 98ed601f1ced0bd2475761078a6afa3158c28f630bf24cc8c8a888d35c3bb512 SHA512 1a1c199608d41f0deccc820d6a87dc5ec0812db34ee2c9ad9c3c8f366e8d0697175b9dbe6a40b2ffd13b8291051dfd8a38f41af8ce7fec0a58ab7d5fa262a094 WHIRLPOOL 062f671e4392abb2fee88f79b64a01fe92fd81e99b1098459ae470d0088e710e626bea83fccb04ec63e64394492d1c3057a5f9c4a957d560b54f0ef5d4e153d8
 EBUILD knode-4.14.8.ebuild 936 SHA256 d5671c3b7d7f3df5fe83a597957016e1fc264e44296ba8a9a39b329d77a00f12 SHA512 a4cc3c20e47ecf440021551c1fbc72bad69b83014a716da32135eaed96fcec036e7ab1f4fa9ca1735efbdc307f6cbc153ead85e01a5de19751a719ac25ce98d5 WHIRLPOOL 7b0b8bc342c50ecb638357f90e74e6d7750a86f2ecd6cb27f759740eece75f1a55c50b58aec1086a72f440c29e912ef79bfea86d9c29a32453bfd10a75972747
 EBUILD knode-4.4.11.1.ebuild 712 SHA256 083ebd505e6b0de16e5ded2465223f540eb1b8f29fc348d22fd9ee83778dbf8e SHA512 994769a4c329049c1f624f88e6d7f1bb26b93863867e5f91ee9672595ff66569098f0997f5ae24b9a77c578f20920eba6e557670c1ca9bad8caaccd14d5bd70b WHIRLPOOL 8fb5ac4d99fcc9d374226eb8f0af07dc122d2567b87f75c4383f09d96e4aaa8212aa7d8033ca4846f2bc4df7891e12f167a954767fd406fc872a299f9110191f
-MISC ChangeLog 38926 SHA256 5572dbd2ee0bab52afe2e78e98a243cdcc3f2ddeea9b0d636f2d0603a8d35d78 SHA512 153e706156cbe3f330586bdd9e38f492f31d4d453a0c8ffb63a08835df5577b835cb16314c9f5a812b24889afc84562692f92364cc0a764f43352d22b711827a WHIRLPOOL 85f837e724dda0765bff39cbd859f921ad6a267678431649c590daa32a00ebfd1daa5727a0a8db8d5825fb4124727b5e160ffee07f807c3b514ddc47f409f1f5
+EBUILD knode-4.4.2015.06.ebuild 748 SHA256 4bc6e5e55c6ca81a12885b079200ae393c50de3f7c158fdc0f0e8765be9aead3 SHA512 166180fda3155664c5f0183d59783c50fe8b589378122aa894a3afd95472cc525fc676d2ccdcae141d0dcd8f411cadb775558dd9033f70d1dae9de2a3f5ded68 WHIRLPOOL 8e82d9e94cc0e137b53db47348fea44def7bc577a8698db4bec1af7e518b8e88fbeca622b7106db5f630361c57c0c3c216039fbc0b4830599537b2c0345047ff
+MISC ChangeLog 39100 SHA256 ff45f08c82843eb58004a3a4d0cff9291819335b41fc1c2a7044f9a9e9eef8a5 SHA512 bb34f34f4e48856a6361b03742e50d71bdf56de51c3a6c07a9f2e875f29ef20d978fe50f74931aafdad5c0c96546f2844db6652cfdadaa55140292461dddfd7d WHIRLPOOL a38580756bca50654e81f499c7ca0ace9d6526b5590bc92e554f23460fc3af371ea1d22f0ef5124521c82db10c0367a5c957f3312e1d61f16b0a5684092cc029
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0v818QAJdfA2phKuc8TgKrrusQuPfm
-Zkcc1lbJEBHAoJCad3DxNviVm4F/YGp+5WyWyzKPL3XR1OuZKOW8f0/preCw4Enm
-O9TBLyRaEE66KzJC7S6LTsUbOqFfZMnrxYClsNQTlZojyD2iMMbz8fidwDZj59OQ
-swB8JIqR1XH1PRytU3urqXyh9Dnu6i0pazApPfvnEpd/Bo6EiwcEppLrYFJG9aIv
-LGorBQgLBoW2ek7bFLFkxeotME3B4gcRWqRYBwhJbQjyk9j7fpa4TTgKrhJLw1d9
-pgqUIwSGG2QYrRMd9JjdQPCPWEYJ/mNtWPvQ58AhMBFNooEPjqnR+7X+r4DUrkZL
-vkd4VJJfb4qkTQZx0jP52M46ZFSz647zai/kALP4ElPQglaceQ+u5WCLNG+9nx7O
-FS7F1mZUrTLwTjHwMt5hmLjCraW3vWpOosOhI1KHiKCmb/+U0E+OmoE2IrllXIxR
-1ZIih+qVI2zcXpYrmd2aCkxsrcJjrZg6XDUam/gMdgFAjtZdA3FoPFZxFm5v5oAR
-8w0NOsaUsBFAQGuXP6W0CF3L0V7fAd5NEJKaBuPWCw3U0PQ3EHotEar08YIRAuJO
-aAORkVIZ8tYlj1GdupeLOOwswvUWDDkgKfqRxu8yDQYIVmpSLvg6nBYoiQDb8xYO
-5h7ucYkZJoY4IR2pfPBg
-=ZNAQ
+iQJ8BAEBCABmBQJVouVBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d56QoQAMK/6/nvt14E2e28RRt3UaG3
+RW1rV5s4Fol6tAH39Y6ftzJm0J1jD6DBIniIKv4PDozy/MWUJpF3B/3g0LvOw65I
+ICGJPBB5Pl2qsySfaiwz4sJ/1Qx5N7K0ZwW5fLmBCtn6Sie3nBfVRjMq5Inch+1X
+1Xv1hjQrqux+t94weqgaBoB7BUN/NS/Av2idyufsoLx23DMJcjhYA90OtYZq7mHY
+aPYutrTxjAQ0joAyvvaF5B5LsPyE90HItUcZPPaXkssytrebLhY/Ra5q+RVYtuYH
+uiiU8ABY71Inf1fsbdKhcEul9wEfbPYjGcm7r9MNsxXNlxxpSc3XTi85SU1MDtuI
+C2/AfuNvc4c9QY/JS0mF9qNsxTPje51z22o+cNXSLkT6RrtvhIahgJUXUOubfvR2
++4y4GOIx+BLtFHBIjASPKGYT/BH7SnZjHrj4pUqWpOvmTfATvEdk3kn8M3uFcjGS
+1WbhB+ZY+a2NGwy2o59hOU4+Bv9qNeQL+tQHlW9dArseJcALcNLITt2Sxg6E4yGM
+t3DcXBHzUo/I0J+rC9cXiQYpK6ra8ekae7+Zcw0EvlAX/VsgNj84dN+heptMHrBF
+KKy6n+SUs8fLKTTNPQGKG3t+fSlDzpX893CGjw+sqgK0+63K8eTOtEikc3h6omm0
+vsOJw57hyEDGQSnBXIGf
+=QLry
 -----END PGP SIGNATURE-----
diff --git a/kde-base/knode/knode-4.4.2015.06.ebuild b/kde-base/knode/knode-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..4c8211f7b099
--- /dev/null
+++ b/kde-base/knode/knode-4.4.2015.06.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:08:00 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkpgp)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkpgp/
+"
+
+KMLOADLIBS="libkdepim"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kioslave/news
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index 71b872087d39..80c213b43178 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.332 2015/07/11 11:49:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.333 2015/07/12 22:08:29 dilfridge Exp $
+
+*knotes-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +knotes-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *knotes-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 02e2ab7133dc..43f42e82bec3 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-base/knotes/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD knotes-4.14.10.ebuild 709 SHA256 2749976dc813711af7e02fcec8f0c36fa0cd9b2ab8b43732a2d44509a91bc214 SHA512 076af173f4be15fd65e64512e38909f54fab2d019b05a1b3bee7d3986c1c09ff1bf0525b084913e0386556b2d44d220d4f55fc68c2e6ef23f5075b3361de75d5 WHIRLPOOL 32ee2d265aa7159a02466d5aa4b93391cd02a15d177c6369c4db263dfe357ccf703cd6a152f068cad70ff7f051f0c1939ecf959367f5c8d718e0f51a49f93f09
 EBUILD knotes-4.14.3.ebuild 666 SHA256 8dc750cc41d993445afee00bbdb1a584c5fbe1ab8058c569d49d3298dcd4c500 SHA512 6307d748932733ebd7580c26c5c6e4edec3a262ce36a55346bd889fef62812806102dce7e50d25e2e236fa0351700b5cb190415a670dbc0ff2a1d207e429b374 WHIRLPOOL cce6661b3cb8f53f52175e355ff874e539b9dfd2f89161b75219cec37068575221f6609b4e9867abfade83c11d3b28a95605f92b4f4da0372c1008670c68f1b1
 EBUILD knotes-4.14.6.ebuild 672 SHA256 743fc798cedf36bba7da6a0351bf808f8553bf774717d786db3565197baddbcd SHA512 a2554d6f0fb5d007d32bb4fab1a0da0bdc347bb5105164ab5bc29fe76fa11087ef2659c71df6c403658010eb8b1376034e29bd84392776ede9176c97877aff20 WHIRLPOOL e2f86762c8f65bc84159dda8d6b2fcbdab3ede2eb0c4662d8a173f9a017de3bf20c28bd07a4b16ec8146519efd15c07581264348f018540a27e2fb9923909142
 EBUILD knotes-4.14.8.ebuild 695 SHA256 0396156c5c143118d97c399ac222475d04410055d1e447bec59756c0ef410187 SHA512 92cebf58807c4a205e4843ec1ae97dca872ca37773c80b927fa869619d6e5868202730d10f561c5fafd4c3db5e156317461f430f7a400977d51808240cf0974a WHIRLPOOL a0cb42f4f31825d4bba904ba3e904e68cde507652f1d9095fa590d6b70d0a595732e981ffefc0b2bb24942934e26d72d9d666a28335349bbce3950a938e11fdd
 EBUILD knotes-4.4.11.1.ebuild 500 SHA256 d6cb03b5139f687f98b5db92096eca7ea0c62935965b7a787277f81f47bb706e SHA512 d6140b09128209fb12d1fb6bf98542ffe302744dc487c15544a16696cea49cc37a8a79aed028013ffd9dc4feea6716700aa0f2e3beab61f7b728fd30e1481e17 WHIRLPOOL e34f5e05ec935e404572d79a1efd18f9ecd491c46e1868a141e4f6568aa174f2dde8a310443a47c6114ea3ed1a4057386d83a65b095b9c7311a3cc0e0fb79e63
-MISC ChangeLog 37968 SHA256 88b0a1b6d732674d7f82754d7bfe7827699f12bc699ef19869be2a8bcb9ceba7 SHA512 bb704bc4e7c1d4f3ddc287560eda3f0106d25ae067aa40c5d4530eb1d3f0612f36e290f2c2c03f22232905335d0003712ffab53ffab09a8e3ebf696b7afb0f3a WHIRLPOOL b0e2381b391ae2d04c412a4801f398b2c3f01291de8b8f87c0d81fc5a3214e8fbed7baf60b6a53c7654d1e8386377da05e0c002f294fbfb4ca438f831e88f041
+EBUILD knotes-4.4.2015.06.ebuild 546 SHA256 c19a44065f01332db49579c0d156c8c07850c6cc2567a1296c74459e7494502b SHA512 02ed58f9371d399fb89ca796157638cf5a7424bd73c06369bf7e259718affbe54f8553cde462ee1c99e07a29c7442332799d94d25bdf433235bd6657708b2bf2 WHIRLPOOL 60859752bfb0a08cabf9009400405a9533267815c3968c81078d00522c0572506679f7ff7ef2f0db95866e79265198b3e0a0fd912baf808a46c74aff7c1b9fc4
+MISC ChangeLog 38144 SHA256 29ec4bdfbc44691e0b23489b1e41565e711557c630ab141e9d53c201fd83613a SHA512 b1d2897ab7ce7bce1fa8aacee2288d08a7a07e069cef1bce3697b4acd55e4b1e37435850aa11bd0ea88ec1de216371d92495c3de2b7b24b8cfd0de07bb3372be WHIRLPOOL 2c66c855df15a729356868a49fc7f467451eac03e33bc9744bf7486a5f6312a0f92f5a4173d0bec3c12c60a26a8ce3b0232a6ed7b1f5863bbba76d1b36fc737e
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0v48kP/AgFe1OxLZ2HvcnSLGkf6r58
-T6efjrTcaA2kBXWlXQtfdTYAHZIIsxQyWh8ErUmDcokQ0k8W48I7mW1dIhg1v4B6
-ze8t++1uEn9aBPwKdZOLdIhW0aj8Rc7BcJNJFxsXYm0+s9QXg7fe9euBYf1cvYHK
-cbKxct+AYH6puPOaU8raq/f33Xf2fBsM6U8v9wWJxhb84MKqUUcoSw0UejGgOfny
-H5/tgNguVQz/OvK3MKXRkO+HNLOmys/TtBSY2moH4smE+YrDgWsuHAG0ZOv1parS
-lCWlYR9WCXoO0Xt5iSjiZjicZYFWxYyl6dxMD5nwMjHNjaFjeGsIG3v6Px1bX9zR
-ghsvFBeF6ao/kOvdnBKCHRMvazlnRvzWGn4TdPzxrZ0UZXWD9y2gyCzeMb10fONR
-NmRGTE4v5afuAv3G3Uwbx6uX6QPCX30Zmg531+VmdrVBzYBNqIz8x2YL2unxFnfh
-gV+2I1kKQGNeUY6PE6fXG88eyRvFkXMX/hHojqEMiCI97SNGB8O2NkfowEfZxjHz
-9ayYKrn7foqqjEfMiQQjj0RYAoO5YA931e6mORYT2p0IjhQKx/eCaGCueqjaCPtM
-RZRf6PrLeGU/yFYsGMP8JyTqfgNZP12xmK+RxdiR+eNq3JJQhi/JSsjYyRRWIgaT
-gc1aU9N/gZTBp02l9FP7
-=j5g4
+iQJ8BAEBCABmBQJVouVeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5UokQAMHtPrJADfI3A1fnEUtUXyEB
+pSZwcKn7hKGcmt47e/JYHKqj8icmbtfR82Sos/fxLdObaAscGEi/kVgvlamfKMgj
+PiAJd97xCahUg4unoA0UyelABF3NGUqRVC71SI6UR1cn1ZdIJn4h9Dk727TJW4n0
+pJz0k0OBB1D39lsBOlQHocdftuWg5SzeyHSUi8qth/5osaagmU/27L8ZSaM7vIMt
+eqRxPcbnNvRAuHg1iQNoM/1DvtxUtHjPV7fjzGKIo0cQSFrq2+MxaRc0lCkLVKv+
+w3iWLku8bb5nnwRJi21kghr8ix/aaGF/D3CfV/om/+Yrsa2UfZbX82KBQhafxSWt
+8DM9Tw7dccMRyB90mp0MnNwhTo+E/cbjgoX2RfA2B3e15jT0Wm8lfnqLShwrGpUV
+uNza5n5abkTq53WRSVJlzrw/gKonHRaAqgidXJYGrc+ExyXJR7ToPUzDHxjdRSyA
+sqz3mJ8xTXZlQzEJQKsoxY7ZS2g7ZU1JYQjy3nByQk4BkGJPseJ7+oI4bYuTLvz2
+OgyLFlGnXA2Zq3b00kbz0CWSnBcSWxA4X82vJBXLmqpCP5fa/r6xS9wjm5oA212U
+Feh1zuJNDZG7jUSl4P8X4/2Cs+eYRuWqzkJ2qRaDDIh3YHg60NiUbQ376m4PDnOL
+i7kQx8HpbAJW/yI58512
+=PUoA
 -----END PGP SIGNATURE-----
diff --git a/kde-base/knotes/knotes-4.4.2015.06.ebuild b/kde-base/knotes/knotes-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..1269f2bff853
--- /dev/null
+++ b/kde-base/knotes/knotes-4.4.2015.06.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:08:29 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="KDE Notes application (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +handbook"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="libkdepim"
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-base/konsolekalendar/ChangeLog
index ae2bf433f0d9..f2ed57c6c059 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-base/konsolekalendar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsolekalendar
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.321 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.322 2015/07/12 22:08:54 dilfridge Exp $
+
+*konsolekalendar-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +konsolekalendar-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *konsolekalendar-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index 67996777b993..24b768827ee3 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-base/konsolekalendar/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD konsolekalendar-4.14.10.ebuild 1110 SHA256 2de7cdc4ffd3221ab84422088943fe581f84aa34332b45fd940f2412b43c4286 SHA512 145f41edd5240bf715d43e58526ad867f04d7a918b0d4d09cf1809814e63f48cd69494f84ae2995fdb03a39c95a351ebfb1adbeced03ff0f5690f9d1ea0c6da9 WHIRLPOOL 581b11a3aa6b7f94f1cd45a46f932c21b2e92c0e5bbfa4097d079095388dfec2c7692da163dca3f2d0a3c912de6a99ad12980b4dbdbe2d22635c39b6d4f9de9b
 EBUILD konsolekalendar-4.14.3.ebuild 740 SHA256 4aa8c6417b5023fb723ac69bb1819d70b52f121058ebfe4fea37e5c671f2f8bb SHA512 7040d46b30484b8d2bb9a2dfb59a4d302f63428222be38551461a729b32447d4b64c02618d9106c7749134792b21cbc8c4f41d18c3c79d840eda273ee86abd3e WHIRLPOOL d56e64ab85dc519cd2235bc6b0cf41b930187acb779e2be12ea09623691344ada43248d2391dc7e8c781412817ad6bae82c0f2c3200745204b898e900f2cc2c8
 EBUILD konsolekalendar-4.14.6.ebuild 1069 SHA256 2328c23e384e68f38e5c28fe77c3ddc67973b7bf9ecf0dbb226186a6dee88663 SHA512 f5cf98f5d2dd17f2be0c0fd73c09cb340c1a17143b19e8d98e48febd2fdbc41bf920ed533253ac3a0e48020394b020fa22784d4ab399e4e751a9937a9d5dbb75 WHIRLPOOL 83d947be2acb5f8527101347e1ff2c4f48247df139cb0df8219c7f0ccff6a3cb2e6c56d2dbf05d0fda4fc8e8a68fd6a06833f4512b579debd4c53552794e986e
 EBUILD konsolekalendar-4.14.8.ebuild 1097 SHA256 07f43d485529db560c90027aaeed49404d8bcf18f54fe3143a55a99c9a8d98f9 SHA512 49ef29a35761c4b243686597d495d71bf770963c034b0ced107f795529f250714a493164d5cc45afcc4c01f0a8116e64341209fac7278bd1098c0910cafd1671 WHIRLPOOL d6defbeb50ea4ccd310bb054053be65f4f1fe2a294cf21e819e925b2bec929036fd53109d9949536d3ec84de3400ad895e1d3549cf7b7c0dc40cb63306222b1f
 EBUILD konsolekalendar-4.4.11.1.ebuild 508 SHA256 85f2bb0b061f2fb4ae3d96641b5ca39cfa6fda739ae8b5d06009e21c833617e6 SHA512 3bc10fe374f5a064c1ea31d5a738a003da7f3f238b8684dabff9b1a04c47477c25f1340c203aeab2627f47d76a4dd5d693139de5c4555be4a30ebab7e06ec32d WHIRLPOOL ae07f4145387f23511265046a9e9d027156e98ddd1a592a41a09d80225a67393ed88f04210820fe5d9655d9106590a30f8a791501a4436a02220b1917a44fa13
-MISC ChangeLog 40928 SHA256 c2b84839253c46e8f2447be95685431bd10cb212354e6e8c466ffeb5edd56997 SHA512 8e36bb7d330ebed1d2dde841de97f2c52e2bd10b1f93ed8fe54360b397beda9eace0baafb977da6a43c7c87a7f0c5174bb71daf11f5dc7f54d6b6967cc9e7251 WHIRLPOOL bf3fc6c5a538045c5f29397872f912c24caade9ff8aa5de3c3e5ab6cc1db2a9c8ebab3b9062a727c731c0a669442eadfeeb60ce3bd379f549fa6074bbae6995d
+EBUILD konsolekalendar-4.4.2015.06.ebuild 545 SHA256 9ab0063ff8cd7de55c594951c5c4309040e39ceb65088ceec11d498f724c0a2c SHA512 3f3df418c7ac28bc61f1d38ccba93f8e713d6c47a66c9ee0ad4286a0e31de926efb7940341e294623375778af819a11ab2eb4a8604a11e2787cc17c0791bd421 WHIRLPOOL 04805abd6d0a044424793c4c83543732d2b8ea4e01e23e071f9465e56419037224b5b5259313c736fe2b88303603275355ddf02c6e3f39d9227d1243cbda6124
+MISC ChangeLog 41122 SHA256 f2d326b714fc392e4d84c9c28d04347827065cbb566755af850d4039937579d4 SHA512 136445f4ec1c707f780522b12be2f8122fb9c74fce36c4c3f43727355411741a0504d6b82a8b08a3aaf5fe07720e32f319b4f8a03edd8c668fa2cff3a0a7f09e WHIRLPOOL 40ea989f3ba057df3352f795eb2600d37099a2795d3907ebd4b1bc561b6e6e4cf2ccb29f8709b3c5d1644c83d3190fc151f6621d2937e087a26f8b5327a64d02
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vYnIP+wR2QCY5xG4F4ZSmrd8yW8Or
-sxq4joRYwUdON0zVs1673qWPTxhSEf3poHau5jvnRiu5PMyTVdrmYv7Zdh9ss9ri
-GZ50ZogxmPnbIOaRaLid0q2ZwUcSOatgq/pfnFd8sfQmwS+RwWK5PYPIE4IHA7yv
-4J5glYVohaKTAsyBYGzvbWQmAAcFIDJGr9eH9aZSDARdGq7Pfr+Ga12VWSokb8Xr
-0ywfpskE8ySK0sfyTAZkvBrQ1YodSyk7cgxSIy3Blf4gKATEj7uMKTnSE0bSFSx7
-FrlM9p7tUN065W2u2qjt5Ay2dHpX8Zf+sexx+H5q543XAeO0s1/X9MDEoTkYokX0
-nVF1zF3mGyGwe99A3AJ4h//VA3nBRT3+jhqVgSTHRtHq+6T46CX3y+f1vcrNxgDd
-Xdbmzjbjx04hVGpdgH6kNOSDzgJMPjg5qWEmZqdkAuP27EyVMI+13U0GA1FBsnNR
-ODo81gPeicgXu9J4Ob4Ll5+b8hegkPFBeZv1EIG5cYj/97h/9e1kxFqge10DiAqL
-ohCcnkeHur+aOJYWjoSpR/ChwO2VMsAAiVHxHDiVfjlEmbILixzNp8or9ZIsNKuM
-IgfRCti9erDt7dnHvlG81UqVqGJ6/Igl/sqfDVtJ+sc296dg7XtKHZua6JPjo4Lq
-TD/jf/LGXAPugfGXl0X6
-=Ytef
+iQJ8BAEBCABmBQJVouV3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5gHAQAKOBr4J+4HJSF0VJEQ/Njurf
+4WyCWQTBFb9OmTiIj00l2CbGV93QSg6LCK8jLcLuCqZfmqGMC41RiTnyXiIFB/HP
+987cG7Hyr6JLf+9MvNCXct9GrM8jJa5lIEstVFZG8eq6kJW1aLsGSpnKBdKoDj+6
+a3HJY7oixDv87cmCrLYOooTwsYFWdRtET/zdCG5q1V2UbthNNxpv69Keetxs9LLU
+DK+umcVyDcNiKf8N6FBLGZPCpw9mKuKCjo7Lc3dwZTnmbjZ4HPCRx03/qUaFAdeJ
+1odoXhxzE44HpKFmw2pFtuvmyNZbSltR4Gm5H0UbGDFI2u6DJ0zwQ0qxqBUHhspk
+BALIU+3CojCDRQBEStzTzZD8UXFoLnEbt0Ygj3+yHfFbWdlfiSUU3/7/tA7YPHxc
+vAqu5fqmsJpg2lVstGpUpzBvwuLoxY98buZOh3/FOD/y9uScFlb1tP0npqt/VpUh
+dxeCNvLXfRB4vE7llQwp9hHYC5kCg4w3rYggdej1okznsZiJAUu6KRc/kUOtcAvb
+tszuSbSsXstmeTrG+xsuQmJTUgVWrUVvo/2Q0shmMd8N+9rxPb/M5IviM9IXqmBc
+12bj1qkYi9FKajuzbyilzuKqDlu57ImM518oc/KWCcXI90yv09luP18YP7Ko5+D0
+CPo/d1yglEoCukbc+NFZ
+=Qj36
 -----END PGP SIGNATURE-----
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.4.2015.06.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..89bb0a959d41
--- /dev/null
+++ b/kde-base/konsolekalendar/konsolekalendar-4.4.2015.06.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:08:54 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index e371109cbaea..b46d0f7bee62 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.351 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.352 2015/07/12 22:09:21 dilfridge Exp $
+
+*kontact-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kontact-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *kontact-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 89874ec27863..b0b1df9939d6 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -7,29 +7,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD kontact-4.14.10.ebuild 1266 SHA256 d5be43474a14939943ff4833e1e4fe6156c5126a4453ecfac14fcc4c3314898a SHA512 8705e9d6591805f23146124faf17cd76a424e90f0d833d17156e509e3ef79c7bd59c0946f6cb0c1ea1a7099d356f5cae403828b6075923abca109e64222a435d WHIRLPOOL c188a1a1e69889bcf30f4a080af72fb3ae59c4a2b6f649329934cda5d8ef94929d11d19994be226349479cf4db041da4bbbf9deda5fd53ba45ec2c8d062c5503
 EBUILD kontact-4.14.3.ebuild 1223 SHA256 16a67dbabac8ec137723318f1fff5ca1c0930b13f7312142700d56272e5c9532 SHA512 30195204577ba313eee4e4c2ce750749a96e114ddb3625471064e7ddc59d543d658c894f6e42e5d5be58525348ee49d97842b71a15885bc0879fad1d4288e6bf WHIRLPOOL ed3edc1e8ed303495a25a3fee1a1b3a1ebd003239437d84fd0ccd639a0ec0c0f7896c839f7d5e82e570e7516c3de23b4dba382255908d5710b77fb2520b71c46
 EBUILD kontact-4.14.6.ebuild 1229 SHA256 0e3f15abc68c28fd6b1e3c4deed99ec5294812985db58d91e859c1838924fd01 SHA512 297f97e72099e2b25f008c2cc54c0a25cc295f416a756b4493cb703610e112c112d0439de895e76908fecac70cca4a3393fa3b3b1cd5f7f47f9f21f5509f7525 WHIRLPOOL 0ecf5957dc426746568f5a392a95b75aa9a03401af86b849e80c06cc7fc97c15a04849441d3ed2db24c643d6c742e82cc77daa8dac507bc6faab0ae665905cf1
 EBUILD kontact-4.14.8.ebuild 1252 SHA256 cf581bc974e92fc57f68af7a5a0c1a88d8c367b02e2f35eab79fc5fea77cf1e4 SHA512 a4d7d3c84bc8d85ad61b9779f0f0111b7f7eb749a96afafc89e1d87102eaa1ac78d68231947c87d2ac01b08c9512a26078807e9a839347342f073eeec67bbde0 WHIRLPOOL c71922b2f4e856c1f9890122b16240a1119bc765c6431b8b51d78ec5268ec8c63cf91ecbc1f55e8e11dfa02b940f760dafe040d7d4e3645141d798c532d8cd56
 EBUILD kontact-4.4.11.1-r1.ebuild 1281 SHA256 1835f0e11285d16152e2b4692d380ea87bcbc1029cf481eca2acbc41ecac9ab5 SHA512 45b9be18f1e5bc61286068dd0b81d5a8e5c4af83a5bd4700d76cf66d67574baaefc9b7822a8c141f6fc1427e193afc4df2f4d1707d0d4bf87670687f416f44c1 WHIRLPOOL c3eff7d2efd64f08c8bdc15f23801a659b01fc04047594b212c8fdafbf58d9d0c48301ff253af5b36dc06a83272aa8a3210f9d781e8b5ec94ec04f921cb9b1e1
-MISC ChangeLog 41468 SHA256 990da4de31141366206c91a67387729340949f42999f575e9b2d9381032c3351 SHA512 f8bf3ccaf171dfeac381ad007843a37ced07030adc8a9c155e8b17e2d3099a9c1fe593946e03fb1758c34046eb677b7b9a86104a0abb808e5c0d9492c0cad80b WHIRLPOOL 42f3c2048261b753dc789aecc2e705d859730301f425865a9ccf3e06363f2904fa2800c95d6ee2fccab85e3eb1a83306d31c3f9236c9c2214401084b46376794
+EBUILD kontact-4.4.2015.06.ebuild 1223 SHA256 bf431a79507069507b5531a481965b0f6dd7d6713b2d66ad09f0481cdfb6c9cd SHA512 3c7c5e958014bf4e6890b338d316b498dc95cb044ff33a06b652c71fe6e8786a676e3647c3b5ada421dd284f0e7d150fc3ece916afe215b307597502c71cc06f WHIRLPOOL aa516511e61a05d7f53cd31839521a9748f150f3d871461d8c0fa51d3ac7306c9371c737ef83d69cd1091dd321791091b7caa95b46b0b887a36d758ab4bdc80e
+MISC ChangeLog 41646 SHA256 1cbf1a0e4b75d085ba04b556ab759f84f857f78f9bfd024340adee7578fd35ac SHA512 4d42c36ee769fa6a527d250606fe7949c4686c0eb8c41bd9a614b68136e481eed53167d547907a4ce726c080ab6fa36daa6e2b8ef61c4062966568cc04f4801c WHIRLPOOL 4c3ea4c423771ba025f6c260c2ee993232b3f1335b0637a4600aed526d3b2c8d40a672013fa07d745a57fb74c6701aaf8931c810f3a07f06823785e780074197
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vZdkQAMUbPwSI/JNHrKSuSp14faK0
-dfb0uJrlhFjmc4QG1LXuEO6QJP3i0z+Iq1QHsEjl6IeWqIRWrtyfCJIp564MwQ1W
-uZKpXg8H3/H0+ZVq+5BHokpYDuAvChSnrOe1Wer44hDyhnJ4um+z7GWAr50g/2TV
-Uy8yahBYo/gJ/LiXJZWcVDlwHPpAPMT90rjxZoXtPgmW8jI1NiXtp5LvDDlf6Wqc
-Sue3Jl7zo2RFYg1PZal1vh1wV7omn9nNYmoYll7EWB+z31bIGrHxJzeaUXVQrFqF
-+9K68uLjjRADjJPwy4qNXNZHV9xD0KDOl9ybYMElG4veb0+gGadxv2lbUfw/0Osv
-9RzKuHIvVRDmVq7eK5TGr+9bXlln0YigT/a1dsxSeFxOhUikU4AL0NDIwLkwtAa0
-9OFtp9zkdwtAC2ejU6X96moE+ZDQt15FeXJW7+eAf6ihZ6fFsyqsiTAhNU4as64H
-xuWq0afB9ZpZHx2x7wMTwGEdVQW16bmBZsVWiUPWEeEw7q+phB7BE8mj14F92C9S
-rzvv+tWnSVYiYDEQiUvRGG5qx29qs5yW2BSx88jr1uv2mBsd20n6Luubf4Rixwpo
-6rhW2dNP+l8d7IcoKoHcFr5Vv4tIuB1qamCwkS0E+8qo0sOtgyBLr/NFEnJFVxhE
-eNNEA0tzb3qwHxuCc4pE
-=TFvH
+iQJ8BAEBCABmBQJVouWSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5w68P/RiMLafiGteQcIfSvs5QIGSi
+igSkv84bEUQ2R6LeAjGGE9Slon+pjKwHnajYGFbHICnNc5ygJHZpBqV0JO+JSANr
+FcQLDB2r+Dmo0nL7lsBOOz3ZkPqQVPTmxQHzyhpbs7/a7ARWmH5f2Kelx6OBk5AJ
+HuYpDp42zg+si74SX0+u5ccwnPArpcWb2BEKv3jV8t/ZdtZ151DkFpBqbvAbcApV
+jsR29tLOhhpeta13uoZEPCuyySxpxsQYJy/ywHaAIlEuvR4gHXkrQRqf+0blg/72
+SMrfl1EN8x4yTHSE91IvzIWoEpmvJOR4P5Taw0G5mj5ktmjhjWqIyJ680gu5Nc2L
+MgkMAs+NDoQp/XFljoBt8W1US4HUd/FrO64WS0eyRq6bGfHMA0feGY9ZwOcs9Ao9
+dZx0X7q1zSyx1zpBcINVap3aDuAxBgtGoypmCqX2t4B971g0AaVDY9CFmewhDkQD
+GKT/ajUsi0rNk/j3z7Z0jUVs0NV38pzJF2QgOdGSrdf+yN8grtiA0JJxm4njfISX
+5cB6924EX1BjylN3t5kozduXVFlppmh5US0EBgVMfdSrJ+VnTKqzjeVmoibFNNu6
+smmzEjw4j3mXI9eldp/KCDy+b9Ks3W7Yu1MbPAgg/mrzgOrFQ34YJ8RdrEVim4tl
+PbTRkCuwHK/DNtZ5Qwsc
+=JIsW
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kontact/kontact-4.4.2015.06.ebuild b/kde-base/kontact/kontact-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..2e5c126a20cc
--- /dev/null
+++ b/kde-base/kontact/kontact-4.4.2015.06.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:09:21 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="libkdepim"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+# xml targets from kmail/ are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+	kmail/
+	kontact/plugins/akregator/
+	kontact/plugins/kaddressbook/
+	kontact/plugins/kjots/
+	kontact/plugins/kmail/
+	kontact/plugins/knode/
+	kontact/plugins/knotes/
+	kontact/plugins/korganizer/
+	kontact/plugins/ktimetracker/
+	kontact/plugins/planner/
+	kontact/plugins/specialdates/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kontact-admin/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index 344f04a713c7..4ded36fbb0f8 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.359 2015/07/11 11:49:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.360 2015/07/12 22:10:29 dilfridge Exp $
+
+*korganizer-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/korganizer-4.4.2015.06-handbook.patch, +korganizer-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *korganizer-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 702a112e1071..b1ec6b7db4c9 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -2,34 +2,37 @@
 Hash: SHA256
 
 AUX korganizer-4.14.10-handbook.patch 349 SHA256 87971e6114cfeb144e42d3ff9eea7190d8fff12720a6d93a33691d641c3e2548 SHA512 d3c87480d8eba3730625804043a9825c880b45d0991d8c47963929a311a891adf70ebeefc9923bbbcf341a0c12d729b4e0b46d11883b5eb82c8c3e57b5953f17 WHIRLPOOL 4d63d5d9332cd174f16287e3da04f5935f381957c466cb43d09d2e8fa4491cc666a80efb4ce79ffa456220d6a3bc8f5f086fd9be984d1432c83a99bf6571e165
+AUX korganizer-4.4.2015.06-handbook.patch 440 SHA256 a2992da20689aac48ff0d14d6a3332393aa9aad517e5cd6049c82dbf097f80de SHA512 841fcd6ba60a3f1fd96337eab2e39c6e2734f35558c015f04c561da7f93e8d5d814547e99f9987eb9a585e4c1383917d7a8160a0e6eb454a4f54beca73fb33a7 WHIRLPOOL 7c4a1b8ce2ca47331ef273e1d707c573dcfd60da8c97e7cc345552778ba7e676c253869964aaddd4245dc65fa8aa8200e4fd35a2cbce05efd4bdcfd31770f894
 DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
 DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD korganizer-4.14.10.ebuild 1855 SHA256 dc46fdc9c64c6a51efe73439efe5fe74d1996b7c9c3cd63cb7cfe9df87f45321 SHA512 718b0b1b46de77b57a1e0abe3e0b4c5e0907bf4634a4afc87f1f5efa2f8d205628d3b89bb0a91de30ce50fea7d976482b1e3f5c19264bd0991f0ed9207dc6ff2 WHIRLPOOL 86914cb6d7c9a893d7f0df9b37d31b019328e76b1f213d408464cc19b6840b8c23f90d5fe5322c0166db0a8020def63427a0ab2241d5f5d661516d7a2d7db69b
 EBUILD korganizer-4.14.3.ebuild 1529 SHA256 1eb1428427f6ff8f42b9b3a0545e45b1f4457b9a43ca4c7824e4eb52ed220e64 SHA512 85f75f3c1d6b66a6b0d12d78ef3eebef755592e93843c1b80d08463c1aecd4cdc4ed9aa10ca073897305a8025b22c7c5898e9452f2e4cf4c36e64c0ae94633aa WHIRLPOOL 49f6340597e8b84e94b6ecc5aa0b91e3158721bbb74ea3ada00d33325213ceb82ce0e4b99f8cf83079000cfc6a3494d4922952b183414b76f2eab1167b2c7bd8
 EBUILD korganizer-4.14.6.ebuild 1714 SHA256 a06ddba8edb4b9d329fff9ddd69f5bba4c4c3a6b6ac745084450dd889ff3398a SHA512 c6df69dad531aaa1e29f15d01630856e664becbffebaa5af4752d1791aed7d8078122e6f82b02ad39fe70a4e5bf2fb9d6b7e8b2f920045315e6ad08a381c6237 WHIRLPOOL eaf1066c7434ec94a77a33c51e53dd10a3cf0a83b96df0608d17170cb46411db63a25b08277d0e4e6869a1ed76d5f6e0ee1a7bd36999052d8f9e40053830087f
 EBUILD korganizer-4.14.8.ebuild 1731 SHA256 aa6a2d030b3809286b34c6f015092c70861b0c486609c394e8e6e36ac9436cfc SHA512 7bf4108bf843bca6081d6c2fd66a81e0047b2cccc774729570f825aded7374bd34e1af306bf778d17fc4675905f5eb0bd480289b6475f1b989799085b8b6b081 WHIRLPOOL d71451c8ab698fbb0e91cc7edb1fe95156c8997ce759f87e82fff82a16f9171e79dac1c9c50f50a13aa09b8a7cace6315fb4f611465233ee42753a74f4ef568e
 EBUILD korganizer-4.4.11.1.ebuild 1122 SHA256 89f1bfd4e08b5df49f6a5e7a98986e2f82d4be0d1b682c94842cf3e0c04e0144 SHA512 dc2854a738fc28fe9ac686e5135947b40dec2c4974f37cf7d5770121a97ba21dd876e4ecb73d8a63732335475049128755d8d7688bdda8124421b36d5b1bb073 WHIRLPOOL c44be409fa7d365420273921178bdfa737018bd5ddd90d342c941ed4d646d80673af5e9112eb4d6d1f669609e2f94de7a5fcdbf561c8958aebda4970564e3a1e
-MISC ChangeLog 45143 SHA256 1488d7cccb14eb8611272591494fa047e55f48808f4c3a9a5b2b046f23facf1c SHA512 874ef0379a110705cbbcbbccbd130b90ba660c1b932720ca83dfd6ae67525b3d52a6a6f8bbdc0c6ac214dad2784e93eafb84a2be64d2014480c53d9f08476f49 WHIRLPOOL eea708a791daf817db3f1d47fed2a6ec79dc38b9e404fc07e526d64e0d0bcf401b5f02f5694b56c488a0274c3e57bda6c15a80debb62441ed291fad3fa491b31
+EBUILD korganizer-4.4.2015.06.ebuild 1296 SHA256 27243ec7bb15a5c4165ea23935ad2e3ff502d8b1480854892aa94f94c04c5db9 SHA512 94437e1b24e6ccc6508bd01b566ed0863566e2f4e963cec6a905f8496646d6d2edaef0af5a5ec7534076604f46cbdde11e38b90badd2f43bd155955b11bad7c8 WHIRLPOOL effe43b0a89ea790298804b1d02a14c6f6398c654d26fa47820d0430fe927350c58ddabb7c4c9b9ea715f9b6b61fe446f8dadd2b28730ebad7fbb92eeda4f801
+MISC ChangeLog 45373 SHA256 806a024c0cb3da460d9314c349a74cb037de1509d9b2079bfeb11f956e3a15ba SHA512 6001f2d81725878d93c6beecab55ee84550fb277019f8f628e5457c4312453567f9c509896e88e15bc3d704938d56601d224eb04f35421fbb1fc18b8f0ac02d5 WHIRLPOOL f1d3dd8680962092081c6c17bfc79069d3b4d6cfc0a1b0dc1113369b7e7562a25bfd140ef2eb2d833064a4ed46b2abb6f9ace30f6eef5c7f132df60980488fbb
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vavQP/RVf9Z5W6XiK179F4qLZIVXh
-cOTlsZgkGwiUv4H2kOJX0LWBLSbsMn7rxRjy2T2kO8LkiiUWxH9jcAEi426JunhF
-Pdn4RNUvhKD3JmIw50uHhWY3cQY4D34esuAwzsMzUraLlkY+FRYHrXyptVuFvws9
-qdglKnuAR5ne2pN+4eM8/aYjo378jfSNM0hn7ixYnxHMwO6WFcq3JNP3SMsjcVrT
-SbsTXXsGSYlEl9HbAa2QbcaanolJBhi5QvRA7rpjBCn/sJ1fDd0nTuCk+a+JPQ9j
-n9BFz0AKWGooVhjLmH/Tw8KCDdDPbpIRFKhtG09FF1F6h8ngzXwXMOo78AE1UCLy
-RR8FYvnp/UxWg8C7r1zN8IHWz4L92sizO+cEg+yCE5yG9pTM4yho8wGgPMvrDfuu
-HyR2fW52cFysmUOotPQIL1UNshodN+tmt+SjyIKzLnL0jZjhPeWHXJw5tOXuObQC
-tsvnEwZjYLl6GQBWs67LKYxa33e8RxXNFspupAYYs26sIhQ2qVQb4ei78d+MDQf3
-FDHgSa9w2hSepIGK6xMukZXIpLmDvZH9dp3dLjDaV4i9Pkth4cRlK/kpIG4vnA+E
-2vPyiRBWR0rvmquZJNNgfFOaWTBIwYs2ciU2Kdtc9Z3O+DiBaowcIlqi+dDdJJWG
-7jzMnHYniNEUsdFmWXT/
-=6LgM
+iQJ8BAEBCABmBQJVouXWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5fe8P/2wL6dQt3z7wAmLoUw80kxdC
+Z+HPWLnA2+9A87kzlCdW54H/W9OW7I6KHHyY2e0esKK+p27OISlY7lrhMLib4LDo
+lhh3orIryIrXIHz4rmC82559oFhDHDVP1ZQ104mZxi+3PQoF5nTDaWkZQyRQHfc/
+cnr3TaIKLB5wI872qVBe4deKcLrjCklnuAwOyuLcdsEd58YGU72CxoTM/Wn2pkVx
+wfigqrEcNEPOL7WC7SUY+wIFCTLOMpTfZsGfi1Tr9+y61MqMAnDxCad/y79KLkMl
+4Dh0X9YIujVAK50akoq07gVRB5if/hV4WyEbekIQoTtap8B4NXilq5pN+BZN/P1N
+CN7XPV6uBCsHkPeJ/8fA1QPJ9gGRQUl4Vy0eura51+AgoNviF827ItsJNJ/Nzm3/
+qLQZItJsLBFvjNRzUVBFANXA6cwGLw/Eo1sNAifkrwW4C+CpgaRB9ku1KoQDv5dQ
+zxTwOTgNn3CcFkFcJ8TWEiSSu6FFGLQvVLyFS+ZmdlXW1LsaulIhwFMgYgIR8cUO
+4oMM256iTb0h9t2dMQRjtDkg4apPS7sHEC6mShPQgXBriyGoB95e1sHZvb4lhBty
+u1XXJ08QweG+8MgX0/yXeysJ4Ufu5N1QaRKgzAPVneZaBh3/Y/s0Qw85wKiyaa/A
+1rN7ztUvPgpvLR9jxeoy
+=PxFq
 -----END PGP SIGNATURE-----
diff --git a/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch b/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch
new file mode 100644
index 000000000000..a3050cce9a37
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch
@@ -0,0 +1,18 @@
+--- a/doc/CMakeLists.txt	2015-06-29 21:11:05.000000000 +0200
++++ b/doc/CMakeLists.txt	2015-07-05 12:29:51.517209734 +0200
+@@ -32,11 +32,12 @@
+ 
+ if(BUILD_kmail)
+   add_subdirectory(kmail)
+-  if(BUILD_korganizer)
+-    add_subdirectory(korganizer)
+-  endif(BUILD_korganizer)
+ endif(BUILD_kmail)
+ 
++if(BUILD_korganizer)
++  add_subdirectory(korganizer)
++endif(BUILD_korganizer)
++
+ if(BUILD_knode)
+   add_subdirectory(knode)
+ endif(BUILD_knode)
diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..c8269fb0ea50
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:10:29 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktimezoned '' 4.14.3)
+"
+
+KMLOADLIBS="libkdepim"
+KMEXTRA="kdgantt1"
+
+# xml targets from kmail are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+	kmail/
+	knode/org.kde.knode.xml
+	kaddressbook/org.kde.KAddressbook.Core.xml
+"
+
+# bug 378151
+RESTRICT=test
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA}
+			kontact/plugins/planner/
+			kontact/plugins/specialdates/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	use handbook && epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
+
+	kde4-meta_src_prepare
+}
+
+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
+}
diff --git a/kde-base/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index fed49096b60b..a372d4654137 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.239 2015/07/11 11:49:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.240 2015/07/12 22:11:12 dilfridge Exp $
+
+*ktimetracker-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ktimetracker-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
 *ktimetracker-4.14.10 (11 Jul 2015)
 
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 205ddff30a68..99fa9d372c27 100644
--- a/kde-base/ktimetracker/Manifest
+++ b/kde-base/ktimetracker/Manifest
@@ -6,29 +6,31 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.14.6.tar.xz 14557904 SHA256 9bea1d793733e8470bbd13faa0842c647630a3163e9cf527ef393210646735b0 SHA512 84501c115a3b3cff1aa866052e401135fb9e48bb2b373420811b5ce261ef5551561591f2f64d55be532db18243f84f9c982da80232142f091b61e618f984af3c WHIRLPOOL 0f6fe5e99d1948decfe146cd69a1cad8a87172420aa1ec589761824f476630ab12b468e2a919752bae08cde6dcbb4a74cbebdd903ae010225e1e9273086b7298
 DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD ktimetracker-4.14.10.ebuild 915 SHA256 3b619f4beb2dc3d940cb7ca4731f80a7b9b39b3202e771bf9649408e9f3fc9ba SHA512 8375b460227ba6d73b5e31458d93568a57f3e79de0546c2657f14b4fc37cbead7bf1f1a50551719479324fb8e0481a2d2c4cd2c67a66def75273ba2b7ef06804 WHIRLPOOL fac9925a43b4c078df9cb92fd7cec2767090b4094f06b815031b1bdfc99b0d7e9fb0a6eb8b8ac30277ce7ec38a33873fc5687a7c4545a77b0bd8192d1dfcf38a
 EBUILD ktimetracker-4.14.3.ebuild 873 SHA256 9dff74322a50240f520e63a03a3e93292e9d41f3315cc343ebbefcf017e9abc9 SHA512 24c0121ced1c839836e01b28f757eac331fa1253f0961a311468dd8cb3962f0a3772fc05c4a04335d83ee4163a0536b6a7122443cee187e9b25cf8e4fa448840 WHIRLPOOL 7b3d40556ec528ace525680f8b4e4aa89f0d60351d3f8a67a4e9200046924a4eb03cdd97edb419c7fc56076eda401435b5b825701e723c457327f2ca3467f4d0
 EBUILD ktimetracker-4.14.6.ebuild 879 SHA256 f48f92cbd0e752e430b19409c4d7f791c6a8136f591eb4e6a13e8bc7051dae18 SHA512 39de78cc12e6406c56ada6eb74144b4e4d1cf178345909ffe7c1dff4d13666f1c4864554e3b2436bffa6c289f9a5395557a918279208e9192278aac1e26fb159 WHIRLPOOL af423f36752a73d5a34e5dd71966da41f990a301f1833aa00bd1c82119e72fee07209cb9fdff0a6eb772239ba2648202a74da416555d965ef183985bf4027333
 EBUILD ktimetracker-4.14.8.ebuild 902 SHA256 1ea8f87bd0b36da6dbd15ad1cd74f7a59ebe586df4f475b406199ce1693dc860 SHA512 4151501104db5276acfa1978b4b69880f95b1380734cea2ec2565b06fa763696bb33a1b0c5f4c94e8bab1140509f4f1744bbdcf69098c0cc2c0e828d3dd1cfb8 WHIRLPOOL a78cdb7e8948272bdbb0eb14053a105ed0269306e7746d7bc0622e1c60e6f887be0375f51c0a12fd2167f0065668544620c6b59fef63019123b542105a3ea662
 EBUILD ktimetracker-4.4.11.1.ebuild 775 SHA256 4bbd110350e3a1f5810f04f86800956b7e826006820bea4c84f855f870ea4db5 SHA512 a26b8fa311e7ae2cc57b4dfd567351d523d27a6f43d161dc604e0388d68029f88ffd2531a94e9c954b36210f7bf97f7797dac94f8a71c9b54aee70b41c60745d WHIRLPOOL 90f066ee18db846b6c3c69309aa74137b8cc7e642a871f784675a2c687f494b47966d86c8e6ca9a90314879fc714dc20b0dd9e290e2d354c992ba02e4bb4b6c9
-MISC ChangeLog 30084 SHA256 f526ee470215a461aed43a274a918cfb9dafaaf4bd5a8170e5e6276ddbdbe87d SHA512 0e2c4f0c83c0ae33f9691440a057a9c9de0903fde724f4a0ca2ee500758c1adda3e675bf2c9da437de514a1d6ea426ea7a3bcc9417f1463181a3326a897aca50 WHIRLPOOL 98a97e95b30c8dd29095c87d88393d39350018e59eea3a5756c6e6ab395dc05e73ac2f047ace9009ed2724770b1f1cb44b6a7da6fc0e1b33c123be69d73b1a64
+EBUILD ktimetracker-4.4.2015.06.ebuild 815 SHA256 d2e7aceef9bcd8a7b586925c35492fa511fac1dbde4d89828e1e0cb775769bb5 SHA512 8cb8aed1d988e062bd69cf04b33e06878203dd59f7f348ad8cba30a828661850c6ab8a8793667d15cf049d0704635470845117f69ffea85ba89a60576f88c67e WHIRLPOOL e83ef6e9983c1a6bc1b26cd93a67004703cee698a8a33e2489a276ee1c216f91763e664db8d8c8a46253b0ca531567cc5a9cc1b4b09d1d99bf3f209e2b446216
+MISC ChangeLog 30272 SHA256 2e708dd588d6166e4ccf80c8196defd0f016acfcef98fc1d92bb62e71ad4265e SHA512 61784120b9df459d5550dc31ca75a152810024225499b51833d0520f3b91fbdaf381467d5a507c7a330d0eb25c92d627d7b2bebe5d86b085b39d88a20d12f24e WHIRLPOOL faffef8faebe3b1ccdd6ef207bb3bcb5d5a6f50b5482db0d03a2386024f64b9a823e8ea25cfbafc4b5cbf1e4dfab94d0f3b034d237843c66a90ae399237f2495
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVoQMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
-OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vj2IQANGaG25LfRWATSdZVYEbqM2s
-SlMEqAM23GdITGDeOZplmKfDI31Qzl/D0B//I4VaQyDGiWOoHZ55e03+6UabrFV6
-4zbWs3FazzWiOMLzdJd1XnbFvX24qhz7XjD2E35wQXSAi9zg5a/of87GWx9PBo6y
-VQQwxVHYY4uMJ0T+ePrMWO4bwSyOPrMsz50g/ezAWArPgl1w12pp0cygCW8ofsnQ
-AYcVmDAivcApDkWoyU/GsKj+dnvMHs4R7B/LhRRc5Fk2RuiUoe7uO1ndCtQdbROr
-xRv3LR3ASzg1WPYMEArNM2qHExWUgKiL+zh6muGH9kMe8fu7Z5djY8sW7FouCREG
-g8w6/cy0R0o+BLmcWmTMVw+w8XB7RlSwsojfExH8AY5FvK4evVdg6E+YsNdWbkw5
-PF7aaQiTLKoFvux9gCca3e5XZgvmaslCyV2x+yEPQWEQbKhIooTLTjpzK75NeUT6
-ns9PA8ZPJtrkjpSzj+Q0q77JkQfDbAEblMhU1zCYWjsA/dhH76uc7/zwyX6iJANU
-EQOqOGUTK8dmfPUqpvhSQjJJhY62NFkF6bz4rbUH1ZlhF25b2Volx22qA5AaiRrc
-IS37HsVVLnRe7lIkV12IKN2iRNVJURecUia4phoXk+r6O1Z2spsFFvA84NzSf+Np
-cj5oc3qlV7veQVWvUBdq
-=gBq5
+iQJ8BAEBCABmBQJVouYBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5UVcQAIRMlVGKmMulyspEfEuATnsI
+IClaJ2GiwOLaLDBq3BijI7SXF+dzmjr0wduQnvi2n7CDB6zac91EMGtbNgdwxFP8
+i5V5eksKHtjV+LEkSE6AjGqEjzP23K+9mFUtuweDsbLU/62SMy6l64uMCFtL6Vtv
+B0553ZoWOOxAMJTsLdZqfY8C8p0AthGh519JtOAozYWpYn3ak5T7v3sMg8e8sdmu
+JZcZ1rl8uQBdgoaTgxZNeVDnM3nRXGENQlW4xkUJTJAW8bn4v2KHBlvdLq5ulD/T
+WUfH4g2vTujMegzD5QmNLPuBSLzJC0zC7rU44DykEPrdjE/QYM3K2R4crjWn3OLR
+CfvQ7672r2hjXYPhzg3HHl7Vgf2dNga82vGxfZqFL+jgoeKfAt16AyYAZrwW6IYL
+WhmPA0yo8Whk9Cc4UveQRiAX0VpPmWwf9Pm8SDxbxnDH7hYLT0R6A/AyinKKK692
+k1t+ljrhL2eN2aE1ZRPmxUKkGz2x60vw7oav4QnmtGALmI0UOcT2jzPO2QTGIsG6
+CNvAKQukG0H0Y/wkf3CXXK+p93P4AH4Oqf5iu2Jfk7f09VP+hPLopBTG0t4HSVbk
+72wLBuPMSuQQiEPnREEso8g68NjbXhox+f0b5IR9BVy5pGTttHm9cO1fiL44q146
+qy7pmDhxVlm9U7lDy/gL
+=B+z4
 -----END PGP SIGNATURE-----
diff --git a/kde-base/ktimetracker/ktimetracker-4.4.2015.06.ebuild b/kde-base/ktimetracker/ktimetracker-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..4ca6a2ab9b24
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.4.2015.06.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:11:12 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+	kresources/
+"
+
+KMLOADLIBS="libkdepim"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 857d206eb163..1d63400fc914 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkdepim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.202 2014/04/05 18:11:45 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.203 2015/07/12 22:11:53 dilfridge Exp $
+
+*libkdepim-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkdepim-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
   05 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   libkdepim-4.4.11.1-r1.ebuild:
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest
index 7958753d081b..ea7f3d7ac949 100644
--- a/kde-base/libkdepim/Manifest
+++ b/kde-base/libkdepim/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX 4.4/0004-libkdepim-Make-spell-checking-work-again.patch 1946 SHA256 57ca15b378faab075b8efd76b0379defcef1e8c110b60f65f3fb9272feacc0cc SHA512 ebb33447d06c76dce434ab6847674a1f790ab6300e0617cf8e88289c6af3ab8d96f3e0c62d7e9d01539fd30cc4dff301b9c8a77d1eefa2fc6b72198804dceb4f WHIRLPOOL 4c6a3bc00f976fd456c0940134ca389ad58cd4cb28c30a04d235e96c2a4b3ab6cc4dd25a4ff23558b3278f40f02b4c2ebef6837d244926aceaba4c137ede32ca
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD libkdepim-4.4.11.1-r1.ebuild 1082 SHA256 6601609c52fcb75bb7d20aaf346bec4bbe7be65aee6b174fc356d151bfcd5f63 SHA512 90f702eeb883ef30984f6a867447b674b43b224d23f9da60bb30ef383c05e125e3059cc4151938082dbc43e4e38f4ce62c7e357ea40fe13df1e7514487b4a6a8 WHIRLPOOL 078149f0843fe814b531ba793ee710cf0fb584f8c88db3b9c7596eeea96e62bd015319ebfee20dd7df4c5bdf837c73718b1e1f0a852f50838a0a9ff0dc41be75
-MISC ChangeLog 26054 SHA256 9ebdde4955887ca513bf2d72bc289b566683560b7f2e883c9314df302dbdf3e5 SHA512 6bbc460e505639126de8beebb6046041c45a3d9f3edd247d53444bc7123b4660c14f686fcade2fcb6ca34bbed440130b74032f6456bb8e98b6745710d48480d8 WHIRLPOOL 2bd20f899f0d24c7ac6cd9a9face1c2ad1a1581910616aa474bfa46973a9d86f25469afd151a75b2e10af4b3103b6f1f8bc0026a103dc1e44811b72b63fc1046
+EBUILD libkdepim-4.4.2015.06.ebuild 1084 SHA256 fa27a3aaddda2e8fe6bd9b14f39360bdc461190f1c4ff305bfe68d23b56f2b0c SHA512 929f89b1e390c36193a89377c6f1d99b8e0d412707868967c2eb0f20f4be80548af5381458097968dc7ff978b9e12b6efcb8f5ff99c0e873b4edb5994677eedf WHIRLPOOL d55429d645420768aba39782c6c68987a1ecdaba375aa4b156bd34af71dc1aad139228bf99506618a22d1d8968b82569f617f9b5a853ac517f817b3bf172258f
+MISC ChangeLog 26231 SHA256 a7e3504ffadd306abcbd4b54568478e1bc6eeda4fdbc5c9556c270710a9d6286 SHA512 81f456efa25b60f110a1af10742742213cf1626b3af81c50ae84fab24a04da0e3b898e0902bf4ac620229846ab4c1cc31b050a56601f337c991e09ac1cec5d54 WHIRLPOOL 2709abe2f7e30f249b8fda2f469bad7b17c3f85526aa8c7e1bae11fab7a6bd26ccacda5dd6a60b4dec4665e9f27d72264b8b338ff98c49285bd2065084a6e573
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTQEdiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcs/EP/1WgbOFkm/RdNgxv3R6WMbct
-Cf2NiReqA2eFZ6Fzv1Q/zXLO+sj2XLVUO5iN/qLeaYz+H0nE/WYjDgxouBEAWcsA
-qXOB3DwJyN8BQtZD1cbSSsJ/Zogb6baKudFMbn8Y6wri+n2X/TvOF3STO2M8XEYd
-9U0wloN3k0ZOqdAJccG2EFj5eIb9MRRm+1CcI5ONRJgtR8Bhdr40Oxy+4oMmYPd4
-42aoe4RyIUsffNheK3pSk0ZThIy34BpbfPPphR6ercdvguKC3Wp5ByQoT/IqVpbx
-bW6IZAJZ4lRKg0dJwWXLIWvf//IXzLWQyAnLNo040YI2KxbRhInjNmLB76kaQNXF
-BHiKL16zyV+aZUkp9hTvUhd+4uTR+LEujPb8TvpVx0pSYJ5fJlR9gW5d5JyIYcdO
-NEk77hgk1Jq1hj9X/dEK1/1gtalHQG704TG3Q82Lj3TL+LqNXquIK3iVQ+ygt3nP
-zCyqLJ0lNihjlL9kEYcH/5RowAo8Bpm2y8lnBPDZjb+sZArtQ9ZdQzbDHiaPbHkK
-mFlbbZzBrJhvpWtdS7Hh2bkfrexUzEdvd7FWgLdqNfasA5B2zBzF8bn5eS4LuLos
-upKJqHgLf4BsvFuZbWL/UDG2ZmflWj9T86IvX+aCJLv0fULuH1pxhXkes9KbKxgu
-AGWwFgHJkTPBkFYv5X8Q
-=wkvb
+iQJ8BAEBCABmBQJVouYqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5DM0P/3hVtNxEBtGOCJ8w5NZvheFs
+PS+QHA+LoFtkO3r64AZ5W4c2DICxr9Ru3k0AVLEiBoAbRT3CPZiNokx4UKw1oVlw
+bIVy5YpjSLYC76LgM6HbjkbPNUdcV4xqbxgKgnreRKIlEFPhSiba6Al6ezTRIjRp
+L9C463DpG8H2944vgKAb/VwoduBOzkfrbCRnZH+rUrraT8m7c4iWayYrQJZYUJ12
+Vemmki6Y9KUGz3Uu0i2PVx3M+PWkVthPmtRCgZInFVOTEo9MUULhzOdOIf2gYXG+
+NacOOeKIACvhInYqCMv1UIeK+JFj8h1K2zCdwKuBy2ytMiI6vJSzg8qkQXrsJs4a
+K2ISEFJfgA5bCpPaj/nLz5yuOYIxhzm6I8ZnxlhAopyR8MvCdCAnOLrsJE75ofLE
+I1kAY2V9ihtLy2L69zHYjsj1pX/7/dqoOrWCl4BOwJJZx4f85DI5/PCEEof9I53e
+WxGO/6vFoUunJEyoRbL/N4jIY0F242XRWqfH00uOwGRgBTxEf4yxBKgxFKJoRwPB
+k9JSC328sjoMHNinPnya3OH5fIyqZQklCiyIhqFKfpF8m96gIGklxd4kYVpUrH7x
+p1sC0pgYw+U1HUxSQFXyYFGlbqppqD05X7+yA/BxAJ/9Zsr3jseh2hT1BN27mD7o
+VKMZWUTNBE+SvJPiOZ/G
+=2Zx+
 -----END PGP SIGNATURE-----
diff --git a/kde-base/libkdepim/libkdepim-4.4.2015.06.ebuild b/kde-base/libkdepim/libkdepim-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..8b1cf71f0ce3
--- /dev/null
+++ b/kde-base/libkdepim/libkdepim-4.4.2015.06.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:11:53 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Common library for KDE PIM apps (noakonadi branch)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+	kaddressbook/org.kde.KAddressbook.Core.xml
+"
+
+KMSAVELIBS="true"
+
+# the one test that can be run requires a dbus session bus
+RESTRICT=test
+
+src_install() {
+	kde4-meta_src_install
+
+	# install additional generated headers that are needed by other packages that
+	# are derived from kdepim. e.g. kmail.
+	pushd "${CMAKE_BUILD_DIR}/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
+	insinto "${PREFIX}/include"
+	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
+	popd 2>/dev/null
+}
diff --git a/kde-base/libkleo/ChangeLog b/kde-base/libkleo/ChangeLog
index d6298bc68514..611fc95c69c9 100644
--- a/kde-base/libkleo/ChangeLog
+++ b/kde-base/libkleo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkleo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/ChangeLog,v 1.87 2014/08/05 18:17:16 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/ChangeLog,v 1.88 2015/07/12 22:12:23 dilfridge Exp $
+
+*libkleo-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkleo-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
   05 Aug 2014; Manuel Rüger <mrueg@gentoo.org> libkleo-4.4.11.1-r1.ebuild:
   Remove trailing '.' from DESCRIPTION.
diff --git a/kde-base/libkleo/Manifest b/kde-base/libkleo/Manifest
index a0c21a06ce01..e4390d1d57c8 100644
--- a/kde-base/libkleo/Manifest
+++ b/kde-base/libkleo/Manifest
@@ -1,5 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libkleo-4.4.11.1-gcc47.patch 631 SHA256 78b60aa738b1e5f937867869e5bdc651bca33c40102e12ba2aeef918c54fa0d2 SHA512 55c14998ae4df67e983e2c9491cde7bd87b20010e4149a6ecfb4e1deaa231e8271c278cf56d47bee01912d7d78c55f5ea40d720905e62742a551661905beeccb WHIRLPOOL 22dbc0bbb63015bf3e2dcb9c74670a8fb298730265bc4e67042dbed74842d8e5aa05ca7b443e4a2fc8411a4af35182cca3a55623ff5a6e479e5c8ab30e5b8719
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD libkleo-4.4.11.1-r1.ebuild 583 SHA256 60f320b90dbe38d03646148d197ff9f86d4ed05ee95e711a1a0116f7fac0c30e SHA512 70b377527bebf26aefe697e7db823a2eb6834c4277a39e0ec08e9fa208016b2a630c7dbe57e33a2d870274e9e034d4612fa3b5aae499bbf27e047332aab81092 WHIRLPOOL 1e4243c9d46ab3474c8d89da167af55ee7798f3e954def6c0438024bf5201b01c24eb7e3010424e1c9c2561c0c4a0b92bf64b626b5c244f79246e08ecd4edc3f
-MISC ChangeLog 10700 SHA256 b04ee8bf0e07a0ffb0833b7d7c6049699a277ffde32f6f8a3e6c82855823212c SHA512 a7caba8595edab03054a06aa78beaac78894880224ab149bc73e153d40d4ab1f0de29801bfb780326099dea6939567d1abe7da6980b39f7ce7b08dfd107aec2a WHIRLPOOL 9c544fe4249b71e5fb7ca24a37e53cb989fd83f995c6189b1977100e1875ef5d73398fc0a4a18ead78b5eae108827db06e9934379da25049dfa195896b1871ea
+EBUILD libkleo-4.4.2015.06.ebuild 545 SHA256 f691a64dfc542b095491f9350507353ece39477e618018babbd2e5005f263905 SHA512 ecbc365948a5b376c2e4544db3f1c51d99a4672be026e185b0ca7aac64e0d852c2dd1a9036a0887165b5dc10c42558b7b717918add2f90c79f8b91bb42a237a4 WHIRLPOOL 8a36500141f91b3f566c276b98fa385d5489c98f3f2d878a5d39123ba01baba454451d930448ca2bb939b8bf9aec0f5e3643477925df362434c69456cb597aab
+MISC ChangeLog 10877 SHA256 622e807e7d93f4f07c484f5e2aecfdbc9ad9d111341ceed155097a1ff58d1e89 SHA512 b021643883ec80dbf261f3a506354018df6ce4a788603a6bff6e426262d6ed6025ef928c8c059f17547c3d1e5ef587112816749d109b4bf6c0b53a5535db4489 WHIRLPOOL 44ed3de00d7a3cd101b6eec8a7afe4e870da1669d2924f3cadd16aafa50087f0128cf4142d81bc7649107252173a844185077f97496beac5e7e2a4929ccad797
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJVouZIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d59JUQAMmg9ruNSFpQXsxWfilv6k5r
+LPwowklEkMOrwlBREUsiTd5J6CNKY2iaExk+zKFOPZEPeDvq/2+7o4osl4uzgJRY
+wczKVYSBdlvP+FIQezlnAsYSjlOmoDwACUtzDjJTqlBjJx8YlJ7oV0oANPcd++xZ
+lMmzhG4tvs4IF15calQ95XIqwvaKsXkdpkVGQ191CX1k8UCff3uIhcKNkg/2O33o
+/qfwVkgYGbkqLgtctoypOwpoWyQlmZrnLDVRsu4Yz2tmwzCuZQ6tvSDgrXOlc1k3
+Zyvm8pWxRfw1wodOgp/w3BW7N90eTf2e2b8gjoI8qt32Qa8S6o2MNortYClVPejq
+t5uAPJXvyf+uyuapmpd9LrHXitA2W9pMdFEeZ7UNBr/yh/43+CB7i6FGzpFfT6Cd
+6EMu1GtJ8WaJvF+Edk5hlZQO3JRaVDYiBTdo0y8COoCIBmILVO5EuTI2U/DulDkZ
+YeuKcJiVdRDLY8aoxHbXG9AmiRowL9xNTQxtmjYeBkN5ACM6+WJuD/2i0g6hzK8h
+mCgLE/OFbgKZM1K8Ejx9LR494b+6/oYrEBQ9ktb4Tw6vPU8Cjv2+L+io0Di9acrS
+irJBceOPN9I/Qwicg/XIDUVr/wJ3zDfAaGlThKC/GQl3TU6ZkDYKIuXf17ew4fTk
+Wk4UDBZ55H2KeLGk6AcF
+=7l4T
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkleo/libkleo-4.4.2015.06.ebuild b/kde-base/libkleo/libkleo-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..49e858e77f90
--- /dev/null
+++ b/kde-base/libkleo/libkleo-4.4.2015.06.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkleo/libkleo-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:12:23 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE library for encryption handling"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMSAVELIBS="true"
+KMEXTRACTONLY="kleopatra/"
diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog
index b13faaa9d953..7242dfb9a4ac 100644
--- a/kde-base/libkpgp/ChangeLog
+++ b/kde-base/libkpgp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/libkpgp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.160 2014/04/05 18:12:56 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.161 2015/07/12 22:12:48 dilfridge Exp $
+
+*libkpgp-4.4.2015.06 (12 Jul 2015)
+
+  12 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libkpgp-4.4.2015.06.ebuild:
+  Version bump to Pali Rohar's noakonadi branch
 
   05 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   libkpgp-4.4.11.1.ebuild:
diff --git a/kde-base/libkpgp/Manifest b/kde-base/libkpgp/Manifest
index e690800b8fbe..1dc0026c308e 100644
--- a/kde-base/libkpgp/Manifest
+++ b/kde-base/libkpgp/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
 EBUILD libkpgp-4.4.11.1.ebuild 398 SHA256 2573de8dbfd4b735abb0be71f0e4c291466da9157548ac31b425f58cdc39090e SHA512 70ce527d865c76886e7b68752c1ffe272c0359ee7ee1e1fa85e3c674e61625cf9964abed93bce74d320b53b846c9bafa4d3e2c44757ab5574462cc8bc437d9f1 WHIRLPOOL 722b1db5754bb595477d6f6803fe7d0592e4bec300f6d0f4479a4c5d39c1c8089c96efac282aa9cc02c4e46d059986d3148990cde6d990726e4b7a208e7d6d61
-MISC ChangeLog 18686 SHA256 72b15f6805dada382f929ed07d7f7f2fab5689b0fb37d35c4d5863a779612535 SHA512 8a6134bc6bf12e69667e008f88b1cc3a87b67d55917bbad4be13ebf3872ffda5e78fe78b05b9d98e7e2c23c0c6a4b1cf4847465bc8a8948bbd0d345fc2b4fb25 WHIRLPOOL 3c1fb219a966da1b819b139af02ae00c0ebe7c7e4d72d291fa5de90a527cf96fdada6c67e10ac1d5e3b933390314c573122f5dd7c994887ebeff51f269729118
+EBUILD libkpgp-4.4.2015.06.ebuild 404 SHA256 a3c117fc8f2e1df6985263dad532464d19080b523dc497f87e5425bd0b86406d SHA512 cd696e6fd56b9b6a955ffef088c076c732d6dbe9ca9e7ceeaf2c78d1305930729075ae32e18e6a7ff112f3250b30d918c9a125f417846376f63a37e6a8f46be7 WHIRLPOOL 2d4c56b9794b031b9f5884f298bd48b139498384cf98c3c07285845596037c65f3cabb850f68614c510e1465c79c301642fdfb67796a1b230f8bd2461a2b8daf
+MISC ChangeLog 18859 SHA256 1c9fdb924486a153389ec4aade4e02a8faeb2da793f3e617fcbc63f2a720c673 SHA512 843350c662fd1e7a3a38cdeb5304872cbc73ef7b08b91f499222b0363a9bd7f2802867864d2818c8252af843595eb9e8d03b7a1c7009a920b1afd955a061b6f0 WHIRLPOOL 33d98d483d9e4d1c61b76b0baacf981b871f53b8e34240f8bed575824940f234a4a392e0e5febaa213d0c838a0eda068b8f2d9bbc7b3a8a3392fff23f04042e1
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTQEepXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc49AP+wQu/GpoB3nsvmMNf6MnDczU
-at7J77jXDePWzJL0t8DO73QcGedV9t44S0YLKuNC4OEPhNKTT51wNj+gNTEqjsF/
-odSDz8CKtgxdvWnUOtE1sz4LtrJrnVKZa+DU+i+25u+IEMDM8Le/aDPtli/lyai3
-EFmt7x4VBaD7ywJAUtY1DhmO5pteaE7LjxTUvLXir04SL5azysx3EAw/IrTIBhpv
-TNgbAs6X3oTharswQD/Z00Rh5bSo5NYvzzbQFA9iBhyyxjh4veIkWJDV8QVqbiHn
-osKyWJfSXZ065pG3r10Hy6ERRmZ8ZjbDYw3ZuYjllvlzwJVUY9DPYkoHqLRlPrBp
-yJDuNjxP/+CFOfI27KmO/4OV4Ka0BjGF5yXwwo4w413nqwXxhDwNjjnSvx1EtALG
-n+xKk2zrIkTXQt2u/VvHbtYRdPIVryn62I1yGUTBhl9JV0hMR192NcAORu/OaG9R
-1srs/LFYK0gsLTRPXaY8KeTVkCLgBZDFOBOKvggTucAKNprnUJq5STzBY5FtxhQM
-PuVFzvc8tR8+WiyB5IMjnrJFwiwcXsP+AiKaa/zEUkhTbfhm7LHHyP4WjuLCCtx5
-/cySXWvbTAAcGF347KVceLBnPBTIkQiMIUo3xWxuQWnEKd6jGWkGCI2VE3iR8PFm
-YzHBRAI6MMApo8BbgacZ
-=E9Pb
+iQJ8BAEBCABmBQJVouZhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5yKEQAJY13nhlErKryyU+YYLqdEaN
+Pb0f4Lr+Brua25ugTH5rfIjyJSx9V335+34ZuNljpR37v+1N/NdGFvysHODBRwH1
+stgNb2k1anRT9QeedPb5RbrOqN2FM+vhSKhkd7CKCnmINVM5AX4vufaTrKFLinGF
+oWt++a2GZQivYdmsnEDd73vwLYkCalU2nVGIAnTICbKKM5zzVPNmaKbEebbmLIuO
+VTGKcTDXjndJTi61H9vPJRIH+HovRUV5iVa4LTLc1MeYfpWuaaR3KpXK0dHazsnT
+4mJw+lFKz5guV+BQnrjqyuFulm0Q1M8AszpTsPmBUDcWWI5xrZxuDHQ/RyvYbunM
+gU6Ec0ryMfYNTGf5zb6tSc3K4BHClYSQm15arwvi1JSmVB7S5IoMJRbTry2CC4aX
+g/2+WZOWR6AdV7C1RNV0dUrEOS657ihoJUkiv8rs2BsxTgjctRrJkoMIsOLbdXEh
+BMf//pOqXS12GcXDZD+1b+n7l4rnCe5HFyPe4auPbsbLV1BUJUKcsyqYfkZDTgBW
+ILs+3TApH4qrnC8S49j/x4oIaOTLeLn0w2SZgTy02dLy/H1Mqe8ov40nyOcX9F1o
+5XR2vFhfLQXavGYJCtqnQE3q5DmAI48jrGua1QG9siva6OmJLV5XZyTmJhJS2S3y
+3pqgOta2z4ohl49UiwW2
+=dluq
 -----END PGP SIGNATURE-----
diff --git a/kde-base/libkpgp/libkpgp-4.4.2015.06.ebuild b/kde-base/libkpgp/libkpgp-4.4.2015.06.ebuild
new file mode 100644
index 000000000000..f87d59387bf2
--- /dev/null
+++ b/kde-base/libkpgp/libkpgp-4.4.2015.06.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-4.4.2015.06.ebuild,v 1.1 2015/07/12 22:12:48 dilfridge Exp $
+
+EAPI=5
+
+KDE_MINIMAL="4.6"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE pgp abstraction library"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
author	Andreas Hüttel <dilfridge@gentoo.org>	2015-07-12 22:12:49 +0000
committer	Andreas Hüttel <dilfridge@gentoo.org>	2015-07-12 22:12:49 +0000
commit	ef323f69e0147f7fc0b77c59e1f011ec726fee6a (patch)
tree	973075727ef514dbc2fbf0f99d5778f5b698595d /kde-base
parent	Version bump (diff)
download	historical-ef323f69e0147f7fc0b77c59e1f011ec726fee6a.tar.gz historical-ef323f69e0147f7fc0b77c59e1f011ec726fee6a.tar.bz2 historical-ef323f69e0147f7fc0b77c59e1f011ec726fee6a.zip