[package.keywords] Update keywords for KDE SC 4.6 dependencies (specify akonadi-server version, remove bunch of live keywords, some still to come)

4 files changed, 4 insertions, 48 deletions

diff --git a/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6 b/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6
index ddb67ef85c2..0e02bd82085 100644
--- a/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6
+++ b/Documentation/package.keywords/.kde-4.6.9999/kdedeps-4.6
@@ -1,16 +1,5 @@
-~app-office/akonadi-server-9999 **
-~dev-libs/libattica-9999 **
-~dev-libs/shared-desktop-ontologies-9999 **
+>=app-office/akonadi-server-1.4.80
 ~dev-libs/soprano-9999 **
-~dev-util/automoc-9999 **
-~app-misc/strigi-9999 **
-~media-sound/phonon-9999 **
 ~sys-auth/polkit-qt-9999 **
 ~sys-auth/polkit-kde-agent-9999 **
 ~kde-misc/polkit-kde-kcmodules-9999 **
-
-# For kde-base/granatier - removed due to use.mask
-#~media-libs/gluon-9999
-
-# For kde-base/kopete
->=net-libs/libmsn-4.0
diff --git a/Documentation/package.keywords/kde-4.6.9999.keywords b/Documentation/package.keywords/kde-4.6.9999.keywords
index d691342f31c..c4bbdca796e 100644
--- a/Documentation/package.keywords/kde-4.6.9999.keywords
+++ b/Documentation/package.keywords/kde-4.6.9999.keywords
@@ -116,22 +116,11 @@
 ~kde-base/krosspython-4.6.9999 **
 ~kde-base/pykde4-4.6.9999 **
 ~kde-base/smoke-4.6.9999 **
-~app-office/akonadi-server-9999 **
-~dev-libs/libattica-9999 **
-~dev-libs/shared-desktop-ontologies-9999 **
+>=app-office/akonadi-server-1.4.80
 ~dev-libs/soprano-9999 **
-~dev-util/automoc-9999 **
-~app-misc/strigi-9999 **
-~media-sound/phonon-9999 **
 ~sys-auth/polkit-qt-9999 **
 ~sys-auth/polkit-kde-agent-9999 **
 ~kde-misc/polkit-kde-kcmodules-9999 **
-
-# For kde-base/granatier - removed due to use.mask
-#~media-libs/gluon-9999
-
-# For kde-base/kopete
->=net-libs/libmsn-4.0
 ~kde-base/blinken-4.6.9999 **
 ~kde-base/cantor-4.6.9999 **
 ~kde-base/kalgebra-4.6.9999 **
diff --git a/Documentation/package.keywords/kde-4.6.keywords b/Documentation/package.keywords/kde-4.6.keywords
index 98fbd6f042e..30d85e3f802 100644
--- a/Documentation/package.keywords/kde-4.6.keywords
+++ b/Documentation/package.keywords/kde-4.6.keywords
@@ -116,22 +116,11 @@ kde-base/krossjava:4.6
 kde-base/krosspython:4.6
 kde-base/pykde4:4.6
 kde-base/smoke:4.6
-~app-office/akonadi-server-9999 **
-~dev-libs/libattica-9999 **
-~dev-libs/shared-desktop-ontologies-9999 **
+>=app-office/akonadi-server-1.4.80
 ~dev-libs/soprano-9999 **
-~dev-util/automoc-9999 **
-~app-misc/strigi-9999 **
-~media-sound/phonon-9999 **
 ~sys-auth/polkit-qt-9999 **
 ~sys-auth/polkit-kde-agent-9999 **
 ~kde-misc/polkit-kde-kcmodules-9999 **
-
-# For kde-base/granatier - removed due to use.mask
-#~media-libs/gluon-9999
-
-# For kde-base/kopete
->=net-libs/libmsn-4.0
 kde-base/blinken:4.6
 kde-base/cantor:4.6
 kde-base/kalgebra:4.6
diff --git a/sets/kdedeps-4.6 b/sets/kdedeps-4.6
index 9ca22b46bf5..3af5390eb45 100644
--- a/sets/kdedeps-4.6
+++ b/sets/kdedeps-4.6
@@ -1,16 +1,5 @@
-~app-office/akonadi-server-9999
-~dev-libs/libattica-9999
-~dev-libs/shared-desktop-ontologies-9999
+>=app-office/akonadi-server-1.4.80
 ~dev-libs/soprano-9999
-~dev-util/automoc-9999
-~app-misc/strigi-9999
-~media-sound/phonon-9999
 ~sys-auth/polkit-qt-9999
 ~sys-auth/polkit-kde-agent-9999
 ~kde-misc/polkit-kde-kcmodules-9999
-
-# For kde-base/granatier - removed due to use.mask
-#~media-libs/gluon-9999
-
-# For kde-base/kopete
->=net-libs/libmsn-4.0