4 files changed, 22 insertions, 45 deletions
diff --git a/app-text/kding/ChangeLog b/app-text/kding/ChangeLog
index 5905fa90ba03..60736a32ccf4 100644
--- a/app-text/kding/ChangeLog
+++ b/app-text/kding/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/kding
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kding/ChangeLog,v 1.22 2014/03/20 20:11:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kding/ChangeLog,v 1.23 2014/04/26 11:48:55 johu Exp $
+
+  26 Apr 2014; Johannes Huber <johu@gentoo.org> -kding-0.6-r1.ebuild,
+  kding-0.6-r2.ebuild:
+  amd64/x86 stable, remove old.
 
 *kding-0.6-r2 (20 Mar 2014)
 
diff --git a/app-text/kding/Manifest b/app-text/kding/Manifest
index b77fcdeae264..b6efa7876fd1 100644
--- a/app-text/kding/Manifest
+++ b/app-text/kding/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX kding-0.6-dtd.patch 923 SHA256 b808bd1c7eaf6baf4d5e65794d4f59ade406397bea935fa08f5b1958c7168046 SHA512 ed1e9c3d4711237298c77ef29eb2fd9456114b255632dee47e43475ba7101cc79defa354662551fd48f8f4d77949fb53beddba672ef380be63efb055b1dfdf88 WHIRLPOOL 51bf30eeffda0cb5216f54248df7f62505a7a27a889b99ff17b6aed26a0041c163d81c0f393713f7e61a3c17597fd1de46e10961e5fa255f59a22b071514eb76
 DIST kding-0.6.tar.bz2 3348783 SHA256 56c070b772b406529972648822dfb45b705980d7f74a98bd009efec72f9c7f71 SHA512 362890e95c8779d188745b41b6d7ef3050740999bf49baf98c16c73debb78fb1e57ebbeaddb902b458f00088f437b86eab398dd029626e35805e8ef6f09d0b86 WHIRLPOOL 5caf0e918dd8ac1f1eafcd04b06c3f1714092523178af6ad959c717ad0a1ca63c0b3cb46655ad8e773a702330c7699239dbce70324c3b5dfd4f9f27a12857737
-EBUILD kding-0.6-r1.ebuild 690 SHA256 58a4c736e8fe1f691a3ea5507d8b846e122db79fc79ddf7f160d4e0170a8271b SHA512 68f7f4f4e6de4dde9f927875ac6641de5b7febe0eb2d3fd29f23c163574ba87a2e88ac0254736f8fe9c49d4c0443a863045fbde783e56ceb5da9610f8ab58282 WHIRLPOOL edd73f411d22199cf3f282352f71aca9362d2732c425abc6b2f00c165b6d6b277f313390a90e699b62d58d999a9e3ee8b35fd58fb2bef98daaefe84d64a64f2e
-EBUILD kding-0.6-r2.ebuild 692 SHA256 029c10e92cdcd0455ed443dc6e978c588c13e81e8ef8eba7701b5cab6e10ef64 SHA512 0015ae0201ce01fbb9e77bf1f15a559d991579373c53eb2b4ad8f5727b3d87fbc24c8146023fd2fc74699246ea29101ae1d491c79a4445185807b3819e2f1f0f WHIRLPOOL df3b9f7133208fdd2d77c43dbb9b44439187dd2a556faa289b94bc20d8cde4d5b081bd8d2cb9cb731088f3d711d9f708142a2643d6f1054e6b2ac3201aee26d5
-MISC ChangeLog 3166 SHA256 0ce297741d6b1d08d36d4ed6615da08c6397b5f802b693c07a69ef9a51650689 SHA512 c72c5d5cdc3adc0bad5e8a5a42f5475cc7e9ecf61e0f1b10042050da7a33698e69d14583ff7dbc5b26fb1a3b372529970af447fdb0743bcd323666149a6424b8 WHIRLPOOL 4584363bdebd0b9cadd0e38514dbce6c86ed91a9e7b01b616726780bad023d798f8921d910a413d23bea11897b8996a21cd410d985c752dfefa334ba638eb099
+EBUILD kding-0.6-r2.ebuild 690 SHA256 a2cde860dd5c2b5f06f8bc579673fd153cd3b65fa054535001f855a247996184 SHA512 674827cc768746ea91a249b0ebccfd5226cd0f002384dd5154c2f6e5bad797af943b54e092a8aa69a6e9305f956a40df25f2ba05dc4b072b7e1efdcdc5cee81e WHIRLPOOL 295ada41f3f83fbc269eb51335c04028d4472de39484a122011682ceb65ee5fafe8e34270daba8f28cc7484e0141ea822762e6f6d074cf862fa8bf8b4181659a
+MISC ChangeLog 3292 SHA256 2e02ab2d16913252f65fb11ef39783f8dbb3c8de14b84aceaa44e8e296cd303e SHA512 4477e29371a401143dd509fb6658538f62c3a0145f6f09061981ad11216af7474d4414a01873bd2ef1e02afe0030fe88bb3a1d7f3d5fb73f0fe479f3841d662e WHIRLPOOL 4e9a39456c75d921311c6f182dc2760131d986c4f07dc5ac0656ee725f4ddd6f083e62b7e910530a6a959f6d2f23e1cce9c397783703dcaf8bac55157932a960
 MISC metadata.xml 460 SHA256 97f407c47872ef8516fda954afd493e5915f4e4d56c24ce8dec5e2464d05fe4e SHA512 8638964ce406146f08cdaa0a7e8453832749a1d152dfedfda3b8de30bb6faec670d1aa679c04591368fefb0f34d2b050850bbadc8e4d7ffaf25a3c294579799b WHIRLPOOL 6baaf60eed1562277c8ee98d5199c38bf7bd5c3de633ac3cecba6601121f106065b7d1cb8e0aacf2de3dc919b62e3fe6196718dc6ca91605beb77e7779320ef7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK0tnAAoJEGVpnaTzz9K9t60P/0ltCjz4BRcqIqKXgWBpxD87
