Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/powerdevil/
Date: Mon, 26 May 2014 12:08:06
Message-Id: 1401106053.cab22e0a5afd34e630c855bcca432cc2233576a5.johu@gentoo
1 commit: cab22e0a5afd34e630c855bcca432cc2233576a5
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 26 12:07:33 2014 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Mon May 26 12:07:33 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cab22e0a
7
8 [kde-base/powerdevil:5] Re-work, bug #511496
9
10 Based on the user closed pull request https://github.com/gentoo/kde/pull/27.
11 Thanks to Elias Probst <mail <AT> eliasprobst.eu>.
12
13 Package-Manager: portage-2.2.10
14
15 ---
16 kde-base/powerdevil/metadata.xml | 1 +
17 kde-base/powerdevil/powerdevil-4.96.0.ebuild | 48 ++++++++++++++++++++++++----
18 kde-base/powerdevil/powerdevil-9999.ebuild | 48 ++++++++++++++++++++++++----
19 3 files changed, 83 insertions(+), 14 deletions(-)
20
21 diff --git a/kde-base/powerdevil/metadata.xml b/kde-base/powerdevil/metadata.xml
22 index 4116ba0..2a5cde4 100644
23 --- a/kde-base/powerdevil/metadata.xml
24 +++ b/kde-base/powerdevil/metadata.xml
25 @@ -4,5 +4,6 @@
26 <herd>kde</herd>
27 <use>
28 <flag name="pm-utils">Adds support for suspend/resume the system through <pkg>sys-power/pm-utils</pkg></flag>
29 + <flag name="upower">Adds support for the <pkg>sys-power/upower</pkg> backend</flag>
30 </use>
31 </pkgmetadata>
32
33 diff --git a/kde-base/powerdevil/powerdevil-4.96.0.ebuild b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
34 index 33bb718..b34db6e 100644
35 --- a/kde-base/powerdevil/powerdevil-4.96.0.ebuild
36 +++ b/kde-base/powerdevil/powerdevil-4.96.0.ebuild
37 @@ -6,18 +6,52 @@ EAPI=5
38
39 inherit kde5
40
41 -DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
42 +DESCRIPTION="Power management for KDE Plasma Shell"
43 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
44 -
45 -LICENSE="GPL-2 LGPL-2.1"
46 KEYWORDS="~amd64 ~x86"
47 -IUSE=""
48 +IUSE="+upower X"
49
50 DEPEND="
51 - $(add_frameworks_dep krunner)
52 - dev-qt/qtdeclarative:5
53 + $(add_frameworks_dep kauth)
54 + $(add_frameworks_dep kcompletion)
55 + $(add_frameworks_dep kconfig)
56 + $(add_frameworks_dep kconfigwidgets)
57 + $(add_frameworks_dep kcoreaddons)
58 + $(add_frameworks_dep kdbusaddons)
59 + $(add_frameworks_dep kdelibs4support)
60 + $(add_frameworks_dep kglobalaccel)
61 + $(add_frameworks_dep ki18n)
62 + $(add_frameworks_dep kidletime)
63 + $(add_frameworks_dep kio)
64 + $(add_frameworks_dep knotifications)
65 + $(add_frameworks_dep knotifyconfig)
66 + $(add_frameworks_dep kservice)
67 + $(add_frameworks_dep kwidgetsaddons)
68 + $(add_frameworks_dep kxmlgui)
69 + $(add_frameworks_dep solid)
70 + $(add_kdebase_dep plasma-workspace)
71 + dev-qt/qtdbus:5
72 dev-qt/qtgui:5
73 + dev-qt/qtwidgets:5
74 + upower? ( sys-power/upoweri:= )
75 + X? (
76 + dev-qt/qtx11extras:5
77 + x11-libs/libX11
78 + x11-libs/libxcb
79 + x11-libs/libXrandr
80 + )
81 "
82 -RDEPEND="${DEPEND}
83 +
84 +RDEPEND="
85 + ${DEPEND}
86 !kde-base/powerdevil:4
87 "
88 +
89 +src_configure() {
90 + local mycmakeargs=(
91 + $(cmake-utils_use_find_package upower UDev)
92 + $(cmake-utils_use_find_package X X11)
93 + )
94 +
95 + kde5_src_configure
96 +}
97
98 diff --git a/kde-base/powerdevil/powerdevil-9999.ebuild b/kde-base/powerdevil/powerdevil-9999.ebuild
99 index 9fcdef6..5bf23ce 100644
100 --- a/kde-base/powerdevil/powerdevil-9999.ebuild
101 +++ b/kde-base/powerdevil/powerdevil-9999.ebuild
102 @@ -6,18 +6,52 @@ EAPI=5
103
104 inherit kde5
105
106 -DESCRIPTION="Manages the power consumption settings of a Plasma Shell"
107 +DESCRIPTION="Power management for KDE Plasma Shell"
108 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/powerdevil"
109 -
110 -LICENSE="GPL-2 LGPL-2.1"
111 KEYWORDS=""
112 -IUSE=""
113 +IUSE="+upower X"
114
115 DEPEND="
116 - $(add_frameworks_dep krunner)
117 - dev-qt/qtdeclarative:5
118 + $(add_frameworks_dep kauth)
119 + $(add_frameworks_dep kcompletion)
120 + $(add_frameworks_dep kconfig)
121 + $(add_frameworks_dep kconfigwidgets)
122 + $(add_frameworks_dep kcoreaddons)
123 + $(add_frameworks_dep kdbusaddons)
124 + $(add_frameworks_dep kdelibs4support)
125 + $(add_frameworks_dep kglobalaccel)
126 + $(add_frameworks_dep ki18n)
127 + $(add_frameworks_dep kidletime)
128 + $(add_frameworks_dep kio)
129 + $(add_frameworks_dep knotifications)
130 + $(add_frameworks_dep knotifyconfig)
131 + $(add_frameworks_dep kservice)
132 + $(add_frameworks_dep kwidgetsaddons)
133 + $(add_frameworks_dep kxmlgui)
134 + $(add_frameworks_dep solid)
135 + $(add_kdebase_dep plasma-workspace)
136 + dev-qt/qtdbus:5
137 dev-qt/qtgui:5
138 + dev-qt/qtwidgets:5
139 + upower? ( sys-power/upoweri:= )
140 + X? (
141 + dev-qt/qtx11extras:5
142 + x11-libs/libX11
143 + x11-libs/libxcb
144 + x11-libs/libXrandr
145 + )
146 "
147 -RDEPEND="${DEPEND}
148 +
149 +RDEPEND="
150 + ${DEPEND}
151 !kde-base/powerdevil:4
152 "
153 +
154 +src_configure() {
155 + local mycmakeargs=(
156 + $(cmake-utils_use_find_package upower UDev)
157 + $(cmake-utils_use_find_package X X11)
158 + )
159 +
160 + kde5_src_configure
161 +}