Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde

20 files changed, 163 insertions, 166 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index de2375a38e9..20e10fb33c8 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Combined KDE 3.5 package.keywords file.
 kde-base/ksayit:3.5
diff --git a/Documentation/package.keywords/kde-4.2.keywords b/Documentation/package.keywords/kde-4.2.keywords
index 39e215c6926..aa6c07f3ded 100644
--- a/Documentation/package.keywords/kde-4.2.keywords
+++ b/Documentation/package.keywords/kde-4.2.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.2 release.
 # Edit Documentation/package.keywords/kde-4.2.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.3.9999.keywords b/Documentation/package.keywords/kde-4.3.9999.keywords
index 339e951d34e..a62a8b5ef7e 100644
--- a/Documentation/package.keywords/kde-4.3.9999.keywords
+++ b/Documentation/package.keywords/kde-4.3.9999.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.3 release.
 # Edit Documentation/package.keywords/kde-4.3.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.3.keywords b/Documentation/package.keywords/kde-4.3.keywords
index d0abf7be339..e38776fcd18 100644
--- a/Documentation/package.keywords/kde-4.3.keywords
+++ b/Documentation/package.keywords/kde-4.3.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.3 release.
 # Edit Documentation/package.keywords/kde-4.3.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords
index cbb79547091..9568633d263 100644
--- a/Documentation/package.keywords/kde-4.4.keywords
+++ b/Documentation/package.keywords/kde-4.4.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE 4.4 release.
 # Edit Documentation/package.keywords/kde-4.4.d/ files instead.
diff --git a/Documentation/package.keywords/kde-extras-live.keywords b/Documentation/package.keywords/kde-extras-live.keywords
index e23ec8b2695..f8e1d269df2 100644
--- a/Documentation/package.keywords/kde-extras-live.keywords
+++ b/Documentation/package.keywords/kde-extras-live.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 ~app-cdr/k3b-9999 **
 ~app-cdr/k9copy-9999 **
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 8690a3fe20d..b36a215cd7d 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -1,15 +1,15 @@
-# root (07 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keywork/unkeyword KDE live release.
 # Edit Documentation/package.keywords/kde-live.base/ files instead.
-~kde-base/kdeplasma-addons-9999 **
-~kde-base/kde-l10n-9999 **
 ~kde-base/kdeaccessibility-colorschemes-9999 **
 ~kde-base/kdeaccessibility-iconthemes-9999 **
 ~kde-base/kmag-9999 **
 ~kde-base/kmousetool-9999 **
 ~kde-base/kmouth-9999 **
 ~kde-base/kttsd-9999 **
+~kde-base/kdeplasma-addons-9999 **
+~kde-base/kde-l10n-9999 **
 ~kde-base/kcron-9999 **
 ~kde-base/knetworkconf-9999 **
 ~kde-base/ksystemlog-9999 **
diff --git a/Documentation/package.keywords/koffice-live.keywords b/Documentation/package.keywords/koffice-live.keywords
index f216f163f5a..d98d387826f 100644
--- a/Documentation/package.keywords/koffice-live.keywords
+++ b/Documentation/package.keywords/koffice-live.keywords
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 ~app-office/kword-9999 **
 ~app-office/kplato-9999 **
diff --git a/Documentation/package.unmask/kde-4.2 b/Documentation/package.unmask/kde-4.2
index d59abe1c019..448cfae6917 100644
--- a/Documentation/package.unmask/kde-4.2
+++ b/Documentation/package.unmask/kde-4.2
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.2 release.
 # Edit Documentation/package.unmask/kde-4.2.d/ files instead.
diff --git a/Documentation/package.unmask/kde-4.3 b/Documentation/package.unmask/kde-4.3
index 9a499e75fe5..36f76fae456 100644
--- a/Documentation/package.unmask/kde-4.3
+++ b/Documentation/package.unmask/kde-4.3
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.3 release.
 # Edit Documentation/package.unmask/kde-4.3.d/ files instead.
