kde-base/powerdevil -> kde-plasma/powerdevil

10 files changed, 8 insertions, 17 deletions

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
index de534854dfdc..378f1d1bacb5 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild
@@ -89,9 +89,9 @@ RDEPEND="
 		$(add_kdebase_dep libplasmaclock)
 		$(add_kdebase_dep libplasmagenericshell)
 		$(add_kdebase_dep libtaskmanager)
-		$(add_kdebase_dep powerdevil)
 		$(add_kdebase_dep qguiplatformplugin_kde)
 		$(add_kdebase_dep solid-actions-kcm)
+		kde-plasma/powerdevil:4
 	)
 	wallpapers? ( kde-plasma/plasma-workspace-wallpapers:5 )
 "
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
deleted file mode 100644
index db5163f83985..000000000000
--- a/kde-base/powerdevil/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml
deleted file mode 100644
index 3441912f9f8c..000000000000
--- a/kde-base/powerdevil/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>kde@gentoo.org</email>
-  <name>Gentoo KDE Project</name>
-</maintainer>
-<use>
-  <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index c1a64b83039f..d0ca8f3e6c45 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,3 @@
+DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
 DIST powerdevil-5.7.5.tar.xz 359656 SHA256 53f90edf793bb055e397d1860930a653a7cc519635c9a775ef97b1d7b18f2ec9 SHA512 f9261c8758f6f44ae4232f7182a3cf4afac17b672700d6ec8f277bf20306ab4f739a790c7738e5e30afdb8c4c7cf1db1b7c3327a547f12ef4dbc5f07879c7102 WHIRLPOOL a4e64f01a19c6053ca9b521f690d89c3c01c5a350d92510d8fec8162bfa2be2f72af9c838338af1787daefaf923b14255f34b37b78b87209be047a718da63476
 DIST powerdevil-5.8.3.tar.xz 356356 SHA256 415f345af1efb94ea9d64942e149aa7686e769ebeec74f2fbd6c30b27ed7a9c6 SHA512 a250d7f93d268b4edd1b82fd28412dd7eb427485c805d319fc3806780a776112d576f3a6958c8826008889f13c6ba9e7d203512ee009046aa084e7024b4f7828 WHIRLPOOL 72ea1fbeac08df5c5ae9d30c5e85443fdb456b8b15227deee0b221825af6b37e1e7c29581c1d8684d2682aa929e97e5646644e001a7511dfab048f10c60b13c4
diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml
index 19e92345623a..df4378973cda 100644
--- a/kde-plasma/powerdevil/metadata.xml
+++ b/kde-plasma/powerdevil/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
 		<flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-base/powerdevil/powerdevil-4.11.22.ebuild b/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
index c8a8e103e5fa..a01d55bb3fb5 100644
--- a/kde-base/powerdevil/powerdevil-4.11.22.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild
index 75b57f78214c..74db8e0c5983 100644
--- a/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.7.5.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
 			sys-power/upower-pm-utils
 		)
 	)
-	!kde-base/powerdevil:4
+	!kde-plasma/powerdevil:4
 	!kde-base/systemsettings:4[handbook]
 "
 
diff --git a/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
index d814adc50157..657ea9287c0d 100644
--- a/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.8.3.ebuild
@@ -62,7 +62,7 @@ RDEPEND="${DEPEND}
 			sys-power/upower-pm-utils
 		)
 	)
-	!kde-base/powerdevil:4
+	!kde-plasma/powerdevil:4
 	!kde-base/systemsettings:4[handbook]
 "
 
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 21ae755f84e9..537a699bc3f1 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -20,7 +20,7 @@ net-analyzer/tcpdump drop-root
 
 # Richard Yao <ryao@gentoo.org> (09 Nov 2012)
 # pm-utils is Linux-specific
-kde-base/powerdevil pm-utils
+kde-plasma/powerdevil pm-utils
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (16 Jul 2012)
 # Allow using iconv in blender
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 0c672e144bb6..c74def6dd13c 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -9,3 +9,4 @@ move net-wireless/bluedevil kde-plasma/bluedevil
 move kde-base/kdeplasma-addons kde-plasma/kdeplasma-addons
 move kde-misc/milou kde-plasma/milou
 move kde-misc/kde-gtk-config kde-plasma/kde-gtk-config
+move kde-base/powerdevil kde-plasma/powerdevil