add kwalletd phonon-kde ; fix kde-base/powerdevil deps

12 files changed, 60 insertions, 9 deletions

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index dbd29a7e090..c6b9683cc41 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -146,7 +146,9 @@ kde-base/kdebase kde-base/libplasma
 kde-base/kdebase kde-base/libtaskmanager
 kde-base/kdebase kde-base/nepomuk
 kde-base/kdebase kde-base/nsplugins
+kde-base/kdebase kde-base/powerdevil
 kde-base/kdebase kde-base/phonon
+kde-base/kdebase kde-base/phonon-kde
 kde-base/kdebase kde-base/phonon-xine
 kde-base/kdebase kde-base/plasma
 kde-base/kdebase kde-base/plasma-apps
@@ -156,6 +158,7 @@ kde-base/kdebase kde-base/solid
 kde-base/kdebase kde-base/solid-hardware
 kde-base/kdebase kde-base/soliduiserver
 kde-base/kdebase kde-base/systemsettings
+kde-base/kdebase kde-base/kwalletd
 kde-base/kdebindings kde-base/kalyptus
 kde-base/kdebindings kde-base/kdejava
 kde-base/kdebindings kde-base/kimono
diff --git a/kde-base/kwalletd/Manifest b/kde-base/kwalletd/Manifest
new file mode 100644
index 00000000000..1bbe649271c
--- /dev/null
+++ b/kde-base/kwalletd/Manifest
@@ -0,0 +1,4 @@
+DIST kdebase-runtime-4.1.67.tar.bz2 58306347 RMD160 45bc0627b40f8b1d1c38ddeb8a8065dd18ba998f SHA1 c64e0d1cb2a273b38ce4966e2eec9ac605ff3c5d SHA256 63d0df28b70530f0bccf72e9f61a651b72673ff98ca02154665022385c8e80a5
+EBUILD kwalletd-4.1.67.ebuild 243 RMD160 754eb3ada635a03ac7a6d6300266d7a84a993eff SHA1 62dc9e42bd579c8bac3b9e090aac2f9d6bd6afc6 SHA256 627e437114f51db510b149ae8c952a3876222867c2b6511ff3b11d849c412c48
+MISC ChangeLog 241 RMD160 31450045aaac7e7138b3b25aff6c594e0649bdcd SHA1 967db0c1f732166ada1620aa9d5c86e9757021e7 SHA256 8b413842f48361d342142b250563814dd996cfad119b945427a8ff4b674bcaa8
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kwalletd/kwalletd-4.1.67.ebuild b/kde-base/kwalletd/kwalletd-4.1.67.ebuild
index 7309d8e0330..31a73a380e3 100644
--- a/kde-base/kwalletd/kwalletd-4.1.67.ebuild
+++ b/kde-base/kwalletd/kwalletd-4.1.67.ebuild
@@ -7,6 +7,6 @@ EAPI="2"
 KMNAME=kdebase-runtime
 inherit kde4-meta
 
-DESCRIPTION="KDE Menu query tool."
+DESCRIPTION="KDE Password Server"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
new file mode 100644
index 00000000000..1859fd7b94f
--- /dev/null
+++ b/kde-base/phonon-kde/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for kde-base/phonon-kde
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*phonon-kde-4.1.67 (27 Sep 2008)
+
+  27 Sep 2008; <alexxy@gentoo.org> +metadata.xml, +phonon-kde-4.1.67.ebuild:
+  version bump
+
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
new file mode 100644
index 00000000000..a7e940add76
--- /dev/null
+++ b/kde-base/phonon-kde/Manifest
@@ -0,0 +1,4 @@
+DIST kdebase-runtime-4.1.67.tar.bz2 58306347 RMD160 45bc0627b40f8b1d1c38ddeb8a8065dd18ba998f SHA1 c64e0d1cb2a273b38ce4966e2eec9ac605ff3c5d SHA256 63d0df28b70530f0bccf72e9f61a651b72673ff98ca02154665022385c8e80a5
+EBUILD phonon-kde-4.1.67.ebuild 507 RMD160 d0d046be031f747a984ea5b37bca968475d74bce SHA1 5d1662e64190bd136ffc5146b700624f0a7a24e6 SHA256 c330277201712f88dd8d610ad05ab9bb418aa015522fc9723348e382fcad2089
+MISC ChangeLog 247 RMD160 e8b23caab595848636cbc6789663ab40f51a0b67 SHA1 da957489516dba2421e4aebda09791f8dd373b10 SHA256 fba2215d54efa0437b789a5bf36b39cfa292935ed4d3569b6d7c56eb42e6f54f
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/phonon-kde/metadata.xml b/kde-base/phonon-kde/metadata.xml
new file mode 100644
index 00000000000..8d1e86a9cef
--- /dev/null
+++ b/kde-base/phonon-kde/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/kde-base/phonon-kde/phonon-kde-4.1.67.ebuild b/kde-base/phonon-kde/phonon-kde-4.1.67.ebuild
new file mode 100644
index 00000000000..2e29142a416
--- /dev/null
+++ b/kde-base/phonon-kde/phonon-kde-4.1.67.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+KMNAME=kdebase-runtime
+KMMODULE=phonon
+inherit kde4-base
+
+DESCRIPTION="Phonon KDE integration"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="!kde-base/phonon:${SLOT}
+        !kde-base/phonon-xine:${SLOT}
+        >=media-sound/phonon-4.3"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with xcb XCB)"
+		kde4-meta_src_compile
+}
+
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index 26431bd4429..6de5fd69a6d 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,4 +1,4 @@
 DIST kdebase-workspace-4.1.67.tar.bz2 48344468 RMD160 20b1b3c1ff336b9ab5bfb4d96c3744bdd06675fa SHA1 eed4b30575289289c095ac817aa6c61152865306 SHA256 2cadd7ddc8d7b5ffbeceeafcc918ac5531c6a30e2d617814b7a1a6ca4d448672
