amd64/x86 stable, remove old.

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

8 files changed, 44 insertions, 156 deletions

diff --git a/kde-misc/kdesudo/ChangeLog b/kde-misc/kdesudo/ChangeLog
index 149c99976e0e..b8112c6192bf 100644
--- a/kde-misc/kdesudo/ChangeLog
+++ b/kde-misc/kdesudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdesudo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/ChangeLog,v 1.8 2014/03/20 22:06:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/ChangeLog,v 1.9 2014/04/24 14:33:22 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kdesudo-3.4.2.4.ebuild,
+  kdesudo-3.4.2.4-r1.ebuild:
+  amd64/x86 stable, remove old.
 
 *kdesudo-3.4.2.4-r1 (20 Mar 2014)
 
diff --git a/kde-misc/kdesudo/Manifest b/kde-misc/kdesudo/Manifest
index dc82b40603df..3007bf75b0fd 100644
--- a/kde-misc/kdesudo/Manifest
+++ b/kde-misc/kdesudo/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST kdesudo-3.4.2.4.tar.gz 53670 SHA256 8fc9ad91c908b27eb1f4173653ba7762f645fc817a9b108d0dd835d8af425584
-EBUILD kdesudo-3.4.2.4-r1.ebuild 811 SHA256 7ce5ea71fe8c06edb718d01edb2e3ea39c1198f59aea8ed33859a3817d4713bd SHA512 c7e7e5e45d2cbd4a5abaddebc1692b33372c28215a575808c2046c8c77e51e667484fe6bddc35f554a53140e83d14201b98d9f4ddd6efaeddb47893e88b5c227 WHIRLPOOL 243b509bdbd507fcc7118c5ce5660bfe76411b075cf42b51d8e80c549253033e1eeccb949462f73b16fe4366f5cfdb04da75388f1bcbefd58b1fd2d4827a8413
-EBUILD kdesudo-3.4.2.4.ebuild 805 SHA256 2d1207ef6f107ffac98668d88ee56ea6d76559b986a40184dda868042cbf1c5c SHA512 971a2edae58d7beca523b410bcbd2121ad794e2c26db9f3bdaec934f7997d41946522d1eab38a34e429aa7b6fa1a43c0fd7295a515aa57f457b3dec69ced6015 WHIRLPOOL a1bd55b8072c928277f8227640ed20bdb1a4f9674f39282044f912d7789792639266f3be4c3f2cdce7208c31c444461b5eea37f23b6ac5bdfe35f83c36326080
-MISC ChangeLog 1210 SHA256 0ccf6a49a0407d0e6fc6ef126cec9f18c9d1c8f8db4819d566ff7f23e346a88f SHA512 6614a73233d8b6dfc2cecee53d7c5f41a76b2a8ac4ba291a477066d977c6ade58cdba709cd64adde57f53ba3706ecdabfb30643024952729b985c58fef3623a7 WHIRLPOOL 2d4cbc98fde535b37fc0e1f3e06bf13566d00268b002988884ad4c639e6a0275cde21bd584877b5c73cb8576f2c6dde0785c428b795c87060605671491d44bcb
+EBUILD kdesudo-3.4.2.4-r1.ebuild 809 SHA256 2f9631f91b2d21425c10f67d9edcf774ef607a82cb677a937b526272affc92ac SHA512 af1e76b364464ffdf3add1447d0bf5d55e16cb29bf93d9558e43cc0e45b0fecb8f8c21f264fc39858c216ad8b5b03f0b02d52414b1ecd896f9d14ed080001c35 WHIRLPOOL 0621f94c9b257d29911b0a6192df16bfad11a55fcbdffebf9925d755dd37bad1bcb46e71d894c8ae5be06295b660a9c4569b0cc017097c89701a581eb2d44bf8
+MISC ChangeLog 1345 SHA256 42bab36b22d31c14cb2cf8312e34df67fa5a4fa537d43052c0e8f750da68c6c7 SHA512 635610025f58ff7459c5293515744b1c7fb3c6bf525cc106360bdfcde07c8c8b0a9eaa64c0e209abc7b55957fffc920e63ef29d6e647e44cf30231c3cc2f903e WHIRLPOOL d21da0a085633c41196ca23c11fd4af7d8361778bccc10e72be3590ea199aa81433615528c071ca819a836f93399d63fcad8d1fda78a7f0db14e1d3d073eed0c
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2ZiAAoJEGVpnaTzz9K9ZWoP/3mUVoXR2dn4Mb0GoO4QzvIh
-Pg3w1+ePpjhPUBn1dI6eRacugpP0Y7FLkmZdJL62cMH9AyVwE/Sh4kgeQs+05Z9o
-rGwnAEm4l5gxOdtFehAJLzwAVH7E9BlAkGbn/Ktd44uTnB/1LZlFCGCyOwBmWF6i
-s+JtXbg6cy/93eXU/dwFxVaQFt9Jm816yFiAR4VXKpJ7MdxNj4SJ1o8acXbaNhKz
-CAMfVPXQLMWY1DTmsNCsjUYhMUSF2Y0lfaoMMIgmkbAXPBsPxaVcd9F5OxXhy+iX
-gGCt+ti1AUihnpFs6OHk113D0tHwkmspEUyfqSYLETmRHrrOkkFe7AjFfrl+93Np
-7ilNeNFXdOuDmP29wag34pXfR8O6VNdfw8KlyJxgT6N8T2jz0qHttrvvRtPPkMkK
-GCkRihc/foRtd0nCItB91AH9l3x5xP1VD90h7EzqlYwg7dOS/3eNgHkz/Ajngdqb
-1nWRikVnB4/3ZVA3FUELgrsbOSp4QYzURZLA9vWgMC3erb4c5qCrC3g5ajxsNIbm
-jN56zHvUOOJCueF26Iw1UnFTzyHNo8D2xvwvyYJHq2QSZdINrZtSSPDm9yZv6aBc
-4jkS20tk7AY+pWxXgufKavv1Guw/RqF0kCJEY13mq6W0/HjWgfN/ZPWRHSj9oOCu
-tEvnaAI+9B7/sz3pVQQ1
-=J2hJ
+iQIcBAEBCAAGBQJTWSCzAAoJEGVpnaTzz9K96pkP/RZmlq3zKzp7IO/4L0ui1ToZ
+jq0H/jPH4t173brmJPyL/M20GyeDqOG+cRhNxn0C1ryDgpt+syu+oDMZpKdpyQki
+UWZ/J2ciSKlbKO5t8HkAcdEqNpC6Ihf6UfBD/bpzjpBZ/B4PWvGAteidX77yQ9LF
+S1B0/6oVRITRbijrH7UCyNz9JyxdCe81oBk4fb16OaN8B+lmWSsCFMz7xk7XsVnY
+iUz2K2BCHrM6OdaLzMR3hoxF6ct1HTtOE3rePggAtzcDHKHyWrt8c/a5rBrhPGnW
+09VJhVj1nc9SW7WrLZN2TPRXybVoj2BjgIwtYdHyhpPEsyNmabngjc57W5oWe57W
+oGHqsH2QsjeVuGqZLlh10Vtqspv3tL2LEKUvcHhmg7/kjaKQJz8qucsS+Bg5RysH
+Ng0KAuNheNSYqSqMz4vjximHEUvH0WVDlaZ36QCDp1pNWdIerky9nzlh8+Tv0QBA
+auFAP58O1deX/bHAXxETIeOvJ6N9/2sWrO1a4BEmpk5L7ctUrzWXyET+QqUgFfnP
+URRqv//ra1vt9kz4fdtOkLk4N4ByzQa2r+Pm4yEkOg/KBswhIkpPfbCIi7d0dRx9
+t1drKKP6V4N3aTLIHHXbYiieG97ZBETdvrB00FaAbBRQqVCe1lFzjxcz6PVK/OdN
+nYRS2yE/yhSUEZ7Ox/kg
+=j7gf
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild b/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
index 99d0d16564e6..4abc9671aeba 100644
--- a/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild
+++ b/kde-misc/kdesudo/kdesudo-3.4.2.4-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/kdesudo/kdesudo-3.4.2.4-r1.ebuild,v 1.1 2014/03/20 22:06:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdesudo/kdesudo-3.4.2.4-r1.ebuild,v 1.2 2014/04/24 14:33:22 johu Exp $
 
 EAPI=5
 # FIXME. What is linguas_jv, different Japanese translation?
