Remove redundant seds to replace the KDE4WORKBASE_ bits, the eclass now handles it

(Portage version: 2.2.0_alpha30/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 229E5838)

16 files changed, 109 insertions, 136 deletions

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2e2d2f02904..2f94d82a1ef 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1,22 @@
-EBUILD kdevelop-9999.ebuild 1647 RMD160 0bd06096472bfa776db62a464e8d7f66c23a42df SHA1 2352741cb168fadeb1d3fefcadeb1fd1a37056c3 SHA256 90ad6c9491d997a49633fa11910d3ddde340a3d53fd1e68443f21cfab29df69f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kdevelop-9999.ebuild 1396 RMD160 c74818da27820505d29c22b8157d6f552e0e42be SHA1 c0671b106a656de16321c5e82d58431f7016e76f SHA256 bdb6997f0795ac2822f12022e8a79290f77dc10d2a614aa7211831f6b5a99c61
 MISC metadata.xml 429 RMD160 19300c79fd5f01e46ccdb57c48e9092f84a99df4 SHA1 c0fa5ba9271542c990a65094391985285fdc17af SHA256 57c402369aa48da3ae4102f7d649da1e3c0bc1ddb38672ae51759cd8490b29f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMdsAAoJELHSF2kinlg4VocP/1HVIRgdD03AfJtt28f/+myC
+NxSs2oOhOQKXkQRgQ5HnULbuukiJ0RQJMvCWIZrgFm0YDZvF8O5LvPnMksl2rerl
+dOoID8qENFpSrgi86xzglXpdeUOa1KVM17CL56nNU4gmEqFl0fcUDSp9do3YSD7q
+40mz7P+FHyxeLLCj25ZVkqmTlgk/DFCt/NBfArNoknx0f6C5O/U4XG5OkmSdVHVP
+b3MXxwwzUfZ17c42fLDbJurM+7H+KfgNIBUD/hccRCPFNUs5dnkNGGajUXliJbch
+rCbFZBj4YxHy5Cys82o08sTr3ONiQypcyl8bogi/cgSP3MsX2bxsEqHzN7jAYxiC
+mVyoHsRxA0YhJN/FmxDvEQVq+6TM9sr82A6CSnUqtDq1lu7MDdnkAKv5V5i1K/5A
+TCowQEuEX2Vz4f8zrWQs1xE5yrxCmK/uqTyWkMWjnCnUE+3Wx/RiB0xEwrEFnjoi
+/1etuB1ETpju049UL4SP/GJyb6T3BlbnfoQM5o79qXnHR46q7/8FWRGIubAasdU2
+baiO0ui8C8v09H/CAHJ/eVluUYEzdcF2Z4aYbnkIONPK5HrCAa9tybbf89Pdai7s
+XYrUwwGFfGwOZLz4GSxX4HNdibtn3ajob1zT9Ga/7+TzFFOGV6axI/VWDRPQbwNX
+pU4m0fv7r17wa9ywSPCm
+=l6Rx
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 79453bb9ac5..a303b7b664b 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -28,15 +28,6 @@ RDEPEND="${DEPEND}
 "
 # see bug 347547 about the kdevplatform[subversion] dependency
 
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Remove this and the ksysguard dep after libprocessui moved into kdelibs
-	sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \
-		debuggers/gdb/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-}
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build cmake)
diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest
index 01a82c7238c..f4515d6e814 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-base/kdeartwork-kscreensaver/Manifest
@@ -3,23 +3,23 @@ Hash: SHA256
 
 AUX kdeartwork-kscreensaver-4.5.95-webcollage.patch 643 RMD160 7cba173fbb03a3eaf4a96a53a4089962a62f5356 SHA1 2fabea6215d2f84eb6a2d435e9df914554c52408 SHA256 cdc24e8cba2b27534efd6dc52aa92547580abc77571f791cf8d733cf8356d8c1
 AUX kdeartwork-kscreensaver-xscreensaver.patch 1116 RMD160 cee0b5a16df17318b0c674900fa5521ed2b5a58b SHA1 61ad2bda0b0db9fa8feebfea3449101f416afd38 SHA256 a4bcd61c09e467924a2651a97d1c57a756b44a3fad182f45328424cdac502e9d
