Move the branched live ebuilds to a version that is consistant with slotting removal; update keywords/masks/etc.

40 files changed, 22 insertions, 308 deletions

diff --git a/sets/kde-4.4 b/sets/kde-4.4
deleted file mode 100644
index 75baa83920d..00000000000
--- a/sets/kde-4.4
+++ /dev/null
@@ -1,24 +0,0 @@
-# We don't include kdesdk on the global set
-kde-base/kate:4.4
-kde-base/kde-l10n:4.4
-kde-base/kde-meta:4.4
-kde-base/kdeplasma-addons:4.4
-
-@kdeaccessibility-4.4
-@kdeadmin-4.4
-@kdeartwork-4.4
-@kdebase-4.4
-@kdeedu-4.4
-@kdegames-4.4
-@kdegraphics-4.4
-@kdelibs-4.4
-@kdemultimedia-4.4
-@kdenetwork-4.4
-@kdepim-4.4
-@kdetoys-4.4
-@kdeutils-4.4
-@kdewebdev-4.4
-
-#for developers
-#@kdebindings-4.4
-#@kdesdk-4.4
diff --git a/sets/kde-4.6 b/sets/kde-4.6
index 214bad51494..687046b9e30 100644
--- a/sets/kde-4.6
+++ b/sets/kde-4.6
@@ -8,7 +8,6 @@ kde-base/kdeplasma-addons:4.6
 @kdeadmin-4.6
 @kdeartwork-4.6
 @kdebase-4.6
-@kdedeps-4.6
 @kdeedu-4.6
 @kdegames-4.6
 @kdegraphics-4.6
diff --git a/sets/kdeaccessibility b/sets/kdeaccessibility
index 3fa16c5e779..32b7a9af12a 100644
--- a/sets/kdeaccessibility
+++ b/sets/kdeaccessibility
@@ -1,8 +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/kttsd
diff --git a/sets/kdeaccessibility-4.4 b/sets/kdeaccessibility-4.4
deleted file mode 100644
index 1649168311f..00000000000
--- a/sets/kdeaccessibility-4.4
+++ /dev/null
@@ -1,7 +0,0 @@
-kde-base/kdeaccessibility-colorschemes:4.4
-kde-base/kdeaccessibility-iconthemes:4.4
-kde-base/kdeaccessibility-meta:4.4
-kde-base/kmag:4.4
-kde-base/kmousetool:4.4
-kde-base/kmouth:4.4
-kde-base/kttsd:4.4
diff --git a/sets/kdeadmin b/sets/kdeadmin
index 406a700972d..0204b2620b0 100644
--- a/sets/kdeadmin
+++ b/sets/kdeadmin
@@ -1,7 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 kde-base/kcron
 kde-base/kdeadmin-meta
-kde-base/knetworkconf
 kde-base/ksystemlog
 kde-base/kuser
 kde-base/system-config-printer-kde
diff --git a/sets/kdeadmin-4.4 b/sets/kdeadmin-4.4
deleted file mode 100644
index 126c3d793b3..00000000000
--- a/sets/kdeadmin-4.4
+++ /dev/null
@@ -1,6 +0,0 @@
-kde-base/kcron:4.4
-kde-base/kdeadmin-meta:4.4
-kde-base/knetworkconf:4.4
-kde-base/ksystemlog:4.4
-kde-base/kuser:4.4
-kde-base/system-config-printer-kde:4.4
diff --git a/sets/kdeartwork b/sets/kdeartwork
index 94926aab61f..0363bb4ef7a 100644
--- a/sets/kdeartwork
+++ b/sets/kdeartwork
@@ -5,7 +5,6 @@ kde-base/kdeartwork-emoticons
 kde-base/kdeartwork-iconthemes
 kde-base/kdeartwork-kscreensaver
 kde-base/kdeartwork-meta
-# kde-base/kdeartwork-kwin-styles <--- not ready yet by upstream
 kde-base/kdeartwork-sounds
 kde-base/kdeartwork-styles
 kde-base/kdeartwork-wallpapers