diff --git a/Documentation/package.unmask/kde-4.4 b/Documentation/package.unmask/kde-4.4
index 22a6357b69c..9f84c119e9d 100644
--- a/Documentation/package.unmask/kde-4.4
+++ b/Documentation/package.unmask/kde-4.4
@@ -1,4 +1,4 @@
-# Alex Alexander <wired@gentoo.org> (05 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.4 release.
 # Edit Documentation/package.unmask/kde-4.4.d/ files instead.
@@ -108,9 +108,6 @@ 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.0
-~dev-libs/soprano-2.3.0
-=media-sound/phonon-4.4_pre*
 kde-base/blinken:4.4
 kde-base/kalgebra:4.4
 kde-base/kalzium: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
deleted file mode 120000
index 96696f08148..00000000000
--- a/Documentation/package.unmask/kde-4.4.d/kdedeps-4.4
+++ /dev/null
@@ -1 +0,0 @@
-../../../sets/kdedeps-4.4
\ No newline at end of file
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 4b53137a00e..b9a6c563cb2 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,76 +1,15 @@
-# root (07 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # 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-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
-~kde-misc/basket-9999
-~kde-misc/filelight-9999
-~kde-misc/kcheckgmail-9999
-~kde-misc/kdiff3-9999
-~kde-misc/kepas-9999
-~kde-misc/kgrubeditor-9999
-~kde-misc/kobby-9999
-~kde-misc/konq-plugins-9999
-~kde-misc/krusader-9999
-~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-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/kmplayer-9999
-~media-video/kplayer-9999
-~media-video/subtitlecomposer-9999
-~net-ftp/kftpgrabber-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/kdebluetooth4-9999
-~sys-auth/policykit-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/kdeplasma-addons:live
+kde-base/kde-l10n:live
 kde-base/kcron:live
 kde-base/knetworkconf:live
 kde-base/ksystemlog:live
@@ -193,6 +132,67 @@ kde-base/libkdeedu:live
 kde-base/marble:live
 kde-base/parley:live
 kde-base/step:live
+~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
+~kde-misc/basket-9999
+~kde-misc/filelight-9999
+~kde-misc/kcheckgmail-9999
+~kde-misc/kdiff3-9999
+~kde-misc/kepas-9999
+~kde-misc/kgrubeditor-9999
+~kde-misc/kobby-9999
+~kde-misc/konq-plugins-9999
+~kde-misc/krusader-9999
+~kde-misc/menubar-9999
+~kde-misc/networkmanager-applet-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/kmplayer-9999
+~media-video/kplayer-9999
+~media-video/subtitlecomposer-9999
+~net-ftp/kftpgrabber-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/kdebluetooth4-9999
+~sys-auth/policykit-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/bomber:live
 kde-base/bovo:live
 kde-base/kapman:live
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 85c93917886..5f08c4d6b70 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -131,18 +131,19 @@ esac
 unset qtopengldepend
 
 # WebKit dependencies
-qtwebkitdepend=">=x11-libs/qt-webkit-${QT_DEPEND}:4"
-
 case ${KDE_REQUIRED} in
 	always)
-		qtwebkitdepend+="[kde]"
+		qtwebkitusedeps="[kde]"
 		;;
 	optional)
-		qtwebkitdepend+="[kde?]"
+		qtwebkitusedeps="[kde?]"
 		;;
 	*) ;;
 esac
-
+qtwebkitdepend="
+	>=x11-libs/qt-webkit-${QT_DEPEND}:4${qtwebkitusedeps}
+"
+unset qtwebkitusedeps
 case ${WEBKIT_REQUIRED} in
 	always)
 		COMMONDEPEND+=" ${qtwebkitdepend}"
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 5d4df4f39cb..9e341a77132 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -4,6 +4,9 @@
 
 # Prefix compat:
 : ${EROOT:=${ROOT}}
