kdedglobalaccel -> kglobalaccel (no releae in the middle so we can safely refactor for now)

Documentation files updated accordingly

14 files changed, 32 insertions, 15 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index ee9732e21a9..a784c08f1f9 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> (14 Feb 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (16 Feb 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.3.keywords b/Documentation/package.keywords/kde-4.3.keywords
index 644cfa962e0..ecec886aad4 100644
--- a/Documentation/package.keywords/kde-4.3.keywords
+++ b/Documentation/package.keywords/kde-4.3.keywords
@@ -62,7 +62,7 @@ kde-base/kdebase-desktoptheme:4.3
 kde-base/kdebase-kioslaves:4.3
 kde-base/kdebase-startkde:4.3
 kde-base/kdebugdialog:4.3
-kde-base/kdedglobalaccel:4.3
+kde-base/kglobalaccel:4.3
 kde-base/kdegraphics-strigi-analyzer:4.3
 kde-base/kde-l10n:4.3
 kde-base/kdelibs:4.3
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index d36613c2948..da2ddebe0ba 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -81,7 +81,7 @@
 ~kde-base/kdebase-kioslaves-9999 **
 ~kde-base/kdebase-startkde-9999 **
 ~kde-base/kdebugdialog-9999 **
-~kde-base/kdedglobalaccel-9999 **
+~kde-base/kglobalaccel-9999 **
 ~kde-base/kdegraphics-strigi-analyzer-9999 **
 ~kde-base/kde-l10n-9999 **
 ~kde-base/kdelibs-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 5ab6c700691..fbf92ad1aa9 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (14 Feb 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (16 Feb 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -41,7 +41,7 @@ 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/kglobalaccel:live
 kde-base/kdepasswd:live
 kde-base/kdesu:live
 kde-base/kdialog:live
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index 36aedfd6de8..9d3dcd949a0 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,6 +1,6 @@
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde4.patch 2183 RMD160 2a60c1ca52d5a578bbe610b1912c76a37895da64 SHA1 bd78a9d592992adff4b0abbc4203a99375a617d8 SHA256 a1a7365b3d8b0a0438e8eca2d630ad037a89176fe8ee3e8d8b460efb9afc2bd5
-EBUILD kdebase-startkde-9999.ebuild 4105 RMD160 e1ba1f8c175aa11ca5900f1f1294e8277568794b SHA1 d74b61a9728e08e4bc10847016c3bdc41e0ddb3f SHA256 1c57122b2b669f53740c09b2a862a5ea25e9424046c7590b67ea6fb0580ca180
+EBUILD kdebase-startkde-9999.ebuild 4102 RMD160 77030fcbee0f52c93eb63d63569ee24e2074f995 SHA1 5e91f17ae019ed8b5a9b778a3654bc545c21b82b SHA256 28e8ac090890cd4e409874423b03c2835189e2a3e045367a9fc0cf228f218c85
 MISC ChangeLog 5612 RMD160 ae1ceb040e68a7f7d72cb44d8aa732f5cdd4f352 SHA1 60b3867c974da6d8ed29322cf304cda3bde8a0b5 SHA256 a8fea2706f4c8c63320c677d4b34140ef0e08837b54c5fbe6c6fc207fb94b87a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 1cd074e3cd1..527ff2d422d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="
 	>=kde-base/kcminit-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kdedglobalaccel-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kglobalaccel-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kde-wallpapers-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/knotify-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kreadconfig-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdedglobalaccel/Manifest b/kde-base/kdedglobalaccel/Manifest
deleted file mode 100644
index 1d734ef1566..00000000000
--- a/kde-base/kdedglobalaccel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD kdedglobalaccel-9999.ebuild 256 RMD160 64a04275ab784d6c5c1ec1b00e8cb470eb985a39 SHA1 82ac11fd6c0ec14041da197b34f74aba3064e6eb SHA256 f75a5e8e96d7c3c2d21b646ebbb21d765f20350a853f90d7157f19934467968f
-MISC ChangeLog 2758 RMD160 c8e162fa6e38b23735712c8d760df55bb154a126 SHA1 b65dd234c4fc0e068295cb5f2e5c91f16b384ad1 SHA256 c913cbdda8fcf85b32916fb3b7784a3f61e8f95ee0c9a909e406399c81c481d2
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdedglobalaccel/ChangeLog b/kde-base/kglobalaccel/ChangeLog
index 27f0493ae4e..3781b1280e8 100644
--- a/kde-base/kdedglobalaccel/ChangeLog
+++ b/kde-base/kglobalaccel/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kglobalaccel-9999 (16 Feb 2009)
+
+  16 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +metadata.xml, +kglobalaccel-9999.ebuild:
+  Stupid cmake script is trying to uninstall previous files causing
+  sandbox violations - better to rename module than disable it for me
+
+  16 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  kdedglobalaccel-9999.ebuild:
+  Module renamed to kglobalaccel - what about ebuild? Rename as well?
+
   13 Feb 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
   -kdedglobalaccel-4.2.61.ebuild:
   Version removed.
diff --git a/kde-base/kglobalaccel/Manifest b/kde-base/kglobalaccel/Manifest
new file mode 100644
index 00000000000..537ec948f0a
--- /dev/null
+++ b/kde-base/kglobalaccel/Manifest
@@ -0,0 +1,3 @@
+EBUILD kglobalaccel-9999.ebuild 388 RMD160 409dcea042f23740b7cd56e7ced3e69d9897e0c3 SHA1 581efa4319923807aa012d45c1b442d2bd3f2252 SHA256 f1de2aaf097370f1139c854181951365f1a6932dbad6eca871f978eca9db9ffb
+MISC ChangeLog 3205 RMD160 2cce4b3a0bb7002cffeba9bc78c8898a8c3bc91e SHA1 ff616ded150bd85cec4249fbc810778e6ff756fa SHA256 0671d06d6e90ff50b7cfdc31c51b45a8e896de39b722a531f4c1be846fafb7f7
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdedglobalaccel/kdedglobalaccel-9999.ebuild b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
index f820595edc7..1ab47801e13 100644
--- a/kde-base/kdedglobalaccel/kdedglobalaccel-9999.ebuild
+++ b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild
@@ -10,3 +10,9 @@ inherit kde4-meta
 DESCRIPTION="KDE's Global Shortcut Daemon"
 KEYWORDS=""
 IUSE="debug htmlhandbook"
+
+# Module renamed upstream
+RDEPEND="
+	!kdeprefix? ( !kde-base/kdedglobalaccel )
+	kdeprefix? ( !kde-base/kdedglobalaccel:${SLOT} )
+"
diff --git a/kde-base/kdedglobalaccel/metadata.xml b/kde-base/kglobalaccel/metadata.xml
index 8d1e86a9cef..8d1e86a9cef 100644
--- a/kde-base/kdedglobalaccel/metadata.xml
+++ b/kde-base/kglobalaccel/metadata.xml
diff --git a/profiles/package.mask b/profiles/package.mask
index 59cd20e72a1..270de273413 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (14 Feb 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (16 Feb 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -265,7 +265,7 @@
 ~kde-base/systemsettings-4.2.61
 ~kde-base/umbrello-4.2.61
 
-# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (14 Feb 2009)
+# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (16 Feb 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -308,7 +308,7 @@ 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/kglobalaccel:live
 kde-base/kdepasswd:live
 kde-base/kdesu:live
 kde-base/kdialog:live
diff --git a/sets/kdebase-4.3 b/sets/kdebase-4.3
index 5e314c0a6ff..35634b16d79 100644
--- a/sets/kdebase-4.3
+++ b/sets/kdebase-4.3
@@ -14,7 +14,7 @@ kde-base/kdebase-desktoptheme:4.3
 kde-base/kdebase-kioslaves:4.3
 kde-base/kdebase-startkde:4.3
 kde-base/kdebugdialog:4.3
-kde-base/kdedglobalaccel:4.3
+kde-base/kglobalaccel:4.3
 kde-base/kdepasswd:4.3
 kde-base/kdesu:4.3
 kde-base/kdialog:4.3
diff --git a/sets/kdebase-live b/sets/kdebase-live
index 7e87ec230e9..1cabd90563d 100644
--- a/sets/kdebase-live
+++ b/sets/kdebase-live
@@ -14,7 +14,7 @@ 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/kglobalaccel:live
 kde-base/kdepasswd:live
 kde-base/kdesu:live
 kde-base/kdialog:live