1 |
commit: 75ab1fb45764be12830e656d21b496502a72605b |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 26 11:20:22 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 26 11:31:07 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ab1fb4 |
7 |
|
8 |
gnome-extra/cinnamon-session: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
11 |
|
12 |
gnome-extra/cinnamon-session/Manifest | 6 -- |
13 |
.../cinnamon-session/cinnamon-session-2.8.2.ebuild | 71 ---------------------- |
14 |
.../cinnamon-session/cinnamon-session-2.8.3.ebuild | 65 -------------------- |
15 |
.../cinnamon-session/cinnamon-session-3.0.1.ebuild | 65 -------------------- |
16 |
.../cinnamon-session/cinnamon-session-3.2.0.ebuild | 65 -------------------- |
17 |
.../cinnamon-session/cinnamon-session-3.4.1.ebuild | 65 -------------------- |
18 |
.../cinnamon-session/cinnamon-session-3.4.2.ebuild | 65 -------------------- |
19 |
.../files/cinnamon-session-2.6.2-automagic.patch | 50 --------------- |
20 |
8 files changed, 452 deletions(-) |
21 |
|
22 |
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest |
23 |
index 436125903f4..2a502be9118 100644 |
24 |
--- a/gnome-extra/cinnamon-session/Manifest |
25 |
+++ b/gnome-extra/cinnamon-session/Manifest |
26 |
@@ -1,7 +1 @@ |
27 |
-DIST cinnamon-session-2.8.2.tar.gz 591438 BLAKE2B 9ae14f696bd0d02ecf6f7653d263ffee1052c2d1963f65fa780e7aa592413471ecb47710d20594aed4b5d15c99b8639957a337834d126e2c07bba79618a6f210 SHA512 4f713cc5d9ec21bb118a2761792b1a86b43c386e0042f3f1c57ab6fa01fb7fd34463d83e63c794950dfe8358e757277a87d649340cda33f72fe4c89c7cf099bc |
28 |
-DIST cinnamon-session-2.8.3.tar.gz 591500 BLAKE2B afa29ced03908701135e3621c93e5c117f7d52c6f8cd952d82dd58de4c8a4e53b10eba267f0e64536ea19edda48102688f8759e0d41c16efac0789de36e85233 SHA512 a581af6a00a5273ab4cf7b91ac4770b78d8ab670cf238c396e2087113795de059b4eaa3abcc8440b5eaa5cf0c4edc9696b183f9ce81803af36b9a3a37b5d5977 |
29 |
-DIST cinnamon-session-3.0.1.tar.gz 592265 BLAKE2B e011806ddcf39b55c76c4b3db5de8d9813d9b9faa7538f11e5d33b611faf4f81324db7547afb28dfffbf319316d88d3b89f3ce423022dfc3b66724f44b37b741 SHA512 cdbf9f910954976854aa1b90033781269dc9d521b86edd3e97ae936b59a9ac4ffa956ba37a51ba11beac73e38a732913ce147557e999484bd68529677eed21e8 |
30 |
-DIST cinnamon-session-3.2.0.tar.gz 595530 BLAKE2B 44d7c77c9fec0c6d58dfd574542bc7cf6ca97ce82e0306c0d5374f9b75e1e3ca73389bf47ed83519956e9da341dae0805739362e6e4499e7d1e6f5e1e383fd36 SHA512 00475069849c7bb1d874c65200128128068e6500475c61053f07deabacb98046bf344ab5d3b4537487c48103dd6c6a8316d1326396e606a0d44bc486db9267d6 |
31 |
-DIST cinnamon-session-3.4.1.tar.gz 595567 BLAKE2B f47818e9c28610a0da444f7fd15f69d45a165ce5a9346702483b9f4b090dd387688331356611e9179585ad3ce77bfa55fdad0b63a470f9c0cbd96d57fe0de5fa SHA512 caac3b445e2dca8e040bdb215e8aca833cbcdb77611e435aab5ebcd4b0f9b6bddb117d97763d26e99d42bbacb7ec51171e6927d87dbdd7d6ed0f5287648dee0e |
32 |
-DIST cinnamon-session-3.4.2.tar.gz 595721 BLAKE2B 7f50d208d6928144a6b47153fd21f4a90875eec8b37fac5b4efb3d7a70a8806561710a10568a2f597ff5f471e8a4d2deb6ce9e233d8c6a0616c966a7c74ca654 SHA512 4a2f49f1717418a7d87df5f46e47c9d3a95bc4484aad6760e5391289100ebec734a300fd2540fd4ff0385a5169c15c01c081a002cc842d9d57d817d15dd6963d |
33 |
DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137 |
34 |
|
35 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild |
36 |
deleted file mode 100644 |
37 |
index 7fabffaee06..00000000000 |
38 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,71 +0,0 @@ |
41 |
-# Copyright 1999-2015 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI="5" |
45 |
-GCONF_DEBUG="no" |
46 |
- |
47 |
-inherit autotools eutils gnome2 |
48 |
- |
49 |
-DESCRIPTION="Cinnamon session manager" |
50 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
51 |
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
52 |
- |
53 |
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
54 |
-SLOT="0" |
55 |
-KEYWORDS="amd64 x86" |
56 |
-IUSE="doc ipv6 systemd" |
57 |
- |
58 |
-COMMON_DEPEND=" |
59 |
- >=dev-libs/dbus-glib-0.88 |
60 |
- >=dev-libs/glib-2.37.3:2 |
61 |
- media-libs/libcanberra |
62 |
- x11-libs/gdk-pixbuf:2 |
63 |
- >=x11-libs/gtk+-3:3 |
64 |
- x11-libs/cairo |
65 |
- x11-libs/libICE |
66 |
- x11-libs/libSM |
67 |
- x11-libs/libX11 |
68 |
- x11-libs/libXau |
69 |
- x11-libs/libXcomposite |
70 |
- x11-libs/libXext |
71 |
- x11-libs/libXrender |
72 |
- x11-libs/libXtst |
73 |
- x11-libs/pango[X] |
74 |
- virtual/opengl |
75 |
- systemd? ( >=sys-apps/systemd-183 ) |
76 |
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
77 |
-" |
78 |
-RDEPEND="${COMMON_DEPEND} |
79 |
- >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
80 |
- !systemd? ( sys-auth/consolekit ) |
81 |
-" |
82 |
-DEPEND="${COMMON_DEPEND} |
83 |
- dev-libs/libxslt |
84 |
- >=dev-util/intltool-0.40.6 |
85 |
- virtual/pkgconfig |
86 |
- doc? ( app-text/xmlto ) |
87 |
- |
88 |
- gnome-base/gnome-common |
89 |
-" |
90 |
-# gnome-base/gnome-common for eautoreconf |
91 |
- |
92 |
-src_prepare() { |
93 |
- # make upower and logind check non-automagic |
94 |
- epatch "${FILESDIR}/${PN}-2.6.2-automagic.patch" |
95 |
- epatch_user |
96 |
- |
97 |
- eautoreconf |
98 |
- gnome2_src_prepare |
99 |
-} |
100 |
- |
101 |
-src_configure() { |
102 |
- DOCS="AUTHORS README README.md" |
103 |
- |
104 |
- gnome2_src_configure \ |
105 |
- --disable-gconf \ |
106 |
- --disable-static \ |
107 |
- $(use_enable doc docbook-docs) \ |
108 |
- $(use_enable ipv6) \ |
109 |
- $(use_enable systemd logind) \ |
110 |
- $(usex systemd --disable-old-upower --enable-old-upower) |
111 |
-} |
112 |
|
113 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild |
114 |
deleted file mode 100644 |
115 |
index 2451a7ce34b..00000000000 |
116 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild |
117 |
+++ /dev/null |
118 |
@@ -1,65 +0,0 @@ |
119 |
-# Copyright 1999-2016 Gentoo Foundation |
120 |
-# Distributed under the terms of the GNU General Public License v2 |
121 |
- |
122 |
-EAPI=6 |
123 |
-inherit autotools eutils gnome2 |
124 |
- |
125 |
-DESCRIPTION="Cinnamon session manager" |
126 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
127 |
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
128 |
- |
129 |
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
130 |
-SLOT="0" |
131 |
-KEYWORDS="amd64 x86" |
132 |
-IUSE="doc ipv6 systemd" |
133 |
- |
134 |
-COMMON_DEPEND=" |
135 |
- >=dev-libs/dbus-glib-0.88 |
136 |
- >=dev-libs/glib-2.37.3:2 |
137 |
- media-libs/libcanberra |
138 |
- x11-libs/gdk-pixbuf:2 |
139 |
- >=x11-libs/gtk+-3:3 |
140 |
- x11-libs/cairo |
141 |
- x11-libs/libICE |
142 |
- x11-libs/libSM |
143 |
- x11-libs/libX11 |
144 |
- x11-libs/libXau |
145 |
- x11-libs/libXcomposite |
146 |
- x11-libs/libXext |
147 |
- x11-libs/libXrender |
148 |
- x11-libs/libXtst |
149 |
- x11-libs/pango[X] |
150 |
- virtual/opengl |
151 |
- systemd? ( >=sys-apps/systemd-183 ) |
152 |
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
153 |
-" |
154 |
-RDEPEND="${COMMON_DEPEND} |
155 |
- >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
156 |
- !systemd? ( sys-auth/consolekit ) |
157 |
-" |
158 |
-DEPEND="${COMMON_DEPEND} |
159 |
- dev-libs/libxslt |
160 |
- >=dev-util/intltool-0.40.6 |
161 |
- virtual/pkgconfig |
162 |
- doc? ( app-text/xmlto ) |
163 |
- |
164 |
- gnome-base/gnome-common |
165 |
-" |
166 |
-# gnome-base/gnome-common for eautoreconf |
167 |
- |
168 |
-src_prepare() { |
169 |
- # make upower and logind check non-automagic |
170 |
- eapply "${FILESDIR}/${PN}-2.6.2-automagic.patch" |
171 |
- eautoreconf |
172 |
- gnome2_src_prepare |
173 |
-} |
174 |
- |
175 |
-src_configure() { |
176 |
- gnome2_src_configure \ |
177 |
- --disable-gconf \ |
178 |
- --disable-static \ |
179 |
- $(use_enable doc docbook-docs) \ |
180 |
- $(use_enable ipv6) \ |
181 |
- $(use_enable systemd logind) \ |
182 |
- $(usex systemd --disable-old-upower --enable-old-upower) |
183 |
-} |
184 |
|
185 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild |
186 |
deleted file mode 100644 |
187 |
index 04d79cfb51f..00000000000 |
188 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild |
189 |
+++ /dev/null |
190 |
@@ -1,65 +0,0 @@ |
191 |
-# Copyright 1999-2016 Gentoo Foundation |
192 |
-# Distributed under the terms of the GNU General Public License v2 |
193 |
- |
194 |
-EAPI=6 |
195 |
-inherit autotools eutils gnome2 |
196 |
- |
197 |
-DESCRIPTION="Cinnamon session manager" |
198 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
199 |
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
200 |
- |
201 |
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
202 |
-SLOT="0" |
203 |
-KEYWORDS="amd64 x86" |
204 |
-IUSE="doc ipv6 systemd" |
205 |
- |
206 |
-COMMON_DEPEND=" |
207 |
- >=dev-libs/dbus-glib-0.88 |
208 |
- >=dev-libs/glib-2.37.3:2 |
209 |
- media-libs/libcanberra |
210 |
- x11-libs/gdk-pixbuf:2 |
211 |
- >=x11-libs/gtk+-3:3 |
212 |
- x11-libs/cairo |
213 |
- x11-libs/libICE |
214 |
- x11-libs/libSM |
215 |
- x11-libs/libX11 |
216 |
- x11-libs/libXau |
217 |
- x11-libs/libXcomposite |
218 |
- x11-libs/libXext |
219 |
- x11-libs/libXrender |
220 |
- x11-libs/libXtst |
221 |
- x11-libs/pango[X] |
222 |
- virtual/opengl |
223 |
- systemd? ( >=sys-apps/systemd-183 ) |
224 |
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
225 |
-" |
226 |
-RDEPEND="${COMMON_DEPEND} |
227 |
- >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
228 |
- !systemd? ( sys-auth/consolekit ) |
229 |
-" |
230 |
-DEPEND="${COMMON_DEPEND} |
231 |
- dev-libs/libxslt |
232 |
- >=dev-util/intltool-0.40.6 |
233 |
- virtual/pkgconfig |
234 |
- doc? ( app-text/xmlto ) |
235 |
- |
236 |
- gnome-base/gnome-common |
237 |
-" |
238 |
-# gnome-base/gnome-common for eautoreconf |
239 |
- |
240 |
-src_prepare() { |
241 |
- # make upower and logind check non-automagic |
242 |
- eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" |
243 |
- eautoreconf |
244 |
- gnome2_src_prepare |
245 |
-} |
246 |
- |
247 |
-src_configure() { |
248 |
- gnome2_src_configure \ |
249 |
- --disable-gconf \ |
250 |
- --disable-static \ |
251 |
- $(use_enable doc docbook-docs) \ |
252 |
- $(use_enable ipv6) \ |
253 |
- $(use_enable systemd logind) \ |
254 |
- $(usex systemd --disable-old-upower --enable-old-upower) |
255 |
-} |
256 |
|
257 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild |
258 |
deleted file mode 100644 |
259 |
index fb4f3cf0ef9..00000000000 |
260 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild |
261 |
+++ /dev/null |
262 |
@@ -1,65 +0,0 @@ |
263 |
-# Copyright 1999-2016 Gentoo Foundation |
264 |
-# Distributed under the terms of the GNU General Public License v2 |
265 |
- |
266 |
-EAPI=6 |
267 |
-inherit autotools eutils gnome2 |
268 |
- |
269 |
-DESCRIPTION="Cinnamon session manager" |
270 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
271 |
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
272 |
- |
273 |
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
274 |
-SLOT="0" |
275 |
-KEYWORDS="~amd64 ~x86" |
276 |
-IUSE="doc ipv6 systemd" |
277 |
- |
278 |
-COMMON_DEPEND=" |
279 |
- >=dev-libs/dbus-glib-0.88 |
280 |
- >=dev-libs/glib-2.37.3:2 |
281 |
- media-libs/libcanberra |
282 |
- x11-libs/gdk-pixbuf:2 |
283 |
- >=x11-libs/gtk+-3:3 |
284 |
- x11-libs/cairo |
285 |
- x11-libs/libICE |
286 |
- x11-libs/libSM |
287 |
- x11-libs/libX11 |
288 |
- x11-libs/libXau |
289 |
- x11-libs/libXcomposite |
290 |
- x11-libs/libXext |
291 |
- x11-libs/libXrender |
292 |
- x11-libs/libXtst |
293 |
- x11-libs/pango[X] |
294 |
- virtual/opengl |
295 |
- systemd? ( >=sys-apps/systemd-183 ) |
296 |
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
297 |
-" |
298 |
-RDEPEND="${COMMON_DEPEND} |
299 |
- >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
300 |
- !systemd? ( sys-auth/consolekit ) |
301 |
-" |
302 |
-DEPEND="${COMMON_DEPEND} |
303 |
- dev-libs/libxslt |
304 |
- >=dev-util/intltool-0.40.6 |
305 |
- virtual/pkgconfig |
306 |
- doc? ( app-text/xmlto ) |
307 |
- |
308 |
- gnome-base/gnome-common |
309 |
-" |
310 |
-# gnome-base/gnome-common for eautoreconf |
311 |
- |
312 |
-src_prepare() { |
313 |
- # make upower and logind check non-automagic |
314 |
- eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" |
315 |
- eautoreconf |
316 |
- gnome2_src_prepare |
317 |
-} |
318 |
- |
319 |
-src_configure() { |
320 |
- gnome2_src_configure \ |
321 |
- --disable-gconf \ |
322 |
- --disable-static \ |
323 |
- $(use_enable doc docbook-docs) \ |
324 |
- $(use_enable ipv6) \ |
325 |
- $(use_enable systemd logind) \ |
326 |
- $(usex systemd --disable-old-upower --enable-old-upower) |
327 |
-} |
328 |
|
329 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.4.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.4.1.ebuild |
330 |
deleted file mode 100644 |
331 |
index db8b6d35c97..00000000000 |
332 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.4.1.ebuild |
333 |
+++ /dev/null |
334 |
@@ -1,65 +0,0 @@ |
335 |
-# Copyright 1999-2017 Gentoo Foundation |
336 |
-# Distributed under the terms of the GNU General Public License v2 |
337 |
- |
338 |
-EAPI=6 |
339 |
-inherit autotools eutils gnome2 |
340 |
- |
341 |
-DESCRIPTION="Cinnamon session manager" |
342 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
343 |
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
344 |
- |
345 |
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
346 |
-SLOT="0" |
347 |
-KEYWORDS="~amd64 ~x86" |
348 |
-IUSE="doc ipv6 systemd" |
349 |
- |
350 |
-COMMON_DEPEND=" |
351 |
- >=dev-libs/dbus-glib-0.88 |
352 |
- >=dev-libs/glib-2.37.3:2 |
353 |
- media-libs/libcanberra |
354 |
- x11-libs/gdk-pixbuf:2 |
355 |
- >=x11-libs/gtk+-3:3 |
356 |
- x11-libs/cairo |
357 |
- x11-libs/libICE |
358 |
- x11-libs/libSM |
359 |
- x11-libs/libX11 |
360 |
- x11-libs/libXau |
361 |
- x11-libs/libXcomposite |
362 |
- x11-libs/libXext |
363 |
- x11-libs/libXrender |
364 |
- x11-libs/libXtst |
365 |
- x11-libs/pango[X] |
366 |
- virtual/opengl |
367 |
- systemd? ( >=sys-apps/systemd-183 ) |
368 |
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
369 |
-" |
370 |
-RDEPEND="${COMMON_DEPEND} |
371 |
- >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
372 |
- !systemd? ( sys-auth/consolekit ) |
373 |
-" |
374 |
-DEPEND="${COMMON_DEPEND} |
375 |
- dev-libs/libxslt |
376 |
- >=dev-util/intltool-0.40.6 |
377 |
- virtual/pkgconfig |
378 |
- doc? ( app-text/xmlto ) |
379 |
- |
380 |
- gnome-base/gnome-common |
381 |
-" |
382 |
-# gnome-base/gnome-common for eautoreconf |
383 |
- |
384 |
-src_prepare() { |
385 |
- # make upower and logind check non-automagic |
386 |
- eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" |
387 |
- eautoreconf |
388 |
- gnome2_src_prepare |
389 |
-} |
390 |
- |
391 |
-src_configure() { |
392 |
- gnome2_src_configure \ |
393 |
- --disable-gconf \ |
394 |
- --disable-static \ |
395 |
- $(use_enable doc docbook-docs) \ |
396 |
- $(use_enable ipv6) \ |
397 |
- $(use_enable systemd logind) \ |
398 |
- $(usex systemd --disable-old-upower --enable-old-upower) |
399 |
-} |
400 |
|
401 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.4.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.4.2.ebuild |
402 |
deleted file mode 100644 |
403 |
index db8b6d35c97..00000000000 |
404 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.4.2.ebuild |
405 |
+++ /dev/null |
406 |
@@ -1,65 +0,0 @@ |
407 |
-# Copyright 1999-2017 Gentoo Foundation |
408 |
-# Distributed under the terms of the GNU General Public License v2 |
409 |
- |
410 |
-EAPI=6 |
411 |
-inherit autotools eutils gnome2 |
412 |
- |
413 |
-DESCRIPTION="Cinnamon session manager" |
414 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
415 |
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz" |
416 |
- |
417 |
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" |
418 |
-SLOT="0" |
419 |
-KEYWORDS="~amd64 ~x86" |
420 |
-IUSE="doc ipv6 systemd" |
421 |
- |
422 |
-COMMON_DEPEND=" |
423 |
- >=dev-libs/dbus-glib-0.88 |
424 |
- >=dev-libs/glib-2.37.3:2 |
425 |
- media-libs/libcanberra |
426 |
- x11-libs/gdk-pixbuf:2 |
427 |
- >=x11-libs/gtk+-3:3 |
428 |
- x11-libs/cairo |
429 |
- x11-libs/libICE |
430 |
- x11-libs/libSM |
431 |
- x11-libs/libX11 |
432 |
- x11-libs/libXau |
433 |
- x11-libs/libXcomposite |
434 |
- x11-libs/libXext |
435 |
- x11-libs/libXrender |
436 |
- x11-libs/libXtst |
437 |
- x11-libs/pango[X] |
438 |
- virtual/opengl |
439 |
- systemd? ( >=sys-apps/systemd-183 ) |
440 |
- !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) |
441 |
-" |
442 |
-RDEPEND="${COMMON_DEPEND} |
443 |
- >=gnome-extra/cinnamon-desktop-2.6[systemd=] |
444 |
- !systemd? ( sys-auth/consolekit ) |
445 |
-" |
446 |
-DEPEND="${COMMON_DEPEND} |
447 |
- dev-libs/libxslt |
448 |
- >=dev-util/intltool-0.40.6 |
449 |
- virtual/pkgconfig |
450 |
- doc? ( app-text/xmlto ) |
451 |
- |
452 |
- gnome-base/gnome-common |
453 |
-" |
454 |
-# gnome-base/gnome-common for eautoreconf |
455 |
- |
456 |
-src_prepare() { |
457 |
- # make upower and logind check non-automagic |
458 |
- eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch" |
459 |
- eautoreconf |
460 |
- gnome2_src_prepare |
461 |
-} |
462 |
- |
463 |
-src_configure() { |
464 |
- gnome2_src_configure \ |
465 |
- --disable-gconf \ |
466 |
- --disable-static \ |
467 |
- $(use_enable doc docbook-docs) \ |
468 |
- $(use_enable ipv6) \ |
469 |
- $(use_enable systemd logind) \ |
470 |
- $(usex systemd --disable-old-upower --enable-old-upower) |
471 |
-} |
472 |
|
473 |
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch |
474 |
deleted file mode 100644 |
475 |
index 48843728f4a..00000000000 |
476 |
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch |
477 |
+++ /dev/null |
478 |
@@ -1,50 +0,0 @@ |
479 |
-From 586c07b431e9b0e1f11a9017ee0b84dc9b8ec08a Mon Sep 17 00:00:00 2001 |
480 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
481 |
-Date: Mon, 5 May 2014 22:34:14 -0400 |
482 |
-Subject: [PATCH] Make logind and old upower check non-automagic |
483 |
- |
484 |
---- |
485 |
- configure.ac | 20 ++++++++++++++++++-- |
486 |
- 1 file changed, 18 insertions(+), 2 deletions(-) |
487 |
- |
488 |
-diff --git a/configure.ac b/configure.ac |
489 |
-index 2f6fa7a..6e908cc 100644 |
490 |
---- a/configure.ac |
491 |
-+++ b/configure.ac |
492 |
-@@ -56,7 +56,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION, |
493 |
- |
494 |
- dnl We can only support old upower |
495 |
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 |
496 |
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) |
497 |
-+AC_ARG_ENABLE([old-upower], |
498 |
-+ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]), |
499 |
-+ [enable_old_upower=$enableval], |
500 |
-+ [enable_old_upower=auto]) |
501 |
-+ |
502 |
-+have_old_upower=no |
503 |
-+if test x$enable_old_upower != xno ; then |
504 |
-+ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) |
505 |
-+fi |
506 |
- AS_IF([test x$have_old_upower = xyes], [ |
507 |
- AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) |
508 |
- ]) |
509 |
-@@ -96,7 +104,15 @@ dnl ==================================================================== |
510 |
- dnl Check for logind |
511 |
- dnl ==================================================================== |
512 |
- |
513 |
--PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no]) |
514 |
-+AC_ARG_ENABLE([logind], |
515 |
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]), |
516 |
-+ [enable_logind=$enableval], |
517 |
-+ [enable_logind=auto]) |
518 |
-+ |
519 |
-+have_logind=no |
520 |
-+if test x$enable_logind != xno ; then |
521 |
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no]) |
522 |
-+fi |
523 |
- |
524 |
- if test x$have_logind = xyes; then |
525 |
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported]) |
526 |
--- |
527 |
-2.4.3 |
528 |
- |