+# some pple thing that /usr/local is lovely, i preffer to write stuff on one
+# place on other hand :]
+[[ ${EROOT} = */ ]] || EROOT+="/"
 
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index e492a7c41a6..fc328b7288e 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -2,7 +2,7 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde4.patch 2470 RMD160 590bd0604d20d254b4a7386bac436b5cd800188d SHA1 0ab1ae0f74100b8e506ebdc9e87dc94664da2f84 SHA256 31538cf162e7450cba61d76bd1b9a90b7e4669a8bf7fe7704d44ec9ab5832fe5
 DIST kdebase-workspace-4.3.61.tar.lzma 61017375 RMD160 0fd3e2652d999bc95493255dba374c126724c5ea SHA1 5ceca099fef86a81a58e1aed6f219c036c397c55 SHA256 f4a0775ff331c5898dd335f18aa88023f2c92afa0263059b69fb6f350605abf8
-EBUILD kdebase-startkde-4.3.61.ebuild 4034 RMD160 68a15012fce9860b7f9f4b42011062f5e3f303ac SHA1 3f26cb5b30f06903c83de7a484eccf8885f52aa6 SHA256 b2b3cf81fb5096e67c22795da06ba5feb1723af2cc8b0058bb1dfaabf91956b4
-EBUILD kdebase-startkde-4.3.9999.ebuild 3992 RMD160 677d453b2fd1761077b16072e5a4c92fc3e39583 SHA1 9fde4e7f406290f807eb8d6f55b5b268bcb74442 SHA256 d2a7003cea28e5e76a14ac95808135ffb90173beb09894a2c0aa13ed00c1fe14
-EBUILD kdebase-startkde-9999.ebuild 3992 RMD160 677d453b2fd1761077b16072e5a4c92fc3e39583 SHA1 9fde4e7f406290f807eb8d6f55b5b268bcb74442 SHA256 d2a7003cea28e5e76a14ac95808135ffb90173beb09894a2c0aa13ed00c1fe14
+EBUILD kdebase-startkde-4.3.61.ebuild 4034 RMD160 173e05dc5c1937dba93ddd7acc23ecc270e3fd91 SHA1 49d8e1128dfbcd949d8151724923117e792d3a3f SHA256 44d762709bb712190962d6eb06d04559aa9d15e3f6bb4d8fc9fa6072199a1945
+EBUILD kdebase-startkde-4.3.9999.ebuild 3992 RMD160 317d80a6981b527e3cd00fa034f06b984768e79f SHA1 1e3f79d237c6cb6c3e378092df761b2bb2bc5538 SHA256 696f6b908b8f8ad7e7c835a54867b4e98a933364adcce2014d85caafb51adcdc
+EBUILD kdebase-startkde-9999.ebuild 3992 RMD160 317d80a6981b527e3cd00fa034f06b984768e79f SHA1 1e3f79d237c6cb6c3e378092df761b2bb2bc5538 SHA256 696f6b908b8f8ad7e7c835a54867b4e98a933364adcce2014d85caafb51adcdc
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.61.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.61.ebuild
index 675fc39252b..d1f937ede22 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.61.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.61.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kreadconfig-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/krunner-${PV}:${SLOT}[kdeprefix=]
@@ -28,13 +29,12 @@ RDEPEND="
 	>=kde-base/ksplash-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kstartupconfig-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kstyles-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kwin-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/phonon-kde-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/plasma-apps-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/systemsettings-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	x11-apps/mkfontdir
 	x11-apps/xmessage
 	x11-apps/xprop
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild
index c52f1aeed76..686ae18f260 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.3.9999.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kreadconfig-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/krunner-${PV}:${SLOT}[kdeprefix=]
@@ -28,13 +29,12 @@ RDEPEND="
 	>=kde-base/ksplash-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kstartupconfig-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kstyles-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kwin-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/phonon-kde-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/plasma-apps-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/systemsettings-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	x11-apps/mkfontdir
 	x11-apps/xmessage
 	x11-apps/xprop
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index c52f1aeed76..686ae18f260 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	>=kde-base/kdebase-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/keditfiletype-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kreadconfig-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/krunner-${PV}:${SLOT}[kdeprefix=]
@@ -28,13 +29,12 @@ RDEPEND="
 	>=kde-base/ksplash-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kstartupconfig-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kstyles-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kwin-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/phonon-kde-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/plasma-apps-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/plasma-workspace-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/systemsettings-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kmimetypefinder-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=]
 	x11-apps/mkfontdir
 	x11-apps/xmessage
 	x11-apps/xprop
