commit: 4bc452376e91877a3a40a587faf1a828b686de1e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 09:56:29 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 09:57:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc45237
kde-base/powerdevil -> kde-plasma/powerdevil
kde-base/kdebase-startkde/kdebase-startkde-4.11.22-r2.ebuild | 2 +-
kde-base/powerdevil/Manifest | 1 -
kde-base/powerdevil/metadata.xml | 11 -----------
kde-plasma/powerdevil/Manifest | 1 +
kde-plasma/powerdevil/metadata.xml | 1 +
{kde-base => kde-plasma}/powerdevil/powerdevil-4.11.22.ebuild | 2 +-
kde-plasma/powerdevil/powerdevil-5.7.5.ebuild | 2 +-
kde-plasma/powerdevil/powerdevil-5.8.3.ebuild | 2 +-
profiles/default/bsd/package.use.mask | 2 +-
profiles/updates/4Q-2016 | 1 +
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 de53485..378f1d1 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 db5163f..00000000
--- 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 3441912..00000000
--- 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>[email protected]</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 c1a64b8..d0ca8f3 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 19e9234..df43789 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
similarity index 94%
rename from kde-base/powerdevil/powerdevil-4.11.22.ebuild
rename to kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
index c8a8e10..a01d55b 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 75b57f7..74db8e0 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 d814adc..657ea92 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 21ae755..537a699 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 <[email protected]> (09 Nov 2012)
# pm-utils is Linux-specific
-kde-base/powerdevil pm-utils
+kde-plasma/powerdevil pm-utils
# Diego Elio Pettenò <[email protected]> (16 Jul 2012)
# Allow using iconv in blender
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 0c672e1..c74def6 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
