amd64/x86 stable, remove old.

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

12 files changed, 66 insertions, 149 deletions

diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index 43bb6638de44..da1708b8838c 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/krusader
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.112 2014/03/21 18:39:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.113 2014/04/24 15:02:24 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -krusader-2.4.0_beta3.ebuild,
+  krusader-2.4.0_beta3-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *krusader-2.4.0_beta3-r1 (21 Mar 2014)
 
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 8a66f73cac20..03cae4b14065 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST krusader-2.4.0-beta3.tar.bz2 4305463 SHA256 ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae SHA512 a0288b0a5d37ade197120f6d96054b5eb9da9bae746969b041f6692a1377e6732a46cf3a672d2a24a5b1eb514ec74ba98695255af39057c4dabe1d935a6f720a WHIRLPOOL 08184cb69dd66ab6738bded5d2c7b470d2659110cb406a9779b61a0dbc28d41b334f86525e6d1a5570c82e751b9bfe3a135d0c35943837a814a3e6746464a4dd
-EBUILD krusader-2.4.0_beta3-r1.ebuild 930 SHA256 d40b4b88047393674c9b505b6e05b9ce03726cdca6e33eb531d7130ba3612911 SHA512 a9e75801a68c6363762120b8b22b0666b4d35e5341f2a3d93f06e39175b62cd7744785befb1500497365f475303d52da1b55ef453ce3ef55e17cb944009dabc6 WHIRLPOOL f19b8607ea581a7fa955e8eb9ebd397bb51b7afe980a1025216b1fd4bfc588e7fa8852535ecbcb7b9c4a7aa441031221578a78db57ed16a185cb21fc90df89d2
-EBUILD krusader-2.4.0_beta3.ebuild 925 SHA256 9a000fc8ba430daa0f9649cf6329a66cbaac09dde3da063deb7a371c35603226 SHA512 29cda30271c1e7b056b44f3e984ae2640a069b2f237a1e51f96998aa3f07b2faa268880ac05263e3c3d26a24584a6c960bc27300a9132f1ba9c54457605f4064 WHIRLPOOL f79ff3248fada21c8476bfb203d7ec1d8cec998423386734b0153e17321c7991e91d86091ab32b382bf45025f0f234b56b184879d8f973ac9a7c8986270cd2d9
-MISC ChangeLog 9926 SHA256 26f08e2b4283b29ce262fca6e1ce3ed66797e7b9bba321371c8611dac3a7542b SHA512 fbe0aded8742f2924f7b7107361b0e7787ce15c7199046d31f3026c410bd79a8f3b13ba96d429333f1c36c44dd0d2516f8ee091a9e4e70fa3d34ca3a915548af WHIRLPOOL 0af020a635c0f076074c9a34db33ffd752843973f6cee5dc197c68628eeecf9ac6533a43a40e4182fba86d8c16c7768435123556def8aaffe4c3bbc79bfa8809
+EBUILD krusader-2.4.0_beta3-r1.ebuild 928 SHA256 7b45fb619c5d9f339739194b29c1972249eca3a2dd0028f4ad8f9bece9f3bd92 SHA512 f77a90aac5e7f67379c9bdb17523d3a23080444dd84e0acf0ec7d02a5f3346c49a6ff1e62064b8269ed7fc9cc8054c84656ef004ab92ec2d17c499311d69d5b1 WHIRLPOOL dffd518a91ae33b2f332511416d5135983c1794adaf0fc3cdb4fbf720723467d6dd67f1aa9bba47e16f08cb7bd3dc6c7dbc71f04438f6afa7e28dab4d2f63084
+MISC ChangeLog 10071 SHA256 cdefabe4b0be1e1f461cd8ac94643f2865b0494befcbb24227c400d051d16557 SHA512 4588f2485f6b52ded800ca02052c6c8111fe96b07d08bc906b91acc3028a2b0fdeec4bb867c277208e91fbb547c3a4c15e903b5e29f2c8445f87076fb3b69e16 WHIRLPOOL 6925fa07014bcd0db1404ea0d8fed195d768006fe0cc9d603cb0e55c2793f7047d44f9f1f5ccd5374a82c0f6f6dc972a67420efc654f275ce53066aec46457ac
 MISC metadata.xml 240 SHA256 3940acd26451de238b92c9602337472a3343be5d392bf7c3e72abddbf8b7ecd5 SHA512 d026b15c9e065629d39d0d595856f6ab43bc6c6d1957ae3d76431026e83cb956acb09ff40b57e40474e839f6cf005bdcc331e0adf40b733a6aa6bec17a14148b WHIRLPOOL ff98af2213775171dee0634ff26b026a798b5900d44bc90e40b1a9c9990dcfb8bd979bc7195ab185269bccf4550abee8daeeb3de2f6bfb41ed2ca0355e9b6507
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIdTAAoJEGVpnaTzz9K97WYQALsRnsSwcbZVk0owTRpwcp45
-48MkBQLAlx2Neg4cnhTtp0NBa9kNQpY+ray2ql4Mc2r2dYs40NC70+06d3VIGbk0
-byD9H3vYcxcLeyEt5mdrIHy+VtOULtdRqIRU92sREWgcEh2PIIDGGNGLVUv2Rqux
-9TZiZ4ck7Uzb96rRmQ3iWRZyArR9GQpceuxyCaWkVuKUmNi4wyU7HDD/Szk1JMSE
-pc+i1wwlUx3uLBUlywM/AtThn6GwZNFPFFJmFJ3/XjUX+k7sILvYpRU8kVNeJ0dy
-RHzx3vlNAxifpQPU8XL2uLrkLXWRgO7+D7hB9+id5coxLhT02Fd+sLATiHF4iqin
-DSi/ZBUG9TiPD2/srk+zneqPl/mY0DIg4r4t0AJfqGmiSZbDtDGMGWoRpqwvh7Bk
-f2tKjkBOUp6BOXvcXxsvMp8o0F1mBMeWCusczHLS8ZJbP8lxsd6MEe7C+2iEfMi2
-9H6WVOy9YEvOQoKxF2GR0td2Bunphn7Ms4xuPO/ObqMmTQTGSoM+guoKRbMXBCjD
-lFHpkZY7sraewDmKLU2l6cGRX32qq0cxLTEzbRvb4Ip3RLPwM0k+3cvj4fSJKY2i
-sHcBYHnvAo55grg1ndTXWOcwziUxe+d7+dBcpSiKUryRN5gjkPKtsIWBDZ83Jf4O
-viSXYXz2m3DcOae6Z4Ze
-=5yl2
+iQIcBAEBCAAGBQJTWSeBAAoJEGVpnaTzz9K9hWgP/0b/A+StmIy7HyWAD580BQ69
+Xgq1xHRsZmoPvucu4xQkHsg3A2NSpFOQeWvVrO3FEY1/0Uk0J1jGIQrZRYwwxOrq
+fw/vvnuExU9Yfjgn+cFrJ1DWmVlfSsNku58PyIdx3eFp3ZWPFO5N+US2O0CkI7EU
+o1dECO5xzK5RDluKgQZKOnMzuMy7hXmW1dyNJBwokvjlVz7cbw2R0sdRz8a7cKwX
+yo3hRXqsWAiQiRgaKStVjGJ8EwQ9elG9nlGnm79MZkSZQ3L8LcbFZD3pXnX4Cxmp
+Gdj7kxptsbNj7Vft7QmlOU4ySluk4n0fzext5yq5JL8rlaTThpVdP/a3z/Zh89MU
+XE0lRC8MuqLi6TxOuOb5me3EIyAH21nik79aLtGTWPIKBQvpwmoPTEEyo7YKdvBe
+4FaFMY6VWsL1Yq4DUeTGdiJZVd5USJyw8+6V8mnIAa3QzXI/4BTIsDmeyI1Gj5LK
+8Jksp6O0bkeD7CjzysXJ9AveSsZZQhHp6db9C/u20pi+TnNCAUay1y6XwVGXK8Hz
+2A13qw35PZT4unnvYGyBXph5m/LJc49CeuG7Z60FTnZutaOQ7Mzh3rAWg6OACePi
+U+N4+c4WdadQYRBIvn9uIbhBhmKNj1RflQ8kjslqOOa/5RjvkQptdGKRoHAs2w8N
+j/WDbzwGmDcc++Oby9ht
+=MSy7
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
index 267aa28ff382..ee92e8f3794f 100644
--- a/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
+++ b/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild,v 1.1 2014/03/21 18:39:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3-r1.ebuild,v 1.2 2014/04/24 15:02:24 johu Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+bookmarks debug"
 
 RDEPEND="
