7 files changed, 35 insertions, 32 deletions
diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index c5222dc3bba..b27e549aae3 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (06 Apr 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (07 Apr 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.unmask/kde-live b/Documentation/package.unmask/kde-live
index 91dac863657..11bccd83eec 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (06 Apr 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (07 Apr 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -11,10 +11,10 @@ kde-base/kttsd:live
 kde-base/kate:live
 kde-base/kdeplasma-addons:live
 kde-base/kde-l10n:live
-kde-base/kuser:live
 kde-base/kcron:live
-kde-base/ksystemlog: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
@@ -296,17 +296,17 @@ kde-base/kgpg:live
 kde-base/ktimer:live
 kde-base/kwallet:live
 kde-base/okteta:live
-# kde-base/printer-applet:live #masked
+kde-base/printer-applet:live
 kde-base/superkaramba:live
 kde-base/sweeper:live
-app-office/kword:live
-app-office/kplato:live
-app-office/kpresenter: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
+=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-plasmoids/kepas-9999
 =kde-plasmoids/menubar-9999
diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index d76a57c447d..0892c9c90d9 100644
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -2,7 +2,7 @@ AUX solid-4.2.0-backport-solid-bluetooth.patch 42383 RMD160 1aa238d89288ecc7f9bf
 DIST kdebase-workspace-4.2.2.tar.bz2 50800751 RMD160 a7cc0bedde529ff7e27ed9e0b6362ef6c20c4082 SHA1 9397220827f378cedf38e800e06e9ca8b1a1235d SHA256 1620cf0467eb08046aeee6bce46ca17948a703e98c0e3d0de3064ab39f196c2f
 DIST kdebase-workspace-4.2.69.tar.lzma 50199185 RMD160 9830f5caecac82953815ea148ff57bc357dbad69 SHA1 2b6916f811e591f8a301480e04d2b9927c1de8b7 SHA256 92a29d31a2271bc7fde21bbf078ce5254bee9c2592dd78c055da633512a49c73
 DIST solid-4.2.0-backport-solid-bluetooth.patch.tar.bz2 6456 RMD160 34d2606be25950c96755fd7019c97f57fe3fa87c SHA1 90cc2b19c34bfa49406e6d71bd4915492f79ea83 SHA256 84008e1367fbf149fd1b32005caab936260e933acefa11498996e9527421df69
-EBUILD solid-4.2.2.ebuild 1082 RMD160 f453c6ddef238c58953a2e4db2061b780ed9cdf6 SHA1 c86cd9c8af8606bc1f1a02aa3dac04fb4533ec5f SHA256 b7bcc7d6b4650987fb48af4e346acacb3e0675c67af95458a34f58bbc914515b
+EBUILD solid-4.2.2.ebuild 1247 RMD160 7855e4fe2e9d41df493f9825f4fa99e01b81fbb4 SHA1 726347787c84bbf782431dd91edead008f5c57c9 SHA256 ee62a39a5c6b501cbd8956ce8da020792308ea3a7c35ec2d8b86acb235f5ba16
 EBUILD solid-4.2.69.ebuild 971 RMD160 150c283a9269561c6494bd1137ca1b338b4cb457 SHA1 b3cfdb73362ed734025b47f9b5e782d6b0d0410c SHA256 4373e0331f2e276e979bbed77d1e21b2180dafaa6fbc8b9a60b1f7655b4a4dda
 EBUILD solid-9999.ebuild 960 RMD160 352c7b035e3e72a02d8a38512752a24aae24dd9a SHA1 8554031d2534d45e9e81c89c41be74a908642e59 SHA256 f7e36cb5a104395162678f4b1968a7d61b52638190e85b9f8bc25b5edbce52cf
 MISC ChangeLog 5915 RMD160 a501744576e182fbfc357b9d465a51c4099ab0f1 SHA1 ed72493dde0f585c8a9d3f60d5c25830cf93dd43 SHA256 8c87e557131963f5a3501f1cb75660ac0a19b9ee18008d05a2813c8e3480a1ec
diff --git a/kde-base/solid/solid-4.2.2.ebuild b/kde-base/solid/solid-4.2.2.ebuild
index 4b3fbd55b47..36da27a4228 100644
--- a/kde-base/solid/solid-4.2.2.ebuild
+++ b/kde-base/solid/solid-4.2.2.ebuild
@@ -14,6 +14,9 @@ DESCRIPTION="Solid: the KDE hardware library"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bluetooth debug networkmanager"
 
+# solid/CMakeLists.txt has an add_subdirectory statement that depends on
+# networkmanager-0.7, referring to a non-existant directory, restricted to =0.6*
+# for now.
 DEPEND="
 	>=sys-apps/hal-0.5.9
 	bluetooth? ( net-wireless/bluez )
diff --git a/profiles/package.mask b/profiles/package.mask
index 6a24b5cd93c..0a66e1f0e31 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (06 Apr 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (07 Apr 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -251,7 +251,7 @@ kde-base/systemsettings:4.3
 kde-base/umbrello:4.3
 ~x11-themes/oxygen-icons-4.2.67
 
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (06 Apr 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (07 Apr 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -264,10 +264,10 @@ kde-base/kttsd:live
 kde-base/kate:live
 kde-base/kdeplasma-addons:live
 kde-base/kde-l10n:live
-kde-base/kuser:live
 kde-base/kcron:live
-kde-base/ksystemlog: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
@@ -549,18 +549,18 @@ kde-base/kgpg:live
 kde-base/ktimer:live
 kde-base/kwallet:live
 kde-base/okteta:live
-# kde-base/printer-applet:live #masked
+kde-base/printer-applet:live
 kde-base/superkaramba:live
 kde-base/sweeper:live
-app-office/kword:live
-app-office/kplato:live
-app-office/kpresenter: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
+=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-plasmoids/kepas-9999
 =kde-plasmoids/menubar-9999
 
diff --git a/sets/kdeadmin-live b/sets/kdeadmin-live
index 1fa70abf64a..5f21d8c468d 100644
--- a/sets/kdeadmin-live
+++ b/sets/kdeadmin-live
@@ -1,5 +1,5 @@
-kde-base/kuser:live
 kde-base/kcron:live
-kde-base/ksystemlog:live
 kde-base/knetworkconf:live
+kde-base/ksystemlog:live
+kde-base/kuser:live
 kde-base/system-config-printer-kde:live
diff --git a/sets/kdeutils-live b/sets/kdeutils-live
index 1e16a33ec08..e0650d4af36 100644
--- a/sets/kdeutils-live
+++ b/sets/kdeutils-live
@@ -7,6 +7,6 @@ kde-base/kgpg:live
 kde-base/ktimer:live
 kde-base/kwallet:live
 kde-base/okteta:live
-# kde-base/printer-applet:live #masked
+kde-base/printer-applet:live
 kde-base/superkaramba:live
 kde-base/sweeper:live