diff --git a/sets/kdeartwork-4.4 b/sets/kdeartwork-4.4
deleted file mode 100644
index 84d1e05fbb5..00000000000
--- a/sets/kdeartwork-4.4
+++ /dev/null
@@ -1,11 +0,0 @@
-kde-base/kdeartwork-colorschemes:4.4
-kde-base/kdeartwork-desktopthemes:4.4
-kde-base/kdeartwork-emoticons:4.4
-kde-base/kdeartwork-iconthemes:4.4
-kde-base/kdeartwork-kscreensaver:4.4
-kde-base/kdeartwork-meta:4.4
-# kde-base/kdeartwork-kwin-styles:4.4 <--- not ready yet by upstream
-kde-base/kdeartwork-sounds:4.4
-kde-base/kdeartwork-styles:4.4
-kde-base/kdeartwork-wallpapers:4.4
-kde-base/kdeartwork-weatherwallpapers:4.4
diff --git a/sets/kdebase b/sets/kdebase
index 3499fafb47b..66e6f59a5d2 100644
--- a/sets/kdebase
+++ b/sets/kdebase
@@ -1,6 +1,5 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 kde-base/kdebase-meta
-
 @kdebase-apps
 @kdebase-runtime
 @kdebase-workspace
diff --git a/sets/kdebase-4.4 b/sets/kdebase-4.4
deleted file mode 100644
index 7e5360a7462..00000000000
--- a/sets/kdebase-4.4
+++ /dev/null
@@ -1,5 +0,0 @@
-kde-base/kdebase-meta:4.4
-
-@kdebase-apps-4.4
-@kdebase-runtime-4.4
-@kdebase-workspace-4.4
diff --git a/sets/kdebase-apps-4.4 b/sets/kdebase-apps-4.4
deleted file mode 100644
index ef799bb456b..00000000000
--- a/sets/kdebase-apps-4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-kde-base/dolphin:4.4
-kde-base/kdepasswd:4.4
-kde-base/kdialog:4.4
-kde-base/keditbookmarks:4.4
-kde-base/kfind:4.4
-kde-base/kfmclient:4.4
-kde-base/konqueror:4.4
-kde-base/konsole:4.4
-kde-base/kwrite:4.4
-kde-base/libkonq:4.4
-kde-base/nsplugins:4.4
-kde-base/plasma-apps:4.4
diff --git a/sets/kdebase-runtime b/sets/kdebase-runtime
index 45f9afec112..69f3f53e4ce 100644
--- a/sets/kdebase-runtime
+++ b/sets/kdebase-runtime
@@ -1,4 +1,5 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
+kde-base/activitymanager
 kde-base/attica
 kde-base/drkonqi
 kde-base/kcmshell
@@ -11,6 +12,7 @@ kde-base/kdebase-menu-icons
 kde-base/kdebase-runtime-meta
 kde-base/kdebugdialog
 kde-base/kdesu
+kde-base/kdontchangethehostname
 kde-base/keditfiletype
 kde-base/kfile
 kde-base/kglobalaccel
@@ -25,7 +27,6 @@ kde-base/kpasswdserver
 kde-base/kquitapp
 kde-base/kreadconfig
 kde-base/kstart
-kde-base/kstyles
 kde-base/ktimezoned
 kde-base/ktraderclient
 kde-base/kuiserver