diff --git a/kde-misc/krusader/krusader-2.4.0_beta3.ebuild b/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
deleted file mode 100644
index 239adbdef5e7..000000000000
--- a/kde-misc/krusader/krusader-2.4.0_beta3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.4.0_beta3.ebuild,v 1.4 2013/01/11 13:04:03 ago Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga
-gl hr hu it ja ko lt mai nb nds nl pa pl pt pt_BR ro ru sk sl sr
-sr@ijekavian sr@ijekavianlatin sr@latin sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras."
-HOMEPAGE="http://www.krusader.org/"
-SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+bookmarks debug"
-
-RDEPEND="
-	$(add_kdebase_dep libkonq)
-	sys-libs/zlib
-	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/kde-misc/kvkbd/ChangeLog b/kde-misc/kvkbd/ChangeLog
index ab8d323c9612..814456dfc39b 100644
--- a/kde-misc/kvkbd/ChangeLog
+++ b/kde-misc/kvkbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kvkbd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/ChangeLog,v 1.10 2014/03/21 18:41:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/ChangeLog,v 1.11 2014/04/24 15:05:37 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kvkbd-0.6.ebuild,
+  kvkbd-0.6-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *kvkbd-0.6-r1 (21 Mar 2014)
 
diff --git a/kde-misc/kvkbd/Manifest b/kde-misc/kvkbd/Manifest
index 606ffda15c83..6f802cf6944e 100644
--- a/kde-misc/kvkbd/Manifest
+++ b/kde-misc/kvkbd/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX kvkbd-0.6-underlinking.patch 507 SHA256 8843cf49fc61f7ea547b2cdd6cf4e313b1c6dc61ac1a2b2185a2407ccc1114f8 SHA512 d88bfd0ab88a3c30d081a456c0d32b63708855391e87b0601b432c33e0a9cf9f9f336dbb1d0099f23b9d1d6b21ace35b8a49783e03d11dea3284e784281834e6 WHIRLPOOL f63d369267d4e1c1e1fe0e6ec3008671b71ee4d8d9e2d7320d70211686a274ef8fbee4eb24db59cd71baf3a9260e7efadc0d902700ff09c931c22bb6718a4822
 DIST 94374-kvkbd-0.6.tar.bz2 76990 SHA256 a4406db59ffcaa5858486adaa67873250c6074b45ce7c8151ac10464372c52fa
