Revert overlay to state before destroying stuff pass 1. Note all users whom wants kde-live and kde-snapshots please checkout kde-crazy overlay.

51 files changed, 265 insertions, 794 deletions

diff --git a/sets/kde b/sets/kde
index 7817c531d21..f38d96704f0 100644
--- a/sets/kde
+++ b/sets/kde
@@ -1,14 +1,14 @@
 # We don't include kdesdk on the global set
-kde-base/kate:4.1
+kde-base/kate
 
-@kdeadmin-4.1
-@kdeartwork-4.1
-@kdebase-4.1
-@kdeedu-4.1
-@kdegames-4.1
-@kdegraphics-4.1
-@kdemultimedia-4.1
-@kdenetwork-4.1
-@kdepim-4.1
-@kdetoys-4.1
-@kdeutils-4.1
+@kdeadmin
+@kdeartwork
+@kdebase
+@kdeedu
+@kdegames
+@kdegraphics
+@kdemultimedia
+@kdenetwork
+@kdepim
+@kdetoys
+@kdeutils
diff --git a/sets/kde-4.2 b/sets/kde-4.2
deleted file mode 100644
index 2891008b21e..00000000000
--- a/sets/kde-4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-# We don't include kdesdk on the global set
-kde-base/kate:4.2
-
-@kdeadmin-4.2
-@kdeartwork-4.2
-@kdebase-4.2
-@kdeedu-4.2
-@kdegames-4.2
-@kdegraphics-4.2
-@kdemultimedia-4.2
-@kdenetwork-4.2
-@kdepim-4.2
-@kdetoys-4.2
-@kdeutils-4.2
diff --git a/sets/kde-live b/sets/kde-live
deleted file mode 100644
index 4a96b376826..00000000000
--- a/sets/kde-live
+++ /dev/null
@@ -1,17 +0,0 @@
-@kdeadmin-svn
-@kdeartwork-svn
-@kdebase-svn
-@kdeedu-svn
-@kde-extras-svn
-@kde-deps-svn
-@kdegames-svn
-@kdegraphics-svn
-@kdemultimedia-svn
-@kdenetwork-svn
-@kdepim-svn
-@kdesdk-svn
-@kdetoys-svn
-@kdeutils-svn
-
-#kde-base/kde-l10n:kde-svn # won't build with empty LINGUAS, not needed 
-#by everyone
diff --git a/sets/kdeaccessibility b/sets/kdeaccessibility
index f80b5645908..a6bb07e1fb6 100644
--- a/sets/kdeaccessibility
+++ b/sets/kdeaccessibility
@@ -1,6 +1,6 @@
-kde-base/kdeaccessibility-colorschemes:4.1
-kde-base/kdeaccessibility-iconthemes:4.1
-kde-base/kmag:4.1
-kde-base/kmousetool:4.1
-kde-base/kmouth:4.1
-kde-base/kttsd:4.1
+kde-base/kdeaccessibility-colorschemes
+kde-base/kdeaccessibility-iconthemes
+kde-base/kmag
+kde-base/kmousetool
+kde-base/kmouth
+kde-base/kttsd
diff --git a/sets/kdeaccessibility-4.2 b/sets/kdeaccessibility-4.2
deleted file mode 100644
index 8ff9e8e9d6f..00000000000
--- a/sets/kdeaccessibility-4.2
+++ /dev/null
@@ -1,6 +0,0 @@
-kde-base/kdeaccessibility-colorschemes:4.2
-kde-base/kdeaccessibility-iconthemes:4.2
-kde-base/kmag:4.2
-kde-base/kmousetool:4.2
-kde-base/kmouth:4.2
-kde-base/kttsd:4.2
diff --git a/sets/kdeadmin b/sets/kdeadmin
index 57315af8b20..3f55c68d90c 100644
--- a/sets/kdeadmin
+++ b/sets/kdeadmin
@@ -1,4 +1,4 @@
-kde-base/kcron:4.1
-kde-base/knetworkconf:4.1
-kde-base/ksystemlog:4.1
-kde-base/kuser:4.1
+kde-base/kcron
+kde-base/knetworkconf
+kde-base/ksystemlog
+kde-base/kuser
diff --git a/sets/kdeadmin-4.2 b/sets/kdeadmin-4.2
deleted file mode 100644
index 61d281519a8..00000000000
--- a/sets/kdeadmin-4.2
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/kcron:4.2
-kde-base/knetworkconf:4.2
-kde-base/ksystemlog:4.2
-kde-base/kuser:4.2
diff --git a/sets/kdeadmin-live b/sets/kdeadmin-live
deleted file mode 100644
index 20b0b320bf1..00000000000
--- a/sets/kdeadmin-live
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/kuser:kde-svn
-kde-base/kcron:kde-svn
-kde-base/ksystemlog:kde-svn
-kde-base/knetworkconf:kde-svn
diff --git a/sets/kdeartwork b/sets/kdeartwork
index 0f9be7d5e95..30a6c52f65c 100644
--- a/sets/kdeartwork
+++ b/sets/kdeartwork
@@ -1,9 +1,9 @@
-kde-base/kdeartwork-colorschemes:4.1
-kde-base/kdeartwork-emoticons:4.1
-kde-base/kdeartwork-iconthemes:4.1
-kde-base/kdeartwork-kscreensaver:4.1
-kde-base/kdeartwork-kworldclock:4.1
-kde-base/kdeartwork-sounds:4.1
-kde-base/kdeartwork-styles:4.1
-kde-base/kdeartwork-wallpapers:4.1
-kde-base/kdeartwork-icewm-themes:4.1
+kde-base/kdeartwork-colorschemes
+kde-base/kdeartwork-emoticons
+kde-base/kdeartwork-iconthemes
+kde-base/kdeartwork-kscreensaver
+kde-base/kdeartwork-kworldclock
+kde-base/kdeartwork-sounds
+kde-base/kdeartwork-styles
+kde-base/kdeartwork-wallpapers
+kde-base/kdeartwork-icewm-themes
diff --git a/sets/kdeartwork-4.2 b/sets/kdeartwork-4.2
deleted file mode 100644
index e8dfcf842c6..00000000000
--- a/sets/kdeartwork-4.2
+++ /dev/null
@@ -1,9 +0,0 @@
-kde-base/kdeartwork-colorschemes:4.2
-kde-base/kdeartwork-emoticons:4.2
-kde-base/kdeartwork-iconthemes:4.2
-kde-base/kdeartwork-kscreensaver:4.2
-kde-base/kdeartwork-kworldclock:4.2
-kde-base/kdeartwork-sounds:4.2
-kde-base/kdeartwork-styles:4.2
-kde-base/kdeartwork-wallpapers:4.2
-kde-base/kdeartwork-icewm-themes:4.2
diff --git a/sets/kdeartwork-live b/sets/kdeartwork-live
deleted file mode 100644
index 955184647c9..00000000000
--- a/sets/kdeartwork-live
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file contains everything in kdeartwork
-
-kde-base/kdeartwork-colorschemes:kde-svn
-kde-base/kdeartwork-emoticons:kde-svn
-kde-base/kdeartwork-icewm-themes:kde-svn
-kde-base/kdeartwork-iconthemes:kde-svn
-kde-base/kdeartwork-kscreensaver:kde-svn
-kde-base/kdeartwork-kworldclock:kde-svn
-kde-base/kdeartwork-sounds:kde-svn
-kde-base/kdeartwork-styles:kde-svn
-kde-base/kdeartwork-wallpapers:kde-svn
diff --git a/sets/kdebase b/sets/kdebase
index 6df107266e9..c5968e95bcf 100644
--- a/sets/kdebase
+++ b/sets/kdebase
@@ -1,67 +1,67 @@
-kde-base/dolphin:4.1
-kde-base/drkonqi:4.1
-kde-base/kappfinder:4.1
-kde-base/kcheckpass:4.1
-kde-base/kcminit:4.1
-kde-base/kcmshell:4.1
-kde-base/kcontrol:4.1
-kde-base/kde-menu:4.1
-kde-base/kde-menu-icons:4.1
-kde-base/kde-wallpapers:4.1
-kde-base/kdebase-cursors:4.1
-kde-base/kdebase-data:4.1
-kde-base/kdebase-kioslaves:4.1
-kde-base/kdebase-startkde:4.1
-kde-base/kdebugdialog:4.1
-kde-base/kdepasswd:4.1
-kde-base/kdesu:4.1
-kde-base/kdialog:4.1
-kde-base/kdm:4.1
-kde-base/keditbookmarks:4.1
-kde-base/kfile:4.1
-kde-base/kfind:4.1
-kde-base/khelpcenter:4.1
-kde-base/khotkeys:4.1
-kde-base/kiconfinder:4.1
-kde-base/kinfocenter:4.1
-kde-base/kioclient:4.1
-kde-base/klipper:4.1
-kde-base/kmenuedit:4.1
-kde-base/kmimetypefinder:4.1
-kde-base/knetattach:4.1
-kde-base/knewstuff:4.1
-kde-base/knotify:4.1
-kde-base/konqueror:4.1
-kde-base/konsole:4.1
-kde-base/kpasswdserver:4.1
-kde-base/kquitapp:4.1
-kde-base/kreadconfig:4.1
-kde-base/krunner:4.1
-kde-base/kscreensaver:4.1
-kde-base/ksmserver:4.1
-kde-base/ksplash:4.1
-kde-base/kstart:4.1
-kde-base/kstartupconfig:4.1
-kde-base/kstyles:4.1
-kde-base/ksysguard:4.1
-kde-base/ksystraycmd:4.1
-kde-base/ktimezoned:4.1
-kde-base/ktraderclient:4.1
-kde-base/kuiserver:4.1
-kde-base/kurifilter-plugins:4.1
-kde-base/kwin:4.1
-kde-base/kwrite:4.1
-kde-base/libkonq:4.1
-kde-base/libkworkspace:4.1
-kde-base/libplasma:4.1
-kde-base/libtaskmanager:4.1
-kde-base/nepomuk:4.1
-kde-base/nsplugins:4.1
-kde-base/phonon-xine:4.1
-kde-base/plasma-apps:4.1
-kde-base/plasma-workspace:4.1
-kde-base/renamedlg-plugins:4.1
-kde-base/solid:4.1
-kde-base/solid-hardware:4.1
-kde-base/soliduiserver:4.1
-kde-base/systemsettings:4.1
+kde-base/dolphin
+kde-base/drkonqi
+kde-base/kappfinder
+kde-base/kcheckpass
+kde-base/kcminit
+kde-base/kcmshell
+kde-base/kcontrol
+kde-base/kde-menu
+kde-base/kde-menu-icons
+kde-base/kde-wallpapers
+kde-base/kdebase-cursors
+kde-base/kdebase-data
+kde-base/kdebase-kioslaves
+kde-base/kdebase-startkde
+kde-base/kdebugdialog
+kde-base/kdepasswd
+kde-base/kdesu
+kde-base/kdialog
+kde-base/kdm
+kde-base/keditbookmarks
+kde-base/kfile
+kde-base/kfind
+kde-base/khelpcenter
+kde-base/khotkeys
+kde-base/kiconfinder
+kde-base/kinfocenter
+kde-base/kioclient
+kde-base/klipper
+kde-base/kmenuedit
+kde-base/kmimetypefinder
+kde-base/knetattach
+kde-base/knewstuff
+kde-base/knotify
+kde-base/konqueror
+kde-base/konsole
+kde-base/kpasswdserver
+kde-base/kquitapp
+kde-base/kreadconfig
+kde-base/krunner
+kde-base/kscreensaver
+kde-base/ksmserver
+kde-base/ksplash
+kde-base/kstart
+kde-base/kstartupconfig
+kde-base/kstyles
+kde-base/ksysguard
+kde-base/ksystraycmd
+kde-base/ktimezoned
+kde-base/ktraderclient
+kde-base/kuiserver
+kde-base/kurifilter-plugins
+kde-base/kwin
+kde-base/kwrite
+kde-base/libkonq
+kde-base/libkworkspace
+kde-base/libplasma
+kde-base/libtaskmanager
+kde-base/nepomuk
+kde-base/nsplugins
+kde-base/phonon-xine
+kde-base/plasma-apps
+kde-base/plasma-workspace
+kde-base/renamedlg-plugins
+kde-base/solid
+kde-base/solid-hardware
+kde-base/soliduiserver
+kde-base/systemsettings
diff --git a/sets/kdebase-4.2 b/sets/kdebase-4.2
deleted file mode 100644
index ec7c1ef99a5..00000000000
--- a/sets/kdebase-4.2
+++ /dev/null
@@ -1,71 +0,0 @@
-kde-base/dolphin:4.2
-kde-base/drkonqi:4.2
-kde-base/kappfinder:4.2
-kde-base/kcheckpass:4.2
-kde-base/kcminit:4.2
-kde-base/kcmshell:4.2
-kde-base/kcontrol:4.2
-kde-base/kde-menu:4.2
-kde-base/kde-menu-icons:4.2
-kde-base/kde-wallpapers:4.2
-kde-base/kdebase-cursors:4.2
-kde-base/kdebase-data:4.2
-kde-base/kdebase-kioslaves:4.2
-kde-base/kdebase-startkde:4.2
-kde-base/kdebugdialog:4.2
-kde-base/kdedglobalaccel:4.2
-kde-base/kdepasswd:4.2
-kde-base/kdesu:4.2
-kde-base/kdialog:4.2
-kde-base/kdm:4.2
-kde-base/keditbookmarks:4.2
-kde-base/kfile:4.2
-kde-base/kfind:4.2
-kde-base/khelpcenter:4.2
-kde-base/khotkeys:4.2
-kde-base/kiconfinder:4.2
-kde-base/kinfocenter:4.2
-kde-base/kioclient:4.2
-kde-base/klipper:4.2
-kde-base/kmenuedit:4.2
-kde-base/kmimetypefinder:4.2
-kde-base/knetattach:4.2
-kde-base/knewstuff:4.2
-kde-base/knotify:4.2
-kde-base/konqueror:4.2
-kde-base/konsole:4.2
-kde-base/kpasswdserver:4.2
-kde-base/kquitapp:4.2
-kde-base/kreadconfig:4.2
-kde-base/krunner:4.2
-kde-base/kscreensaver:4.2
-kde-base/ksmserver:4.2
-kde-base/ksplash:4.2
-kde-base/kstart:4.2
-kde-base/kstartupconfig:4.2
-kde-base/kstyles:4.2
-kde-base/ksysguard:4.2
-kde-base/ksystraycmd:4.2
-kde-base/ktimezoned:4.2
-kde-base/ktraderclient:4.2
-kde-base/kuiserver:4.2
-kde-base/kurifilter-plugins:4.2
-kde-base/kwalletd:4.2
-kde-base/kwin:4.2
-kde-base/kwrite:4.2
-kde-base/libkonq:4.2
-kde-base/libkworkspace:4.2
-kde-base/libplasma:4.2
-kde-base/libplasmaclock:4.2
-kde-base/libtaskmanager:4.2
-kde-base/nepomuk:4.2
-kde-base/nsplugins:4.2
-kde-base/phonon-kde:4.2
-kde-base/plasma-apps:4.2
-kde-base/plasma-workspace:4.2
-kde-base/powerdevil:4.2
-kde-base/renamedlg-plugins:4.2
-kde-base/solid:4.2
-kde-base/solid-hardware:4.2
-kde-base/soliduiserver:4.2
-kde-base/systemsettings:4.2
diff --git a/sets/kdebase-live b/sets/kdebase-live
deleted file mode 100644
index 2af2879abf3..00000000000
--- a/sets/kdebase-live
+++ /dev/null
@@ -1,84 +0,0 @@
-# This file contains everything in kdebase
-
-# This is kdebase
-kde-base/dolphin:live
-kde-base/drkonqi:live
-kde-base/kappfinder:live
-kde-base/kcheckpass:live
-kde-base/kcminit:live
-kde-base/kcmshell:live
-kde-base/kcontrol:live
-kde-base/kde-menu:live
-kde-base/kde-menu-icons:live
-kde-base/kde-wallpapers:live
-kde-base/kdebase-cursors:live
-kde-base/kdebase-data:live
-kde-base/kdebase-kioslaves:live
-kde-base/kdebase-startkde:live
-kde-base/kdebugdialog:live
-kde-base/kdepasswd:live
-kde-base/kdesu:live
-kde-base/kdialog:live
-kde-base/kdm:live
-kde-base/keditbookmarks:live
-kde-base/kfile:live
-kde-base/kfind:live
-kde-base/khelpcenter:live
-kde-base/khotkeys:live
-kde-base/kiconfinder:live
-kde-base/kinfocenter:live
-kde-base/kioclient:live
-kde-base/klipper:live
-kde-base/kmenuedit:live
-kde-base/kmimetypefinder:live
-#kde-base/kmilo:live
-kde-base/knetattach:live
-kde-base/knewstuff:live
-kde-base/knotify:live
-kde-base/konqueror:live
-kde-base/konsole:live
-kde-base/kpasswdserver:live
-kde-base/kquitapp:live
-kde-base/kreadconfig:live
-kde-base/krunner:live
-kde-base/kscreensaver:live
-kde-base/ksmserver:live
-kde-base/ksplash:live
-kde-base/kstart:live
-kde-base/kstartupconfig:live
-kde-base/kstyles:live
-kde-base/ksysguard:live
-kde-base/ksystraycmd:live
-kde-base/ktimezoned:live
-kde-base/ktraderclient:live
-kde-base/kuiserver:live
-kde-base/kurifilter-plugins:live
-kde-base/kwalletd:live
-kde-base/kwin:live
-kde-base/kwrite:live
-kde-base/libkonq:live
-kde-base/libkworkspace:live
-kde-base/libplasma:live
-kde-base/libplasmaclock:live
-kde-base/libtaskmanager:live
-kde-base/nepomuk:live
-kde-base/nsplugins:live
-kde-base/phonon-kde:live
-kde-base/plasma-apps:live
-kde-base/plasma-workspace:live
-kde-base/powerdevil:live
-kde-base/renamedlg-plugins:live
-kde-base/solid:live
-kde-base/solid-hardware:live
-kde-base/soliduiserver:live
-kde-base/systemsettings:live
-
-
-# This file contains basic dependencies for KDE4
-
-=app-office/akonadi-server-9999
-=dev-libs/soprano-9999
-=app-misc/strigi-9999
-=kde-base/automoc-9999
-kde-base/kdelibs:live
-kde-base/kdepimlibs:live
diff --git a/sets/kdebindings-4.2 b/sets/kdebindings-4.2
deleted file mode 100644
index 7c3b5c9482f..00000000000
--- a/sets/kdebindings-4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-kde-base/krosspython:4.2
-kde-base/pykde4:4.2
diff --git a/sets/kdedeps b/sets/kdedeps
index dd1df7305d8..7b14f621328 100644
--- a/sets/kdedeps
+++ b/sets/kdedeps
@@ -1,2 +1,2 @@
-kde-base/kdelibs:4.1
-kde-base/kdepimlibs:4.1
+kde-base/kdelibs
+kde-base/kdepimlibs
diff --git a/sets/kdedeps-4.2 b/sets/kdedeps-4.2
deleted file mode 100644
index 239267d1aef..00000000000
--- a/sets/kdedeps-4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-kde-base/kdelibs:4.2
-kde-base/kdepimlibs:4.2
diff --git a/sets/kdeedu b/sets/kdeedu
index e44084d707f..e8ca4cfd9a2 100644
--- a/sets/kdeedu
+++ b/sets/kdeedu
@@ -1,20 +1,20 @@
-kde-base/blinken:4.1
-kde-base/kalgebra:4.1
-kde-base/kalzium:4.1
-kde-base/kanagram:4.1
-kde-base/kbruch:4.1
-kde-base/kgeography:4.1
-kde-base/khangman:4.1
-kde-base/kig:4.1
-kde-base/kiten:4.1
-kde-base/klettres:4.1
-kde-base/kmplot:4.1
-kde-base/kpercentage:4.1
-kde-base/kstars:4.1
-kde-base/ktouch:4.1
-kde-base/kturtle:4.1
-kde-base/kwordquiz:4.1
-kde-base/libkdeedu:4.1
-kde-base/marble:4.1
-kde-base/parley:4.1
-kde-base/step:4.1
+kde-base/blinken
+kde-base/kalgebra
+kde-base/kalzium
+kde-base/kanagram
+kde-base/kbruch
+kde-base/kgeography
+kde-base/khangman
+kde-base/kig
+kde-base/kiten
+kde-base/klettres
+kde-base/kmplot
+kde-base/kpercentage
+kde-base/kstars
+kde-base/ktouch
+kde-base/kturtle
+kde-base/kwordquiz
+kde-base/libkdeedu
+kde-base/marble
+kde-base/parley
+kde-base/step
diff --git a/sets/kdeedu-4.2 b/sets/kdeedu-4.2
deleted file mode 100644
index 85631638d8e..00000000000
--- a/sets/kdeedu-4.2
+++ /dev/null
@@ -1,19 +0,0 @@
-kde-base/blinken:4.2
-kde-base/kalgebra:4.2
-kde-base/kalzium:4.2
-kde-base/kanagram:4.2
-kde-base/kgeography:4.2
-kde-base/khangman:4.2
-kde-base/kig:4.2
-kde-base/kiten:4.2
-kde-base/klettres:4.2
-kde-base/kmplot:4.2
-kde-base/kpercentage:4.2
-kde-base/kstars:4.2
-kde-base/ktouch:4.2
-kde-base/kturtle:4.2
-kde-base/kwordquiz:4.2
-kde-base/libkdeedu:4.2
-kde-base/marble:4.2
-kde-base/parley:4.2
-kde-base/step:4.2
diff --git a/sets/kdeedu-live b/sets/kdeedu-live
deleted file mode 100644
index cd9868af1de..00000000000
--- a/sets/kdeedu-live
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file contains everything in kdeedu
-
-kde-base/blinken:kde-svn
-kde-base/kalgebra:kde-svn
-kde-base/kalzium:kde-svn
-kde-base/kanagram:kde-svn
-#kde-base/kbruch:kde-svn
-kde-base/kgeography:kde-svn
-kde-base/khangman:kde-svn
-kde-base/kig:kde-svn
-kde-base/kiten:kde-svn
-kde-base/klettres:kde-svn
-kde-base/kmplot:kde-svn
-kde-base/kpercentage:kde-svn
-kde-base/kstars:kde-svn
-kde-base/ktouch:kde-svn
-kde-base/kturtle:kde-svn
-kde-base/kwordquiz:kde-svn
-kde-base/libkdeedu:kde-svn
-kde-base/marble:kde-svn
-kde-base/parley:kde-svn
-kde-base/step:kde-svn
diff --git a/sets/kdegames b/sets/kdegames
index 52be254baa1..2c8b7051a9d 100644
--- a/sets/kdegames
+++ b/sets/kdegames
@@ -1,32 +1,32 @@
-kde-base/bovo:4.1
-kde-base/katomic:4.1
-kde-base/kbattleship:4.1
-kde-base/kblackbox:4.1
-kde-base/kblocks:4.1
-kde-base/kbounce:4.1
-kde-base/kbreakout:4.1
-kde-base/kdiamond:4.1
-kde-base/kfourinline:4.1
-kde-base/kgoldrunner:4.1
-kde-base/kiriki:4.1
-kde-base/kjumpingcube:4.1
-kde-base/klines:4.1
-kde-base/kmahjongg:4.1
-kde-base/kmines:4.1
-kde-base/knetwalk:4.1
-kde-base/kolf:4.1
-kde-base/kollision:4.1
-kde-base/konquest:4.1
-kde-base/kpat:4.1
-kde-base/kreversi:4.1
-kde-base/ksame:4.1
-kde-base/kshisen:4.1
-kde-base/ksirk:4.1
-kde-base/kspaceduel:4.1
-kde-base/ksquares:4.1
-kde-base/ktuberling:4.1
-kde-base/kubrick:4.1
-kde-base/libkdegames:4.1
-kde-base/libkmahjongg:4.1
-kde-base/lskat:4.1
-kde-base/ksudoku:4.1
+kde-base/bovo
+kde-base/katomic
+kde-base/kbattleship
+kde-base/kblackbox
+kde-base/kblocks
+kde-base/kbounce
+kde-base/kbreakout
+kde-base/kdiamond
+kde-base/kfourinline
+kde-base/kgoldrunner
+kde-base/kiriki
+kde-base/kjumpingcube
+kde-base/klines
+kde-base/kmahjongg
+kde-base/kmines
+kde-base/knetwalk
+kde-base/kolf
+kde-base/kollision
+kde-base/konquest
+kde-base/kpat
+kde-base/kreversi
+kde-base/ksame
+kde-base/kshisen
+kde-base/ksirk
+kde-base/kspaceduel
+kde-base/ksquares
+kde-base/ktuberling
+kde-base/kubrick
+kde-base/libkdegames
+kde-base/libkmahjongg
+kde-base/lskat
+kde-base/ksudoku
diff --git a/sets/kdegames-4.2 b/sets/kdegames-4.2
deleted file mode 100644
index eefde51a16f..00000000000
--- a/sets/kdegames-4.2
+++ /dev/null
@@ -1,31 +0,0 @@
-kde-base/bovo:4.2
-kde-base/katomic:4.2
-kde-base/kbattleship:4.2
-kde-base/kblackbox:4.2
-kde-base/kblocks:4.2
-kde-base/kbounce:4.2
-kde-base/kbreakout:4.2
-kde-base/kdiamond:4.2
-kde-base/kfourinline:4.2
-kde-base/kgoldrunner:4.2
-kde-base/kiriki:4.2
-kde-base/kjumpingcube:4.2
-kde-base/klines:4.2
-kde-base/kmahjongg:4.2
-kde-base/kmines:4.2
-kde-base/knetwalk:4.2
-kde-base/kolf:4.2
-kde-base/kollision:4.2
-kde-base/konquest:4.2
-kde-base/kpat:4.2
-kde-base/kreversi:4.2
-kde-base/ksame:4.2
-kde-base/kshisen:4.2
-kde-base/ksirk:4.2
-kde-base/kspaceduel:4.2
-kde-base/ksquares:4.2
-kde-base/ktuberling:4.2
-kde-base/kubrick:4.2
-kde-base/libkdegames:4.2
-kde-base/libkmahjongg:4.2
-kde-base/lskat:4.2
diff --git a/sets/kdegames-live b/sets/kdegames-live
deleted file mode 100644
index 8bf0038f2b8..00000000000
--- a/sets/kdegames-live
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# This file contains everything in kdegames
-kde-base/bovo:kde-svn
-kde-base/katomic:kde-svn
-kde-base/kbattleship:kde-svn
-kde-base/kblackbox:kde-svn
-kde-base/kblocks:kde-svn
-kde-base/kbounce:kde-svn
-kde-base/kbreakout:kde-svn
-kde-base/kdiamond:kde-svn
-kde-base/kfourinline:kde-svn
-kde-base/kgoldrunner:kde-svn
-kde-base/kiriki:kde-svn
-kde-base/kjumpingcube:kde-svn
-kde-base/klines:kde-svn
-kde-base/kmahjongg:kde-svn
-kde-base/kmines:kde-svn
-kde-base/knetwalk:kde-svn
-kde-base/kolf:kde-svn
-kde-base/kollision:kde-svn
-kde-base/konquest:kde-svn
-kde-base/kpat:kde-svn
-kde-base/kreversi:kde-svn
-kde-base/ksame:kde-svn
-kde-base/kshisen:kde-svn
-kde-base/ksirk:kde-svn
-kde-base/kspaceduel:kde-svn
-kde-base/ksquares:kde-svn
-kde-base/ksudoku:kde-svn
-kde-base/ktuberling:kde-svn
-kde-base/kubrick:kde-svn
-kde-base/libkdegames:kde-svn
-kde-base/libkmahjongg:kde-svn
-kde-base/lskat:kde-svn
diff --git a/sets/kdegraphics b/sets/kdegraphics
index b65c439fc32..ec5ced8f9bd 100644
--- a/sets/kdegraphics
+++ b/sets/kdegraphics
@@ -1,14 +1,14 @@
-kde-base/gwenview:4.1
-kde-base/kamera:4.1
-kde-base/kcolorchooser:4.1
-kde-base/kgamma:4.1
-kde-base/kolourpaint:4.1
-kde-base/kruler:4.1
-kde-base/ksnapshot:4.1
-kde-base/libkdcraw:4.1
-kde-base/libkexiv2:4.1
-kde-base/libkipi:4.1
-kde-base/libksane:4.1
-kde-base/okular:4.1
-kde-base/svgpart:4.1
-kde-base/kdegraphics-strigi-analyzer:4.1
+kde-base/gwenview
+kde-base/kamera
+kde-base/kcolorchooser
+kde-base/kgamma
+kde-base/kolourpaint
+kde-base/kruler
+kde-base/ksnapshot
+kde-base/libkdcraw
+kde-base/libkexiv2
+kde-base/libkipi
+kde-base/libksane
+kde-base/okular
+kde-base/svgpart
+kde-base/kdegraphics-strigi-analyzer
diff --git a/sets/kdegraphics-4.2 b/sets/kdegraphics-4.2
deleted file mode 100644
index aec139ab66b..00000000000
--- a/sets/kdegraphics-4.2
+++ /dev/null