diff --git a/sets/kdebase-runtime-4.4 b/sets/kdebase-runtime-4.4
deleted file mode 100644
index 7f0f6a6e8b4..00000000000
--- a/sets/kdebase-runtime-4.4
+++ /dev/null
@@ -1,37 +0,0 @@
-kde-base/attica:4.4
-kde-base/drkonqi:4.4
-kde-base/kcmshell:4.4
-kde-base/kcontrol:4.4
-kde-base/kdebase-data:4.4
-kde-base/kdebase-desktoptheme:4.4
-kde-base/kdebase-kioslaves:4.4
-kde-base/kdebase-menu:4.4
-kde-base/kdebase-menu-icons:4.4
-kde-base/kdebase-runtime-meta:4.4
-kde-base/kdebugdialog:4.4
-kde-base/kdesu:4.4
-kde-base/keditfiletype:4.4
-kde-base/kfile:4.4
-kde-base/kglobalaccel:4.4
-kde-base/khelpcenter:4.4
-kde-base/kiconfinder:4.4
-kde-base/kioclient:4.4
-kde-base/kmimetypefinder:4.4
-kde-base/knetattach:4.4
-kde-base/knewstuff:4.4
-kde-base/knotify:4.4
-kde-base/kpasswdserver:4.4
-kde-base/kquitapp:4.4
-kde-base/kreadconfig:4.4
-kde-base/kstart:4.4
-kde-base/kstyles:4.4
-kde-base/ktimezoned:4.4
-kde-base/ktraderclient:4.4
-kde-base/kuiserver:4.4
-kde-base/kurifilter-plugins:4.4
-kde-base/kwalletd:4.4
-kde-base/nepomuk:4.4
-kde-base/phonon-kde:4.4
-kde-base/plasma-runtime:4.4
-kde-base/renamedlg-plugins:4.4
-kde-base/solid-runtime:4.4
diff --git a/sets/kdebase-workspace b/sets/kdebase-workspace
index 75441cfe4bd..0f22bfc05e4 100644
--- a/sets/kdebase-workspace
+++ b/sets/kdebase-workspace
@@ -1,4 +1,5 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
+kde-base/freespacenotifier
 kde-base/kcheckpass
 kde-base/kcminit
 kde-base/kdebase-cursors
@@ -15,11 +16,13 @@ kde-base/kscreensaver
 kde-base/ksmserver
 kde-base/ksplash
 kde-base/kstartupconfig
+kde-base/kstyles
 kde-base/ksysguard
 kde-base/ksystraycmd
 kde-base/kwin
 kde-base/kwrited
 kde-base/libkworkspace
+kde-base/liboxygenstyle
 kde-base/libplasmaclock
 kde-base/libplasmagenericshell
 kde-base/libtaskmanager
diff --git a/sets/kdebase-workspace-4.4 b/sets/kdebase-workspace-4.4
deleted file mode 100644
index d2af2ad35f7..00000000000
--- a/sets/kdebase-workspace-4.4
+++ /dev/null
@@ -1,29 +0,0 @@
-kde-base/kcheckpass:4.4
-kde-base/kcminit:4.4
-kde-base/kdebase-cursors:4.4
-kde-base/kdebase-startkde:4.4
-kde-base/kdebase-wallpapers:4.4
-kde-base/kdm:4.4
-kde-base/kephal:4.4
-kde-base/khotkeys:4.4
-kde-base/kinfocenter:4.4
-kde-base/klipper:4.4
-kde-base/kmenuedit:4.4
-kde-base/krunner:4.4
-kde-base/kscreensaver:4.4
-kde-base/ksmserver:4.4
-kde-base/ksplash:4.4
-kde-base/kstartupconfig:4.4
-kde-base/ksysguard:4.4
-kde-base/ksystraycmd:4.4
-kde-base/kwin:4.4
-kde-base/kwrited:4.4
-kde-base/libkworkspace:4.4
-kde-base/libplasmaclock:4.4
-kde-base/libplasmagenericshell:4.4
-kde-base/libtaskmanager:4.4
-kde-base/plasma-workspace:4.4
-kde-base/powerdevil:4.4
-kde-base/qguiplatformplugin_kde:4.4
-kde-base/solid:4.4
-kde-base/systemsettings:4.4
diff --git a/sets/kdebindings b/sets/kdebindings
index 59a68f9aa51..845d3eab19e 100644
--- a/sets/kdebindings
+++ b/sets/kdebindings
@@ -1,9 +1,9 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 kde-base/kdebindings-csharp
 kde-base/kdebindings-meta
+kde-base/kdebindings-perl
 kde-base/kdebindings-ruby
 kde-base/krossjava
 kde-base/krosspython
-kde-base/krossruby
 kde-base/pykde4
 kde-base/smoke