-EBUILD kvkbd-0.6-r1.ebuild 566 SHA256 c6b5d9a0fc73e376169dd2969a931693c203789f2391a4cf5f81962515f4fd4c SHA512 1bba4ffa8b6dca27c52899b030c50d4548fdd57d8a70cf3c52ab8a323bfd58b5193087fe82a508764563cfa5b4feaf88316f2c38963c6a8e48e5fb3f7d771d03 WHIRLPOOL f679e0e61ef6872c962728437f6098ad9f6ee0de5dc7649eb348eefeae1af71aca6120d95b1e8c87ea973537019bccb33ffc9ebeba0da87f28e2700d6e5f8703
-EBUILD kvkbd-0.6.ebuild 555 SHA256 adca0994376b71495574065384c2d959d2681cb37336d8466ad1861bea1e12c1 SHA512 5e3177cb43e4b052200bda7b2fbee10d039a922cf547b1a0a0c41846b4e567cbd617ee4a7f7267006086e731cacb62b3a139f11c671b90ff06a5a37cedc64880 WHIRLPOOL 25380acc62acd686bbd6c5fd08b7d6508cf520e580512352e57f66cca607811c7e40a954b46e897f4eac6d073697a48ec9134187a7372dee8c4cd183fa321ea8
-MISC ChangeLog 1428 SHA256 fd17939e5fbfdf1d34fd55e8a59fcd97c1c57de8db894449e7bf177f2e4c7d30 SHA512 626567b1c52495e2b863cc257940772978b5ae05a6864dd805e369a3ff5546c965ab235636dfd2d803379472a6bf373e128dc5e6247d95669be6d23c41f9e14d WHIRLPOOL f88a0ee402e9e0b5394ad99c8088fbb147cda5bfe06000d5878dd22cdd302e4fa7023569acabbaf4c0315c954e03b00e258580e9c522ce64029a2404d5117da4
+EBUILD kvkbd-0.6-r1.ebuild 564 SHA256 ccbbf8a5d0ab40e99f31f0e3842383762b03d41a579a2e808d8579ed3fa214ef SHA512 c98be707bb6d0156e9151ce8f2d5c13da56587b8f6670326b0cdce81536d0d7c8e16583b7c60597f9dff2c766f5945eecca2e4851891d7ef34cff630908b9a6b WHIRLPOOL d6d335a2731501f7ba6ad9e8b38e095dec3ce1f6c99c20c8edfc37b4f015d4a24e7ce68a24a7f49fb790779dc164d1d7aa1fc1b7f0d58dae12cf7f9f2078aac2
+MISC ChangeLog 1551 SHA256 a94ed59f8dae58add2c776a69d6dae65b825b63090de1d3ee36745df12023d59 SHA512 0b1d08da9bb5fe6531e1404fafc3ddedfee11793c3dc1e3c25413c35dc4e1671e576acb028bde2705c16975edab1dfd4eacc126f4f41532062a73b501a42b5d3 WHIRLPOOL 7baf0d78c41c35c3df458abba910c1e7dff8bf1811890c2e5111eb944a371ee7b230295e032aeae5fb7b51e7568954543df60b5d41a526750d70c20f1a7385ab
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIf1AAoJEGVpnaTzz9K90q0QAK4+oo3FrOA/wJI0iScrBH8u
-d6T2uMWMIveQEbLC4KALI4v9sNyalbXo98ZaNqBmHmydf9JKHbIN8qjMNk/qBdcc
-0waZbwMjOPg0QuGpi/tU3lQlXyllMDXPswuiCJNgOu1UPQlNOij33aiH/3UoREas
-JqPYNy8FL+jfjQ+hASRKV2YrM37PwnLKTcr/2boVLFYlUNtOwxLKwDnwjzAc0mjD
-/80YIetjL56gmmfVM3sAAtDCYH/J8AzIgLWobvcAhsHZAGOMzIw09fyoHtULprMg
-PsU+CvUxpv+lGfXXu6YlgD6PBKYRMxCNVAvF0mc/cQQmeujp5D9x4OOlI+1tPHGJ
-U7rQ4JHIFDjq/CNLLQFKyykUlTp4bVwimPjHtBZ+D/3DkJ430A07pdNED5HpIijj
-eBcdqT53QFbGoXzUHrPrFFVV1lNtp28Ry63VvobJa8TQ4g/QPJpBiY0u7CgDpfwO
-+qs7oNpMTyaGvzSlk8vxXf1+7z9MMwZpdRnfvUFFrCKPgYdmP4+rkHyZiBD3jgzf
-6rB2Yg9ueBAuBpdxP5VkFPYKyPuta+ZFT7EzV0lQxtbQUJvwauCMALq9aCM3KxR7
-+B6uSGWuTL90tDZmuplPRzaIqaA+WqWo2gbEQU5sjCU3U+CRGJKCS6yIekPvqZKs
-ZLPgDX8PGUJkRiKMZLbr
-=cMDQ
+iQIcBAEBCAAGBQJTWShCAAoJEGVpnaTzz9K9z5oP/3XQj2/QsU4g/1CEQR6KY0xl
+zu1EL01HUoWL0j4Zjg7pMwPh+XDudQsqRkVxGdtjxuVk9Adf8d9sxYUrNQ/TvLTa
+QXJfuWZRgfY20H0R6QQbdMB3dX+RJ3Q6rcL8aJ5xBIUtWQOfSZUWDpyOFRF1YTiQ
+HleYB7K4TWvNvj/weEzQtSbDvyHh7SzPXsLz86/o+01NI+7AhLKJEWaPUYxeGYxM
+T/F+I3JfZwcGisF7XI30a+0Gi3f7nP2dQ5yL3dgSDlXYVtlrl99vNJF67ke8kCF4
+635DlQhsofGvInvJuZaR5tE+7JR7M9pk0seVTvw/00LLPzrmj6nTgInnsqBjBzC7
++W1kSk83MQaOo5Bb6MWlQUblFGJs+Qy/pjIVBHeGfEiaje0+xHDnC5+aPozmRTx2
+mf0SadLciy0QmwYXsd+ZGF5NIxYMK+adBczyYz01GLtssK+ZIJUwHI3kSm6CE7D3
+xGl93lg8qVvKFlGSlABdneYsL1gQa5A7T5gMLdldYG/EPl1T/ClJy61zbN+fa4Do
+s7ZjeuAM1d7UyS2prCM+Un3ClgLkwAXgAiYmpoQLSBDbOQTFGcyRAe3a30H2ZINL
+1iZa56xAJ6wqBHD8f9hboLosOHn7mIV+yUv/SMOMDFn+ksC2ijyIO97O7hd42gxf
+IkqeNP/ynHIBJvDlni/a
+=y/Nj
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild b/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
index 2cbbbaa37fc5..4d0e83cedbca 100644
--- a/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
+++ b/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild,v 1.1 2014/03/21 18:41:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6-r1.ebuild,v 1.2 2014/04/24 15:05:37 johu Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.kde-apps.org/CONTENT/content-files/${KDEAPPS_ID}-${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 PATCHES=(
diff --git a/kde-misc/kvkbd/kvkbd-0.6.ebuild b/kde-misc/kvkbd/kvkbd-0.6.ebuild
deleted file mode 100644
index 72f14a65c542..000000000000
--- a/kde-misc/kvkbd/kvkbd-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kvkbd/kvkbd-0.6.ebuild,v 1.6 2013/06/11 15:52:33 ago Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-KDEAPPS_ID="94374"
-
-DESCRIPTION="A virtual keyboard for KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=94374"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/${KDEAPPS_ID}-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-underlinking.patch"
-)
diff --git a/kde-misc/miniplayer/ChangeLog b/kde-misc/miniplayer/ChangeLog
index 3be130fd541f..c1a15f81ece6 100644
--- a/kde-misc/miniplayer/ChangeLog
+++ b/kde-misc/miniplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/miniplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/ChangeLog,v 1.12 2014/03/21 18:44:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/ChangeLog,v 1.13 2014/04/24 15:08:32 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -miniplayer-2.5.ebuild,
+  miniplayer-2.5-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *miniplayer-2.5-r1 (21 Mar 2014)
 
diff --git a/kde-misc/miniplayer/Manifest b/kde-misc/miniplayer/Manifest
index f860a92323db..a6976e56bd7d 100644
--- a/kde-misc/miniplayer/Manifest
+++ b/kde-misc/miniplayer/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST 95501-miniplayer-2.5.tar.bz2 49453 SHA256 84b19fcb6c01c03d857431e2f39eceed756d8e4026b0cc3860b2aaf31b4c1705 SHA512 b3678e32ec141479386f8185dcdbd88bb6b84f9e7fbe9277e0ec85f12d7802c932e0b8ac525abcb1817afa1c11a201372f154333ece90bcc9666d28755af8180 WHIRLPOOL 2b2f5db1f196877085306ae3eb39625dc24fca1c1b6350f243f0b66bd13e36033d0fbf30695eb8a6550006e20279d96ea1a279b0c776d1cc1f2591e7e7a14e94
-EBUILD miniplayer-2.5-r1.ebuild 815 SHA256 f0e02050b8934f3a91be085f172ec6f1dc6e8f03572cba428603cc3edcc09611 SHA512 a822d5cf72f63ca2bc10b0b4dab827da283a6b5edec01f89f4211bb4aa2e261a2bdaa3e118dde6d5f19ceda16b35721631a0e1dca60804f87f52abcaa26af25a WHIRLPOOL 5f69c1f31a0462d1df0072110a1fc79f2a688347f13c4567f6517bb83e7a094353cf42396b652000f091cf879ba41b0c90df096aef8cc751e2dc24f1546545a4
-EBUILD miniplayer-2.5.ebuild 810 SHA256 ad44b8b4a9820b1a244555cca42ee8bbf1f45e50abdcebffe243cbf85a7b53d6 SHA512 e9e194fd751bf070fb43b9cae3739a246a2855696c3b5d3af2d2f577e46eb6b90904c0c31ebf5ee2fc5604988ac6f92dd9a72f19af2f6afdefc2e15ef49aa8e2 WHIRLPOOL 2f66db13f18df99795b727943aa407afbcd8fbd203034a70f3f63cbe95b896079e7b575aff1a3770e0b76945655656d69dbdfaab0b14b75608520e225c1151d1
-MISC ChangeLog 1728 SHA256 8f92a07da6a30bd63947ed5a2ace3f4c4b00cbac2e96d15fd7350c4ed45f8029 SHA512 87b6b956bd3270a7c54135e19cd0064960130bf369c39156bec4a7aeb30cc20031e1a02e2d57a1dd9bf8dce17d62525f8e273e0514a3082188454656661636ad WHIRLPOOL 78a9d30eec8780b460a2cca578981b085e4a2ea38bb171cdbeb034375b512ea88d465fbde00dfb680bcca0577d94cf58a89ec3fb341b3f58df4f88406f62d70a
+EBUILD miniplayer-2.5-r1.ebuild 813 SHA256 e1b4122d82065dc7cbece6614f0c32ea76a3658932f11f59b13bd3d3b810a420 SHA512 2cf908f219707e2cf8de34e7207b6cffdd41f4a29ea0c64f0116edc62cfc0effaf97097cc4ce5965286e5e9a7b194a60816d0435d591daef2e3d3ef1100e8c06 WHIRLPOOL b44e4cee6a47099c0b6a36a3b39480a024dcfa1860b8a86ca257de1c46ca8b8530611da2c329b256973de7836f89fd2c2a1ce36e2aa52ded00a3de61c26af795
+MISC ChangeLog 1861 SHA256 055700214815140daf2ceb6ad4f90ce430c56b1f9ac4b88bc50390d6f6abed59 SHA512 5add8134599bb3b1e8b3508ff5f3ef8b929b2b4b87e34a920e0a0e410b058f60553bfadca51528113adf0f1cbd98ff886a8e0f436c077b95aea62c044e0a9865 WHIRLPOOL be756e4c103c8a9e6772147fec7a3c73c6258d12f62c872d2942bf3a22f06d8ea9278fd40c932f78170803208a97fea8492f5ae16ef9c23f6febf7c85b73dfb8
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLIiCAAoJEGVpnaTzz9K9FzIP+wYeHeipTEbvufOZwAvMtO5g
-qzQiuRgiNycbyvyTQY/IkaZ+aHX/rvR8shN9q1dd7lYNzoPBNl6YOgOVtXck12GK
-c+XwcZ/Cmar9bV55A63gAmjqukGtuy4QKMH/ZusQLcRQSrOH1ePDdvqPqnnxCKvt
-tqNPCGameC1KkR2+F0cON3CuYDTvwkNyZVNiHSgjiccLxV7CB+xUr8BGzaoL7MfF
-IxlVQdvIQ7ambxxn3H0pJWhIgfFRDEYPPuMlzZFy32m6mvWwlOi7277pjsXb0HQh
-PlMYAlPlcGmn5kPGmoQJIySKns7MJo5ormkNiuqGzFsutKm6/bjGR3sx7yVkW0lN
-FJXTJYq405h89c2jB07i9veevAv7BqSzyxN1zJGMlXQG/Q7SqfWZJAQ/em4P6eUY
-Qwpngj+vjKZn7O4S/ZkhdvNd0LxmNFzlVeUTdj2iB1M0JvxeiHKbAk8yOV7yq8TE
-SIv+s3ChMZ45mU9m89Ps624J9xE6JItQx38U5tPMmWFVUr9NK0gURhdFPqIGJuCF
-cON2TkodoBpORoq7cuMKOsMMJ29hmHfzspjkPZBStv1iln0PULMK6O2mXZwZseRF
-HYtVY0ti0kG9hcZM+j79A49yrnehGZmxt33tO0yMOT8bGx6FzWIQFlpLwdZAflBr
-JVC1tsUNKHjX5WqMGczM
-=y4Zm
+iQIcBAEBCAAGBQJTWSjyAAoJEGVpnaTzz9K9qGgQAKY48qQUv9k8N2Fwwu/epXOr
+89hIwKO7VUUX6GTMlRx+1ebieevqou1t0p5jdXGf4VlsUGT9mBue35gEf159bVxe
+O1JGQetFBcuimqlp43U/gu+1RKcdgQqTaUPGyreKzjIKObjMxD6ShFRvXJV0elQB
++UP9+G/oLRc4jwsOu8qH+dTYYT/Cqpg6VBz46Qbk/YPF4J/6j65NDZxOkkAjoHLB
+qpy/CJI+JxXQD9UXaabffRHjaNQU58EB5DEuyzr3GGx9au0A1EZh9yguZjmmNi9b
+HC+Fms/PBUGJi5BQIA5EK6Ajb/NeeQPLdGr60KDoaClAcZE/2PvC75xMKe/+5cNP
+9amL0VM0k1oQGBnO1wyfZ99rNVYmkF6ydPVoHt0Uq1eMBkg9rkEell0tuYOxyy40
+kFVhsbwL1HA5xMAj/ChBvyyLlQPDKc1oqPeXvsN+PicpRV5/7wBkisQh4TDdzkRS
+5D3RLAIhxOIZ3Yn+h0iuhFcdeUvMUFv9UfPuZb4ocVQKXHDircwtKs3fZVN3vItp
+i6WIGG6UADYCq8WQCyXFiTvv2VbRbbu7IJ3GYFKQzdOJUJG7etodwnQst2Cv9VCI
+8b7EQp4l8ym95V5/Ddxgu3CFuSyVqHxfuSTnzdS8shaA24cxYbz/fdOHXePau6RQ
+duk1PpWyQtGjz4+dzl2E
+=Lp9p
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
index 3624e4d7d796..69f14afbac9c 100644
--- a/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
+++ b/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild,v 1.1 2014/03/21 18:44:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/miniplayer-2.5-r1.ebuild,v 1.2 2014/04/24 15:08:32 johu Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://kde-look.org/content/show.php?content=95501"
 SRC_URI="http://kde-look.org/CONTENT/content-files/95501-${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="debug"
 
diff --git a/kde-misc/miniplayer/miniplayer-2.5.ebuild b/kde-misc/miniplayer/miniplayer-2.5.ebuild
deleted file mode 100644
index 14310d136c57..000000000000
--- a/kde-misc/miniplayer/miniplayer-2.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/miniplayer/miniplayer-2.5.ebuild,v 1.3 2012/11/14 20:13:48 johu Exp $
-
-EAPI=4
-
-KDE_LINGUAS_DIR="applet/locale"
-KDE_LINGUAS="de et pl pt ru sv uk"
-inherit kde4-base
-
-DESCRIPTION="Multimedia player plasmoid"
-HOMEPAGE="http://kde-look.org/content/show.php?content=95501"
-SRC_URI="http://kde-look.org/CONTENT/content-files/95501-${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	media-libs/phonon
-"
-RDEPEND="
-	${DEPEND}
-	$(add_kdebase_dep plasma-workspace)
-"
-
-src_prepare() {
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			rm ${KDE_LINGUAS_DIR}/${lang}.mo
-		fi
-	done
-
-	kde4-base_src_prepare
-}