30 files changed, 242 insertions, 242 deletions
diff --git a/sets/kde-4.1 b/sets/kde-4.1
deleted file mode 100644
index 7817c531d21..00000000000
--- a/sets/kde-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-# We don't include kdesdk on the global set
-kde-base/kate:4.1
-
-@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
diff --git a/sets/kde-4x b/sets/kde-4x
new file mode 100644
index 00000000000..909c900b283
--- /dev/null
+++ b/sets/kde-4x
@@ -0,0 +1,14 @@
+# We don't include kdesdk on the global set
+kde-base/kate:4
+
+@kdeadmin-4
+@kdeartwork-4
+@kdebase-4
+@kdeedu-4
+@kdegames-4
+@kdegraphics-4
+@kdemultimedia-4
+@kdenetwork-4
+@kdepim-4
+@kdetoys-4
+@kdeutils-4
diff --git a/sets/kdeaccessibility-4 b/sets/kdeaccessibility-4
new file mode 100644
index 00000000000..125b28c26d2
--- /dev/null
+++ b/sets/kdeaccessibility-4
@@ -0,0 +1,6 @@
+kde-base/kdeaccessibility-colorschemes:4
+kde-base/kdeaccessibility-iconthemes:4
+kde-base/kmag:4
+kde-base/kmousetool:4
+kde-base/kmouth:4
+kde-base/kttsd:4
diff --git a/sets/kdeaccessibility-4.1 b/sets/kdeaccessibility-4.1
deleted file mode 100644
index f80b5645908..00000000000
--- a/sets/kdeaccessibility-4.1
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/sets/kdeadmin-4 b/sets/kdeadmin-4
new file mode 100644
index 00000000000..a635bfd3e7e
--- /dev/null
+++ b/sets/kdeadmin-4
@@ -0,0 +1,4 @@
+kde-base/kcron:4
+kde-base/knetworkconf:4
+kde-base/ksystemlog:4
+kde-base/kuser:4
diff --git a/sets/kdeadmin-4.1 b/sets/kdeadmin-4.1
deleted file mode 100644
index 57315af8b20..00000000000
--- a/sets/kdeadmin-4.1
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/kcron:4.1
-kde-base/knetworkconf:4.1
-kde-base/ksystemlog:4.1
-kde-base/kuser:4.1
diff --git a/sets/kdeartwork-4 b/sets/kdeartwork-4
new file mode 100644
index 00000000000..8ec6f241d03
--- /dev/null
+++ b/sets/kdeartwork-4
@@ -0,0 +1,9 @@
+kde-base/kdeartwork-colorschemes:4
+kde-base/kdeartwork-emoticons:4
+kde-base/kdeartwork-iconthemes:4
+kde-base/kdeartwork-kscreensaver:4
+kde-base/kdeartwork-kworldclock:4
+kde-base/kdeartwork-sounds:4
+kde-base/kdeartwork-styles:4
+kde-base/kdeartwork-wallpapers:4
+kde-base/kdeartwork-icewm-themes:4
diff --git a/sets/kdeartwork-4.1 b/sets/kdeartwork-4.1
deleted file mode 100644
index 0f9be7d5e95..00000000000
--- a/sets/kdeartwork-4.1
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/sets/kdebase-4 b/sets/kdebase-4
new file mode 100644
index 00000000000..c0a7255f1fa
--- /dev/null
+++ b/sets/kdebase-4
@@ -0,0 +1,67 @@
+kde-base/dolphin:4
+kde-base/drkonqi:4
+kde-base/kappfinder:4
+kde-base/kcheckpass:4
+kde-base/kcminit:4
+kde-base/kcmshell:4
+kde-base/kcontrol:4
+kde-base/kde-menu:4
+kde-base/kde-menu-icons:4
+kde-base/kde-wallpapers:4
+kde-base/kdebase-cursors:4
+kde-base/kdebase-data:4
+kde-base/kdebase-kioslaves:4
+kde-base/kdebase-startkde:4
+kde-base/kdebugdialog:4
+kde-base/kdepasswd:4
+kde-base/kdesu:4
+kde-base/kdialog:4
+kde-base/kdm:4
+kde-base/keditbookmarks:4
+kde-base/kfile:4
+kde-base/kfind:4
+kde-base/khelpcenter:4
+kde-base/khotkeys:4
+kde-base/kiconfinder:4
+kde-base/kinfocenter:4
+kde-base/kioclient:4
+kde-base/klipper:4
+kde-base/kmenuedit:4
+kde-base/kmimetypefinder:4
+kde-base/knetattach:4
+kde-base/knewstuff:4
+kde-base/knotify:4
+kde-base/konqueror:4
+kde-base/konsole:4
+kde-base/kpasswdserver:4
+kde-base/kquitapp:4
+kde-base/kreadconfig:4
+kde-base/krunner:4
+kde-base/kscreensaver:4
+kde-base/ksmserver:4
+kde-base/ksplash:4
+kde-base/kstart:4
+kde-base/kstartupconfig:4
+kde-base/kstyles:4
+kde-base/ksysguard:4
+kde-base/ksystraycmd:4
+kde-base/ktimezoned:4
+kde-base/ktraderclient:4
+kde-base/kuiserver:4
+kde-base/kurifilter-plugins:4
+kde-base/kwin:4
+kde-base/kwrite:4
+kde-base/libkonq:4
+kde-base/libkworkspace:4
+kde-base/libplasma:4
+kde-base/libtaskmanager:4
+kde-base/nepomuk:4
+kde-base/nsplugins:4
+kde-base/phonon-xine:4
+kde-base/plasma-apps:4
+kde-base/plasma-workspace:4
+kde-base/renamedlg-plugins:4
+kde-base/solid:4
+kde-base/solid-hardware:4
+kde-base/soliduiserver:4
+kde-base/systemsettings:4
diff --git a/sets/kdebase-4.1 b/sets/kdebase-4.1
deleted file mode 100644
index 6df107266e9..00000000000
--- a/sets/kdebase-4.1
+++ /dev/null
@@ -1,67 +0,0 @@
-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
diff --git a/sets/kdeedu-4 b/sets/kdeedu-4
new file mode 100644
index 00000000000..74078ae1f7e
--- /dev/null
+++ b/sets/kdeedu-4
@@ -0,0 +1,20 @@
+kde-base/blinken:4
+kde-base/kalgebra:4
+kde-base/kalzium:4
+kde-base/kanagram:4
+kde-base/kbruch:4
+kde-base/kgeography:4
+kde-base/khangman:4
+kde-base/kig:4
+kde-base/kiten:4
+kde-base/klettres:4
+kde-base/kmplot:4
+kde-base/kpercentage:4
+kde-base/kstars:4
+kde-base/ktouch:4
+kde-base/kturtle:4
+kde-base/kwordquiz:4
+kde-base/libkdeedu:4
+kde-base/marble:4
+kde-base/parley:4
+kde-base/step:4
diff --git a/sets/kdeedu-4.1 b/sets/kdeedu-4.1
deleted file mode 100644
index e44084d707f..00000000000
--- a/sets/kdeedu-4.1
+++ /dev/null
@@ -1,20 +0,0 @@
-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
diff --git a/sets/kdegames-4 b/sets/kdegames-4
new file mode 100644
index 00000000000..8187cf066e1
--- /dev/null
+++ b/sets/kdegames-4
@@ -0,0 +1,31 @@
+kde-base/bovo:4
+kde-base/katomic:4
+kde-base/kbattleship:4
+kde-base/kblackbox:4
+kde-base/kblocks:4
+kde-base/kbounce:4
+kde-base/kbreakout:4
+kde-base/kdiamond:4
+kde-base/kfourinline:4
+kde-base/kgoldrunner:4
+kde-base/kiriki:4
+kde-base/kjumpingcube:4
+kde-base/klines:4
+kde-base/kmahjongg:4
+kde-base/kmines:4
+kde-base/knetwalk:4
+kde-base/kolf:4
+kde-base/kollision:4
+kde-base/konquest:4
+kde-base/kpat:4
+kde-base/kreversi:4
+kde-base/ksame:4
+kde-base/kshisen:4
+kde-base/ksirk:4
+kde-base/kspaceduel:4
+kde-base/ksquares:4
+kde-base/ktuberling:4
+kde-base/kubrick:4
+kde-base/libkdegames:4
+kde-base/libkmahjongg:4
+kde-base/lskat:4
diff --git a/sets/kdegames-4.1 b/sets/kdegames-4.1
deleted file mode 100644
index 16688aecfd7..00000000000
--- a/sets/kdegames-4.1
+++ /dev/null
@@ -1,31 +0,0 @@
-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
diff --git a/sets/kdegraphics-4 b/sets/kdegraphics-4
new file mode 100644
index 00000000000..66c4ee56bfb
--- /dev/null
+++ b/sets/kdegraphics-4
@@ -0,0 +1,14 @@
+kde-base/gwenview:4
+kde-base/kamera:4
+kde-base/kcolorchooser:4
+kde-base/kgamma:4
+kde-base/kolourpaint:4
+kde-base/kruler:4
+kde-base/ksnapshot:4
+kde-base/libkdcraw:4
+kde-base/libkexiv2:4
+kde-base/libkipi:4
+kde-base/libksane:4
+kde-base/okular:4
+kde-base/svgpart:4
+kde-base/kdegraphics-strigi-analyzer:4
diff --git a/sets/kdegraphics-4.1 b/sets/kdegraphics-4.1
deleted file mode 100644
index b65c439fc32..00000000000
--- a/sets/kdegraphics-4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/sets/kdemultimedia-4 b/sets/kdemultimedia-4
new file mode 100644
index 00000000000..13857d8f846
--- /dev/null
+++ b/sets/kdemultimedia-4
@@ -0,0 +1,7 @@
+kde-base/dragonplayer:4
+kde-base/juk:4
+kde-base/kdemultimedia-kioslaves:4
+kde-base/kmix:4
+kde-base/kscd:4
+kde-base/libkcddb:4
+kde-base/libkcompactdisc:4
diff --git a/sets/kdemultimedia-4.1 b/sets/kdemultimedia-4.1
deleted file mode 100644
index bf2256648c4..00000000000
--- a/sets/kdemultimedia-4.1
+++ /dev/null
@@ -1,7 +0,0 @@
-kde-base/dragonplayer:4.1
-kde-base/juk:4.1
-kde-base/kdemultimedia-kioslaves:4.1
-kde-base/kmix:4.1
-kde-base/kscd:4.1
-kde-base/libkcddb:4.1
-kde-base/libkcompactdisc:4.1
diff --git a/sets/kdenetwork-4 b/sets/kdenetwork-4
new file mode 100644
index 00000000000..fa28c9748b8
--- /dev/null
+++ b/sets/kdenetwork-4
@@ -0,0 +1,8 @@
+kde-base/kdenetwork-filesharing:4
+kde-base/kdnssd:4
+kde-base/kget:4
+kde-base/knewsticker:4
+kde-base/kopete:4
+kde-base/kppp:4
+kde-base/krdc:4
+kde-base/krfb:4
diff --git a/sets/kdenetwork-4.1 b/sets/kdenetwork-4.1
deleted file mode 100644
index a7595bd284c..00000000000
--- a/sets/kdenetwork-4.1
+++ /dev/null
@@ -1,8 +0,0 @@
-kde-base/kdenetwork-filesharing:4.1
-kde-base/kdnssd:4.1
-kde-base/kget:4.1
-kde-base/knewsticker:4.1
-kde-base/kopete:4.1
-kde-base/kppp:4.1
-kde-base/krdc:4.1
-kde-base/krfb:4.1
diff --git a/sets/kdeoptional-4 b/sets/kdeoptional-4
new file mode 100644
index 00000000000..afefc66e928
--- /dev/null
+++ b/sets/kdeoptional-4
@@ -0,0 +1,4 @@
+kde-base/lilo-config:4
+kde-base/kfloppy:4
+kde-base/ksudoku:4
+@kdeaccessibility-4
diff --git a/sets/kdeoptional-4.1 b/sets/kdeoptional-4.1
deleted file mode 100644
index 5bdc0fb297f..00000000000
--- a/sets/kdeoptional-4.1
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/lilo-config:4.1
-kde-base/kfloppy:4.1
-kde-base/ksudoku:4.1
-@kdeaccessibility-4.1
diff --git a/sets/kdepim-4 b/sets/kdepim-4
new file mode 100644
index 00000000000..f3eb23e9c1b
--- /dev/null
+++ b/sets/kdepim-4
@@ -0,0 +1,28 @@
+kde-base/akonadi:4
+kde-base/akregator:4
+kde-base/kaddressbook:4
+kde-base/kalarm:4
+kde-base/kdemaildir:4
+kde-base/kdepim-icons:4
+kde-base/kdepim-kresources:4
+kde-base/kdepim-strigi-analyzer:4
+kde-base/kdepim-wizards:4
+kde-base/kitchensync:4
+kde-base/kjots:4
+kde-base/kleopatra:4
+kde-base/kmail:4
+kde-base/kmailcvt:4
+kde-base/knode:4
+kde-base/knotes:4
+kde-base/kode:4
+kde-base/kontact:4
+kde-base/kontactinterfaces:4
+kde-base/korganizer:4
+kde-base/ktimetracker:4
+kde-base/ktnef:4
+kde-base/libkdepim:4
+kde-base/libkholidays:4
+kde-base/libkleo:4
+kde-base/libkpgp:4
+kde-base/libksieve:4
+kde-base/mimelib:4
diff --git a/sets/kdepim-4.1 b/sets/kdepim-4.1
deleted file mode 100644
index 68f040d6623..00000000000
--- a/sets/kdepim-4.1
+++ /dev/null
@@ -1,28 +0,0 @@
-kde-base/akonadi:4.1
-kde-base/akregator:4.1
-kde-base/kaddressbook:4.1
-kde-base/kalarm:4.1
-kde-base/kdemaildir:4.1
-kde-base/kdepim-icons:4.1
-kde-base/kdepim-kresources:4.1
-kde-base/kdepim-strigi-analyzer:4.1
-kde-base/kdepim-wizards:4.1
-kde-base/kitchensync:4.1
-kde-base/kjots:4.1
-kde-base/kleopatra:4.1
-kde-base/kmail:4.1
-kde-base/kmailcvt:4.1
-kde-base/knode:4.1
-kde-base/knotes:4.1
-kde-base/kode:4.1
-kde-base/kontact:4.1
-kde-base/kontactinterfaces:4.1
-kde-base/korganizer:4.1
-kde-base/ktimetracker:4.1
-kde-base/ktnef:4.1
-kde-base/libkdepim:4.1
-kde-base/libkholidays:4.1
-kde-base/libkleo:4.1
-kde-base/libkpgp:4.1
-kde-base/libksieve:4.1
-kde-base/mimelib:4.1
diff --git a/sets/kdesdk-4 b/sets/kdesdk-4
new file mode 100644
index 00000000000..4a4acd421ac
--- /dev/null
+++ b/sets/kdesdk-4
@@ -0,0 +1,15 @@
+kde-base/cervisia:4
+kde-base/kapptemplate:4
+kde-base/kate:4
+kde-base/kbugbuster:4
+kde-base/kcachegrind:4
+kde-base/kdeaccounts-plugin:4
+kde-base/kdesdk-kioslaves:4
+kde-base/kdesdk-misc:4
+kde-base/kdesdk-scripts:4
+kde-base/kdesdk-strigi-analyzer:4
+kde-base/kompare:4
+kde-base/kstartperf:4
+kde-base/kuiviewer:4
+kde-base/lokalize:4
+kde-base/umbrello:4
diff --git a/sets/kdesdk-4.1 b/sets/kdesdk-4.1
deleted file mode 100644
index 0eb29281063..00000000000
--- a/sets/kdesdk-4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-kde-base/cervisia:4.1
-kde-base/kapptemplate:4.1
-kde-base/kate:4.1
-kde-base/kbugbuster:4.1
-kde-base/kcachegrind:4.1
-kde-base/kdeaccounts-plugin:4.1
-kde-base/kdesdk-kioslaves:4.1
-kde-base/kdesdk-misc:4.1
-kde-base/kdesdk-scripts:4.1
-kde-base/kdesdk-strigi-analyzer:4.1
-kde-base/kompare:4.1
-kde-base/kstartperf:4.1
-kde-base/kuiviewer:4.1
-kde-base/lokalize:4.1
-kde-base/umbrello:4.1
diff --git a/sets/kdetoys-4 b/sets/kdetoys-4
new file mode 100644
index 00000000000..12581613397
--- /dev/null
+++ b/sets/kdetoys-4
@@ -0,0 +1,4 @@
+kde-base/amor:4
+kde-base/kteatime:4
+kde-base/ktux:4
+kde-base/kweather:4
diff --git a/sets/kdetoys-4.1 b/sets/kdetoys-4.1
deleted file mode 100644
index b822023c5f6..00000000000
--- a/sets/kdetoys-4.1
+++ /dev/null
@@ -1,4 +0,0 @@
-kde-base/amor:4.1
-kde-base/kteatime:4.1
-kde-base/ktux:4.1
-kde-base/kweather:4.1
diff --git a/sets/kdeutils-4 b/sets/kdeutils-4
new file mode 100644
index 00000000000..b158c16a363
--- /dev/null
+++ b/sets/kdeutils-4
@@ -0,0 +1,11 @@
+kde-base/ark:4
+kde-base/kcalc:4
+kde-base/kcharselect:4
+kde-base/kdessh:4
+kde-base/kdf:4
+kde-base/kgpg:4
+kde-base/ktimer:4
+kde-base/kwallet:4
+kde-base/superkaramba:4
+kde-base/sweeper:4
+kde-base/okteta:4
diff --git a/sets/kdeutils-4.1 b/sets/kdeutils-4.1
deleted file mode 100644
index bf822c37a6a..00000000000
--- a/sets/kdeutils-4.1
+++ /dev/null
@@ -1,11 +0,0 @@
-kde-base/ark:4.1
-kde-base/kcalc:4.1
-kde-base/kcharselect:4.1
-kde-base/kdessh:4.1
-kde-base/kdf:4.1
-kde-base/kgpg:4.1
-kde-base/ktimer:4.1
-kde-base/kwallet:4.1
-kde-base/superkaramba:4.1
-kde-base/sweeper:4.1
-kde-base/okteta:4.1