Remove old.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

19 files changed, 114 insertions, 361 deletions

diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog
index dda7e78a8272..fb95986df1a9 100644
--- a/kde-base/akonadi/ChangeLog
+++ b/kde-base/akonadi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.104 2015/02/16 08:31:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.105 2015/02/16 19:53:41 johu Exp $
+
+  16 Feb 2015; Johannes Huber <johu@gentoo.org> -akonadi-4.4.11.1.ebuild:
+  Remove old.
 
   16 Feb 2015; Agostino Sarubbo <ago@gentoo.org> akonadi-4.4.11.1-r1.ebuild:
   Stable for ppc wrt bug #517344
diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest
index 5baea05d5b45..6cbf5f7e42fb 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -3,23 +3,22 @@ Hash: SHA256
 
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 EBUILD akonadi-4.4.11.1-r1.ebuild 1023 SHA256 1a64c6d27158e1b09420e8ee2708d4f2287ae20779805d67cee1e283591724f4 SHA512 642fee728334d51831054e000c31324d06ff3fc82c3622ecdcd3f82283a884971a3edc66eb5d1596dc876928ff4f2612581ecbc4e64b41374129c62bb3c745b9 WHIRLPOOL 1bccb630ce0ea51f57fcb4f7ba124bb24520e31ccc5c406bc3470a4106c4f8329c202deaada5286b5d7b7401b464963885fafc50832ec65204bfbfdf32ab7d1c
-EBUILD akonadi-4.4.11.1.ebuild 1047 SHA256 28a2a62f8f817a34b9e2df0dab5abaf54827578fff30b8891b34eb745e4aa84f SHA512 31733fbe5e72646545dd20a7b4914a2ff8a544e72a3f4bcb79a79b66f9b2a2bbec60d6343c5ae468ae412e706f7aefbc06da56187d30204e1d1b88ea5b4aa596 WHIRLPOOL e9664e2b0b4b6ec6298df926329c60b62a9b7468c7afdaf680797f4fe08d2cee423484c8e8f29729c0c94ebb8c747113c685eeadae8889a2e2516fd718c4a7e6
-MISC ChangeLog 13014 SHA256 728b3379a1fd7008a43edc68338e42b37a35ab0086a1945aefbaaad0d472d1b4 SHA512 da131727a4817b9aba6f3066ab00b289aa64f78dd6e71657a0eefdc401fdc3428cf156e9eb553df274fcc1176d93fe4fb91deff60b54d8122a27decff22313df WHIRLPOOL d468ee15875b15babf1057857c519c658ea540996eeb331cb762a9439c1ac85833af2439d988c5bee05247c3347d6b9b212c0bcfb3f8a2c57714aefb2ac7550e
+MISC ChangeLog 13104 SHA256 c233009a783be8cf76b70b1195f5f26a83edaeccacda06ff4fb6df6053f28aeb SHA512 b2fd566ed78393519a2f974c81417cfed430821496a0e92e8736cd2c235010a3d5f02cec7b4d5dd4358499840d4b1d3dee9fb06ae079b85fdbcd4ec12344ec9a WHIRLPOOL 08a895f89dd8e184abc95a0d5e2e8df4031d2787d991a04bf037291123ba59210ceac94e3922b3481c645d8c0d73ea47b58ecaafb22dbbda2c4ef45693be8035
 MISC metadata.xml 264 SHA256 32efc15c63fd9700059a66f445311cb07b7f1bd882c5d9e81f9a8861d6445f54 SHA512 977e88d3d19c3e2bcf0ab8918acda9f0b413042a6f97d9dc9cc0a3033d41402f50964b6b1ece53997d7d6976c26c9afb582f5ea1e3d48fff0ebe6a9d8fd392e8 WHIRLPOOL 881e6c1a5cca813b154e3efb65e3bbca2977b663fddcef40ac323da86aad381fa3cc712c5645fbff2a946bb3d235673e5929fce64dec20e996660d38561def80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4atqAAoJELp701BxlEWfR+UP/1L0UdFoB/ozdOoGPvWYz9Cb
-XzOCmuawUSuBJtoafTNDicLdflvUEcuCr9uRtPdZ5Z9gbf9HSZLyIgAKNwpwHjUD
-c2Dl6Z8+jn2Xh2j22UR40BI6vmnw1D6YY1Jen+j+v5tkrW/mwDFVcdrO7SRODhBb
-fXSM4CqwVd+iePrcO2Ziw4HG2ERiSa2WeLDLYVecM33u8x/XFytUVi9uD4hXCCwG
-RjSNB7j31NXRtYO9Pck3Rk65t0VoeqhIKbI0ke0dgaEfcMhxnOviAP5tUASFlFbp
-5C4ETjDKvRK8MA5cqE4BUSY3SzywJKv40KWO/7VTPzXpM2AwB3w57k0+O6etxQTu
-9aISCx4BVm4pRPF9UjIv0I0W6AosZPj4f/Cdtc8cWUsNfPEL/Z2etMEgieGcGPDX
-gEUO1Xbi8TSRV4UcvVh0sJaiWs9ZVk9nbATekqWtcPl8LT573wTTE1T0aNzp0Y0W
-Q/vmjvBKVmkLauLVQmN62VNdftk0t4yUwL8lwKhlA2BWV81yGBxu+swoxYmvkgsx
-eeu9xHjL5wn+NgnSIFdGDChtH1LGLG2xnNy/Ih1LhYA10tLcckGXb09uc5MYKS8V
-8j9iXeD4kAbNKbwoY1f9E5PKUNebynudwcJlqT1zvlKRVHBlS/CAx3L7+5rpY4/Q
-kYT5LyyYhUx6w9hxTn9Z
-=bAHJ
+iQIcBAEBCAAGBQJU4krAAAoJEGVpnaTzz9K9C2wP/jXftOHhFvzVrElKwZ+5ovOM
+HJmfFjPtyqOgawCOufTAVf8sXg5QDqtUFhGr0crn2/l0udaClQ6fKlUHFXRBfHeg
+1byjLN5VXhlNeARDTktsDuBsVxEKipMnhugwxhkCc5ChTVqtEAvXraBUMjIk6sxT
+qMx+q61i8Kr3Hqo6q1HTE36Yn1cq9LE35rBQbR8o7CTtXcHIeaPS/7M904P22Vyf
+zJzNcVFGbywRiLU0L1MwkEqueJTSXON3VcNG4nVmrghMR4sPFVvbllqeWkAmsr7n
+HWD3Z4yg7gRt4uQjz1P3mvJUCpmD4z6x+JLi/Xaiv9OQMVAMnvGYuSsa3zwjI16h
+jQZOIaKFRbxRFrttIURytY8+7KWdj5tAbtR0HQTtNZLON/AZKFqEpVSpq3toUaXj
+6Lc5n8B0+m6kOGf7xFzL3oa+iIC6co+oO6Idw/TLV5G8w5CEdg3+PnUBrtyo7VTF
+7GYiRdUd1slD5i4fSmuzzobuRjDIIIpzGn0OFO14jo2J9GwYH8wEvGbMjZaDJwpG
+44zGvcDTp8+UKQz71nPX3OAxZ+4dhkJWgNct0+7VjHH6fMVKwhrVA8/fBWyis6e0
+FdAwv/89al2Y1h78tImPexnbyP0/ZpbbgBYcDt0yYa+E3vn/+tU0N4LmEkI4m7mq
+/Cu0uswL9Qse1iWe6ihO
+=I/jc
 -----END PGP SIGNATURE-----
