Synced RDEPEND from tree (kioclient for pasma-workspace)

5 files changed, 15 insertions, 6 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 13ddec292a2..47ef8c3ddc9 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  plasma-workspace-4.2.2.ebuild, plasma-workspace-4.2.67.ebuild,
+  plasma-workspace-9999.ebuild:
+  Synced RDEPEND from tree
+
+  29 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  plasma-workspace-4.2.2.ebuild:
+  Reverted plasma USE deps
+
   29 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com>
   +files/4.2.1-panelview-crash-fix.patch, +files/4.2-fix-quicklaunch.patch,
   +plasma-workspace-4.2.1-r1.ebuild, plasma-workspace-4.2.2.ebuild:
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index b9368b601e0..af4f0691050 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,8 +1,8 @@
 AUX plasma-workspace-4.1.72-fix.patch 958 RMD160 2922b5ac13b9cbd79a747181b3ff846691508872 SHA1 d3d889ebc5cb7c9f7bd7d00a0729b8350c09b481 SHA256 b2bb0ab8133cd07ca134b41394b0244d07286831a4a4b063b55d8bee157918b3
 DIST kdebase-workspace-4.2.2.tar.bz2 50800751 RMD160 a7cc0bedde529ff7e27ed9e0b6362ef6c20c4082 SHA1 9397220827f378cedf38e800e06e9ca8b1a1235d SHA256 1620cf0467eb08046aeee6bce46ca17948a703e98c0e3d0de3064ab39f196c2f
 DIST kdebase-workspace-4.2.67.tar.lzma 49804605 RMD160 5f2219f660e8682e76de2f93a99d0ccd68cacf16 SHA1 6c2de41a9824abe22e20ddf6209f7a604b6bd9b6 SHA256 c5273cc92db066a4d98469be2fb983f818911f247767e77287c10efc46b0b4ee
-EBUILD plasma-workspace-4.2.2.ebuild 2564 RMD160 e25aa42ff066bb0581d20e2ebb566ae2841fa087 SHA1 be1ac696848b648a5ee60e01ba29e0c57e863add SHA256 6485a5e319717048829c3904394b2a90b771cbf3ee3afa1ffd6f32d542eb3131
-EBUILD plasma-workspace-4.2.67.ebuild 2286 RMD160 db75fb01f22cd613c8b1a815bd885205be28fb42 SHA1 4fe3cd715498f1157fccb281292a71883c1f9236 SHA256 2d2306799e0e8d6ce339653bd0dd5386a3d13efbca37e609d7bc90ae03b35dfb
-EBUILD plasma-workspace-9999.ebuild 2275 RMD160 672cbef75563b75e7145dcee4727ded9fc5aa888 SHA1 351fafe4a49fc83a3eea3f617a6bdbb98825540d SHA256 62471ef186f048eabb7c2d8f69659cbd9ee9beea3719d38d99001c6f46206c11
-MISC ChangeLog 9049 RMD160 ff6e822178576c33f1f17995741ec29a11ea98d9 SHA1 73b7292aff17d2094ee64f9cda797cfbd54edd48 SHA256 703fbf4a7e730cf82aec074e0aa06b051a49cf130e8f8c79629f53adad816d33
+EBUILD plasma-workspace-4.2.2.ebuild 2465 RMD160 d26a97a9f1910529914b3a03adf689140c2cceb2 SHA1 ea2f608021014064699d68bb59190309c4a0c97b SHA256 0a5f39a671612c5f4f10f36b594fb4ba479bd456eb8f871a52a01e2b9393dc48
+EBUILD plasma-workspace-4.2.67.ebuild 2334 RMD160 870f46c449b58f05e3451d053bd9502cdf7f4c12 SHA1 89572cebb7f8535eb7aeee3c236ac613c6f1c884 SHA256 f69eb0db02fc2a04810d425c3837b699cac206e2921920b93ed7df68ea3af60f
+EBUILD plasma-workspace-9999.ebuild 2323 RMD160 bed9bc8ef87c4b23826c031cf3deca2a8afff48d SHA1 860714e61b854c9375d6f3d1b2ca080ed89bf197 SHA256 43de1b9b7559c2f9caf4c29ea8fc1dd0624b75d90122345ea0e0adad1ab43f86
+MISC ChangeLog 9363 RMD160 e5b5c7b6371038d9a76292ca656d834ad4550c67 SHA1 349f4338b53068c11dc6e1060e60f3592ea41521 SHA256 b1389edf460784be7c3abfec9786f2d4e4b94e9c97912f37a39c7d7788f41ab8
 MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
index aa3b96165e5..603e069a71f 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.2.ebuild
@@ -13,7 +13,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug google-gadgets python rss xcomposite xinerama"
 
 COMMONDEPEND="
-	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,plasma]
 	>=kde-base/kephal-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/ksysguard-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/libkworkspace-${PV}:${SLOT}[kdeprefix=]
@@ -39,7 +38,6 @@ DEPEND="${COMMONDEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
-	!kdeprefix? ( !kde-base/plasma[-kdeprefix] )
 	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kde-menu-icons-${PV}:${SLOT}[kdeprefix=]
 "
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.2.67.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.2.67.ebuild
index b4c5d2c32d6..50902f204f6 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.2.67.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.2.67.ebuild
@@ -38,6 +38,7 @@ DEPEND="${COMMONDEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-menu-icons-${PV}:${SLOT}[kdeprefix=]
 "
 
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 436d0694beb..d6300f1ab99 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -38,6 +38,7 @@ DEPEND="${COMMONDEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
+	>=kde-base/kioclient-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-menu-icons-${PV}:${SLOT}[kdeprefix=]
 "