Update polkit deps

12 files changed, 58 insertions, 10 deletions

diff --git a/Documentation/package.keywords/.kde-live/kdedeps-live b/Documentation/package.keywords/.kde-live/kdedeps-live
index 55fbe510f00..ddb67ef85c2 100644
--- a/Documentation/package.keywords/.kde-live/kdedeps-live
+++ b/Documentation/package.keywords/.kde-live/kdedeps-live
@@ -6,7 +6,8 @@
 ~app-misc/strigi-9999 **
 ~media-sound/phonon-9999 **
 ~sys-auth/polkit-qt-9999 **
-~sys-auth/polkit-kde-9999 **
+~sys-auth/polkit-kde-agent-9999 **
+~kde-misc/polkit-kde-kcmodules-9999 **
 
 # For kde-base/granatier - removed due to use.mask
 #~media-libs/gluon-9999
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 0043bbdd5e7..07801ea6c47 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -124,7 +124,8 @@
 ~app-misc/strigi-9999 **
 ~media-sound/phonon-9999 **
 ~sys-auth/polkit-qt-9999 **
-~sys-auth/polkit-kde-9999 **
+~sys-auth/polkit-kde-agent-9999 **
+~kde-misc/polkit-kde-kcmodules-9999 **
 
 # For kde-base/granatier - removed due to use.mask
 #~media-libs/gluon-9999
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index b096e8dc074..e89865deecf 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -124,7 +124,8 @@ kde-base/smoke:live
 ~app-misc/strigi-9999
 ~media-sound/phonon-9999
 ~sys-auth/polkit-qt-9999
-~sys-auth/polkit-kde-9999
+~sys-auth/polkit-kde-agent-9999
+~kde-misc/polkit-kde-kcmodules-9999
 
 # For kde-base/granatier - removed due to use.mask
 #~media-libs/gluon-9999
diff --git a/kde-misc/polkit-kde-kcmodules/Manifest b/kde-misc/polkit-kde-kcmodules/Manifest
new file mode 100644
index 00000000000..27e92cec3dc
--- /dev/null
+++ b/kde-misc/polkit-kde-kcmodules/Manifest
@@ -0,0 +1,2 @@
+EBUILD polkit-kde-kcmodules-9999.ebuild 749 RMD160 68afff2db9e86f0e2ff72299b24f2c6319cef1d1 SHA1 929483ea59e2465bb1418d6f719476d9a2d5f16a SHA256 34190438b6c90425bf6cdcd63c391d011c7579cce13a0c86a85389c634ec3271
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/sys-auth/polkit-kde/metadata.xml b/kde-misc/polkit-kde-kcmodules/metadata.xml
index 8d1e86a9cef..8d1e86a9cef 100644
--- a/sys-auth/polkit-kde/metadata.xml
+++ b/kde-misc/polkit-kde-kcmodules/metadata.xml
diff --git a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild
new file mode 100644
index 00000000000..eab717a3470
--- /dev/null
+++ b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git
+	EGIT_REPO_URI="git://anongit.kde.org/polkit-kde-kcmodules-1"
+	EGIT_PROJECT="polkit-kde-kcmodules-1"
+else
+	KDE_LINGUAS="da en_GB et gl lt nl pt pt_BR sk sv uk zh_TW"
+	MY_P="${P/kde/kde-1}"
+	SRC_URI="mirror://kde/stable/apps/KDE4.x/admin/${MY_P}.tar.bz2"
+fi
+inherit kde4-base
+
+DESCRIPTION="PolKit agent module for KDE."
+HOMEPAGE="http://www.kde.org"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+	>=sys-auth/polkit-kde-agent-0.98
+	>=sys-auth/polkit-qt-0.98
+"
+RDEPEND="${DEPEND}"
+
+[[ ${PV} = *9999* ]] || S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	git_src_unpack
+}
diff --git a/profiles/updates/4Q-2010 b/profiles/updates/4Q-2010
index 44a1d68f49c..81575ccaeeb 100644
--- a/profiles/updates/4Q-2010
+++ b/profiles/updates/4Q-2010
@@ -1 +1,2 @@
 slotmove ~aAApp-cdr/k9copy-9999 2 4
+pkgmove sys-auth/polkit-kde sys-auth/polkit-kde-agent
diff --git a/sets/kdedeps-live b/sets/kdedeps-live
index d6cff93a3ea..9ca22b46bf5 100644
--- a/sets/kdedeps-live
+++ b/sets/kdedeps-live
@@ -6,7 +6,8 @@
 ~app-misc/strigi-9999
 ~media-sound/phonon-9999
 ~sys-auth/polkit-qt-9999
-~sys-auth/polkit-kde-9999
+~sys-auth/polkit-kde-agent-9999
+~kde-misc/polkit-kde-kcmodules-9999
 
 # For kde-base/granatier - removed due to use.mask
 #~media-libs/gluon-9999
diff --git a/sys-auth/polkit-kde-agent/Manifest b/sys-auth/polkit-kde-agent/Manifest
new file mode 100644
index 00000000000..700d457b554
--- /dev/null
+++ b/sys-auth/polkit-kde-agent/Manifest
@@ -0,0 +1,2 @@
+EBUILD polkit-kde-agent-9999.ebuild 707 RMD160 aca28f776feb3358b47ad38985a600b72ac62ebe SHA1 c85f939d9a188ee98c0dea5c13661343821ae166 SHA256 498f2ab513428288d67d672cbbe513258d109cda02238371cf437cad8c6e490c
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/sys-auth/polkit-kde-agent/metadata.xml b/sys-auth/polkit-kde-agent/metadata.xml
new file mode 100644
index 00000000000..8d1e86a9cef
--- /dev/null
+++ b/sys-auth/polkit-kde-agent/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/sys-auth/polkit-kde/polkit-kde-9999.ebuild b/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
index eb1492944b2..d69b906099b 100644
--- a/sys-auth/polkit-kde/polkit-kde-9999.ebuild
+++ b/sys-auth/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -6,8 +6,8 @@ EAPI="2"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git
-	EGIT_REPO_URI="git://gitorious.org/policykit-kde/policykit-kde.git"
-	EGIT_PROJECT="policykit-kde"
+	EGIT_REPO_URI="git://anongit.kde.org/polkit-kde-agent-1"
+	EGIT_PROJECT="polkit-kde-agent-1"
 else
 	KDE_LINGUAS="da en_GB et gl lt nl pt pt_BR sk sv uk zh_TW"
 	MY_P="${P/kde/kde-1}"
@@ -15,8 +15,8 @@ else
 fi
 inherit kde4-base
 
-DESCRIPTION="PolicyKit integration module for KDE."
-HOMEPAGE="http://kde.org"
+DESCRIPTION="PolKit agent module for KDE."
+HOMEPAGE="http://www.kde.org"
 
 LICENSE="GPL-2"
 KEYWORDS=""
diff --git a/sys-auth/polkit-kde/Manifest b/sys-auth/polkit-kde/Manifest
deleted file mode 100644
index 6f7ec5fe217..00000000000
--- a/sys-auth/polkit-kde/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD polkit-kde-9999.ebuild 718 RMD160 d02b6714f7e80143fdb76c69a3c85f84e6e41e4d SHA1 858afe2e4cc1c81c54cb0a2d7aba4d10b906db56 SHA256 f4193f460e87bcf53bf187aad09ffb121575ba6d8c318cdf810e509c89d364a4
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a