-EBUILD kdeartwork-kscreensaver-4.6.9999.ebuild 1236 RMD160 d31d7edfec070c6d38fe316096e048b92c487478 SHA1 687b7c00a6072a194c1616f5afff50067b4ceb6c SHA256 18e9256bc9b322ce144b0d31a995d33e489b4dbad9680d754821f53e02434e10
-EBUILD kdeartwork-kscreensaver-9999.ebuild 1236 RMD160 d31d7edfec070c6d38fe316096e048b92c487478 SHA1 687b7c00a6072a194c1616f5afff50067b4ceb6c SHA256 18e9256bc9b322ce144b0d31a995d33e489b4dbad9680d754821f53e02434e10
+EBUILD kdeartwork-kscreensaver-4.6.9999.ebuild 1013 RMD160 c2034f02ee5d6f726e7ea75b37489779eb1d8230 SHA1 3b67ad3c52ce7680a65e7120e2bac52c57a3fd95 SHA256 b784c1a4e80c4f82cd7b473600d3320477a817a10a2230339eff289fb6f9efef
+EBUILD kdeartwork-kscreensaver-9999.ebuild 1013 RMD160 c2034f02ee5d6f726e7ea75b37489779eb1d8230 SHA1 3b67ad3c52ce7680a65e7120e2bac52c57a3fd95 SHA256 b784c1a4e80c4f82cd7b473600d3320477a817a10a2230339eff289fb6f9efef
 MISC metadata.xml 353 RMD160 5286585f94bb5137c91e90b26dc8e96350840005 SHA1 65e8ee3ca6c601f6de1319d215255f3e326babef SHA256 9cbb330c7bdc2416419842e1076e9bb8ca853d485bcbfe4c8b8649162ef192a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNric4AAoJELHSF2kinlg4ylkP+wVVkvy5YLHpTimfH48/yC0C
-CtCOU4FdjSr9vJuF4K++d/WuoE2GMZSXs1e66mjCZ2yY5AsVjS1IPSZQdiDpnjfI
-ISPO9nAvYEcW1jeNbjXF9JRvbPptjq62MW5htrtdy4RftvNW3iTmLam2ZbMUxu2e
-Zq4nYuqFMZgVk8Yujsta0ycl957uyXwZnvWm/Us8bZiS+GtU8JHkouCC5fGkfugL
-MZx+Amq0TGg9aOLeMIuryah6V1eRROCjfn80Dj58XImfXKYA64dFbopbCGGB0LMs
-kvSfnsFygZJEi+aAL4prNH6c5qK5i8HbN55Z9mHXYUdLb2I4gmOoNfsUi4PpDAfI
-grsHdABzJNE1xpk+IIxmqQ+D5eumI6tOrnaqQsR4I7ODgD+6T9AZ2pB9OK21aaMQ
-SoXze8Hi+JkgNTvlaQNunEUkXubNHhDX0C7pskadlLp/OL8hMOdbDBw9s3LRJrak
-lf210BxhZo1UyrcWjgDitsCPxQ5zOq60vJPekpY1oy7yJbbzd3juPz1wwJjoVKBw
-u1x6b7A4zryNQJRsIk3UAbRg15iz/9GKBUNV257ipv4KhowwEhVjVodn5A/wSq7M
-rFBkAoUsyRgdg0hms6MK2y/bEo/Caza3ct1ZzD1fiDIN6m/XCZF37WBf0VRXfEb/
-2boplklOTEmnu7d+7VAf
-=rU0b
+iQIcBAEBCAAGBQJNuMdrAAoJELHSF2kinlg4um0P/jOgymXl0vxDqYk3vnn9nKTD
+cHm8Lsi+M13ctDFzo0mIwikQpoH2norDzooqcrJw6DCac6XHHstPKccQ9c8GTOmW
+WO8B7yOeWXd1sUCU94C8s2CEhrUe4VyHsb149nbtErsBLoZ/ponFn0o93HSIaxfr
+KSjy8gvh6W6qn7chcJp3V5gUzcLvyUEKdYS0Mh7uzw8brz0OQUtvJpSsNcjrFxOs
+5Sqk1XoChEukudOlEpNmU/cYq9Ak97EPi/pFj2dBWFxVMW74pXjh3DpLhWhNvf+U
+1DsVqqC+tnvF2ebcYsinXRSqpmSGVm5JytsTppdW+B34aG/pc/ccKUIpnVVPd9+r
+dPqE2pIgtvt444K+mvR8tOqf1BiFdjvBADEr8jwHiV+DY4QFJX5JnPKDXr+zwvi9
+/MDVUFHM3JQ87JpBAbkaiqF5gjrrXeWTVXgL7/EiwuboqSiyXCnRYL0QEHsOSZGA
+lAtjPlVmoLhHc5xkiUjWvUh3TYu3AMWZS9pGbzimIozMKuHBvnluVDz9Yx5qnf/d
+loqlcgA6A2f+XcCmIJ08vkJuxZMTw1aXjEmYZhmnp6pFrnaf8cw8nT4N+VHYfrRa
+CGUxNITVSnSMOLX0ubU+1MBkCb/HFcBmhXVkdhOW8CY6orSsc6SPFkhODcZt4xr1
+OA4lwWYtB3mLGy6JIAPZ
+=3vgh
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
index 8bd8ad3aae6..c2498234ad0 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
@@ -29,14 +29,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
 	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DKSCREENSAVER_SOUND_SUPPORT=ON
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
index 8bd8ad3aae6..c2498234ad0 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
@@ -29,14 +29,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
 	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
