Update sets to remove slotting, update scripts using sets for new syntax

86 files changed, 1152 insertions, 1159 deletions

diff --git a/sets/kde b/sets/kde
index 19798fa8055..1ab8add4e67 100644
--- a/sets/kde
+++ b/sets/kde
@@ -1,9 +1,9 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # We don't include kdesdk on the global set
-kde-base/kate
-kde-base/kde-l10n
-kde-base/kde-meta
-kde-base/kdeplasma-addons
+kde-base/kate:4
+kde-base/kde-l10n:4
+kde-base/kde-meta:4
+kde-base/kdeplasma-addons:4
 
 @kdeaccessibility
 @kdeadmin
diff --git a/sets/kde-4.6 b/sets/kde-4.6
index 687046b9e30..a7594554599 100644
--- a/sets/kde-4.6
+++ b/sets/kde-4.6
@@ -1,8 +1,8 @@
 # We don't include kdesdk on the global set
-kde-base/kate:4.6
-kde-base/kde-l10n:4.6
-kde-base/kde-meta:4.6
-kde-base/kdeplasma-addons:4.6
+>=kde-base/kate-4.5.50
+>=kde-base/kde-l10n-4.5.50
+>=kde-base/kde-meta-4.5.50
+>=kde-base/kdeplasma-addons-4.5.50
 
 @kdeaccessibility-4.6
 @kdeadmin-4.6
diff --git a/sets/kde-4.7 b/sets/kde-4.7
index e925f2feb0c..3150cdfa9af 100644
--- a/sets/kde-4.7
+++ b/sets/kde-4.7
@@ -1,8 +1,8 @@
 # We don't include kdesdk on the global set
-kde-base/kate:4.7
-kde-base/kde-l10n:4.7
-kde-base/kde-meta:4.7
-kde-base/kdeplasma-addons:4.7
+>=kde-base/kate-4.6.50
+>=kde-base/kde-l10n-4.6.50
+>=kde-base/kde-meta-4.6.50
+>=kde-base/kdeplasma-addons-4.6.50
 
 @kdeaccessibility-4.7
 @kdeadmin-4.7
diff --git a/sets/kde-live b/sets/kde-live
index 5297d14b52d..7b1b208f699 100644
--- a/sets/kde-live
+++ b/sets/kde-live
@@ -1,8 +1,8 @@
 # We don't include kdesdk on the global set
-kde-base/kate:live
-kde-base/kde-l10n:live
-kde-base/kde-meta:live
-kde-base/kdeplasma-addons:live
+~kde-base/kate-9999
+~kde-base/kde-l10n-9999
+~kde-base/kde-meta-9999
+~kde-base/kdeplasma-addons-9999
 
 @kdeaccessibility-live
 @kdeadmin-live