diff --git a/sets/kdebindings-4.4 b/sets/kdebindings-4.4
deleted file mode 100644
index ec54c82cec1..00000000000
--- a/sets/kdebindings-4.4
+++ /dev/null
@@ -1,8 +0,0 @@
-kde-base/kdebindings-csharp:4.4
-kde-base/kdebindings-meta:4.4
-kde-base/kdebindings-ruby:4.4
-kde-base/krossjava:4.4
-kde-base/krosspython:4.4
-kde-base/krossruby:4.4
-kde-base/pykde4:4.4
-kde-base/smoke:4.4
diff --git a/sets/kdedeps-4.6 b/sets/kdedeps-4.6
deleted file mode 100644
index 7f120240cc3..00000000000
--- a/sets/kdedeps-4.6
+++ /dev/null
@@ -1,7 +0,0 @@
-# Polkit and other deps
-~app-office/akonadi-server-1.5.2
-~dev-libs/libattica-0.2.0
-~dev-libs/soprano-2.6.0
-~kde-misc/polkit-kde-kcmodules-0.98_pre20101127
-~sys-auth/polkit-kde-agent-0.99.0
-~sys-auth/polkit-qt-0.99.0
diff --git a/sets/kdeedu-4.4 b/sets/kdeedu-4.4
deleted file mode 100644
index 725490850bb..00000000000
--- a/sets/kdeedu-4.4
+++ /dev/null
@@ -1,23 +0,0 @@
-kde-base/blinken:4.4
-kde-base/cantor:4.4
-kde-base/kalgebra:4.4
-kde-base/kalzium:4.4
-kde-base/kanagram:4.4
-kde-base/kbruch:4.4
-kde-base/kdeedu-meta:4.4
-kde-base/kgeography:4.4
-kde-base/khangman:4.4
-kde-base/kig:4.4
-kde-base/kiten:4.4
-kde-base/klettres:4.4
-kde-base/kmplot:4.4
-kde-base/kstars:4.4
-kde-base/ktouch:4.4
-kde-base/kturtle:4.4
-kde-base/kvtml-data:4.4
-kde-base/kwordquiz:4.4
-kde-base/libkdeedu:4.4
-kde-base/marble:4.4
-kde-base/parley:4.4
-kde-base/rocs:4.4
-kde-base/step:4.4
diff --git a/sets/kdegames b/sets/kdegames
index 7ae8dad50bf..6d026952fd5 100644
--- a/sets/kdegames
+++ b/sets/kdegames
@@ -3,6 +3,7 @@ kde-base/bomber
 kde-base/bovo
 kde-base/granatier
 kde-base/kapman
+kde-base/kajongg
 kde-base/katomic
 kde-base/kbattleship
 kde-base/kblackbox
@@ -17,6 +18,7 @@ kde-base/killbots
 kde-base/kigo
 kde-base/kiriki
 kde-base/kjumpingcube
+kde-base/klickety
 kde-base/klines
 kde-base/kmahjongg
 kde-base/kmines
@@ -26,7 +28,6 @@ kde-base/kollision
 kde-base/konquest
 kde-base/kpat
 kde-base/kreversi
-kde-base/ksame
 kde-base/kshisen
 kde-base/ksirk
 kde-base/kspaceduel