@@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/${PN}/3.x/${PV}/+download/${P}.tar.gz"
 
 LICENSE="FDL-1.2 GPL-2 LGPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild b/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild
deleted file mode 100644
index 0ad31654012d..000000000000
--- a/kde-misc/kdesudo/kdesudo-3.4.2.4.ebuild
+++ /dev/null
@@ -1,25 +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/kdesudo/kdesudo-3.4.2.4.ebuild,v 1.5 2013/06/11 15:52:29 ago Exp $
-
-EAPI=4
-# FIXME. What is linguas_jv, different Japanese translation?
-KDE_LINGUAS="ar cs da de el en_GB es et fa fi fr gl he hr hu id is it ja kk ko
-lt lv ms nb nl oc pl pt pt_BR ro ru sk sv tl tr uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A frontend for sudo. Unlike kdesu, it uses directly sudo as backend."
-HOMEPAGE="http://launchpad.net/kdesudo/"
-SRC_URI="http://launchpad.net/${PN}/3.x/${PV}/+download/${P}.tar.gz"
-
-LICENSE="FDL-1.2 GPL-2 LGPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	app-admin/sudo
-"
-
-DOCS=( AUTHORS ChangeLog README )
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 27b7851a41d4..f99510d067db 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.70 2014/03/20 22:08:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.71 2014/04/24 14:38:17 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kdiff3-0.9.97-r1.ebuild,
+  kdiff3-0.9.97-r2.ebuild:
+  amd64/x86 stable, remove old.
 
 *kdiff3-0.9.97-r2 (20 Mar 2014)
 
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 4c1202bc2805..2efaf6454619 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -3,24 +3,23 @@ Hash: SHA256
 
 AUX kdiff3-0.9.97-relativepath.patch 2542 SHA256 affa8b351b96109748a1909d83d89e32c9ff51308f7cce438c314486793035e7 SHA512 dfff58aa2bd277eb771fbfd09270532a03ec9d534d28b199499b626ea6467aba3bd116dd5a74e0709f7c24a98cc4a2c2ab807a4762b1a547af706ce01961e19b WHIRLPOOL fe4fcd896df8d9a64e24bbe1aad73aa6a79d241dba8327b07d2781cf17f63029b170645537523d846e81383d31967b709a2b1992252146cdbee03f794d518eba
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
-EBUILD kdiff3-0.9.97-r1.ebuild 1878 SHA256 bfa1d311a8d14043178b160f6111bd8edfceeff45659488c26c777336106a21c SHA512 ee21d7c239a6631650d7a3cc8ea232b0a8407f9341320db174ce7e191c175072cc326fc8080f9ffb1b233e14a705c482684e051552b869db3ad969620b1af1f4 WHIRLPOOL e550e58a82f2e35ff5b913e9426015f4656ecf5857431aa3b71654e9aa7f6a265800b1403abc689ba541fe3f7aa0b20c97bbb815476c235f855368fb9141a950
-EBUILD kdiff3-0.9.97-r2.ebuild 1876 SHA256 3266467294dcdf19e2b360417f350a632b68ba17872866bbb6b08d33d302b4c9 SHA512 040e4eeadcdd8df49d5fb4032e2eb45137d9c96d8d9a806ed4086ecf494c425e3a0f1ea90572ba97cf57a4e4d47e7c32339e1051112b71682e1ddf92bbd43bb8 WHIRLPOOL 2f3e161e4c5a2b68228036ad78548d6b2cc981e18a47a732040df065bf4bdaa52c6a834ff2a51246ca6697bbec842ecdae2f77ac7e6177208368a9204c7684fa
-MISC ChangeLog 11189 SHA256 bc6658bec1d3889fe950922be363e63bf97ed413f10a73ebe41d92860f2c3394 SHA512 d50c0c9a30ed4e6d44758f7bbcb1a3755b1edcd1930506a2ace9c6b34434d779c5f73d445b75cfd0dc4e181a83aa15598520a39f1d014b583ac9387396dfccf6 WHIRLPOOL 006b4c31fb566240ea46b94bcb03746dd1f8a71419b7d092c671dffbfeae4f875b9dbf422df1ccb458e7bee93942bf2934d5fa16fff647630d5e7166fd925597
+EBUILD kdiff3-0.9.97-r2.ebuild 1874 SHA256 78417498662123f23902a58128bbcb64069c305e11a2d34ddeed4a39ca04713f SHA512 5f0b4ce38c28f2bfb7d0e43d09a4674a84d6ccfe6d8f121d8b2d488c5585ccabc1fc63a093c3c3218dd7d468a7e1555e9eeaa8ac32bb196c0fee6d802ba1fa88 WHIRLPOOL 502e516e358b1e99a0731c7c97623f41a0b16f0333e36af52c96d226956d5eef7b6046fe2ad196fd5533cc3d71d41eb0e609b8a8bc203fcd6d698f8b235de892
+MISC ChangeLog 11323 SHA256 5282857814b96e5ce187dc375c2d37679298d07117f6c6eaffd5db299233fc50 SHA512 1ef97b56f7b72e8d9ca360c10683d26f864aeb6a9dc6b1397363e65a931c77385fec8b5919e2829430c1341f79dfbbb0156cc0e188ae949aaf16dca213327bb2 WHIRLPOOL 9b4466404e2b5ad4fd97a4165789d6361d81093c1df9181498b72018e467e0d267214e4082f6ae06c96676cae196c555134989399f780c9a796cfca8a774fb4e
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTK2bhAAoJEGVpnaTzz9K9etoQALtbmx3KNRJtSzEJnfiBHxnf
-5DgVtAb6MxVcwJekOMg5gWGVHfgZSmckdVPp36bKCkSaB5XWCHPEb3NUj6pL+yRG
-ogu/NVcx7kqHo9m3NPGpWV14JC1dq20ZUG3pa3KaebDqMn8Loi0PoSK9ih3Ahlvr
-xiDUCNRboBqx1ANFaQIVDi0LPFFk0//uAOiCVXsU1zdmKicZsWV7VFvNgMNNSsef
-q25luRRAA9LUR/3I4ImfVwfNezafRZ0W7Y9mvmfqzseC2+1qhbYdU8zHOHTuVffl
-utrpgBZAxR9X7bye4Gjpp1C+SBdXwZi93sktFtoP1auk1WWtRc5x3x9MxAh/3w1N
-Y7EnjNqM/vgYxGcyiXJjTruOAHQtX4dzJD2vNZMuh07DDQQNceWpstYBHjcL03/6
-KbMP1D14K2hgjYW7zw63oaFubj0QArltHDhDTNuxa1f6LZOJznk/K59V7jql6aWp
-eBEJ86uuroe6ObA3I4Jr3I/1KWbuyXmRzOlUB9wOftQgkNRQggOClHuqVwWjK9XA
-NDGyamxrVfCDwDT5/OmFhczW5P6EWIPyg3zoMfDwT/+b13IxV5Fck3Xk7F73ivNl
-jbSBNCwKDmVC2oBnKvC6blNo4OpF3KUURbr/uaFb6VQZyqs+2KJ+Kd25KqNTk8xJ
-Lwq65/P/9rCPEMBat7OX
-=DshB
+iQIcBAEBCAAGBQJTWSHaAAoJEGVpnaTzz9K9654QALJDooNO6H4ShTda7/feovAD
+GJxu3nQpAKN9oIWZZXzUk50jzhRMA20HRXZsYNbRaU8eIJhh+ZcgDOkQasTtFHca
+hGLJv7iPGRKGZj6EA+e+jgMLwfcvo06ZcZMYPxgfxMeH1kRIwOgFkCjfti7mLmGp
+kzxiL4JYfCs1cjqzvirYIqo/ehL0o4jePIljktqo8Y4pE1oi/clu26dKafOQxz0b
+MzqB2JeUL0/kQlpI82p8g1BQ+0boW1ms8fwjxxdsOB8yXCZF1YWvdR/ct1dmmhTE
+JI+H2IyAzHa1e7SbYernQvkCUOoL8YpvFaGNoawS4L4o6SO3AJg8FieTiizwjEHS
+zfZRG8KzTPX3QfLAucIhGiGnt+JN0u22UI8jLeU25mPxkVdl8eLCAw0TxeXgmNHK
+7LZ0HWgmHzxFs5L8EAH1389Y1077SKkbpimScwV6reNzHFDmANdSk6jZAgh0KQ5r
+6JfETS5FDjzYb9sSJbrr8B1v/WGcNeEbX6OrA4uKpiliwYd8Z9Dk4tndrONUTAjt
+0W5GdMhg5Ebbez/153WuJBpVOdgZM1ZAmCUiMqXfJzq3Zi1iWfwqwLPFxlVBTJQf
+83NpyMRP3NZsv7YcLtfsCVvVYlvLahTgPRljxudLRbawQjTQt2cf9R6q+v2OKcW2
+/l31evuNCurIfykcZRAb
+=VzAg
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
deleted file mode 100644
index 243db1ddc948..000000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
+++ /dev/null
@@ -1,93 +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/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.5 2013/03/02 21:29:51 hwoarang Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
-	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
-	sv ta tg tr ug uk zh_CN zh_TW"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
-	KDE_HANDBOOK="optional"
-else
-	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
-	KEYWORDS=""
-fi
-
-KDE_REQUIRED="optional"
-inherit kde4-base qt4-r2
-
-DESCRIPTION="Qt/KDE based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug kde"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	kde? ( $(add_kdebase_dep kdelibs) )
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.97-relativepath.patch"
-)
-
-RESTRICT="!kde? ( test )"
-
-src_unpack(){
-	if [[ ${PV} == *9999* ]]; then
-		subversion_src_unpack
-	elif use kde; then
-		kde4-base_src_unpack
-	else
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if ! use kde; then
-		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
-		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
-		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
-	else
-		kde4-base_src_prepare
-	fi
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		qt4-r2_src_compile
-	fi
-}
-
-src_install() {
-	if use kde; then
-		kde4-base_src_install
-	else
-		qt4-r2_src_install
-	fi
-}
-
-src_test() {
-	if use kde; then
-		kde4-base_src_test
-	fi
-}
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
index 09e05ef59848..c20bf81d156f 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-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/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.1 2014/03/20 22:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.2 2014/04/24 14:38:17 johu Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
 	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
 	sv ta tg tr ug uk zh_CN zh_TW"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
 	KDE_HANDBOOK="optional"
 else
 	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"