diff --git a/kde-base/akonadi/akonadi-4.4.11.1.ebuild b/kde-base/akonadi/akonadi-4.4.11.1.ebuild
deleted file mode 100644
index adecc447a6fa..000000000000
--- a/kde-base/akonadi/akonadi-4.4.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.11.1.ebuild,v 1.14 2014/04/21 13:26:06 johu Exp $
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
-HOMEPAGE="http://pim.kde.org/akonadi"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	>=app-office/akonadi-server-1.3.1[soprano(+)]
-	$(add_kdebase_dep kdelibs 'semantic-desktop(+)' 4.6)
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)' 4.6)
-	$(add_kdebase_dep libkdepim)
-	!kde-base/akonadiconsole
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-KMEXTRA="
-	akonadiconsole/
-"
-
-src_configure() {
-	mycmakeargs=(
-		# Set the dbus dirs, otherwise it searches in KDEDIR
-		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
-		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 22f3a16bca5a..6d9fc6bb55b4 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,10 @@
 # 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.351 2015/02/16 08:31:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.352 2015/02/16 19:52:32 johu Exp $
+
+  16 Feb 2015; Johannes Huber <johu@gentoo.org>
+  -kaddressbook-4.4.11.1-r1.ebuild, kaddressbook-4.12.5.ebuild:
+  Remove old.
 
   16 Feb 2015; Agostino Sarubbo <ago@gentoo.org> kaddressbook-4.14.3.ebuild,
   kaddressbook-4.4.11.1-r2.ebuild:
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 56f22d4f71c6..b8232b13d8e9 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -5,26 +5,25 @@ AUX 4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch 1
 DIST kdepim-4.12.5.tar.xz 14259060 SHA256 5e26dc33b5d36eb305a24a834b153515990ea8a501498b63ee10103df94c6ff0 SHA512 fa0a35210a3442fc5944133619ed7d867ce01500d01d17712e5363970f5d39aeb03885dafd9e265a6b37280bfa47d51a24ae7ee229077ed9bc68c433533eb6e5 WHIRLPOOL 0c5a6ec47f9d1b6843e11ecc2890d6f2110325c1cce5d3949cc321fa8d8338e4e24fe38af01929ed9f83db0ee6a76ec48e8a8c1a2d91a38aea574851b842bb34
 DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
-EBUILD kaddressbook-4.12.5.ebuild 1083 SHA256 499738f5722f16f14e4f694af82d0519652c2a19ced819425810b30122d78752 SHA512 cb25c08da967c618873e96494a8fd8cb22976445415ea33c4129268ea35aab08d8a9519f2e7e801c8b9317d165a46cb2d2f64f76bb801421d7893a32d5a03f30 WHIRLPOOL 9a508e2549a7cf14b47374d98eab2a23ccc64d2747c753a7a1a2d2301fcf80a282a5c042875d9d0071825caead57c6bfb72e5d3c53baad7cdd4f4eded2e7b9ea
+EBUILD kaddressbook-4.12.5.ebuild 1077 SHA256 63fe4a51be14c91ee3fc702ca9384a5c8a11efbd5abdc59c9c553e4c3cf77534 SHA512 95c4e45b790a2fac12d1716773bbf194dc2efe5e49ccdbbe2907deb5d3aa23741eddf071888929901b46764045bffe7df5ece0bb6e4a5ae9a1d8e68ddaec1ce8 WHIRLPOOL c83584846bf43474a24894a3654ddb8100c09075f8706d6fe283f544e3ee74ffcd68e76965c859414475e0a4c8b150f31642cc8c81ac783337ad941bcaba8aba
 EBUILD kaddressbook-4.14.3.ebuild 1132 SHA256 503625667a71967c4cb4826383cd6fd684c16e0927b1ae8d9073897e7089966b SHA512 2dcd7d7f3ffad17537e9e85ab0c733ad937f2a75fddda3a6cb3faee495da247e2d292125fedecadc8b341c0e3ec2a9704a9581a342a1e3cfa016c64e0ddca47c WHIRLPOOL ed32cd43f318089a6b5cb87a05865fc83372597eaa2e7b0dd468130ef8aefa58a7e1e07ebbe2cb5fa51761e0aad0e09d273efd96004e27fd0680e9354899dd3d
-EBUILD kaddressbook-4.4.11.1-r1.ebuild 1002 SHA256 701eeaae0c9e969211649d8de6f2b696c6e3f818fb012ac999fad5c8896be8c2 SHA512 7fbba57fd57fdd797ab7060e4aaefcb3fd035c27bbd14ed5092a51092e1386be6170de2d7bd7677c10befff7e460a84057cbb0170b204cfef8fd09a51fc63b2a WHIRLPOOL 59fe75db062eb75337cbbb3204b9403c4b050b344d8ff936109861b2c31fec9ce82b77fa53868d77f5cd8170033d5e682ff9fa29a59119e5f3f9970e2358db49
 EBUILD kaddressbook-4.4.11.1-r2.ebuild 971 SHA256 8471d733e7dffa322509ba361f7a5f352dd52260c57545327f9afa258d188575 SHA512 da225d44c1fcb5ef12e052e40c04e0f53ee0df18c338ec7d51f8590cc674ec98c8bf82119bbfa42e468246c610ce458e94a426b23d087e10ea31b4e847cca34a WHIRLPOOL dd10b2f5173564a7ac5e98127c9b31a53108b8d4ce3b009a31a62f6746e17d2d9de266b56f0c3e6ba2093c038b6a77900fd71a630225b39df2df8f8fc97b138b
-MISC ChangeLog 44929 SHA256 9df952c3f801e46fe7d7a330ec62d5b7142e3797cf3099628cb78f9750e80e54 SHA512 8b3e52610b41d8e21e60a3444e2648c7d0be2126933429ec9520aed327019eb540727808ce836e53fe0b6987d86751f7c25539ea1c37b1a9203550107d7c7a52 WHIRLPOOL 9c600277f97b9dea8d4ce53c7de7387b0ce6661974ae87a47ccbeb99e513fd85bafa70aeb5bc7896b26168492362f5f5a31bc5aea8f9baef814efc79eeb1200e
+MISC ChangeLog 45057 SHA256 3d2c9df507940b191ed5eab6d9f17dd44c207043d82d6088ba387dd9a103d01e SHA512 6d8cd9b40738d295e48c9f6f3a780229d5d51eeb1de4dbb847e32a19ac51de690f376e211aaf80c2e946a18b40be87de67c3c2ebc269ee4585b741f7353049c9 WHIRLPOOL f9b118870d6bdf35749fdecb80d39646b3dd5f64ed55741a0f097c5738160381b632fcb0255a64186efb06d70065effee7fb88532382093dff6fe31af4f7a853
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4atsAAoJELp701BxlEWfLSEP/2F5SW6GZH5SUMokAJFTzfzD
-n5bFD9Ab2IDa5u9GUDicghDNr3VBAUJOpLYUrvH1kQqRyRbV0s06GS9Gc+di0/fo
-/fWCH2B8HAqlpRY/lO4kgkTbe9Iiqki12LYwBa0c6hrKpfpWQWdl58iYwo1+qbEW
-t0tj+3i4Y0OBIWh9HXL0oqO19kZxM+QHUlgbh5jVVRGoAj8j2r9+ti8CvxfRPqRP
-d8XfvkjNa3kk+Zl274NnFeW3DrY3aXxyGdCjY3u5Jxu62OUfKIognCJJPACFTpp5
-ihzl3PpiHpifrB3qaf0Zj6B4Aa2/IWniBFdUOOk6ZvMOXzcZ1OHu62F1TV8ytEtG
-TTZH3vxsMQ13Xvzk8l9CzM8EIJhKyzIUJqRCGsDJFwD6epunvJd+qxsDUgQpWkNm
-WBY5alQJ+MSPT6TXw+zk0O+mv3onySvg/QZ2kMYxjXUX+9euPC95Qo6rLOWGbjJ9
-mWwxzVZusXnXmlAo+4QrY0GLOM3z6/sWtkCHICWBJEpjXSCDYdmKVddczn4NEI1C
-/5DyW/R32dgdOavysSWNoAyuXoMgftec3tnaQ6pOwwnrtwswoQzPtJK3tviFy6CB
-Snqmu/ag39K0ribFScnBlS/HqonOkxP94gotSpBqQmJ/sH4ry1OchmKEwBrrsU40
-WLNbxI2hVP8sHsBhzC4Q
-=VhmJ
+iQIcBAEBCAAGBQJU4kp6AAoJEGVpnaTzz9K98UAP/1EZdr2du909/+O7uMwf429w
+UW/EWJgkroFSTRb0pkUPdjp+p5U8hNeGb6HnvTvYLXcjxCE3X0c9ZK8xpQjdsDth
+DAPyb2FnXCl9bCF4n3ZXQHqLlJ4SD32qIFb5euhsw60RMwMbPkCpbWYkbJMWGLCW
+2ti7VUkebTAapAs/xWkIb6fnk9tOBLl+Tdvn4MB1dtlkRU0HPLJRBbNWvqHWw0OB
++qrV/NcVmEKrNJOsAzkkE35gxA9qEUDfQmr7c1QzoVz0J9Ed4xFsoSnruQ2O5Sw5
+4iCKZ4kaIZpEcYGPwFTsl3LnLXDfUsPY8IBr1fQOIt/2SAk4q8O6mpHVmbXTij5H
+TFW8RPi3XTPeECumORP+T8o0J+CPWWpWyqf61WOPqUeEi+yymYVzUMs8bRgWLkkc
+aWS4TwvN2/qfNKrx817ZYen/HNs+LnVGkCm2Yb74UNC9ejn1BECUg0b79zNhckp3
+tdWTis8gpUAyHFMwVyn745eMHx2nyxoA3BW+DkqIY2EEBh7bpJK/gbObv4M5Wyub
+h+iqRM4oi3AslcL95iB1ejx4T1AwvoUF39DkM7VHmyDzrYDgSyim3q+2a5diaxY5
+Yis3bzB0NQ8KXXErsYms6FPlVc0+viJK+K3LVCcDZtgbIZcNt6lbzCyOu+gkJJYy
+E8uzXXhURkbmeWwI0Ryr
+=C55Q
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kaddressbook/kaddressbook-4.12.5.ebuild b/kde-base/kaddressbook/kaddressbook-4.12.5.ebuild
index 0207e9726ef2..093976ea4c68 100644
--- a/kde-base/kaddressbook/kaddressbook-4.12.5.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.12.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.12.5.ebuild,v 1.6 2014/12/26 10:57:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.12.5.ebuild,v 1.7 2015/02/16 19:52:32 johu Exp $
 
 EAPI=5
 
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
deleted file mode 100644
index 52c5f90dc359..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild,v 1.9 2014/04/05 17:54:21 dilfridge Exp $
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop(+)' 4.6)
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)' 4.6)
-	$(add_kdebase_dep libkdepim)
-	$(add_kdebase_dep libkleo)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	libkleo/
-"
-
-KMLOADLIBS="libkdepim"
-
-PATCHES=( "${FILESDIR}/4.4/"0002-*.patch )
-
-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/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index 5c1a8d68bc5d..ebb101613b4e 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,9 @@
 # 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.348 2015/02/16 08:31:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.349 2015/02/16 19:49:16 johu Exp $
+
+  16 Feb 2015; Johannes Huber <johu@gentoo.org> -kdepim-meta-4.4.11.1.ebuild:
+  Remove old.
 
   16 Feb 2015; Agostino Sarubbo <ago@gentoo.org> kdepim-meta-4.14.3.ebuild,
   kdepim-meta-4.4.11.1-r1.ebuild:
diff --git a/kde-base/kdepim-meta/Manifest b/kde-base/kdepim-meta/Manifest
index be409393469c..548fd7ef840e 100644
--- a/kde-base/kdepim-meta/Manifest
+++ b/kde-base/kdepim-meta/Manifest
@@ -4,23 +4,22 @@ Hash: SHA256
 EBUILD kdepim-meta-4.12.5.ebuild 1187 SHA256 286785bf071c06fafc7d11194988178c5cdc0f15de0393b78ed9017990a012cf SHA512 aea029876928078869460960d1fdb20c5c85be0de0977459af9ccfe179dd092fd83029445e081675bf0604194d2ec7e0120ca88303a7a8e8e6c3d3396561175b WHIRLPOOL bb4bbc462b9deed28773e3312b0b12db38af4a819ef19a5fb37ff574df50256d49fd5cc8907c8171beb66aa0bae5eb8d0afd1009b97437960e2082b64dba025a
 EBUILD kdepim-meta-4.14.3.ebuild 1149 SHA256 62da04d9760152cb39104fc52894b3a0367a836ef899722f950f643ea7afcdb0 SHA512 f544afe0e6b22c6fda9daed54a77d6397e294dba3ae1e42f39fafecf9fc76cfef420de17b8b1b2810538e918f30335f9945b56d50824e011010481427e63f263 WHIRLPOOL 3867a2bfe13a8a495c3ef56af1741f6131504a2e57d2d503d0655253653fb944af5c2dddc612d5ca81d34c2ceff511c39ff451bbaa41fb654e12709bebab27eb
 EBUILD kdepim-meta-4.4.11.1-r1.ebuild 1213 SHA256 b851487951893b37f0e69daf9fd7603572838db409615b8c774e94f76eda132f SHA512 193e8123474239f70fb35206c681400e3063606e46512da4b82bf535ac38790f7366f3388611a30b98b3c00323b01c640fce25c9b207cc03fb1cca091b9e9878 WHIRLPOOL 59876678c186824198ca6c42a9ccbb2749cf9dce79bf6d911ce9ebb24881af8cd0f334eac8529b4949b7a6ef974b5716968ca709911781b742f54bb08f1ec6ba
-EBUILD kdepim-meta-4.4.11.1.ebuild 1234 SHA256 5d5c98b2b169279656d793168b36640385669cc62fd2d0d17b5bb166610fb655 SHA512 370621de5afbc785d4b7e2e7a38e4e8cf7ab507502387445b99cb6983c375bc847b9f7fb95374e31034d725198e763f18d6a48a597c554ce1ad47081679eb1df WHIRLPOOL 2de99508f669cfa39f53a48e60210d5548f3476229ba6a30b906be9a787ef6a5e1e7bbdbc67699f4b7be7cd3f45a99a888ee35d78bfea041753eb745fd8b5678
-MISC ChangeLog 43067 SHA256 50eaccdb14037827a47f3f6d6cbc35bbb13e37b18a797d2a19aaf79922502fc1 SHA512 929f4181356cc7571d2a32a1e9c34e26dbb8ec53001cb819dad360c622f2b1b6bd23dbace0f75aafd6fcfa013aea07b0ea76185e08437767e8802ae99741a798 WHIRLPOOL f9e1129556eee5595b5fe5046ead0bdfe1a0ef555e9a103ab2887628c3e19ea2b1600d1f1f7ca366bcb915c22265e25965fc794bf9accf5a2c5ee452327be230
+MISC ChangeLog 43161 SHA256 bc802f0239566a5dcf36b56ce252a5c08adaac68a9be605134eafc69b4c8816a SHA512 e55c633db6400e4bdc1f283432bb0bbce07b1bef79d6bb1d123c71e0c35e51725c7851ff182d0cb02fca6d03e50eea002a680c2c76b1d08b01c442d131ac5295 WHIRLPOOL 7f54668b819a622e76a5413460205b01f4b27d698822017b2905105fb98321a8028ec7c44a311dc9a82aa54010b150f11f2686f7caecc6548255225172a19d7c
 MISC metadata.xml 250 SHA256 2408dde55db5121baf6ea40f9381b79210035703e98a4ce899cba12a47a692f9 SHA512 30aa58a653fa69ff5b9e770f34d701f3074757365d5232d059fd66ab3963dbd5d47bac2484142457e6b55995480ddb3372550bb5d770fa985fac226aea28f656 WHIRLPOOL 08f62759be103db937b21dc395dbd24d9a6b7c7473507cf3b421f955bef82c683d16d77ac7f2e9c37eb94653741554ea97f030e37212098ec3f59bb4bdf9be4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4atyAAoJELp701BxlEWft3gQAMTuZLpqObUZdokxCq1uQhMh
-5IoQ1FZcJEts8uNMCl1z+yI2ddDgDPoMva8mTd6gw6PJU5Xm+cdJV0pUlYK/00eX
-Eounjtks7uAXCflvdGnzKQCrmiP46b9d3rYS1ll/Wr6fZxpJcBtQTA0VYKvNoom3
-/GD/qbmeuE4Y7luvFdDu/z+BpiThnMMf2PIE1TIC+G3J3K43tlsnIV9t+MwQohiR
-jdjTwLeufxEdwRVymvoIyGjuTMZmckdiqj8vHFDTiXT376kjz4oc71hn9tAT1fND
-1HiYkbSYq+jUiQei6tBooooe3g8q8XgN1BVdTCr06gTssq2MKpSkMTXDF08bAdb5
-GG8y0TPTrOVAeqKrxFGJsgE9NXpAoiTzxxxNm2G6e4SGBvc4ygJVk5AY4IhVP26k
-MhqwjodSkQiXv+kLy36IydyHgQoOih5YF42uhyyVImwcekHZx3wFShumEuTMjYgK
-LS6/WpxFLC9BbUUlo9DJrS/D6//QRxLptH9PYktCH9wi8UxnX6+4tRSf6nYezTRC
-Hjq88CLq0BTE9SmQU/JqAcVphjHwy09pdCh36u/Nd5YUmCdAw78xgDI3K4HHIb5m
-24O6LIGmJB/xoNRG68laZZfAx7jHrhVV+c7ma7e4e+gdvJsJa+675vDJFGfE9Lo5
-clAE7fyifsTz/I03461t
-=ItsY
+iQIcBAEBCAAGBQJU4km3AAoJEGVpnaTzz9K9BOkP/0WgSNqn+/MbFSCXvHDxtIzw
+oUUL+hA9bkEfnRmw4jzEPOWa6xDReCwaz9vvDJc2G0PfNwAXCUPyQO8ZG4ODuQCW
+3VYB1GAE1yc2WpnBielrDN7WzypzmfgNP715TZyhDV+z7i5WSQUkmkOikCJD9hlc
+JMfGmxy+NwjqF2514aU/e746i11CTlvGgvXLP+Y1PuUEUAggf+ZARp14TlIKOTSW
+I+JKDyKovo75z8BdqqZ2vhZwC9bgMmXC3IBoh73QCDR6Og/+gHSvuvNcFxFR3kko
+3QfFgglaOuil7kw0kcOzrPsX1aMu8G0y+FSNxksYWbOyBFg/vK8jLwLYaMMjrrJ+
+uvgZoF7a6LNuUkN/bKHvZNPCKq4MrdAPQHQBzlPER1ySNoAJYsAQmcbCPej4OCaq
+gCa0TK7jwDRPUTmHkHj76h2EUCjW6pv05qMAvUnOVc3s7r1l3Seqq81xKRAqb4Eq
+YuuRRK7zzf3eI2Y67nmdszXkyK0c0eu/dwkIbhSC2MC9EUskvr38tXjoJslcFYHC
+Rsr1TH2Af2xp8/yicSTddHcFpBguRwU6WGSq1Uxqh6oLN5CEBMvJagxGCGfJfN7z
+hZOojKZNblt5Fkogg+oU5yzSY+EVnAnOzCPa7dADYeuBFSqttZm0gHDLrQQv21BC
+8nsh9gu5jvCQ+i+QJ9HL
+=N6qd
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.11.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.11.1.ebuild
deleted file mode 100644
index 02b1cff330b0..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.11.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 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.11.1.ebuild,v 1.11 2014/04/05 18:14:51 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 semantic-desktop"
-
-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-runtime)
-	$(add_kdebase_dep kdepim-strigi-analyzer)
-	$(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_kdebase_dep kde-l10n)
-		$(add_kdebase_dep kdepim-l10n)
-	)
-	semantic-desktop? ( $(add_kdebase_dep akonadi) )
-"
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 1b6c868003fd..0a8fab6fe9db 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.229 2015/02/16 08:31:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.230 2015/02/16 19:54:57 johu Exp $
+
+  16 Feb 2015; Johannes Huber <johu@gentoo.org>
+  -kdepim-runtime-4.4.11.1-r2.ebuild:
+  Remove old.
 
   16 Feb 2015; Agostino Sarubbo <ago@gentoo.org> kdepim-runtime-4.14.3.ebuild,
   kdepim-runtime-4.4.11.1-r3.ebuild:
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index d7acb5993167..dc181bac7d06 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -12,24 +12,23 @@ DIST kdepim-runtime-4.14.3.tar.xz 1168856 SHA256 2d8fe881c86b74015e3aa44df042110
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6 SHA512 37f0de7b37ef1d4b116c258e35644f99a6734082cdd5a984962246dc58ab9124020cdd31350a06058e067b0ea3fcddbd864beef6dbb13ca529b637a2a51071ad WHIRLPOOL c1fe887ebc1162aab17cda15f294b94ec06e3690221647fabe0fe2ab7ae718f2624bf100cc068771744ec4a951c539004ee2139bae965e32ac49002c66929b71
 EBUILD kdepim-runtime-4.12.5.ebuild 1224 SHA256 47d80d25d582af8c567f3f55c2f1436b1dd151e3bdc644e5047c033b5e619271 SHA512 05ba5044e72bb61109f6c5e7cd9b5ab9f9139d954b14d9443ca69885f03cf50da4afb91a42b0334995cfd5edbda7267145f0eb36f80e96e6bac9d956c490c635 WHIRLPOOL 12c41bdb66c1cc3af75fc3cf2bc7bec1ac719daee11829d9d76b60c1dbc06b2a22b3019eaaccbc616313bca813c22faa49ea46404a0156e882f8243abc3e6b1c
 EBUILD kdepim-runtime-4.14.3.ebuild 1157 SHA256 8a626b55f783ef80af5e05add4201a2dbde2b043cbffa3232b871e11c85eb32c SHA512 2eec8f7dfa6a9e8261085260f2ac3ff0273a6f6f58d491d5ee3f041f92369f8b250ba52916eb1d8b108ef7c51d344d4d7eb3f095da301f9b06200c5b002461a8 WHIRLPOOL f109dc8fc7e3ac8a76a558d4457fc0e29aa5aa8b93846646a9b4515368e4ac1c9f246c5696b1f50fc5aaad85cd1d44aea0522fb882dfdf59d2ce3222dc8dd142