diff --git a/sets/kdegames-4.4 b/sets/kdegames-4.4
deleted file mode 100644
index 394ebdce1c3..00000000000
--- a/sets/kdegames-4.4
+++ /dev/null
@@ -1,40 +0,0 @@
-kde-base/bomber:4.4
-kde-base/bovo:4.4
-kde-base/granatier:4.4
-kde-base/kapman:4.4
-kde-base/katomic:4.4
-kde-base/kbattleship:4.4
-kde-base/kblackbox:4.4
-kde-base/kblocks:4.4
-kde-base/kbounce:4.4
-kde-base/kbreakout:4.4
-kde-base/kdegames-meta:4.4
-kde-base/kdiamond:4.4
-kde-base/kfourinline:4.4
-kde-base/kgoldrunner:4.4
-kde-base/killbots:4.4
-kde-base/kigo:4.4
-kde-base/kiriki:4.4
-kde-base/kjumpingcube:4.4
-kde-base/klines:4.4
-kde-base/kmahjongg:4.4
-kde-base/kmines:4.4
-kde-base/knetwalk:4.4
-kde-base/kolf:4.4
-kde-base/kollision:4.4
-kde-base/konquest:4.4
-kde-base/kpat:4.4
-kde-base/kreversi:4.4
-kde-base/ksame:4.4
-kde-base/kshisen:4.4
-kde-base/ksirk:4.4
-kde-base/kspaceduel:4.4
-kde-base/ksquares:4.4
-kde-base/ksudoku:4.4
-kde-base/ktron:4.4
-kde-base/ktuberling:4.4
-kde-base/kubrick:4.4
-kde-base/libkdegames:4.4
-kde-base/libkmahjongg:4.4
-kde-base/lskat:4.4
-kde-base/palapeli:4.4
diff --git a/sets/kdegraphics-4.4 b/sets/kdegraphics-4.4
deleted file mode 100644
index dfdaf44511d..00000000000
--- a/sets/kdegraphics-4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-kde-base/gwenview:4.4
-kde-base/kamera:4.4
-kde-base/kcolorchooser:4.4
-kde-base/kdegraphics-meta:4.4
-kde-base/kdegraphics-strigi-analyzer:4.4
-kde-base/kgamma:4.4
-kde-base/kolourpaint:4.4
-kde-base/kruler:4.4
-kde-base/ksaneplugin:4.4
-kde-base/ksnapshot:4.4
-kde-base/libkdcraw:4.4
-kde-base/libkexiv2:4.4
-kde-base/libksane:4.4
-kde-base/libkipi:4.4
-kde-base/okular:4.4
-kde-base/svgpart:4.4
-kde-base/thumbnailers:4.4
diff --git a/sets/kdelibs-4.4 b/sets/kdelibs-4.4
deleted file mode 100644
index fa23f51b0d5..00000000000
--- a/sets/kdelibs-4.4
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/kde-env:4.4
-kde-base/kdelibs:4.4
-kde-base/kdepimlibs:4.4
-kde-base/oxygen-icons:4.4
diff --git a/sets/kdemultimedia b/sets/kdemultimedia
index 55fbfa22990..50a6d0e6cc9 100644
--- a/sets/kdemultimedia
+++ b/sets/kdemultimedia
@@ -1,5 +1,6 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 kde-base/dragonplayer
+kde-base/ffmpegthumbs
 kde-base/juk
 kde-base/kdemultimedia-kioslaves
 kde-base/kdemultimedia-meta
diff --git a/sets/kdemultimedia-4.4 b/sets/kdemultimedia-4.4
deleted file mode 100644
index dba384ed4ce..00000000000
--- a/sets/kdemultimedia-4.4
+++ /dev/null
@@ -1,9 +0,0 @@
-kde-base/dragonplayer:4.4
-kde-base/juk:4.4
-kde-base/kdemultimedia-kioslaves:4.4
-kde-base/kdemultimedia-meta:4.4
-kde-base/kmix:4.4
-kde-base/kscd:4.4
-kde-base/libkcddb:4.4
-kde-base/libkcompactdisc:4.4
-kde-base/mplayerthumbs:4.4
diff --git a/sets/kdenetwork b/sets/kdenetwork
index 3202672ed86..3b5e426aaab 100644
--- a/sets/kdenetwork
+++ b/sets/kdenetwork
@@ -4,5 +4,6 @@ kde-base/kdenetwork-meta
 kde-base/kdnssd
 kde-base/kget
 kde-base/kopete
+kde-base/kppp
 kde-base/krdc
 kde-base/krfb
