Documentation files:

- removed duplicated kdeplasma-addons from live package.keywords
- removed kdeplasma-addons and kde-l10n from kde-live-extra (they are from kde-base and pull live
kdelibs which is not desired for people who want to use 4.2 + live extra packages)
- added combined live package.unmask - should be regenerated by 'cat kde-live/* > kde-live-all'
in Documentation/package.umask directory when something is changed

4 files changed, 302 insertions, 9 deletions

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 61e03dba47d..a2800d5ad69 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -89,7 +89,6 @@
 ~kde-base/kdemultimedia-kioslaves-9999 **
 ~kde-base/kdenetwork-filesharing-9999 **
 ~kde-base/kdepasswd-9999 **
-~kde-base/kdeplasma-addons-9999 **
 ~kde-base/kdepim-icons-9999 **
 ~kde-base/kdepim-kresources-9999 **
 ~kde-base/kdepimlibs-9999 **
diff --git a/Documentation/package.unmask/kde-live-all b/Documentation/package.unmask/kde-live-all
new file mode 100644
index 00000000000..edbaaac2cbc
--- /dev/null
+++ b/Documentation/package.unmask/kde-live-all
@@ -0,0 +1,301 @@
+kde-base/kdeaccessibility-colorschemes:live
+kde-base/kdeaccessibility-iconthemes:live
+kde-base/kmag:live
+kde-base/kmousetool:live
+kde-base/kmouth:live
+kde-base/kttsd:live
+kde-base/kuser:live
+kde-base/kcron:live
+kde-base/ksystemlog:live
+kde-base/knetworkconf:live
+# kde-base/system-config-printer-kde:live # heavy and unresolved deps
+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-kwin-styles:live <--- not ready yet by upstream
+kde-base/kdeartwork-sounds:live
+kde-base/kdeartwork-styles:live
+kde-base/kdeartwork-wallpapers:live
+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-desktoptheme:live
+kde-base/kdebase-kioslaves:live
+kde-base/kdebase-startkde:live
+kde-base/kdebugdialog:live
+kde-base/kdedglobalaccel:live
+kde-base/kdepasswd:live
+kde-base/kdesu:live
+kde-base/kdialog:live
+kde-base/kdm:live
+kde-base/keditbookmarks:live
+kde-base/kephal: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/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/kwrited:live
+kde-base/libkonq:live
+kde-base/libkworkspace: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
+kde-base/krosspython:live
+kde-base/krossruby:live
+kde-base/pykde4:live
+=app-office/akonadi-server-9999
+=dev-libs/soprano-9999
+=app-misc/strigi-9999
+=kde-base/automoc-9999
+=media-sound/phonon-9999
+kde-base/kdelibs:live
+kde-base/kdepimlibs:live
+kde-base/blinken:live
+kde-base/kalgebra:live
+kde-base/kalzium:live
+kde-base/kanagram:live
+kde-base/kbruch:live
+kde-base/kgeography:live
+kde-base/khangman:live
+kde-base/kig:live
+kde-base/kiten:live
+kde-base/klettres:live
+kde-base/kmplot:live
+kde-base/kstars:live
+kde-base/ktouch:live
+kde-base/kturtle:live
+kde-base/kwordquiz:live
+kde-base/libkdeedu:live
+kde-base/marble:live
+kde-base/parley:live
+kde-base/step:live
+app-cdr/k3b:live
+app-cdr/k9copy:live
+=app-editors/yzis-9999
+=app-editors/kile-9999
+dev-util/inspektor:live
+dev-util/kdesvn:live
+dev-util/kdevelop:live
+dev-util/kdevplatform:live
+dev-util/krazy2:live
+games-board/tagua:live
+kde-misc/kapman:live
+kde-misc/kblogger
+kde-misc/kdelirc:live
+kde-misc/kdiff3:live
+kde-misc/killbots:live
+kde-misc/konq-plugins:live
+kde-misc/krusader:live
+kde-misc/networkmanager-applet:live
+kde-misc/playground-plasma:live
+kde-misc/webkit-kpart:live
+kde-misc/yakuake:live
+=mail-client/mailody-9999
+media-gfx/digikam:live
+media-gfx/kflickr:live
+media-plugins/kipi-plugins:live
+media-sound/amarok:live
+media-sound/kaudiocreator:live
+media-tv/kdetv:live
+media-video/kaffeine:live
+media-video/kmplayer:live
+media-video/kplayer:live
+net-ftp/kftpgrabber:live
+net-im/kmess:live
+net-misc/smb4k:live
+=net-libs/decibel-9999
+=net-libs/telepathy-qt-9999
+net-p2p/kmldonkey:live
+=net-p2p/ktorrent-9999
+=net-voip/tapioca-qt-9999
+net-wireless/kdebluetooth4:live
+x11-themes/gtk-engines-qt:live
+kde-base/bomber:live
+kde-base/bovo:live
+kde-base/kapman:live
+kde-base/katomic:live
+kde-base/kbattleship:live
+kde-base/kblackbox:live
+kde-base/kblocks:live
+kde-base/kbounce:live
+kde-base/kbreakout:live
+kde-base/kdiamond:live
+kde-base/kfourinline:live
+kde-base/kgoldrunner:live
+kde-base/killbots:live
+kde-base/kiriki:live
+kde-base/kjumpingcube:live
+kde-base/klines:live
+kde-base/kmahjongg:live
+kde-base/kmines:live
+kde-base/knetwalk:live
+kde-base/kolf:live
+kde-base/kollision:live
+kde-base/konquest:live
+kde-base/kpat:live
+kde-base/kreversi:live
+kde-base/ksame:live
+kde-base/kshisen:live
+kde-base/ksirk:live
+kde-base/kspaceduel:live
+kde-base/ksquares:live
+kde-base/ksudoku:live
+kde-base/ktuberling:live
+kde-base/kubrick:live
+kde-base/libkdegames:live
+kde-base/libkmahjongg:live
+kde-base/lskat:live
+kde-base/gwenview:live
+kde-base/kamera:live
+kde-base/kcolorchooser:live
+kde-base/kgamma:live
+kde-base/kolourpaint:live
+kde-base/kruler:live
+kde-base/ksaneplugin:live
+kde-base/ksnapshot:live
+kde-base/libkdcraw:live
+kde-base/libkexiv2:live
+kde-base/libksane:live
+kde-base/libkipi:live
+kde-base/okular:live
+kde-base/svgpart:live
+kde-base/kdegraphics-strigi-analyzer:live
+kde-base/dragonplayer:live
+kde-base/juk:live
+kde-base/kdemultimedia-kioslaves:live
+kde-base/kmix:live
+kde-base/kscd:live
+kde-base/libkcddb:live
+kde-base/libkcompactdisc:live
+kde-base/kdenetwork-filesharing:live
+kde-base/kdnssd:live
+kde-base/kget:live
+kde-base/kopete:live
+kde-base/kppp:live
+kde-base/krdc:live
+kde-base/krfb:live
+kde-base/lilo-config:live
+kde-base/kfloppy:live
+kde-base/akonadi:live
+kde-base/akregator:live
+kde-base/kaddressbook:live
+kde-base/kalarm:live
+kde-base/kdepim-icons:live
+kde-base/kdepim-kresources:live
+kde-base/kdepim-strigi-analyzer:live
+kde-base/kdepim-wizards:live
+# kde-base/kitchensync:live # removed from 4.2
+kde-base/kjots:live
+kde-base/kleopatra:live
+kde-base/kmail:live
+kde-base/kmailcvt:live
+# kde-base/kmobiletools:live # missing ebuild
+kde-base/knode:live
+kde-base/knotes:live
+kde-base/kode:live
+kde-base/kontact:live
+kde-base/kontact-specialdates:live
+kde-base/kontactinterfaces:live
+kde-base/korganizer:live
+# kde-base/korn:live disabled for now
+kde-base/kpilot:live
+kde-base/ktimetracker:live
+kde-base/libkdepim:live
+kde-base/libkleo:live
+kde-base/libkpgp:live
+kde-base/libksieve:live
+kde-base/mimelib:live
+kde-base/cervisia:live
+kde-base/kapptemplate:live
+kde-base/kate:live
+kde-base/kbugbuster:live
+kde-base/kcachegrind:live
+kde-base/kdeaccounts-plugin:live
+kde-base/kdesdk-kioslaves:live
+kde-base/kdesdk-misc:live
+kde-base/kdesdk-scripts:live
+kde-base/kdesdk-strigi-analyzer
+kde-base/kompare:live
+kde-base/kstartperf:live
+kde-base/kuiviewer:live
+kde-base/lokalize:live
+kde-base/umbrello:live
+kde-base/amor:live
+kde-base/kteatime:live
+kde-base/ktux:live
+kde-base/kweather:live
+kde-base/ark:live
+kde-base/kcalc:live
+kde-base/kcharselect:live
+kde-base/kdessh:live
+kde-base/kdf:live
+kde-base/kgpg:live
+kde-base/ktimer:live
+kde-base/kwallet:live
+kde-base/okteta:live
+# kde-base/printer-applet:live #masked
+kde-base/superkaramba:live
+kde-base/sweeper:live
+app-office/kword:live
+app-office/kplato:live
+app-office/kpresenter:live
+app-office/kivio:live
+app-office/kchart:live
+app-office/karbon:live
+app-office/krita:live
+app-office/koffice-data:live
+app-office/koffice-libs:live
+app-office/kspread:live
+kde-plasmoids/kepas:live
+kde-plasmoids/menubar:live
diff --git a/Documentation/package.unmask/kde-live/kde-extras-live b/Documentation/package.unmask/kde-live/kde-extras-live
index 9363088a737..9abb05e3f57 100644
--- a/Documentation/package.unmask/kde-live/kde-extras-live
+++ b/Documentation/package.unmask/kde-live/kde-extras-live
@@ -8,8 +8,6 @@ dev-util/kdevelop:live
 dev-util/kdevplatform:live
 dev-util/krazy2:live
 games-board/tagua:live
-kde-base/kdeplasma-addons:live
-kde-base/kde-l10n:live
 kde-misc/kapman:live
 kde-misc/kblogger
 kde-misc/kdelirc:live
diff --git a/Documentation/package.unmask/kde-live/kdeaccessibility-live b/Documentation/package.unmask/kde-live/kdeaccessibility-live
index c2d4e66958d..1c6fdb1c6d0 100644..120000
--- a/Documentation/package.unmask/kde-live/kdeaccessibility-live
+++ b/Documentation/package.unmask/kde-live/kdeaccessibility-live
@@ -1,6 +1 @@
-kde-base/kdeaccessibility-colorschemes:live
-kde-base/kdeaccessibility-iconthemes:live
-kde-base/kmag:live
-kde-base/kmousetool:live
-kde-base/kmouth:live
-kde-base/kttsd:live
+/usr/local/portage/kde-testing/sets/kdeaccessibility-live
\ No newline at end of file