-EBUILD kdepim-runtime-4.4.11.1-r2.ebuild 1016 SHA256 1e4069f917cc8eb775d96c76280ba44895615cd22145e945b41ddc7e2863bb7a SHA512 a2d8ed146c96abced48937bda46b26d227c32b0115ce6674086a6c03ce794d27382f608a7a095094119d56b211968ff8b34ae81a1bfb2f1023e3c385c1885b10 WHIRLPOOL 99c012e6811ed6a05518656af97b827ce9f25c1f17123d97272de741dbffc7b947d64665eda64c567e52b75a1adf33f083f96d55af038d26b1e30d03020f431b
 EBUILD kdepim-runtime-4.4.11.1-r3.ebuild 1010 SHA256 8306baa76a5aba1f3e2cab882e115fe660a67c13c79d89cf19e2c71d18d12702 SHA512 c697187a1b65b225c2f66895198843d0cee2e33d788db7fb20bb36809bd989b272c725a63b0e9e01839220e19201321c49bd3d2dc51cf13aae659acb511153d4 WHIRLPOOL aa71d7b39d0e5bc0337abc04210b58038260c450dfc095a406640ee4d7c87a6256270f2ff3d1eec85124a04a2a1353992360b6a162493ac27d2b408c00b3e7d1
-MISC ChangeLog 32331 SHA256 e019a66da9e7f029f32db7de4216641b0cd353f1a721d6512d8ba3fe7a2060da SHA512 453bb8c1ebd2db43d5f41e2feb35e4cd882f5877666e869cd4e0403905bef6377b0c3a7347bdc433195f7e46789eac8c1428e20eb723657f09e6a255ba625ecc WHIRLPOOL 58830afc4a91b67cd049611067e1e8481c06a0d254c084c7e1cac742cffeb792e093b2cdcf5edc2b6144c7257b08dd7e2f5428e3d8cf860ca9cd3c8ab439c7fa
+MISC ChangeLog 32433 SHA256 52f3c079c9ec45e609dc7f76a30b5d6a0e019a0c54de28529bb7fc00ed296eff SHA512 57c603f572f91316225bbaa961c17afa3c6b7dc4164063f44c8ae00ae58900085da24f4317c309356bc6e733ad1ad80e953b9cef838559479a57d97e541c0a4b WHIRLPOOL ce504a85e53eb4253579cff830a65fefd3dcd247ae44693e69a4bcf09d9c4ce9c8f52b24f3cb9826e1f4c8f9649e2b121ef7961bf9d86e67cf0348358491bccd
 MISC metadata.xml 350 SHA256 bafffe596d33a865d1b37fe2debe878eb0858e69f7ad79a2d30c5229ba73f6c4 SHA512 48644af0621dbd39d5d60c25b4326469eaa5b80525798e721113287933f174e63702a33ce20fa54b08b2f9aca7d00684b1a4aeecb9c0eaabc3612a2deefbfdc1 WHIRLPOOL 32fe40728eb501b4a519ec6daff3d85d86b0a020aaae504928f24948cb2d5e8782f106daa3c7f66deb2aee84963dd80540f1e0dd8185229b9bbe556da01801b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4atyAAoJELp701BxlEWfenQP/1ySjl7+TWRG35WEkSmnW3CR