diff --git a/sets/kdenetwork-4.4 b/sets/kdenetwork-4.4
deleted file mode 100644
index 99455ea1144..00000000000
--- a/sets/kdenetwork-4.4
+++ /dev/null
@@ -1,7 +0,0 @@
-kde-base/kdenetwork-filesharing:4.4
-kde-base/kdenetwork-meta:4.4
-kde-base/kdnssd:4.4
-kde-base/kget:4.4
-kde-base/kopete:4.4
-kde-base/krdc:4.4
-kde-base/krfb:4.4
diff --git a/sets/kdeoptional b/sets/kdeoptional
index 56db7b0770a..255470e57db 100644
--- a/sets/kdeoptional
+++ b/sets/kdeoptional
@@ -1,5 +1,3 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/kdelirc
 kde-base/kfloppy
 kde-base/kppp
-kde-base/policykit-kde
diff --git a/sets/kdeoptional-4.4 b/sets/kdeoptional-4.4
deleted file mode 100644
index b0002366d8c..00000000000
--- a/sets/kdeoptional-4.4
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/kdelirc:4.4
-kde-base/kfloppy:4.4
-kde-base/kppp:4.4
-kde-base/policykit-kde:4.4
diff --git a/sets/kdepim b/sets/kdepim
index 51d426c18fc..5020deef545 100644
--- a/sets/kdepim
+++ b/sets/kdepim
@@ -1,10 +1,11 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
-kde-base/akonadi
+kde-base/akonadiconsole
 kde-base/akregator
 kde-base/blogilo
 kde-base/kabcclient
 kde-base/kaddressbook
 kde-base/kalarm
+kde-base/kdepim-common-libs
 kde-base/kdepim-icons
 kde-base/kdepim-kresources
 kde-base/kdepim-meta
@@ -20,6 +21,3 @@ kde-base/konsolekalendar
 kde-base/kontact
 kde-base/korganizer
 kde-base/ktimetracker
-kde-base/libkdepim
-kde-base/libkleo
-kde-base/libkpgp
diff --git a/sets/kdepim-4.6 b/sets/kdepim-4.6
index 15a9fbb1baa..b61a0f140fd 100644
--- a/sets/kdepim-4.6
+++ b/sets/kdepim-4.6
@@ -9,8 +9,8 @@ kde-base/kdepim-icons:4.6
 kde-base/kdepim-kresources:4.6
 kde-base/kdepim-meta:4.6
 kde-base/kdepim-strigi-analyzer:4.6
-kde-base/kdepim-wizards:4.6
 kde-base/kdepim-runtime:4.6
+kde-base/kdepim-wizards:4.6
 kde-base/kjots:4.6
 kde-base/kleopatra:4.6
 kde-base/kmail:4.6
diff --git a/sets/kdepim-4.7 b/sets/kdepim-4.7
index 10c48b3f693..86f78e64e88 100644
--- a/sets/kdepim-4.7
+++ b/sets/kdepim-4.7
@@ -9,8 +9,8 @@ kde-base/kdepim-icons:4.7
 kde-base/kdepim-kresources:4.7
 kde-base/kdepim-meta:4.7
 kde-base/kdepim-strigi-analyzer:4.7
-kde-base/kdepim-wizards:4.7
 kde-base/kdepim-runtime:4.7
+kde-base/kdepim-wizards:4.7
 kde-base/kjots:4.7
 kde-base/kleopatra:4.7
 kde-base/kmail:4.7
diff --git a/sets/kdepim-live b/sets/kdepim-live
index efe54b535f8..82946945fea 100644
--- a/sets/kdepim-live
+++ b/sets/kdepim-live
@@ -9,8 +9,8 @@ kde-base/kdepim-icons:live
 kde-base/kdepim-kresources:live
 kde-base/kdepim-meta:live
 kde-base/kdepim-strigi-analyzer:live
-kde-base/kdepim-wizards:live
 kde-base/kdepim-runtime:live
+kde-base/kdepim-wizards:live
 kde-base/kjots:live
 kde-base/kleopatra:live
 kde-base/kmail:live
diff --git a/sets/kdesdk b/sets/kdesdk
index f19fc9abef6..8630c177c7e 100644
--- a/sets/kdesdk
+++ b/sets/kdesdk
@@ -1,8 +1,8 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 kde-base/cervisia
+kde-base/dolphin-plugins
 kde-base/kapptemplate
 kde-base/kate