-PWfOkXb1JXwH3MutNNUmW0Yx18FpXawB+o8lMkCcH6NDIpw3wzvtl5Lo4NIAk0W6
-w6AJZ9pfdCSIQBFXOcLD5MPY3G7iAwXR6/crv2YW8KAFhtInRqwNSXNwnWjgmvsp
-5CqlXI4F/SQCb2IMnTZvOq7spAx8XCkvju9Z3P02t7bWahQ+oe48P7OnHTVLMtfW
-Y63GGi+sCZMyTPShtKMDKfCtTmGw0gNLK2zsPoGcIhDQ/qvNxUE3PD1aERUpA+C3
-MnE8sRo/W21P1j7tetwsJ8AZsnpw+p2J+gvxNQNjYu4cTs9FLLNtrsJVREKAZv9S
-YzlPIlVm8iGDnz3T64E0OWIsy054MbXakMNzC13ZsXJYFeEQdYKYzk4AePIPuJkA
-IvsiICq+ryZ5hHC2KS/Nw0nHJQ8qFYcxfQeAEXGZ2gLEQxB7fiT6xVoZWOPgbinY
-JTGjNHQ4OuTNNVUSrqLyr1G6xCUtWd4UosoqRdJOUfIiG1zLcYL+ku3RuDVWkiZX
-z+X7RoZ/YX6Xb60wW8crZeRnJzB4/nJYiMiu8XbVLOXdExRFS1cnNeiV4ND957tB
-rqj2gZ7DNmRcjwVsrRxaD08aOVlqIdJtOkPvJbdJT3BLp/4ry7R4gCzvGAPjScuP
-6HrZ2qv7oUssU+OcmcXI
-=CXxa
+iQIcBAEBCAAGBQJTW50oAAoJEGVpnaTzz9K9HY4P/29xa9h/2aIKXpvxKkngMpSa
+Asnq+ykxdiu/fsizsvfpT7qBN20hvqpEZDAB1VYNqO3BLxWkL5TGsAxtpB9atZ5O
+f21iXmL0b0kivT5Ut6lVT09IAwEPmcpR7skKjCZ5l3xQKaW6GyCHDNSMWvf4e9sG
+qxiu+Wr0H1xCfQxM7hS7ryIZOpQLst2vqxBByN4oqgBB0264EGAUoDeVIAtDuDXq
+6J93CBI9dE8ZxpM6wArQKbLnQNJZZqzMuid28D4roTKwbnAX+wP68+XMLE+16r8S
+PYCy/CbH25BUXoyWnRWVg6hnHIauVphJtTh9FD4b0x7JUPJcElRYZlMHToROubij
+zFT1uRCtjt0k/SGpYRkVeefi101bf1G5Z78lzcb2Ha0KmWtxo7rXovMDBgg7pumm
+0AQHROa+7dxHVLfB53eXTT1PgIfTeA+0VPRG8P4jD9lsYaxFeXkhQqeQhvVLlMnp
+R0dh9FPH1vXTIN2EFDyMHNdkQsN5IahGIz3BB3Na9nNt3+AMvjTZyoS/r2WYk06/
+b56VGVdtwv7aJDrNTaKgKTP01Lu2qF4gc7jW0WLXP1iP2rJUXQDU14XvfirNRp1g
+klQxPnBEo8rE0ZDo9m4nlSXOyDmnAW0lL7WrzUXQQ/IxxfwvtVh5e1VFt7gTwX8b
+VhinF0C+jkeYKWqh6Dha
+=8cgw
 -----END PGP SIGNATURE-----
diff --git a/app-text/kding/kding-0.6-r1.ebuild b/app-text/kding/kding-0.6-r1.ebuild
deleted file mode 100644
index 8948c3ddad92..000000000000
--- a/app-text/kding/kding-0.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kding/kding-0.6-r1.ebuild,v 1.4 2012/11/16 22:48:56 johu Exp $
-
-EAPI=4
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="de"
-inherit kde4-base
-
-DESCRIPTION="KDE port of Ding, a dictionary lookup program."
-HOMEPAGE="http://www.rexi.org/software/kding/"
-SRC_URI="http://www.rexi.org/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-PATCHES=( "${FILESDIR}"/${P}-dtd.patch )
-
-src_prepare() {
-	sed -e "/Encoding=UTF-8/d" \
-		-i resources/kding.desktop || die "fixing .desktop file failed"
-
-	kde4-base_src_prepare
-}
diff --git a/app-text/kding/kding-0.6-r2.ebuild b/app-text/kding/kding-0.6-r2.ebuild
index ade1d06040ba..625f60a8a3da 100644
--- a/app-text/kding/kding-0.6-r2.ebuild
+++ b/app-text/kding/kding-0.6-r2.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/app-text/kding/kding-0.6-r2.ebuild,v 1.1 2014/03/20 20:11:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kding/kding-0.6-r2.ebuild,v 1.2 2014/04/26 11:48:55 johu Exp $
 
 EAPI=5
 KDE_HANDBOOK="optional"
@@ -13,7 +13,7 @@ SRC_URI="http://www.rexi.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 PATCHES=( "${FILESDIR}"/${P}-dtd.patch )