-src_prepare() {
-	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
-		kscreensaver/{kdesavers{,/asciiquarium},kpartsaver}/CMakeLists.txt \
-		|| die "Failed to patch CMake files"
-
-	kde4-meta_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DKSCREENSAVER_SOUND_SUPPORT=ON
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index abb5dd8572e..0ebaf9053d0 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,3 +1,23 @@
-EBUILD kdeplasma-addons-4.6.9999.ebuild 2099 RMD160 e6787fa60ac8736d777417d6cb7a35102dce04ec SHA1 afcbfdbb385b7efe446ac7975dc92871381b4e93 SHA256 0d567ceb06afccfff82be8724831eee508ac22c4f39388f3ba6ce7ae2e298134
-EBUILD kdeplasma-addons-9999.ebuild 2099 RMD160 e6787fa60ac8736d777417d6cb7a35102dce04ec SHA1 afcbfdbb385b7efe446ac7975dc92871381b4e93 SHA256 0d567ceb06afccfff82be8724831eee508ac22c4f39388f3ba6ce7ae2e298134
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD kdeplasma-addons-4.6.9999.ebuild 1774 RMD160 3aca471cde5fb3e88f0994f135af258201028f54 SHA1 7a76798b0e38b4f898e7498f2946df5078a1b7df SHA256 b93059f89b704f6dd613ba17bd36110718f668e93c05f387e41aa984e1d3a05e
+EBUILD kdeplasma-addons-9999.ebuild 1774 RMD160 3aca471cde5fb3e88f0994f135af258201028f54 SHA1 7a76798b0e38b4f898e7498f2946df5078a1b7df SHA256 b93059f89b704f6dd613ba17bd36110718f668e93c05f387e41aa984e1d3a05e
 MISC metadata.xml 590 RMD160 348b8b1bc247366b339794cc2aec564b2226e067 SHA1 677e55796be545f56fc4b7351268fb7aff49aaa9 SHA256 f1b43f2d7869ec912de095ae4cac3d50bcd7cd8295d73f65e57e0ff7d8ca9ea6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMdrAAoJELHSF2kinlg4Zq4QAIykqOUPADZ5HRXtDV6sdgDx
+DkXi0EIdLShiv8eJem+nfABp9o/DXvTJG5Qg5y9Mhq8KZtkO+YCrVW9S8wZXKpZV
+93KqQ8aUAcw1n63AZ9Pm9rcwsWHUOTYjV/fcgKrathbg/JZD+TJVy1PdkaV8Wxyf
+MQmP0z7W4BJjp1sp+a2vjbaX5BGnPhfPvSb3u4Sf88ULs4ZjWddVM43IWV6q0njw
+4nZ91F89dA8an3OieUtvNrSCwPZezauCho5gNEtV1o2XSSzp5cdB/j7IJwLafoSb
+Dm+QXhYjXyQje3It6RbT8h8S3Un+0t1r0Qb4DKlSp0m1FkRY2YubMmUtTb6WhCKF
+DGOonrMzjjo7mo0xnKGmpD+UYxF0kBYmbYK6GZut2YmI/f3ctbda+PvZ8QDFhnn+
+ybMiiK17JhmYnWFSxsERsvp8VP76d8tSB7bMb7ZAvVeD1aCqYnDwCFTfoFBbdBBs
+P+6jX9JZAgu7s0fIT78gHnRlRToOUwK/G8y/QVvECxrPsKHyYC269YE9pWyprEOB
+TnZG6usVDyyJwvc2/fykE/cTS9cwHp5GqEVpu8Oi4LHb33yaYHHEWlHKqP4A/+3J
+pcQRoGmd+FJSw5/AWMYH5va+syIYRPTKU2yxZ2BtQAO/XHsh70oTxNw8zc6Urs7F
+JPMA/vmf9wajvzPxDHtQ
+=HBnn
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
index 5070cbe9279..11636baad4a 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
@@ -49,17 +49,6 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
-src_prepare() {
-	find "${S}" -name CMakeLists.txt | \
-		xargs sed -i \
-			-e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
-			-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
-			-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
-		|| die "Failed to patch CMake files"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 5070cbe9279..11636baad4a 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -49,17 +49,6 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
-src_prepare() {
-	find "${S}" -name CMakeLists.txt | \
-		xargs sed -i \
-			-e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
-			-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
-			-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
-		|| die "Failed to patch CMake files"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
diff --git a/kde-base/kremotecontrol/Manifest b/kde-base/kremotecontrol/Manifest
index a1c5ec555f0..60b985ac396 100644
--- a/kde-base/kremotecontrol/Manifest
+++ b/kde-base/kremotecontrol/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD kremotecontrol-4.6.9999.ebuild 677 RMD160 858280e9a90003245e40fd781cd18f1f65dfb3a7 SHA1 202549ec6479bae6e48c39b2ddd50ba71ebe1b3e SHA256 cf4eeeb53bcd593932e2789c1be7559d3988344a20364c6a6df8884076693998
-EBUILD kremotecontrol-9999.ebuild 677 RMD160 858280e9a90003245e40fd781cd18f1f65dfb3a7 SHA1 202549ec6479bae6e48c39b2ddd50ba71ebe1b3e SHA256 cf4eeeb53bcd593932e2789c1be7559d3988344a20364c6a6df8884076693998
+EBUILD kremotecontrol-4.6.9999.ebuild 462 RMD160 abced35a4c766a3edae6a73a7b2d3e0072232809 SHA1 3bc7df2956bed01b681cdf926edebec3aba1ce5f SHA256 587da632bb2a2d1c2fdb2fff6e59b953a583a6bcc9ea8919029698d0ac84049b
+EBUILD kremotecontrol-9999.ebuild 462 RMD160 abced35a4c766a3edae6a73a7b2d3e0072232809 SHA1 3bc7df2956bed01b681cdf926edebec3aba1ce5f SHA256 587da632bb2a2d1c2fdb2fff6e59b953a583a6bcc9ea8919029698d0ac84049b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNridIAAoJELHSF2kinlg4dDQP/j8RwjOukRAyvSAxLijV7Z/d
-Qjli1Q0n0aQVCnLgeDcBlFIo6BT6sIgFj5n5v6WcR/KWe454sP6IGKcITczAxVdJ
-4syQz0Ibv0jEFVtGjEw0mbyaatutGBjnH25/6dgVtcX4nKyVxKvoLETgBquDpkJP
-KUxxHN+wpf7IM4dXJdxpKHKArpDG66LspmFrVwDQ9ZvYX7yW2qt9jIeGw4+bKt0R
-x72lB299HPm5OC4w42KZV6wDL5DcSL+LX48AeAGYOVRqFAsMuEW8NvX8JiVDEYPW
-L1OA5f1LhbK4VvgsL7bBeX3HlHjvIxEejxBAB449A5uixLGubCn0NEUYZNCxpkxc
-3DO01DUTtxXpOC6tBkMNJyt4O0BaS0LSoe6dDO4jDvWkNLYq8nIzlhE5ln4FY2jQ
-tOSe77Kj2HYKjvD5m6buPoRmGoA7DhMP4zdS1Rj71jjy4wWL7cjqYTGon1JwKXJo
-d+V8tDPQA/EceUSKNgj4mFzp5OWNPpAddcl0GMW5w8SDLKacmip0qwNAKSzgLIw7
-U2gUk7oIfz/MQda1prSwhYOP6e6BKwRbpOwd5JZ/H+W6fdv7gkLDETDlA5YubPh0
-5YuO3RHZLTYCNrvYa2gUdl2bm2MD/d9FeRQEC4W4MJw7lOnvtq9LB9vHEcdN3AcQ
-3jaQhfW/6UVOcLdUb05x
-=xzYt
+iQIcBAEBCAAGBQJNuMdsAAoJELHSF2kinlg4tuAP/ilST9x1K9jlwPnGBpjFfART
+xj7ts3nJ0riPEuF9myvTQKs83uIAHUNLX4Vvm5TsmGEfckqfqoBC0swDzH3EsqJI
+dint6gm4zXlpBwlZSiK1kwKHgnf/R2azb5upluySmUruLwyVTHelFiA/hljjhyc0
+5pmYUFmUNO4mNAfwWV5U8O/9tf9bFpGHE2cR0+xaeX7R42OpjMjeNOs3kNhWqego
+1V2+Wm2lZQBDkv2SUk+7s9cvqfT+ovf1zfGbggt1+egYbK/bol/v1p3KH4uJCJZd
+MhPx6k5vyzvNsJhRhyxzRIX49WyfYkcuAznGPqK3KwYOLq+ROIBS5cjq2mLIk9Rv
+Jj+jibvKv7yxhkd9kkqv6WBBcGdAzYnJgrQyqVAuLCMPzKH61doBru89a96oqPUT
+5xi28YaYwAqPNLiL2r/Rd4x+sgIiFGHj2EjV90+rfU7iGWcYNfvYeDTr1j7CCotE
+NJ8kQecidX1K7fjGt3ktvShMtECA+sF/lhW0JaRuuqnmWOmlXXgJhCAAU5NgvrQo
+s7KDpe0OIcBmDEyLLBSDv5p3pJtHMZcQSg/04+f7i5sGg2J7ICoC/jkeC0X28En1
+++pTfntofyg90fIyjRFyUsMm24JGukyTUtObltHzWiht3qMeq9mLjKbFztpoWXjP
+CAxBQizpsfbQxxYxDk2W
+=H2Z2
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild
index 71e2f2669ab..cf7c59b9da9 100644
--- a/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-4.6.9999.ebuild
@@ -25,11 +25,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \
-		-i kremotecontrol/{kcmremotecontrol,kded,krcdnotifieritem,libkremotecontrol}/CMakeLists.txt \
-		|| die
-}
diff --git a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
index 71e2f2669ab..cf7c59b9da9 100644
--- a/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-9999.ebuild
@@ -25,11 +25,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \
-		-i kremotecontrol/{kcmremotecontrol,kded,krcdnotifieritem,libkremotecontrol}/CMakeLists.txt \
-		|| die
-}
diff --git a/kde-base/ktux/Manifest b/kde-base/ktux/Manifest
index 7fc7674365a..31819242096 100644
--- a/kde-base/ktux/Manifest
+++ b/kde-base/ktux/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD ktux-4.6.9999.ebuild 596 RMD160 b79fb1d09681dbdd8778dadfee90108de630b941 SHA1 637e7ef09a998641e094e193eb905ff9df947e83 SHA256 234e8ba93e13678d81192e5ff72a56617be822d991d15eb2a3c3e8163fdd81d2
-EBUILD ktux-9999.ebuild 596 RMD160 b79fb1d09681dbdd8778dadfee90108de630b941 SHA1 637e7ef09a998641e094e193eb905ff9df947e83 SHA256 234e8ba93e13678d81192e5ff72a56617be822d991d15eb2a3c3e8163fdd81d2
+EBUILD ktux-4.6.9999.ebuild 416 RMD160 913dc6b9f724899b1c2c9d765c1f1f0f006a8311 SHA1 d61a2f4b550088ae73c89d27a809698af039e985 SHA256 5db746b9dc4928d74677e3c131eea35023fa567ed8986c94d088fd6d092b1259
+EBUILD ktux-9999.ebuild 416 RMD160 913dc6b9f724899b1c2c9d765c1f1f0f006a8311 SHA1 d61a2f4b550088ae73c89d27a809698af039e985 SHA256 5db746b9dc4928d74677e3c131eea35023fa567ed8986c94d088fd6d092b1259
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNridJAAoJELHSF2kinlg42UAQAJywUiXyipfqDzIUpHOcBi65
-0NTRKj8qPtKvx3z+mJTMrR9DpJdHreteW81PQ96dSqKlct2RAdrXYQ6AwMAQ3/sM
-r5ljRuo9pen/CYpe4yp/DDm8HWRzUDEcyUhKnhArpin8ICwhhjzKIEWCmi972we2
-+PSoS93SfTCnQTlPMy8EzwS1H1v5FVdMZkLkilJfmLCd75eqOZHc06mAG/6BtBe7
-nPnODuauoW3Qd6l27tMMplkLdiFfe82M4oGTkZK+KO3LyYOQ+4cYiUREwCV/nc1M
-Aqsly1IaWnhgw6REuHghtunCnvUJwgtCDqbHnIen2terCpcyySQ/1lKu7g6lUVtI
-wi+m3XIY3wC55IjTn1Jyf9z9wUIP++puKoyc3HXSZ0K5We3rtwzjhlpqbc+ZMVJb
-hjsu8LLWy1O1ZaHOKiiqzE64JB5UacQGaLw0RsA0A5CA1dY19kUuCZgH/p/AQf/C
-7JPCPyf7n203TyB92wjcc87PaacawqlvfBcWYSiqruxYfHG8+Gpq3S24M4GRY3jv
-MKvJ0NZmYiceFa1hB1aD8xx4NYCqLpsy+Cqcg+puIpdpkLFsZRWIQtKJwsgOCnOl
-ag7vU6NrTt7v0dDYQ85yU4S/MJaR5kSEHLDKz7bKIsS17GQfy7mtwIe692TamHMs
-1cTUK/LEC1dVl8nUSOe6
-=6GU/
+iQIcBAEBCAAGBQJNuMdrAAoJELHSF2kinlg4OOsP/1gNwwS2ccfuUSsCpwt5uqfN
+yqQ7yECtGwaFVh8WTPuxPwf+kcpF3o18jakf6B1nZWE3XR1Ys0IyL18GKXKNNCGl
+RViRPgXmN96o7YEC2AeoicW+uY0dQ0pCXTzchEKDLyeOOKrQpVKKKfUVuV8JjTN+
+DJsrI7d+GooMZXZcAMy1hWuHnyB9wbRJh29bBXDUcR5zDtCRKxRL3eQwogyS3wHF
+wjq1XuAiENOvzy0csowLKzSza5BaV/4JxWDGGsbYEl5dzEzmC4uVR6bz50N1jh5M
+aiy4zuyPsa2pdTaBylLBVBH3llPiqtjgTJQxetKnH+ctjLe8APh2EFdYxvczLpAC
+RsVQs/lFvm6hz5icmReaGtkAo7C6NYPIu8skrsFryqhC9mI3uPV7i8o1eL/VUppx
+qo1z+06GP5ns8Lsyv4P5bWGX4mHsc1dPCa/H0ZxGhDtDMXZgEHmSQ4dHRLhUkOQf
+Dq+oaEJwJHxnCpFTM4qyC+lT/BoLy8a09CJyKDjR10ffEJztjLwJ1GCr8VDChiOu
+tucDvUsDqmFuWLDDrOWgUfJNNO0LvANaRmUUrlXVxC1aQsLj2qkZXzeqqmc8Mgl4
+U7XAVznN6wxHVSLL9hbTLsYCOM0sFoXaG4Nn/lDyhX7x/rbYGmvRV9qHmpCBjv6z
+LI4wUIQvexAwXIH4NTj0
+=HNfx
 -----END PGP SIGNATURE-----
diff --git a/kde-base/ktux/ktux-4.6.9999.ebuild b/kde-base/ktux/ktux-4.6.9999.ebuild
index afdb30915d4..68d1dec9cbb 100644
--- a/kde-base/ktux/ktux-4.6.9999.ebuild
+++ b/kde-base/ktux/ktux-4.6.9999.ebuild
@@ -17,10 +17,3 @@ DEPEND="
 	$(add_kdebase_dep libkworkspace)
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/' \
-		"${PN}"/src/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-base/ktux/ktux-9999.ebuild b/kde-base/ktux/ktux-9999.ebuild
index afdb30915d4..68d1dec9cbb 100644
--- a/kde-base/ktux/ktux-9999.ebuild
+++ b/kde-base/ktux/ktux-9999.ebuild
@@ -17,10 +17,3 @@ DEPEND="
 	$(add_kdebase_dep libkworkspace)
 "
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/' \
-		"${PN}"/src/CMakeLists.txt || die "Failed to patch CMakeLists.txt"
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-misc/chromi/Manifest b/kde-misc/chromi/Manifest
index 87872553977..bafab666761 100644
--- a/kde-misc/chromi/Manifest
+++ b/kde-misc/chromi/Manifest
@@ -1,2 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST jinliu-kwin-deco-chromi-v0.2-0-g4390e63.tar.gz 55674 RMD160 7cd28b4079ca679e0e279211d72d4ce8e543644b SHA1 4c281d18229e1ce3d798c36d270da097864dd10c SHA256 5c3ccc4bdfc0d7565827755678a092a3107447c55f817c625df75761a01399aa
-EBUILD chromi-0.2.ebuild 788 RMD160 5e494b577ff2488b15b72b4a197a49a50697f407 SHA1 2096955d59e5f8be4c973c1f8e02d9e63ad3fd62 SHA256 eb2031166d08ed9f0afa7a84f3a34948d176687e01cfa080f06e08c08572c62b
+EBUILD chromi-0.2.ebuild 578 RMD160 8f2e0f4e45d6cb4d367c732483e32c76bb85c305 SHA1 4954b2fa248dde8dab37fc26461a7130324d7e11 SHA256 c4b1399bc10de9c4fd731c49af18639b0b81113cba7e285ab4a198f223b852c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNuMdsAAoJELHSF2kinlg4yWgP/3w9fWP2W21zxKgECffnIh/k
+NAKxM6MaVmBQJ8TLTzto3hMIVeTVBEr+8LKe9G6Gw5DRSUIcmfuYRbX7yvKh84Yj
+URAENGBKlyz3SklexiSfzvfIhdS/9ujTfqwh6p5uU9D7DOqjSe9z1EDnpZRJxuag
+3qnR4mqCGNgHS9qE/omb5fLVnt1X0i5NWw1OjiEdy7/DPLwLiCfZCfscWTh1lM/v
+zZK/d/xuRNLPZmD6boyC+KdP/rhGE3KbacRKISvhTX3NXh0E7ILZmS9a3XcTelXw
+dWPESSBQkfunLw6mTcyB0ryKfvoQAOgAlF6c1d2MojEkUs/v6lTE/WMFk8Ls7sUH
+6vkxgXe3rU7VF4hB52dA1/SArN/5e+nW/sGdIN60/hkl+t/D36EGVrqF4mcVIcLS
+tRrrxyk4BlYJ+oWxiciWMFaFpoPJXBnWsECsnYiIfPmZ+GiYMqj6UWDrUPFdQSIZ
+6vQVKDQnezeDH+mqqSDDm3iC3fHCDrfWQs37fXR9+0BVmGJmXotVv4ALNmAhOdqD
+VZ22E+xm5cr/sw34BzfhcySI4UX2WH9bPHAuQKdeTpGLctJBKJVMFfvUu8/GbBmD
+glQEEW0VRpUGiAA/e8rK8m65bKAggCm+MfY58KdlnIYDrsEGolVOX0xhT1qlXWyX
+imb86RSTP7pykJHDag3L
+=QbDf
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/chromi/chromi-0.2.ebuild b/kde-misc/chromi/chromi-0.2.ebuild
index 0ac4041ffb9..00d54381e3c 100644
--- a/kde-misc/chromi/chromi-0.2.ebuild
+++ b/kde-misc/chromi/chromi-0.2.ebuild
@@ -20,13 +20,3 @@ S="${WORKDIR}/jinliu-kwin-deco-chromi-4390e63"
 
 DEPEND=">kde-base/kwin-4.4.1"
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Prevent a gentoo-specific linking error.
-	sed -e 's/${KDE4WORKSPACE_KDECORATIONS_LIBS}/kdecorations/g' \
-		-i "${S}"/src/CMakeLists.txt || die "Patching failed!"
-}
-
-