diff --git a/sets/kdeaccessibility b/sets/kdeaccessibility
index 32b7a9af12a..117312f5895 100644
--- a/sets/kdeaccessibility
+++ b/sets/kdeaccessibility
@@ -1,9 +1,9 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/jovie
-kde-base/kaccessible
-kde-base/kdeaccessibility-colorschemes
-kde-base/kdeaccessibility-iconthemes
-kde-base/kdeaccessibility-meta
-kde-base/kmag
-kde-base/kmousetool
-kde-base/kmouth
+kde-base/jovie:4
+kde-base/kaccessible:4
+kde-base/kdeaccessibility-colorschemes:4
+kde-base/kdeaccessibility-iconthemes:4
+kde-base/kdeaccessibility-meta:4
+kde-base/kmag:4
+kde-base/kmousetool:4
+kde-base/kmouth:4
diff --git a/sets/kdeaccessibility-4.6 b/sets/kdeaccessibility-4.6
index ffc58155bd3..27b89b3c9b5 100644
--- a/sets/kdeaccessibility-4.6
+++ b/sets/kdeaccessibility-4.6
@@ -1,8 +1,8 @@
-kde-base/jovie:4.6
-kde-base/kaccessible:4.6
-kde-base/kdeaccessibility-colorschemes:4.6
-kde-base/kdeaccessibility-iconthemes:4.6
-kde-base/kdeaccessibility-meta:4.6
-kde-base/kmag:4.6
-kde-base/kmousetool:4.6
-kde-base/kmouth:4.6
+>=kde-base/jovie-4.5.50
+>=kde-base/kaccessible-4.5.50
+>=kde-base/kdeaccessibility-colorschemes-4.5.50
+>=kde-base/kdeaccessibility-iconthemes-4.5.50
+>=kde-base/kdeaccessibility-meta-4.5.50
+>=kde-base/kmag-4.5.50
+>=kde-base/kmousetool-4.5.50
+>=kde-base/kmouth-4.5.50
diff --git a/sets/kdeaccessibility-4.7 b/sets/kdeaccessibility-4.7
index 90a580c12f3..c60000663de 100644
--- a/sets/kdeaccessibility-4.7
+++ b/sets/kdeaccessibility-4.7
@@ -1,6 +1,6 @@
-kde-base/jovie:4.7
-kde-base/kaccessible:4.7
-kde-base/kdeaccessibility-meta:4.7
-kde-base/kmag:4.7
-kde-base/kmousetool:4.7
-kde-base/kmouth:4.7
+>=kde-base/jovie-4.6.50
+>=kde-base/kaccessible-4.6.50
+>=kde-base/kdeaccessibility-meta-4.6.50
+>=kde-base/kmag-4.6.50
+>=kde-base/kmousetool-4.6.50
+>=kde-base/kmouth-4.6.50
diff --git a/sets/kdeaccessibility-live b/sets/kdeaccessibility-live
index 37e3cef465b..710bfb3116d 100644
--- a/sets/kdeaccessibility-live
+++ b/sets/kdeaccessibility-live
@@ -1,6 +1,6 @@
-kde-base/jovie:live
-kde-base/kaccessible:live
-kde-base/kdeaccessibility-meta:live
-kde-base/kmag:live
-kde-base/kmousetool:live
-kde-base/kmouth:live
+~kde-base/jovie-9999
+~kde-base/kaccessible-9999
+~kde-base/kdeaccessibility-meta-9999
+~kde-base/kmag-9999
+~kde-base/kmousetool-9999
+~kde-base/kmouth-9999
diff --git a/sets/kdeadmin b/sets/kdeadmin
index 0204b2620b0..69cdcbbb988 100644
--- a/sets/kdeadmin
+++ b/sets/kdeadmin
@@ -1,6 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/kcron
-kde-base/kdeadmin-meta
-kde-base/ksystemlog
-kde-base/kuser
-kde-base/system-config-printer-kde
+kde-base/kcron:4
+kde-base/kdeadmin-meta:4
+kde-base/ksystemlog:4
+kde-base/kuser:4
+kde-base/system-config-printer-kde:4
diff --git a/sets/kdeadmin-4.6 b/sets/kdeadmin-4.6
index ffd05b5aaa9..f1c4a33cb95 100644
--- a/sets/kdeadmin-4.6
+++ b/sets/kdeadmin-4.6
@@ -1,5 +1,5 @@
-kde-base/kcron:4.6
-kde-base/kdeadmin-meta:4.6
-kde-base/ksystemlog:4.6
-kde-base/kuser:4.6
-kde-base/system-config-printer-kde:4.6
+>=kde-base/kcron-4.5.50
+>=kde-base/kdeadmin-meta-4.5.50
+>=kde-base/ksystemlog-4.5.50
+>=kde-base/kuser-4.5.50
+>=kde-base/system-config-printer-kde-4.5.50
diff --git a/sets/kdeadmin-4.7 b/sets/kdeadmin-4.7
index 752db055d5e..d958919e174 100644
--- a/sets/kdeadmin-4.7
+++ b/sets/kdeadmin-4.7
@@ -1,5 +1,5 @@
-kde-base/kcron:4.7
-kde-base/kdeadmin-meta:4.7
-kde-base/ksystemlog:4.7
-kde-base/kuser:4.7
-kde-base/system-config-printer-kde:4.7
+>=kde-base/kcron-4.6.50
+>=kde-base/kdeadmin-meta-4.6.50
+>=kde-base/ksystemlog-4.6.50
+>=kde-base/kuser-4.6.50
+>=kde-base/system-config-printer-kde-4.6.50
diff --git a/sets/kdeadmin-live b/sets/kdeadmin-live
index 80190d7b4d8..970df087f5d 100644
--- a/sets/kdeadmin-live
+++ b/sets/kdeadmin-live
@@ -1,5 +1,5 @@
-kde-base/kcron:live
-kde-base/kdeadmin-meta:live
-kde-base/ksystemlog:live
-kde-base/kuser:live
-kde-base/system-config-printer-kde:live
+~kde-base/kcron-9999
+~kde-base/kdeadmin-meta-9999
+~kde-base/ksystemlog-9999
+~kde-base/kuser-9999
+~kde-base/system-config-printer-kde-9999
diff --git a/sets/kdeartwork b/sets/kdeartwork
index 0363bb4ef7a..c3a2b11c531 100644
--- a/sets/kdeartwork
+++ b/sets/kdeartwork
@@ -1,11 +1,11 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/kdeartwork-colorschemes
-kde-base/kdeartwork-desktopthemes
-kde-base/kdeartwork-emoticons
-kde-base/kdeartwork-iconthemes
-kde-base/kdeartwork-kscreensaver
-kde-base/kdeartwork-meta
-kde-base/kdeartwork-sounds
-kde-base/kdeartwork-styles
-kde-base/kdeartwork-wallpapers
-kde-base/kdeartwork-weatherwallpapers
+kde-base/kdeartwork-colorschemes:4
+kde-base/kdeartwork-desktopthemes:4
+kde-base/kdeartwork-emoticons:4
+kde-base/kdeartwork-iconthemes:4
+kde-base/kdeartwork-kscreensaver:4
+kde-base/kdeartwork-meta:4
+kde-base/kdeartwork-sounds:4
+kde-base/kdeartwork-styles:4
+kde-base/kdeartwork-wallpapers:4
+kde-base/kdeartwork-weatherwallpapers:4
diff --git a/sets/kdeartwork-4.6 b/sets/kdeartwork-4.6
index bf7cb71836e..00d1b15e4ce 100644
--- a/sets/kdeartwork-4.6
+++ b/sets/kdeartwork-4.6
@@ -1,10 +1,10 @@
-kde-base/kdeartwork-colorschemes:4.6
-kde-base/kdeartwork-desktopthemes:4.6
-kde-base/kdeartwork-emoticons:4.6
-kde-base/kdeartwork-iconthemes:4.6
-kde-base/kdeartwork-kscreensaver:4.6
-kde-base/kdeartwork-meta:4.6
-kde-base/kdeartwork-sounds:4.6
-kde-base/kdeartwork-styles:4.6
-kde-base/kdeartwork-wallpapers:4.6
-kde-base/kdeartwork-weatherwallpapers:4.6
+>=kde-base/kdeartwork-colorschemes-4.5.50
+>=kde-base/kdeartwork-desktopthemes-4.5.50
+>=kde-base/kdeartwork-emoticons-4.5.50
+>=kde-base/kdeartwork-iconthemes-4.5.50
+>=kde-base/kdeartwork-kscreensaver-4.5.50
+>=kde-base/kdeartwork-meta-4.5.50
+>=kde-base/kdeartwork-sounds-4.5.50
+>=kde-base/kdeartwork-styles-4.5.50
+>=kde-base/kdeartwork-wallpapers-4.5.50
+>=kde-base/kdeartwork-weatherwallpapers-4.5.50
diff --git a/sets/kdeartwork-4.7 b/sets/kdeartwork-4.7
index a7047ea991d..3d9826690cc 100644
--- a/sets/kdeartwork-4.7
+++ b/sets/kdeartwork-4.7
@@ -1,10 +1,10 @@
-kde-base/kdeartwork-colorschemes:4.7
-kde-base/kdeartwork-desktopthemes:4.7
-kde-base/kdeartwork-emoticons:4.7
-kde-base/kdeartwork-iconthemes:4.7
-kde-base/kdeartwork-kscreensaver:4.7
-kde-base/kdeartwork-meta:4.7
-kde-base/kdeartwork-sounds:4.7
-kde-base/kdeartwork-styles:4.7
-kde-base/kdeartwork-wallpapers:4.7
-kde-base/kdeartwork-weatherwallpapers:4.7
+>=kde-base/kdeartwork-colorschemes-4.6.50
+>=kde-base/kdeartwork-desktopthemes-4.6.50
+>=kde-base/kdeartwork-emoticons-4.6.50
+>=kde-base/kdeartwork-iconthemes-4.6.50
+>=kde-base/kdeartwork-kscreensaver-4.6.50
+>=kde-base/kdeartwork-meta-4.6.50
+>=kde-base/kdeartwork-sounds-4.6.50
+>=kde-base/kdeartwork-styles-4.6.50
+>=kde-base/kdeartwork-wallpapers-4.6.50
+>=kde-base/kdeartwork-weatherwallpapers-4.6.50
diff --git a/sets/kdeartwork-live b/sets/kdeartwork-live
index 1268778c25c..58a54ee6a2e 100644
--- a/sets/kdeartwork-live
+++ b/sets/kdeartwork-live
@@ -1,10 +1,10 @@
-kde-base/kdeartwork-colorschemes:live
-kde-base/kdeartwork-desktopthemes:live
-kde-base/kdeartwork-emoticons:live
-kde-base/kdeartwork-iconthemes:live
-kde-base/kdeartwork-kscreensaver:live
-kde-base/kdeartwork-meta:live
-kde-base/kdeartwork-sounds:live
-kde-base/kdeartwork-styles:live
-kde-base/kdeartwork-wallpapers:live
-kde-base/kdeartwork-weatherwallpapers:live
+~kde-base/kdeartwork-colorschemes-9999
+~kde-base/kdeartwork-desktopthemes-9999
+~kde-base/kdeartwork-emoticons-9999
+~kde-base/kdeartwork-iconthemes-9999
+~kde-base/kdeartwork-kscreensaver-9999
+~kde-base/kdeartwork-meta-9999
+~kde-base/kdeartwork-sounds-9999
+~kde-base/kdeartwork-styles-9999
+~kde-base/kdeartwork-wallpapers-9999
+~kde-base/kdeartwork-weatherwallpapers-9999
diff --git a/sets/kdebase b/sets/kdebase
index 66e6f59a5d2..c56a2e966ce 100644
--- a/sets/kdebase
+++ b/sets/kdebase
@@ -1,5 +1,5 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/kdebase-meta
+kde-base/kdebase-meta:4
 @kdebase-apps
 @kdebase-runtime
 @kdebase-workspace