-kde-base/kbugbuster
 kde-base/kcachegrind
 kde-base/kdeaccounts-plugin
 kde-base/kdesdk-kioslaves
@@ -14,4 +14,5 @@ kde-base/kompare
 kde-base/kstartperf
 kde-base/kuiviewer
 kde-base/lokalize
+kde-base/okteta
 kde-base/umbrello
diff --git a/sets/kdesdk-4.4 b/sets/kdesdk-4.4
deleted file mode 100644
index bb65ecfdd34..00000000000
--- a/sets/kdesdk-4.4
+++ /dev/null
@@ -1,16 +0,0 @@
-kde-base/cervisia:4.4
-kde-base/kapptemplate:4.4
-kde-base/kate:4.4
-kde-base/kbugbuster:4.4
-kde-base/kcachegrind:4.4
-kde-base/kdeaccounts-plugin:4.4
-kde-base/kdesdk-kioslaves:4.4
-kde-base/kdesdk-meta:4.4
-kde-base/kdesdk-misc:4.4
-kde-base/kdesdk-scripts:4.4
-kde-base/kdesdk-strigi-analyzer:4.4
-kde-base/kompare:4.4
-kde-base/kstartperf:4.4
-kde-base/kuiviewer:4.4
-kde-base/lokalize:4.4
-kde-base/umbrello:4.4
diff --git a/sets/kdetoys b/sets/kdetoys
index be27bef5c70..7fc3c246bd1 100644
--- a/sets/kdetoys
+++ b/sets/kdetoys
@@ -3,4 +3,3 @@ kde-base/amor
 kde-base/kdetoys-meta
 kde-base/kteatime
 kde-base/ktux
-kde-base/kweather
diff --git a/sets/kdetoys-4.4 b/sets/kdetoys-4.4
deleted file mode 100644
index ff33fbc95dc..00000000000
--- a/sets/kdetoys-4.4
+++ /dev/null
@@ -1,5 +0,0 @@
-kde-base/amor:4.4
-kde-base/kdetoys-meta:4.4
-kde-base/kteatime:4.4
-kde-base/ktux:4.4
-kde-base/kweather:4.4
diff --git a/sets/kdeutils b/sets/kdeutils
index 2daa033a2f9..c50e7b9929d 100644
--- a/sets/kdeutils
+++ b/sets/kdeutils
@@ -1,13 +1,15 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 kde-base/ark
+kde-base/filelight
 kde-base/kcalc
 kde-base/kcharselect
 kde-base/kdeutils-meta
 kde-base/kdf
+kde-base/kfloppy
 kde-base/kgpg
+kde-base/kremotecontrol
 kde-base/ktimer
 kde-base/kwallet
-kde-base/okteta
 kde-base/printer-applet
 kde-base/superkaramba
 kde-base/sweeper
diff --git a/sets/kdeutils-4.4 b/sets/kdeutils-4.4
deleted file mode 100644
index 3ea579f4b38..00000000000
--- a/sets/kdeutils-4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-kde-base/ark:4.4
-kde-base/kcalc:4.4
-kde-base/kcharselect:4.4
-kde-base/kdeutils-meta:4.4
-kde-base/kdf:4.4
-kde-base/kgpg:4.4
-kde-base/ktimer:4.4
-kde-base/kwallet:4.4
-kde-base/okteta:4.4
-kde-base/printer-applet:4.4
-kde-base/superkaramba:4.4
-kde-base/sweeper:4.4
diff --git a/sets/kdewebdev-4.4 b/sets/kdewebdev-4.4
deleted file mode 100644
index acbdc2ba4f8..00000000000
--- a/sets/kdewebdev-4.4
+++ /dev/null
@@ -1,5 +0,0 @@
-kde-base/kdewebdev-meta:4.4
-kde-base/kfilereplace:4.4
-kde-base/kimagemapeditor:4.4
-kde-base/klinkstatus:4.4
-kde-base/kommander:4.4