[gentoo-commits] proj/kde:master commit in: profiles/package.mask/, kde-base/powerdevil/, sets/, kde-misc/powerdevil/

[Michael Palimaka]

commit:     eec91d75de87196c08a34f607c71be18bed040c9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri May 23 08:46:32 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri May 23 08:46:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eec91d75

[kde-misc/powedevil] Move to kde-base.

Upstream moved the proect from extragear to workspace.

---
 kde-base/powerdevil/metadata.xml                           |  8 ++++----
 {kde-misc => kde-base}/powerdevil/powerdevil-4.96.0.ebuild | 10 ++--------
 {kde-misc => kde-base}/powerdevil/powerdevil-9999.ebuild   |  9 ++-------
 kde-misc/powerdevil/metadata.xml                           |  5 -----
 profiles/package.mask/kde5-extra                           |  1 -
 profiles/package.mask/plasma-next                          |  1 +
 sets/kde-applications                                      |  1 -
 sets/kde-applications-5.0                                  |  1 -
 sets/kde-applications-live                                 |  1 -
 sets/kde-workspaces                                        |  1 +
 sets/kde-workspaces-5.0                                    |  1 +
 sets/kde-workspaces-live                                   |  1 +
 12 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml
index 94ce7b0..4116ba0 100644
--- a/kde-base/powerdevil/metadata.xml
+++ b/kde-base/powerdevil/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-  <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
-</use>
+	<herd>kde</herd>
+	<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-misc/powerdevil/powerdevil-4.96.0.ebuild b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
similarity index 61%
rename from kde-misc/powerdevil/powerdevil-4.96.0.ebuild
rename to kde-base/powerdevil/powerdevil-4.96.0.ebuild
index 335ce6c..33bb718 100644
--- a/kde-misc/powerdevil/powerdevil-4.96.0.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
@@ -4,19 +4,13 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_BRANCH="frameworks"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
 inherit kde5
 
 DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/powerdevil"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
 
 LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="

diff --git a/kde-misc/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
similarity index 64%
rename from kde-misc/powerdevil/powerdevil-9999.ebuild
rename to kde-base/powerdevil/powerdevil-9999.ebuild
index 0635390..9fcdef6 100644
--- a/kde-misc/powerdevil/powerdevil-9999.ebuild
+++ b/kde-base/powerdevil/powerdevil-9999.ebuild
@@ -4,18 +4,13 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/unstable/plasma/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
 inherit kde5
 
 DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
-HOMEPAGE="https://projects.kde.org/projects/extragear/base/powerdevil"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
 
 LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="

diff --git a/kde-misc/powerdevil/metadata.xml b/kde-misc/powerdevil/metadata.xml
deleted file mode 100644
index a23f444..0000000
--- a/kde-misc/powerdevil/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/profiles/package.mask/kde5-extra b/profiles/package.mask/kde5-extra
index a311fe6..b9e807b 100644
--- a/profiles/package.mask/kde5-extra
+++ b/profiles/package.mask/kde5-extra
@@ -1,4 +1,3 @@
 # Michael Palimaka <kensington@g.o> (18 May 2014)
 # Cross-overlay dependencies.
-~kde-misc/powerdevil-4.96.0
 ~x11-libs/libkscreen2-1.71

diff --git a/profiles/package.mask/plasma-next b/profiles/package.mask/plasma-next
index 31d5ebb..52cdb72 100644
--- a/profiles/package.mask/plasma-next
+++ b/profiles/package.mask/plasma-next
@@ -18,4 +18,5 @@
 ~kde-base/oxygen-4.96.0
 ~kde-base/plasma-desktop-4.96.0
 ~kde-base/plasma-workspace-4.96.0
+~kde-base/powerdevil-4.96.0
 ~kde-base/systemsettings-4.96.0

diff --git a/sets/kde-applications b/sets/kde-applications
index afff2a3..faf6ee9 100644
--- a/sets/kde-applications
+++ b/sets/kde-applications
@@ -1,4 +1,3 @@
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # sort them later to the appropriate sets
-kde-misc/powerdevil-5.0.50
 x11-libs/libkscreen2

diff --git a/sets/kde-applications-5.0 b/sets/kde-applications-5.0
index a81bc51..f87a5bf 100644
--- a/sets/kde-applications-5.0
+++ b/sets/kde-applications-5.0
@@ -1,3 +1,2 @@
 # sort them later to the appropriate sets
-<kde-misc/powerdevil-5.0.50
 x11-libs/libkscreen2

diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index ecd48c6..da1143a 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -1,7 +1,6 @@
 # sort them later to the appropriate sets
 ~kde-base/konsole-9999
 ~kde-misc/plasma-nm-9999
-~kde-misc/powerdevil-9999
 ~net-libs/libmm-qt-9999
 ~net-libs/libnm-qt-9999
 ~x11-libs/libkscreen2-9999

diff --git a/sets/kde-workspaces b/sets/kde-workspaces
index eb2ec39..0d8b885 100644
--- a/sets/kde-workspaces
+++ b/sets/kde-workspaces
@@ -15,4 +15,5 @@ kde-base/milou-5.0.50
 kde-base/oxygen-5.0.50
 kde-base/plasma-desktop-5.0.50
 kde-base/plasma-workspace-5.0.50
+kde-base/powerdevil-5.0.50
 kde-base/systemsettings-5.0.50

diff --git a/sets/kde-workspaces-5.0 b/sets/kde-workspaces-5.0
index fd2c455..2029d2c 100644
--- a/sets/kde-workspaces-5.0
+++ b/sets/kde-workspaces-5.0
@@ -14,4 +14,5 @@
 <kde-base/oxygen-5.0.50
 <kde-base/plasma-desktop-5.0.50
 <kde-base/plasma-workspace-5.0.50
+<kde-base/powerdevil-5.0.50
 <kde-base/systemsettings-5.0.50

diff --git a/sets/kde-workspaces-live b/sets/kde-workspaces-live
index 2415898..842e277 100644
--- a/sets/kde-workspaces-live
+++ b/sets/kde-workspaces-live
@@ -14,4 +14,5 @@
 ~kde-base/oxygen-9999
 ~kde-base/plasma-desktop-9999
 ~kde-base/plasma-workspace-9999
+~kde-base/powerdevil-9999
 ~kde-base/systemsettings-9999