8 files changed, 13 insertions, 387 deletions
diff --git a/Documentation/package.keywords/kde-4.4.9999.d/kdedeps-4.4 b/Documentation/package.keywords/kde-4.4.9999.d/kdedeps-4.4
index 0f7f74512f0..19d3c2944cd 100644
--- a/Documentation/package.keywords/kde-4.4.9999.d/kdedeps-4.4
+++ b/Documentation/package.keywords/kde-4.4.9999.d/kdedeps-4.4
@@ -1 +1,2 @@
->=app-office/akonadi-server-1.2.60
+~app-office/akonadi-server-1.2.90
+~dev-libs/soprano-2.3.70
diff --git a/Documentation/package.keywords/kde-4.4.9999.keywords b/Documentation/package.keywords/kde-4.4.9999.keywords
index 6c52f51703b..86e8c4d37f5 100644
--- a/Documentation/package.keywords/kde-4.4.9999.keywords
+++ b/Documentation/package.keywords/kde-4.4.9999.keywords
@@ -108,7 +108,8 @@
 ~kde-base/krossruby-4.4.9999 **
 ~kde-base/pykde4-4.4.9999 **
 ~kde-base/smoke-4.4.9999 **
->=app-office/akonadi-server-1.2.60
+~app-office/akonadi-server-1.2.90
+~dev-libs/soprano-2.3.70
 ~kde-base/blinken-4.4.9999 **
 ~kde-base/cantor-4.4.9999 **
 ~kde-base/kalgebra-4.4.9999 **
diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords
index 8b14687674a..001a0ecb188 100644
--- a/Documentation/package.keywords/kde-4.4.keywords
+++ b/Documentation/package.keywords/kde-4.4.keywords
@@ -108,7 +108,8 @@ kde-base/krosspython:4.4
 kde-base/krossruby:4.4
 kde-base/pykde4:4.4
 kde-base/smoke:4.4
->=app-office/akonadi-server-1.2.60
+~app-office/akonadi-server-1.2.90
+~dev-libs/soprano-2.3.70
 kde-base/blinken:4.4
 kde-base/cantor:4.4
 kde-base/kalgebra:4.4
diff --git a/Documentation/package.unmask/kde-4.4 b/Documentation/package.unmask/kde-4.4
index 34d7510a13b..e426869b80a 100644
--- a/Documentation/package.unmask/kde-4.4
+++ b/Documentation/package.unmask/kde-4.4
@@ -108,6 +108,8 @@ kde-base/krosspython:4.4
 kde-base/krossruby:4.4
 kde-base/pykde4:4.4
 kde-base/smoke:4.4
+~app-office/akonadi-server-1.2.90
+~dev-libs/soprano-2.3.70
 kde-base/blinken:4.4
 kde-base/cantor:4.4
 kde-base/kalgebra:4.4
diff --git a/Documentation/package.unmask/kde-4.4.d/kdedeps-4.4 b/Documentation/package.unmask/kde-4.4.d/kdedeps-4.4
new file mode 120000
index 00000000000..96696f08148
--- /dev/null
+++ b/Documentation/package.unmask/kde-4.4.d/kdedeps-4.4
@@ -0,0 +1 @@
+../../../sets/kdedeps-4.4
+\ No newline at end of file
diff --git a/profiles/package.mask b/profiles/package.mask
index dc86b98b8a4..4b396575e1d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -115,6 +115,8 @@ kde-base/krosspython:4.4
 kde-base/krossruby:4.4
 kde-base/pykde4:4.4
 kde-base/smoke:4.4
+~app-office/akonadi-server-1.2.90
+~dev-libs/soprano-2.3.70
 kde-base/blinken:4.4
 kde-base/cantor:4.4
 kde-base/kalgebra:4.4
@@ -293,388 +295,6 @@ kde-base/kdetoys-meta:4.4
 kde-base/kdeutils-meta:4.4
 kde-base/kdewebdev-meta:4.4
 