-EBUILD powerdevil-4.1.67.ebuild 434 RMD160 7678a9012bb40f22a5792b12adc044be9d3de3ef SHA1 62509401b30c163cded2ab4a62594dc83eabf202 SHA256 c19daf52614d2452a62838dab1dd0bf1ec694363f3faf47781ee46f758ad840a
+EBUILD powerdevil-4.1.67.ebuild 452 RMD160 a3d474ed01210f08b94f5895b83c572fd63bf591 SHA1 c4c1e13c28f625adfb9a93d7d67819f40571c08c SHA256 28f94e726162999623b0ba77e836a390e4317649914691c705adefc44d2c1bd1
 MISC ChangeLog 247 RMD160 510776d8fe926cf986b417ee3a539a6d493a317a SHA1 d86c1e4148844eeb861874b25837914a5328392e SHA256 d9ff17430f2c1d2d0cb9d66e629e7dbf9b0ebafc3f62c3324ea01c1121eb56c6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/powerdevil/powerdevil-4.1.67.ebuild b/kde-base/powerdevil/powerdevil-4.1.67.ebuild
index 89deb0e4bac..8d4b4a795c9 100644
--- a/kde-base/powerdevil/powerdevil-4.1.67.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.1.67.ebuild
@@ -14,9 +14,9 @@ LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="!kde-misc/powerdevil
-	de-base/systemsettings:${SLOT}
-	kde-base/kscreensaver:${SLOT}"
+DEPEND="kde-base/systemsettings:${SLOT}
+		kde-base/kscreensaver:${SLOT}
+		!kdeprefix ( !kde-misc/powerdevil )"
 RDEPEND="${DEPEND}"
 
 
diff --git a/kde-misc/powerdevil/Manifest b/kde-misc/powerdevil/Manifest
index c574a037df8..05baa1f81aa 100644
--- a/kde-misc/powerdevil/Manifest
+++ b/kde-misc/powerdevil/Manifest
@@ -1,4 +1,4 @@
 DIST 85078-powerdevil-1.2.0-kde4.1.1.tar.bz2 38827 RMD160 7d98923f3ff2a907bf70e47d2bb083f5c701bc85 SHA1 58ab084cd7e489759c67b26913476127e08a4b68 SHA256 3551a89c8c8b09c69d116d13ffc8491b26ea91e49436e9be43c927c6645daf76
-EBUILD powerdevil-1.2.0.ebuild 785 RMD160 a4e64146d8060d2f34a1c33caf33bac0f709b88f SHA1 00f4fd78fea4076bfe2b248e8dc41f6e6c453b61 SHA256 bfe7024a3b7b40d5448f776702363886c8ad8d6d5b19eae6d285bc16bc899712
+EBUILD powerdevil-1.2.0.ebuild 764 RMD160 8cd8dfce334343137c06ea83550b1a2bd0bea2de SHA1 36ffa6d4308712efe4aabc71e38e42676e8c9bd6 SHA256 befdcbd65dc2147cdace4a8ab8340e039ccbdc92d87d904ca13bce14a482f1e6
 MISC ChangeLog 650 RMD160 c3baed49365273cee0fd9593b2a5aee649e7bd63 SHA1 ab130e72bd7c55928cd461944b1557b734bc7466 SHA256 c4b5b22797e3afa1b50d1af6b94fec4e6b19d7db03fd41bb8e13e70188ac47b1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/powerdevil/powerdevil-1.2.0.ebuild b/kde-misc/powerdevil/powerdevil-1.2.0.ebuild
index 1d886fac86d..640de90e7fb 100644
--- a/kde-misc/powerdevil/powerdevil-1.2.0.ebuild
+++ b/kde-misc/powerdevil/powerdevil-1.2.0.ebuild
@@ -16,9 +16,8 @@ SLOT="4.1"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="!kde-base/powerdevil
-	kde-base/systemsettings:${SLOT}
-	kde-base/kscreensaver:${SLOT}"
+DEPEND="kde-base/systemsettings:${SLOT}
+		kde-base/kscreensaver:${SLOT}"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/"${P}"-kde4.1.1
diff --git a/sets/kdebase-4.2 b/sets/kdebase-4.2
index 88504455a09..a053ff0693e 100644
--- a/sets/kdebase-4.2
+++ b/sets/kdebase-4.2
@@ -58,6 +58,7 @@ kde-base/libplasma:4.2
 kde-base/libtaskmanager:4.2
 kde-base/nepomuk:4.2
 kde-base/nsplugins:4.2
+kde-base/phonon-kde:4.2
 kde-base/phonon-xine:4.2
 kde-base/plasma-apps:4.2
 kde-base/plasma-workspace:4.2