diff --git a/profiles/package.mask b/profiles/package.mask
index 4a3c93fd259..81eb85d4957 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# root (07 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -6,18 +6,18 @@
 # Name changed to plasma-applet-daisy.
 kde-misc/daisy
 
-# root (07 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.4 release.
 # Edit Documentation/package.unmask/kde-4.4.d/ files instead.
-kde-base/kdeplasma-addons:4.4
-kde-base/kde-l10n:4.4
 kde-base/kdeaccessibility-colorschemes:4.4
 kde-base/kdeaccessibility-iconthemes:4.4
 kde-base/kmag:4.4
 kde-base/kmousetool:4.4
 kde-base/kmouth:4.4
 kde-base/kttsd:4.4
+kde-base/kdeplasma-addons:4.4
+kde-base/kde-l10n:4.4
 kde-base/kcron:4.4
 kde-base/knetworkconf:4.4
 kde-base/ksystemlog:4.4
@@ -116,9 +116,6 @@ 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.0
-~dev-libs/soprano-2.3.0
-=media-sound/phonon-4.4_pre*
 kde-base/blinken:4.4
 kde-base/kalgebra:4.4
 kde-base/kalzium:4.4
@@ -295,79 +292,18 @@ kde-base/kdetoys-meta:4.4
 kde-base/kdeutils-meta:4.4
 kde-base/kdewebdev-meta:4.4
 
-# root (07 Aug 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (10 Aug 2009)
 # 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-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
-~kde-misc/basket-9999
-~kde-misc/filelight-9999
-~kde-misc/kcheckgmail-9999
-~kde-misc/kdiff3-9999
-~kde-misc/kepas-9999
-~kde-misc/kgrubeditor-9999
-~kde-misc/kobby-9999
-~kde-misc/konq-plugins-9999
-~kde-misc/krusader-9999
-~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-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/kmplayer-9999
-~media-video/kplayer-9999
-~media-video/subtitlecomposer-9999
-~net-ftp/kftpgrabber-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/kdebluetooth4-9999
-~sys-auth/policykit-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/kdeplasma-addons:live
+kde-base/kde-l10n:live
 kde-base/kcron:live
 kde-base/knetworkconf:live
 kde-base/ksystemlog:live
@@ -490,6 +426,67 @@ kde-base/libkdeedu:live
 kde-base/marble:live
 kde-base/parley:live
 kde-base/step:live
+~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
+~kde-misc/basket-9999
+~kde-misc/filelight-9999
+~kde-misc/kcheckgmail-9999
+~kde-misc/kdiff3-9999
+~kde-misc/kepas-9999
+~kde-misc/kgrubeditor-9999
+~kde-misc/kobby-9999
+~kde-misc/konq-plugins-9999
+~kde-misc/krusader-9999
+~kde-misc/menubar-9999
+~kde-misc/networkmanager-applet-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/kmplayer-9999
+~media-video/kplayer-9999
+~media-video/subtitlecomposer-9999
+~net-ftp/kftpgrabber-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/kdebluetooth4-9999
+~sys-auth/policykit-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/bomber:live
 kde-base/bovo:live
 kde-base/kapman:live