-# Autogenerated by regenerate-files, DO NOT EDIT.
-# Live packages are masked by default.
-# Edit Documentation/package.unmask/kde-live.d/ files instead.
-kde-base/kdeplasma-addons:live
-kde-base/kde-l10n:live
-~app-backup/kaveau-9999
-~app-backup/timevault-9999
-~app-cdr/k3b-9999
-~app-cdr/k9copy-9999
-~app-editors/kile-9999
-~app-office/scribus-9999
-~app-office/skrooge-9999
-~dev-cpp/eigen-9999
-~dev-util/kdesvn-9999
-~dev-util/kdevelop-9999
-~dev-util/kdevelop-plugins-9999
-~dev-util/kdevplatform-9999
-~dev-util/krazy2-9999
-~dev-util/kxsldbg-9999
-~kde-misc/basket-9999
-~kde-misc/filelight-9999
-~kde-misc/kbstateapplet-9999
-~kde-misc/kcheckgmail-9999
-~kde-misc/kdiff3-9999
-~kde-misc/kepas-9999
-~kde-misc/kgrubeditor-9999
-~kde-misc/knetworkmanager-9999
-~kde-misc/kobby-9999
-~kde-misc/konq-plugins-9999
-~kde-misc/krusader-9999
-~kde-misc/menubar-9999
-~kde-misc/plasma-emergelog-9999
-~kde-misc/raptormenu-9999
-~kde-misc/translatoid-9999
-~kde-misc/webkit-kpart-9999
-~kde-misc/yakuake-9999
-~mail-client/mailody-9999
-~media-gfx/digikam-9999
-~media-gfx/kflickr-9999
-~media-libs/liblastfm-9999
-~media-libs/taglib-extras-9999
-~media-plugins/kipi-plugins-9999
-~media-sound/amarok-9999
-~media-sound/amarok-utils-9999
-~media-sound/kaudiocreator-9999
-~media-sound/kradio-9999
-~media-tv/kdetv-9999
-~media-video/kaffeine-9999
-~media-video/kamoso-9999
-~media-video/kmplayer-9999
-~media-video/kplayer-9999
-~media-video/subtitlecomposer-9999
-~net-ftp/kftpgrabber-9999
-~net-im/choqok-9999
-~net-im/kmess-9999
-~net-im/kopete-facebook-9999
-~net-im/synapse-9999
-~net-irc/aki-9999
-~net-irc/akiirc-9999
-~net-irc/konversation-9999
-~net-libs/libqinfinity-9999
-~net-misc/slimrat-9999
-~net-misc/smb4k-9999
-#net-p2p/kmldonkey-9999
-~net-p2p/ktorrent-9999
-~net-wireless/kbluetooth-9999
-~sys-auth/policykit-qt-9999
-~sys-auth/polkit-kde-9999
-~sys-auth/polkit-qt-9999
-~sys-block/partitionmanager-9999
-~www-client/rekonq-9999
-~x11-libs/qtscriptgenerator-9999
-~x11-themes/bespin-9999
-~x11-themes/gtk-engines-qt-9999
-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/kcron:live
-kde-base/knetworkconf:live
-kde-base/ksystemlog:live
-kde-base/kuser:live
-kde-base/system-config-printer-kde:live
-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/kdeartwork-weatherwallpapers:live
-kde-base/attica: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/kdebase-cursors:live
-kde-base/kdebase-data:live
-kde-base/kdebase-desktoptheme:live
-kde-base/kdebase-kioslaves:live
-kde-base/kdebase-menu:live
-kde-base/kdebase-menu-icons:live
-kde-base/kdebase-startkde:live
-kde-base/kdebase-wallpapers:live
-kde-base/kdebugdialog:live
-kde-base/kglobalaccel:live
-kde-base/kdepasswd:live
-kde-base/kdesu:live
-kde-base/kdialog:live
-kde-base/kdm:live
-kde-base/keditbookmarks:live
-kde-base/keditfiletype:live
-kde-base/kephal:live
-kde-base/kfile:live
-kde-base/kfind:live
-kde-base/kfmclient: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/libplasmagenericshell: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-runtime:live
-kde-base/plasma-workspace:live
-kde-base/powerdevil:live
-kde-base/qguiplatformplugin_kde:live
-kde-base/renamedlg-plugins:live
-kde-base/solid:live
-kde-base/solid-runtime:live
-kde-base/systemsettings:live
-kde-base/kdebindings-csharp:live
-kde-base/krossjava:live
-kde-base/krosspython:live
-kde-base/krossruby:live
-kde-base/pykde4:live
-kde-base/smoke:live
-~app-office/akonadi-server-9999
-~dev-libs/libattica-9999
-~dev-libs/soprano-9999
-~app-misc/strigi-9999
-~kde-base/automoc-9999
-~media-sound/phonon-9999
-~sys-auth/polkit-qt-9999
-
-# For kde-base/kdebase-kioslaves
-~net-libs/libssh-9999
-
-# For kde-base/granatier
-~media-libs/gluon-9999
-kde-base/blinken:live
-kde-base/cantor: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/kvtml-data:live
-kde-base/kwordquiz:live
-kde-base/libkdeedu:live
-kde-base/marble:live
-kde-base/parley:live
-kde-base/rocs:live
-kde-base/step:live
-kde-base/bomber:live
-kde-base/bovo:live
-kde-base/granatier: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/kigo: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/ktron:live
-kde-base/ktuberling:live
-kde-base/kubrick:live
-kde-base/libkdegames:live
-kde-base/libkmahjongg:live
-kde-base/lskat:live
-kde-base/palapeli: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/thumbnailers:live
-kde-base/kde-env:live
-kde-base/kdelibs:live
-kde-base/kdepimlibs:live
-kde-base/oxygen-icons: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/mplayerthumbs: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/kdelirc:live
-kde-base/policykit-kde:live
-kde-base/akonadi:live
-kde-base/akregator:live
-kde-base/blogilo:live
-kde-base/kabcclient: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/kdepim-runtime:live
-kde-base/kjots:live
-kde-base/kleopatra:live
-kde-base/kmail:live
-kde-base/kmailcvt:live
-kde-base/knode:live
-kde-base/knotes:live
-kde-base/konsolekalendar:live
-kde-base/kontact:live
-kde-base/kontact-specialdates:live
-kde-base/korganizer: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:live
-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/kdf:live
-kde-base/kgpg:live
-kde-base/ktimer:live
-kde-base/kwallet:live
-kde-base/okteta:live
-kde-base/printer-applet:live
-kde-base/superkaramba:live
-kde-base/sweeper:live
-kde-base/kfilereplace:live
-kde-base/kimagemapeditor:live
-kde-base/klinkstatus:live
-kde-base/kommander:live
-~app-office/kword-9999
-~app-office/kplato-9999
-~app-office/kpresenter-9999
-~app-office/kchart-9999
-~app-office/karbon-9999
-~app-office/krita-9999
-~app-office/koffice-data-9999
-~app-office/koffice-libs-9999
-~app-office/kspread-9999
-kde-base/kdeaccessibility-meta:live
-kde-base/kdeadmin-meta:live
-kde-base/kdeartwork-meta:live
-kde-base/kdebase-meta:live
-kde-base/kdebase-runtime-meta:live
-kde-base/kdeedu-meta:live
-kde-base/kdegames-meta:live
-kde-base/kdegraphics-meta:live
-kde-base/kde-meta:live
-kde-base/kdemultimedia-meta:live
-kde-base/kdenetwork-meta:live
-kde-base/kdepim-meta:live
-kde-base/kdesdk-meta:live
-kde-base/kdetoys-meta:live
-kde-base/kdeutils-meta:live
-kde-base/kdewebdev-meta:live
-~kde-misc/kepas-9999
-~kde-misc/menubar-9999
-~kde-misc/plasma-emergelog-9999
-
 media-libs/opengtl
 
 # Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (26 Feb 2009)
diff --git a/profiles/package.mask.d/kde-live b/profiles/package.mask.d/kde-live
deleted file mode 120000
index 788cebd0daa..00000000000
--- a/profiles/package.mask.d/kde-live
+++ /dev/null
@@ -1 +0,0 @@
-../../Documentation/package.unmask/kde-live
-\ No newline at end of file
diff --git a/sets/kdedeps-4.4 b/sets/kdedeps-4.4
index 0f7f74512f0..19d3c2944cd 100644
--- a/sets/kdedeps-4.4
+++ b/sets/kdedeps-4.4
@@ -1 +1,2 @@
->=app-office/akonadi-server-1.2.60
+~app-office/akonadi-server-1.2.90
+~dev-libs/soprano-2.3.70