-P+HR6tXRIBmZ7DDLDYZCy3H2AV8fN7s9Kbg0xg5SbTgVuempKoisQcCPp6bFGuNu
-Kb/EWSsScdhnAiMjvME2i4owkiahamD5a26lue7ikvzeRnuZhdqa2p2/V6qfd9Nw
-d5I7MCDbejwhmG2YBFzfxmptkUK4NHTebMUm0mudLO2qY2EC1ZI6a8G9N3vV2CWO
-wyvaSDcb0rgumyIbWnU9kPCxhks98kaN8MyektzuiMEeg8lHaNdFNSeCvIfXKR8w
-zr+5PMrkEWifT75zaEs8lyxBfXptfChKs8AjJ2t4Z/Phq/MIUSpJR0Hm7w44Jlxc
-IXaC5QCDt17KD03cNCqJjS8DfsHb9F8C4FoB3+GQP1OkfljqPAT0/txsQNFTm7O2
-6+Y1CNndP9F6RfJSYWboC9bHE2NYtg66oI4NZXez9aiSShDuJ8cVJ0nBAHtdB4lP
-wmt2pUwQaOCE0p49+JyfnMyf4hUxh1CMQsfRzWIIvyXQRgB21qy5n8rdJn9l1yTz
-MZCuGRdSaN2ggHjccgZyIdO9AWryiFSrSlMOqO5zL/yfJrWtGIpJF9Uvvikt6pGu
-2iFSNrj0yWEe7KruzvNxxPzv8/BthB6M1H/k1ze7T6fDvaCSmQ5lxpcEyMOQLuTf
-sa/fUd47BoWH/L6mw7wT
-=cEPx
+iQIcBAEBCAAGBQJU4ksLAAoJEGVpnaTzz9K9C7gQAIFa7HPYRGFlG00Bbj5KIVo4
+EDj2lJ0qLvtTYYmzKFnJu4m//dD6Zoej78FDRKsLqFxg5pR3ojYkqXzarNMervEl
+PoeOSr2g5StIaK0x2k1CzHIwPMjteuJpa9/vl+A7X0SQFEvRQXk+jGGpv65WFc58
+2HLSynkldLMLtyF6Np8vaJWorTe8echWPZAWMIxdxfWnQc6TWzFLMdyZxztEGxuV
+6f687wcKXGkQndzEF5V9ijub1mYFIfHpwXZIC/Q6Nwzt/lp0wxH8Em+U/pJIOAVb
+SdxneVYWOodcSnRah5QVjDYhmmkRv4+d9Nu1cXzuS7vKUq0DJSzFPZLsaClwanXc
+AgnlGTQGJCxwU5NFbjD/c/+Nbga6mXiY9i0xPDnSlCuJQSClUKAeQTeJZrZ9f74m
+l6F9abyj10q5xvPjTl6os68x5SyMEXYGLlWBWBYc1xalakXSIfNLcsjLT+d1A20q
+HqCBdLvxhreoL0fMgQKPXMrT014wsoszjCf2sXjuqUyycfD4kcy0WbmmztLget7J
+qM4VVjTT8HvEKRqqTg2QKFdwX6bkmbXibBTBtgYF3SIWsEQnYtA9JlcjsOkgtlET
+/GQsSReTGkK95wbw3YI0AslmM+3hRpL2UoYlIt42PPlIhkc7ZQdE0LTrkM7Bsk6n
+rw4r4gl+BjIAOi9IDgnN
+=6YMB
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
deleted file mode 100644
index 413f93c8420e..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r2.ebuild,v 1.6 2014/05/08 21:07:58 johu Exp $
-
-EAPI=5
-
-if [[ ${PV} = *9999* ]]; then
-	KMNAME="kdepim"
-	KMMODULE="runtime"
-	inherit kde4-meta
-else
-	inherit kde4-base
-fi
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 x86 ppc ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs
-
-COMMON_DEPEND="
-	app-misc/strigi
-	>=app-office/akonadi-server-1.3.1[soprano(+)]
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.12)
-	$(add_kdebase_dep kdepimlibs '' 4.12)
-	$(add_kdebase_dep libkdepim)
-	x11-misc/shared-mime-info
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdebase_dep kdepim-icons)
-"
-
-PATCHES=(
-	"${FILESDIR}/4.4/"000[1-2]-*.patch
-	"${FILESDIR}/4.4/"999[6-9]-*.patch
-)
diff --git a/kde-base/kdepim-strigi-analyzer/ChangeLog b/kde-base/kdepim-strigi-analyzer/ChangeLog
index ae69768d2b3c..4b66ba82155c 100644
--- a/kde-base/kdepim-strigi-analyzer/ChangeLog
+++ b/kde-base/kdepim-strigi-analyzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-strigi-analyzer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.174 2015/02/16 08:31:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.175 2015/02/16 19:56:17 johu Exp $
+
+  16 Feb 2015; Johannes Huber <johu@gentoo.org>
+  -kdepim-strigi-analyzer-4.4.11.1.ebuild:
+  Remove old.
 
   16 Feb 2015; Agostino Sarubbo <ago@gentoo.org>
   kdepim-strigi-analyzer-4.4.11.1-r1.ebuild:
diff --git a/kde-base/kdepim-strigi-analyzer/Manifest b/kde-base/kdepim-strigi-analyzer/Manifest
index 8d5ccb7b4436..34266b04c258 100644
--- a/kde-base/kdepim-strigi-analyzer/Manifest
+++ b/kde-base/kdepim-strigi-analyzer/Manifest
@@ -3,23 +3,22 @@ Hash: SHA256
 
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 EBUILD kdepim-strigi-analyzer-4.4.11.1-r1.ebuild 554 SHA256 57ef003c88552225ea7b4b48c5a22b0985d6f4376318556c0d37a18b9d01f901 SHA512 7e30066d5de415a4c65c16b1dc88cb3d3ffb811f855c3d5eb24c0386ac0e062a09ed3412f305d823e681d218c1a06c96618436b2b43d378cb05d781489af2478 WHIRLPOOL 5cb208c2f18144bf7f0ae8a6e598e0387ba6fe0006a0b05b6726a2cb2d75671fdb148f06922b85949ed2b9c9dd7589028e089685d45b604d79474052031f6981
-EBUILD kdepim-strigi-analyzer-4.4.11.1.ebuild 512 SHA256 3d3e105a851b792435e6eb277045904fad63ed4c5cf21cc6cf2406f640c4c33c SHA512 81c41752027d4b9296d068b2acbb4077b335f4e8448e82278dc34455d9179c4054c2013a594f54dc4c2296b62ac3becfaed5e780a5aa82458264eaadc643ea09 WHIRLPOOL d77dbf2d98b0888bdcae6f76c28cf9afa518483a43fbac735a3f83dabd8e332fb583d1625cc349c7f52bcc0ecb0660b24ba7cb6ca35c9f22050daedcc7dd7a21
-MISC ChangeLog 24265 SHA256 44692682baf2a989d63d95083785f43ee9357dfdd2a6cf846f14bc2952cae99c SHA512 86efc677387a2e35114d170e41504d0f012f71e96c60cf4cee8b5da0cd1e34ddd64fe355b486249964b0e06613b1cbaa6976f34241bc3e7b2e163a9ac60c95a6 WHIRLPOOL 2376aed1abd7fe45702530d738ab7080ae7cf2ffdc49be507c3c84d3b19327e213dfc0dc702bfadf6b51e8789151387bcfed1b18b347f935fc48e0ba147356b6
+MISC ChangeLog 24372 SHA256 2046ccdd60811e64872285bdd6a52bce613d3493f456d80f2bb4cb3a283c3a3a SHA512 a017fb4299953cf9f2305a8a6a133283b36c5744fdfd43dd2d25007abebacf9ed6191ea62e9777071d669ed7b8849faa2534a245b48e4bb3b6cbba51e2c3de45 WHIRLPOOL 78ec72628e776f21016c5b3b87860afb20984974d874db15b1a2f931fc665d503ca0b80cfcc4bc6f9eb555c6367b6e844e331b9227c21742c135440c02de6883
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4atyAAoJELp701BxlEWfFA0QAMe6ke7exNaFUMFsHBlr61Q+
-unUAbhlgBg6O3jF5PsChFYb5fVTFGlqrcJZLqTXesly/Sk+idy/2yfzCYMKiq/yH
-1rJRQ7MGTRKnXjw329+Wkykxg0qbVBLmyGjGWJoOS8LTrw+5WvZKvA2mgylajddv
-3V3MKep+mFfG+fTR3PqhJ02nAym7Ak7t3vWZGohumXPwBtEltiykuutE1Vuzi1hM
-WfQvVAPC5UzYSfKf5BndDMjBCt6ijALDxqLNhyPvuP9e7YersMRsJzQ2N47xGINi
-pJjSOGUJlEGt6S4rznpRhXWIty/xtTHYs/8LYSNpeFZwWsk6io4aovSllQe4dJwS
-G4rtw8QiuZ/ddsADbpNasXQPZpLd997B/lZjQq/Ucf7GeN0ZreKDopGaMr6dbEuw
-/cR5QIdIODZCAd81IujljJtvlo/EJy7v2LzEA2M3nV2FW+V3My82Hy0ycB08r5YV
-cL16LcIOXWjbBMahKgmXqPWnSeIT9pltcxoFVTaGDtfUVL+DOc82UYku+zAGl9kZ
-qsbVsCXnzyKgQoYL4pUyC61JWYn2a7aBdE5VOp4zWe3Qqr3KSlknd8xpJXO0TG3x
-tYNmq/v5Qjy9hu4LfLvy2sZs0iLlnEu23G4QioMDURfeL1Vy67UBFJqWSk3Sevzk
-1K2AuYFnI3QEOLHLFd76
-=+N6W
+iQIcBAEBCAAGBQJU4ktcAAoJEGVpnaTzz9K9UpAP/RsAFbG0FI9/+wqWDd5/DbVi
+kyyMsnWXblE5Pj8e30xcqi4Hl2c/OiXLztBzu9XoojLAGvY6Cv8YUvvyMawAzB94
+Dz7aM+QBJ+ke0+qLfb1RViZI3wReEaAIfl/5t/tjgQZmTiUsbQQ0R/OulPSxz2Vh
+ys2h+heA3rmnqAG0NqVYbqrMWV1WWt/PHhCo69c00YM724TAodDdJ4WvC3I8DeGH
+DTyu5cjPJzwuzZdH+gd6V2nNk13fWM4yArEDH7EKDIlJ/VTbqTdksWY60ql7o4bc
+4VWR1oXODTk0OoombKVjBtuz5lQHu9m4OiRXCxWnPBIOvRIkFUJYvGRionAXHMP5
+AIk2PJirrSPvTBbqFoyldGKMOuYqQzZPbZlY/PWylQxTKTMRMJzw4376R2V55K/S
+suQIuUo5oMoMSiYsm6XqVyjfJKfG687+7ZKoJx5SLg3kiTgWnwn1+0pWp/b99Ip0
+d+g9XoNGe3Hny2+fgZJbrNoVoAPa+I3GU5aKd9UjuNdLPK6/dH2xJgO2R2wA5uA7
+g+zJhpZIkxv/qDs2j3CDvxMvMae5nTbrgn8FV877b2y4YlubMuNHhImxCli8TBdJ
+uWZCtyXGIq5IWIdVPKyMD9ULDK4+A5g0EaND5CmYkfgUqJTTqkX8RwAmPVz/AUpP
+yxjqHBEBgiYun+Nq+/zH
+=1s/l
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.11.1.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.11.1.ebuild
deleted file mode 100644
index e4ad609c1488..000000000000
--- a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.11.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.4.11.1.ebuild,v 1.9 2014/04/05 18:05:43 dilfridge Exp $
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="strigi-analyzer"
-inherit kde4-meta
-
-DESCRIPTION="kdepim: strigi plugins"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-misc/strigi
-	$(add_kdebase_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index b2923e3e51b2..c058f87077c9 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,9 @@
 # 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.434 2015/02/16 08:31:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.435 2015/02/16 19:50:33 johu Exp $
+
+  16 Feb 2015; Johannes Huber <johu@gentoo.org> -kmail-4.4.11.1-r1.ebuild:
+  Remove old.
 
   16 Feb 2015; Agostino Sarubbo <ago@gentoo.org> kmail-4.14.3.ebuild,
   kmail-4.4.11.1-r2.ebuild:
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 70b5bc08e970..3447e0b2a5dd 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -11,24 +11,23 @@ DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf733758
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
 EBUILD kmail-4.12.5.ebuild 2610 SHA256 a58bf46272b8048e112bd125e466aee876d04ad8bde2133bc5ff32f7d97fac93 SHA512 169ec379b3c52114546f703c525606965f21f6f8ddea3217e83ed07fe2bdf594935a41c3b412dd37cba59705d404ae46692dd18d22906b030467bd9960e6ce5d WHIRLPOOL 3cf127ff401f6f017aa0db31edd4659fd82f1318a60c9e62ec46bb79c3606914b4800bc8ff07c9bd4390397d81a242adf2a3d621a9e20452bbaed76a5c26a00d
 EBUILD kmail-4.14.3.ebuild 2693 SHA256 41d2a7a021ca09404b1fcf9ea4d0e2b700883263e8db98c7e6a45162059b1a4c SHA512 01a3e372659a124b502b47decc9469ffee1494e949152c3e485d1f672da7ec70f5f6f4057ab5fb4534c02b63d2d30c4acb1cffe651261fc799866d8e29f2abbb WHIRLPOOL d4ddf8e1fd777d92cd1f4abbde71ef49cedd7f928b25e2b7f502930288ed497c63dc7737786dba0feec614e0a0456db3973a42379e434566ae397e0a08c143d2
-EBUILD kmail-4.4.11.1-r1.ebuild 1689 SHA256 9090ce469cd2fe24642d20f4a899a890aa35f76de19214df7472938308da86ba SHA512 2c3e168de29c31e4e29476004812a95b2728ab9959832da4ad0b763a3c3513921870d525c3079c474e938d99e5ce55999f9354454e51614eaf25bd859967a747 WHIRLPOOL 209380b283e38b0fb5555756a5a094184419fbb351e4bb2b2fb3df0c8fbea568fe0063e7c4a8d7356127371e9e68a584cb999c6fb67506c99c70864abf7fe186
 EBUILD kmail-4.4.11.1-r2.ebuild 1661 SHA256 7c5f88afae4b8780db6ffc517170bfbd790aecb6963ce5cab0fa01257df962fc SHA512 7481b48a2954dddca31c242273a42f40512ab849095cb9eb8f6173cb8a9b252c106bab44b4d97171a4a8fe7edbde5b8ed7ea43c9f0e94ec7350ce4075ed2e06f WHIRLPOOL b9b43ee19223061abac96b044b31254336b2a00065155766fa4652f26b7c7612116112f26ccac4863b05a37cf2450ff7bc17b0777836d7a8decad945dab5b19a
-MISC ChangeLog 55694 SHA256 920302be7c57c66c93cabec1fa31e070ff4385a1f066f8d644de640993d53729 SHA512 846ce4dd1f65ce8ef5d79a20176755193b117100abcc8e0c9f480be3a7a7c8e4b40ebb75e67a14e0c87c74b3fe45da6b10f0b023f8704bb5c5156493402ad5af WHIRLPOOL a9e3f48be4b8cb566d8416c3658b9fd9a7a846c58680d5f2d4804cbaf477dd0109a9070f9195186bb130055fb195cb876dcdd4dbafe21cc587200e9aab281691
+MISC ChangeLog 55785 SHA256 d5162546961543337c4680fc3965ebe07d4903d3d0f8b138d0f444a3306201e2 SHA512 d5eb8d20238f7b493130a093b85f66fa5761aa96985f53c1dcb55d75b59c14a876fbdaa72f1ddd38d38cd36095929ee4ed30b10213809a0ebdbcababe34c20ab WHIRLPOOL a95ad9c3ac3ac3619e651a432d8f3f912ab870c766e557690e2cc35f3e770305d259afcaac1877e2b7972b594bd79c1753966708d3ad199dd19e09055ab9dd2e
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4at2AAoJELp701BxlEWfs7wQAIYec1/TsTEw726+/f4WTDzD
-MQaAqZam6zeMm6NLavx/KFa/sjEBG8gMehOINCqynApKvFW88Crqz2aqLIiFuGTx
-vC2+A31eDub3NledrcNlcqoOi1kRxUV+Xa3uu67seWshVz0eDyNb7kNCVbrzI4bR
-YS6x2iMq1gQ1c3IaiiShH+Q6oZOJnL93eq0RvG1aKSRh9SIeYo5KWygYcZjzyPoW
-7D3VSbDvzBD7VhOMEW560YPPFgaKxFQR4iII2ZDN017ZMKwpzN7Tf3GvPOq0Kg1/
-8N9OKPY00bdLZZMf2BfhHkBwlyE6dJM3By8EUsEFDsZQIGC396qK6YMxhmKQdNB1
-LgXvpuyDTuijYYt8FWF1NQDwf1XISZL+gMZcx2n/jpZ+ewj3CGViWdHKcjMrQGSi
-g2XbuiwFYQxLYrNlskSImE64TafUS6h4eHUBGLIVVddR6NuLU49LmZbrLkYA+bh4
-Fynik9JGw/9tj0+kwY0+UH9cUce5M7jvn/bf7ddJTpFWug2b2uRjiNozZfTPAYoS
-MXq+JWyWiySu0QVNNIoJ25JLMSb8975BAHMkUMolA7On0dMAmqydJWA00QxROz68
-Ngk/qXYXyByHsL7j4dbRduHZUhTgeaRor5XYtbF4cWGDPQwZc5na33V6Nue0GKFb
-p6583/J1Ng9j0SGnmGM3
-=eF+9
+iQIcBAEBCAAGBQJU4koEAAoJEGVpnaTzz9K9/igQAICxCS3HYxGvfrSMhXu5iifE
+3rOesR5H8tvZc12wvxzJA0U6X/Ubi6KiyWV2/vLlExJARjNR7GwJL6bDa+BfYyhK
+eemnkUnt6oo+4H3XPEurCish2qQR0y8RFbJpKkKh18M9RWRqEK946ax+XIipDgSH
+XJOPU6CVmAdT1OrYmohzAmkgjGJhx9Dro+qtjx6WLjDug+xBQTY4gTDI8qvgyP16
+cLfykNrEo2UZyhLr9ekMpZnz91U3KfSFvFzryFZa32WiU2h+kEW/4YNu0QysRQSx
+N/CFNzV0uAyHZBAW2qO6t5luofmxBSt+jhz/X8U2hybE1CHz4zyY+vdTE8uZnpwn
+s3kV0zfj0Q9YY3HqtTatUUGiFk1sHiuVnd5PaPOu4p8AB97XONu+SVsgENByciuE
+atjNCO/KsXESBwzkTV3/Yz7YC9mGykG5c9gM3+hhaT+RwZMCaLOCRk5ZKEAMBdzK
+113SQ/TGLe2sn8YUpgzMOBOOnU+fVWwBMd8PjSTuA2x89vClF154u97TVa57iR+b
+2OS4NiXDTBwU86hsa6VjR1H9c3e5wha8zMJj9Y23Gdld8pPlLJdso4vCxrfuXX0O
+wTFyV2mOqYIlRChHnMIq1WA1Ataf1bf2G6xZuWpiWAL7zHMKsgAxKkyDFhwTnKdF
+QWPrttvy5jg/kYHyjwCw
+=Q0Pi
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/kmail-4.4.11.1-r1.ebuild b/kde-base/kmail/kmail-4.4.11.1-r1.ebuild
deleted file mode 100644
index 3f441e843a0b..000000000000
--- a/kde-base/kmail/kmail-4.4.11.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.11.1-r1.ebuild,v 1.11 2014/08/05 18:17:12 mrueg Exp $
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop(+)' 4.6)
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop(+)' 4.6)
-	$(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
-	$(add_kdebase_dep libkleo)
-	$(add_kdebase_dep libkpgp)
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
-
-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"
-	"${FILESDIR}/4.4/"000{2,4,5}-*.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
-}