diff --git a/sets/kdebase-4.6 b/sets/kdebase-4.6
index 551e1357925..052c4c26f5e 100644
--- a/sets/kdebase-4.6
+++ b/sets/kdebase-4.6
@@ -1,4 +1,4 @@
-kde-base/kdebase-meta:4.6
+>=kde-base/kdebase-meta-4.5.50
 @kdebase-apps-4.6
 @kdebase-runtime-4.6
 @kdebase-workspace-4.6
diff --git a/sets/kdebase-4.7 b/sets/kdebase-4.7
index 996019defa9..71ddfc93be6 100644
--- a/sets/kdebase-4.7
+++ b/sets/kdebase-4.7
@@ -1,4 +1,4 @@
-kde-base/kdebase-meta:4.7
+>=kde-base/kdebase-meta-4.6.50
 @kdebase-apps-4.7
 @kdebase-runtime-4.7
 @kdebase-workspace-4.7
diff --git a/sets/kdebase-apps b/sets/kdebase-apps
index b4ad3dc0b35..f42ca8c7110 100644
--- a/sets/kdebase-apps
+++ b/sets/kdebase-apps
@@ -1,13 +1,13 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/dolphin
-kde-base/kdepasswd
-kde-base/kdialog
-kde-base/keditbookmarks
-kde-base/kfind
-kde-base/kfmclient
-kde-base/konqueror
-kde-base/konsole
-kde-base/kwrite
-kde-base/libkonq
-kde-base/nsplugins
-kde-base/plasma-apps
+kde-base/dolphin:4
+kde-base/kdepasswd:4
+kde-base/kdialog:4
+kde-base/keditbookmarks:4
+kde-base/kfind:4
+kde-base/kfmclient:4
+kde-base/konqueror:4
+kde-base/konsole:4
+kde-base/kwrite:4
+kde-base/libkonq:4
+kde-base/nsplugins:4
+kde-base/plasma-apps:4
diff --git a/sets/kdebase-apps-4.6 b/sets/kdebase-apps-4.6
index ad31fd0ab78..db07254648d 100644
--- a/sets/kdebase-apps-4.6
+++ b/sets/kdebase-apps-4.6
@@ -1,12 +1,12 @@
-kde-base/dolphin:4.6
-kde-base/kdepasswd:4.6
-kde-base/kdialog:4.6
-kde-base/keditbookmarks:4.6
-kde-base/kfind:4.6
-kde-base/kfmclient:4.6
-kde-base/konqueror:4.6
-kde-base/konsole:4.6
-kde-base/kwrite:4.6
-kde-base/libkonq:4.6
-kde-base/nsplugins:4.6
-kde-base/plasma-apps:4.6
+>=kde-base/dolphin-4.5.50
+>=kde-base/kdepasswd-4.5.50
+>=kde-base/kdialog-4.5.50
+>=kde-base/keditbookmarks-4.5.50
+>=kde-base/kfind-4.5.50
+>=kde-base/kfmclient-4.5.50
+>=kde-base/konqueror-4.5.50
+>=kde-base/konsole-4.5.50
+>=kde-base/kwrite-4.5.50
+>=kde-base/libkonq-4.5.50
+>=kde-base/nsplugins-4.5.50
+>=kde-base/plasma-apps-4.5.50
diff --git a/sets/kdebase-apps-4.7 b/sets/kdebase-apps-4.7
index 1de17eb8645..7a3b11e00f3 100644
--- a/sets/kdebase-apps-4.7
+++ b/sets/kdebase-apps-4.7
@@ -1,13 +1,13 @@
-kde-base/dolphin:4.7
-kde-base/kdepasswd:4.7
-kde-base/kdialog:4.7
-kde-base/keditbookmarks:4.7
-kde-base/kfind:4.7
-kde-base/kfmclient:4.7
-kde-base/konqueror:4.7
-kde-base/konq-plugins:4.7
-kde-base/konsole:4.7
-kde-base/kwrite:4.7
-kde-base/libkonq:4.7
-kde