Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
Date: Sun, 29 May 2016 12:42:36
Message-Id: 1464525649.9d6ac8c221234d9b52ded99b3e532ec2fa512a5e.pacho@gentoo
1 commit: 9d6ac8c221234d9b52ded99b3e532ec2fa512a5e
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 29 11:33:46 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun May 29 12:40:49 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6ac8c2
7
8 gnome-extra/cinnamon: Drop old
9
10 Package-Manager: portage-2.3.0_rc1
11
12 gnome-extra/cinnamon/Manifest | 2 -
13 gnome-extra/cinnamon/cinnamon-2.6.13.ebuild | 262 ----------------------------
14 gnome-extra/cinnamon/cinnamon-2.8.4.ebuild | 247 --------------------------
15 3 files changed, 511 deletions(-)
16
17 diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
18 index 27933bd..0bece92 100644
19 --- a/gnome-extra/cinnamon/Manifest
20 +++ b/gnome-extra/cinnamon/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST cinnamon-2.6.13.tar.gz 2967812 SHA256 f349403901bf3e84cda2ebd425dc6f58850059092775e285862067f120debe86 SHA512 41192b25ac34c542596f9625a671d019531aa466f057777da12ca0fda0f23daa10929c9f7a4e3c1a7137887fc9b0b556836a82f42645128b620949386387efec WHIRLPOOL 0c7c7ed6375964a93217adf43cc6236f7e7b92b75facfc94ded86f914890452b92753486d1c46b8a6531eef49993a0bc9fc0d387e8ea2a5bc4f05dd80571462a
23 -DIST cinnamon-2.8.4.tar.gz 3025109 SHA256 4ae7ed062e2bfacabdac66002c14666c4709182d45a6f0140a577800e28b0326 SHA512 d2be926c17262c20aff7253b8fb25f7955328fbd7ee4271ec1f29d847c1768f1dffc90c1d9dd843c4bcd4a8a0503200b078e01d6dd6cc8fa66894f1b5fcd9a37 WHIRLPOOL a9726b360958799c6b8614b088acb0b38c544e5e78739d0e5f35e14d801d1aae32d0bc12064efd405eea01bddf6f5350f1e1298c2c11c10a07f27c54a2bc1566
24 DIST cinnamon-2.8.6.tar.gz 3025161 SHA256 c262ae64320d4db8bffdfa7f05ab5a82449e96035b35dd8fb9353741323cb9a2 SHA512 fb683aaea1704eec5a1d2221d55c5e0e6530897f7aefc6ff9b9ff9d15818737a0d5d15aaa1d1f830e1f01e462324db026ac8c4475e39630cd6fd4a67dca9bddf WHIRLPOOL 488c215daf441be87d8f552bd4f0d8e55683286db143b2fbe5f8dd43a53df8e5c1e03b9230708ca149b85e3d9a93df58618b50afa014755a5ea943e33123edb8
25 DIST cinnamon-2.8.8.tar.gz 3026643 SHA256 33f838cb9c1d4213ebb18d5869949757dda97a6e0745f224d06be75de69caee7 SHA512 e41fae744ea2dfcb3589a47f689b230369a8dc4c3682f3cc15836a9be6c67fd1cd872223084b518cd422057431ea77f7df67055757b5cd43e5e96cb3cb3a2ec5 WHIRLPOOL 1cb5e0b13814d4b21e7711ad0d5754aa85c36e4616d48e7dbebad1bd7d34b928a5b4d4d55b6fd12fb2b44c96b22535ca68b3b6542af99306a609cbc58ea59784
26
27 diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
28 deleted file mode 100644
29 index 8cbf5cf..0000000
30 --- a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
31 +++ /dev/null
32 @@ -1,262 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI="5"
38 -GCONF_DEBUG="no"
39 -GNOME2_LA_PUNT="yes"
40 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
41 -PYTHON_REQ_USE="xml"
42 -
43 -inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
44 -
45 -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
46 -HOMEPAGE="http://cinnamon.linuxmint.com/"
47 -
48 -MY_PV="${PV/_p/-UP}"
49 -MY_P="${PN}-${MY_PV}"
50 -
51 -SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
52 -
53 -LICENSE="GPL-2+"
54 -SLOT="0"
55 -
56 -# bluetooth support dropped due bug #511648
57 -IUSE="+nls +networkmanager" #+bluetooth
58 -
59 -# We need *both* python 2.7 and 3.x
60 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
61 - python_targets_python2_7
62 - || ( python_targets_python3_3 python_targets_python3_4 )
63 - "
64 -
65 -KEYWORDS="amd64 x86"
66 -
67 -COMMON_DEPEND="
68 - app-accessibility/at-spi2-atk:2
69 - app-misc/ca-certificates
70 - dev-libs/dbus-glib
71 - >=dev-libs/glib-2.29.10:2[dbus]
72 - >=dev-libs/gobject-introspection-0.10.1:=
73 - >=dev-libs/json-glib-0.13.2
74 - >=dev-libs/libcroco-0.6.2:0.6
75 - dev-libs/libxml2:2
76 - gnome-base/gconf:2[introspection]
77 - gnome-base/librsvg
78 - >=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
79 - gnome-extra/cinnamon-menus[introspection]
80 - >=gnome-extra/cjs-2.4
81 - >=media-libs/clutter-1.10:1.0[introspection]
82 - media-libs/cogl:1.0=[introspection]
83 - >=gnome-base/gsettings-desktop-schemas-2.91.91
84 - media-libs/gstreamer:1.0
85 - media-libs/gst-plugins-base:1.0
86 - media-sound/pulseaudio:0=[glib]
87 - net-libs/libsoup:2.4[introspection]
88 - >=sys-auth/polkit-0.100[introspection]
89 - x11-libs/gdk-pixbuf:2[introspection]
90 - >=x11-libs/gtk+-3.9.12:3[introspection]
91 - x11-libs/pango[introspection]
92 - >=x11-libs/startup-notification-0.11
93 - x11-libs/libX11
94 - >=x11-libs/libXfixes-5.0
95 - >=x11-wm/muffin-2.5[introspection]
96 - ${PYTHON_DEPS}
97 - networkmanager? (
98 - gnome-base/libgnome-keyring
99 - >=net-misc/networkmanager-0.8.999[introspection] )
100 -"
101 -#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
102 -
103 -# Runtime-only deps are probably incomplete and approximate.
104 -# Each block:
105 -# 2. Introspection stuff + dconf needed via imports.gi.*
106 -# 3. gnome-session is needed for gnome-session-quit
107 -# 4. Control shell settings
108 -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
109 -# user switching with gdm-3.1.x)
110 -# 6. caribou needed for on-screen keyboard
111 -# 7. xdg-utils needed for xdg-open, used by extension tool
112 -# 8. gconf-python, imaging, lxml needed for cinnamon-settings
113 -# 9. gnome-icon-theme-symbolic needed for various icons
114 -# 10. pygobject needed for menu editor
115 -# 11. nemo - default file manager, tightly integrated with cinnamon
116 -# 12. polkit-gnome - explicitly autostarted by us
117 -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
118 -RDEPEND="${COMMON_DEPEND}
119 - >=gnome-base/dconf-0.4.1
120 - >=gnome-base/libgnomekbd-2.91.4[introspection]
121 - || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
122 -
123 - >=gnome-extra/cinnamon-session-2.4
124 - >=gnome-extra/cinnamon-settings-daemon-2.4
125 -
126 - >=sys-apps/accountsservice-0.6.14[introspection]
127 -
128 - >=app-accessibility/caribou-0.3
129 -
130 - x11-misc/xdg-utils
131 -
132 - dev-python/dbus-python[python_targets_python2_7]
133 - dev-python/gconf-python:2[python_targets_python2_7]
134 - dev-python/lxml[python_targets_python2_7]
135 - dev-python/pexpect[python_targets_python2_7]
136 - dev-python/pycairo[python_targets_python2_7]
137 - dev-python/pygobject:3[${PYTHON_USEDEP}]
138 - dev-python/pyinotify[python_targets_python2_7]
139 - dev-python/pypam[python_targets_python2_7]
140 - dev-python/pillow[python_targets_python2_7]
141 -
142 - x11-themes/gnome-themes-standard[gtk]
143 - x11-themes/gnome-icon-theme-symbolic
144 -
145 - >=gnome-extra/nemo-2.4
146 - >=gnome-extra/cinnamon-control-center-2.4
147 - >=gnome-extra/cinnamon-screensaver-2.4
148 -
149 - gnome-extra/polkit-gnome
150 -
151 - networkmanager? (
152 - gnome-extra/nm-applet
153 - net-misc/mobile-broadband-provider-info
154 - sys-libs/timezone-data )
155 - nls? ( >=gnome-extra/cinnamon-translations-2.4 )
156 -"
157 -#bluetooth? ( net-wireless/cinnamon-bluetooth )
158 -
159 -DEPEND="${COMMON_DEPEND}
160 - dev-python/polib[python_targets_python2_7]
161 - >=sys-devel/gettext-0.17
162 - virtual/pkgconfig
163 - >=dev-util/intltool-0.40
164 - gnome-base/gnome-common
165 - !!=dev-lang/spidermonkey-1.8.2*
166 -"
167 -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
168 -# https://bugs.gentoo.org/show_bug.cgi?id=360413
169 -
170 -S="${WORKDIR}/Cinnamon-${PV}"
171 -
172 -pkg_setup() {
173 - python_setup
174 -}
175 -
176 -src_prepare() {
177 - # Fix backgrounds path as cinnamon doesn't provide them
178 - # https://github.com/linuxmint/Cinnamon/issues/3575
179 - epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
180 -
181 - # Fix automagic gnome-bluetooth dep, bug #398145
182 - epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
183 -
184 - # Optional NetworkManager, bug #488684
185 - epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
186 -
187 - # Use wheel group instead of sudo (from Fedora/Arch)
188 - # https://github.com/linuxmint/Cinnamon/issues/3576
189 - epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
190 -
191 - # Fix GNOME 3.14 support (from Fedora/Arch)
192 - # https://github.com/linuxmint/Cinnamon/issues/3577
193 - epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
194 -
195 - # Fix build with clutter[-gtk]
196 - # https://github.com/linuxmint/Cinnamon/pull/4600
197 - epatch "${FILESDIR}"/${PN}-2.6.13-test-recorder-includes.patch
198 -
199 - # Use pkexec instead of gksu (from Arch)
200 - # https://github.com/linuxmint/Cinnamon/issues/3565
201 - sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
202 -
203 - # Add polkit agent to required components (from Fedora/Arch), bug #523958
204 - # https://github.com/linuxmint/Cinnamon/issues/3579
205 - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
206 - files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
207 -
208 - # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
209 - sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
210 - -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
211 - -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
212 - -i files/usr/lib/*/*.py \
213 - -i files/usr/lib/*/*/*.py \
214 - -i files/usr/bin/* || die "sed failed"
215 - if [[ "$(get_libdir)" != lib ]]; then
216 - mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
217 - fi
218 -
219 - if ! use networkmanager; then
220 - rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die
221 - fi
222 -
223 - epatch_user
224 -
225 - # python 2-and-3 shebang fixing craziness
226 - local p
227 - python_setup 'python3*'
228 - for p in $(grep -rl '#!.*python3'); do
229 - python_fix_shebang "${p}"
230 - done
231 -
232 - python_setup 'python2*'
233 - for p in $(grep -rl '#!.*python[^3]'); do
234 - python_fix_shebang "${p}"
235 - done
236 -
237 - eautoreconf
238 - gnome2_src_prepare
239 -}
240 -
241 -src_configure() {
242 - # https://bugs.gentoo.org/show_bug.cgi?id=536374
243 - # https://github.com/linuxmint/Cinnamon/issues/3843
244 - append-ldflags $(no-as-needed)
245 -
246 - gnome2_src_configure \
247 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
248 - --disable-rpath \
249 - --disable-jhbuild-wrapper-script \
250 - $(use_enable networkmanager) \
251 - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
252 - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
253 - --without-bluetooth
254 -}
255 -
256 -src_install() {
257 - gnome2_src_install
258 - python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
259 -
260 - # Required for gnome-shell on hardened/PaX, bug #398941
261 - pax-mark mr "${ED}usr/bin/cinnamon"
262 -
263 - # Doesn't exist on Gentoo, causing this to be a dead symlink
264 - rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
265 -
266 - # Ensure authentication-agent is started, bug #523958
267 - # https://github.com/linuxmint/Cinnamon/issues/3579
268 - insinto /etc/xdg/autostart/
269 - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
270 -}
271 -
272 -pkg_postinst() {
273 - gnome2_pkg_postinst
274 -
275 - if ! has_version 'media-libs/gst-plugins-good:1.0' || \
276 - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
277 - ewarn "To make use of Cinnamon's built-in screen recording utility,"
278 - ewarn "you need to either install media-libs/gst-plugins-good:1.0"
279 - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
280 - ewarn "org.cinnamon.recorder/pipeline to what you want to use."
281 - fi
282 -
283 - if ! has_version ">=x11-base/xorg-server-1.11"; then
284 - ewarn "If you use multiple screens, it is highly recommended that you"
285 - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
286 - ewarn "pointer barriers which will make it easier to use hot corners."
287 - fi
288 -
289 - if has_version "<x11-drivers/ati-drivers-12"; then
290 - ewarn "Cinnamon has been reported to show graphical corruption under"
291 - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
292 - ewarn "open-source drivers."
293 - fi
294 -}
295
296 diff --git a/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
297 deleted file mode 100644
298 index 12c8a03..0000000
299 --- a/gnome-extra/cinnamon/cinnamon-2.8.4.ebuild
300 +++ /dev/null
301 @@ -1,247 +0,0 @@
302 -# Copyright 1999-2015 Gentoo Foundation
303 -# Distributed under the terms of the GNU General Public License v2
304 -# $Id$
305 -
306 -EAPI="5"
307 -GCONF_DEBUG="no"
308 -GNOME2_LA_PUNT="yes"
309 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
310 -PYTHON_REQ_USE="xml"
311 -
312 -inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
313 -
314 -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
315 -HOMEPAGE="http://cinnamon.linuxmint.com/"
316 -
317 -MY_PV="${PV/_p/-UP}"
318 -MY_P="${PN}-${MY_PV}"
319 -
320 -SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
321 -
322 -LICENSE="GPL-2+"
323 -SLOT="0"
324 -
325 -# bluetooth support dropped due bug #511648
326 -IUSE="+nls +networkmanager" #+bluetooth
327 -
328 -# We need *both* python 2.7 and 3.x
329 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
330 - python_targets_python2_7
331 - || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
332 -"
333 -
334 -KEYWORDS="~amd64 ~x86"
335 -
336 -COMMON_DEPEND="
337 - app-accessibility/at-spi2-atk:2
338 - app-misc/ca-certificates
339 - dev-libs/dbus-glib
340 - >=dev-libs/glib-2.35.0:2[dbus]
341 - >=dev-libs/gobject-introspection-0.10.1:=
342 - >=dev-libs/json-glib-0.13.2
343 - >=dev-libs/libcroco-0.6.2:0.6
344 - dev-libs/libxml2:2
345 - gnome-base/gconf:2[introspection]
346 - gnome-base/librsvg
347 - >=gnome-extra/cinnamon-desktop-2.4:0=[introspection]
348 - gnome-extra/cinnamon-menus[introspection]
349 - >=gnome-extra/cjs-2.4
350 - >=media-libs/clutter-1.10:1.0[introspection]
351 - media-libs/cogl:1.0=[introspection]
352 - >=gnome-base/gsettings-desktop-schemas-2.91.91
353 - media-libs/gstreamer:1.0
354 - media-libs/gst-plugins-base:1.0
355 - media-sound/pulseaudio:0=[glib]
356 - net-libs/libsoup:2.4[introspection]
357 - >=sys-auth/polkit-0.100[introspection]
358 - x11-libs/gdk-pixbuf:2[introspection]
359 - >=x11-libs/gtk+-3.9.12:3[introspection]
360 - x11-libs/pango[introspection]
361 - >=x11-libs/startup-notification-0.11
362 - x11-libs/libX11
363 - >=x11-libs/libXfixes-5.0
364 - >=x11-wm/muffin-2.5[introspection]
365 - ${PYTHON_DEPS}
366 - networkmanager? (
367 - gnome-base/libgnome-keyring
368 - >=net-misc/networkmanager-0.8.999[introspection] )
369 -"
370 -#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
371 -
372 -# Runtime-only deps are probably incomplete and approximate.
373 -# Each block:
374 -# 2. Introspection stuff + dconf needed via imports.gi.*
375 -# 3. gnome-session is needed for gnome-session-quit
376 -# 4. Control shell settings
377 -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
378 -# user switching with gdm-3.1.x)
379 -# 6. caribou needed for on-screen keyboard
380 -# 7. xdg-utils needed for xdg-open, used by extension tool
381 -# 8. gconf-python, imaging, lxml needed for cinnamon-settings
382 -# 9. gnome-icon-theme-symbolic needed for various icons
383 -# 10. pygobject needed for menu editor
384 -# 11. nemo - default file manager, tightly integrated with cinnamon
385 -# 12. polkit-gnome - explicitly autostarted by us
386 -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
387 -RDEPEND="${COMMON_DEPEND}
388 - >=gnome-base/dconf-0.4.1
389 - >=gnome-base/libgnomekbd-2.91.4[introspection]
390 - || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
391 -
392 - >=gnome-extra/cinnamon-session-2.4
393 - >=gnome-extra/cinnamon-settings-daemon-2.4
394 -
395 - >=sys-apps/accountsservice-0.6.14[introspection]
396 -
397 - >=app-accessibility/caribou-0.3
398 -
399 - x11-misc/xdg-utils
400 -
401 - dev-python/dbus-python[python_targets_python2_7]
402 - dev-python/gconf-python:2[python_targets_python2_7]
403 - dev-python/lxml[python_targets_python2_7]
404 - dev-python/pexpect[python_targets_python2_7]
405 - dev-python/pycairo[python_targets_python2_7]
406 - dev-python/pygobject:3[${PYTHON_USEDEP}]
407 - dev-python/pyinotify[python_targets_python2_7]
408 - dev-python/pypam[python_targets_python2_7]
409 - dev-python/pillow[python_targets_python2_7]
410 -
411 - x11-themes/gnome-themes-standard[gtk]
412 - x11-themes/gnome-icon-theme-symbolic
413 -
414 - >=gnome-extra/nemo-2.4
415 - >=gnome-extra/cinnamon-control-center-2.4
416 - >=gnome-extra/cinnamon-screensaver-2.4
417 -
418 - gnome-extra/polkit-gnome
419 -
420 - networkmanager? (
421 - gnome-extra/nm-applet
422 - net-misc/mobile-broadband-provider-info
423 - sys-libs/timezone-data )
424 - nls? ( >=gnome-extra/cinnamon-translations-2.4 )
425 -"
426 -#bluetooth? ( net-wireless/cinnamon-bluetooth )
427 -
428 -DEPEND="${COMMON_DEPEND}
429 - dev-python/polib[python_targets_python2_7]
430 - >=sys-devel/gettext-0.17
431 - virtual/pkgconfig
432 - >=dev-util/intltool-0.40
433 - gnome-base/gnome-common
434 - !!=dev-lang/spidermonkey-1.8.2*
435 -"
436 -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
437 -# https://bugs.gentoo.org/show_bug.cgi?id=360413
438 -
439 -S="${WORKDIR}/Cinnamon-${PV}"
440 -
441 -pkg_setup() {
442 - python_setup
443 -}
444 -
445 -src_prepare() {
446 - # Fix backgrounds path as cinnamon doesn't provide them
447 - # https://github.com/linuxmint/Cinnamon/issues/3575
448 - epatch "${FILESDIR}"/${PN}-2.8.0-background.patch
449 -
450 - # Fix automagic gnome-bluetooth dep, bug #398145
451 - epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
452 -
453 - # Optional NetworkManager, bug #488684
454 - epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
455 -
456 - # Use wheel group instead of sudo (from Fedora/Arch)
457 - # https://github.com/linuxmint/Cinnamon/issues/3576
458 - epatch "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch
459 -
460 - # Fix GNOME 3.14 support (from Fedora/Arch)
461 - # https://github.com/linuxmint/Cinnamon/issues/3577
462 - epatch "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch
463 -
464 - # Use pkexec instead of gksu (from Arch)
465 - # https://github.com/linuxmint/Cinnamon/issues/3565
466 - sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
467 -
468 - # Add polkit agent to required components (from Fedora/Arch), bug #523958
469 - # https://github.com/linuxmint/Cinnamon/issues/3579
470 - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
471 - files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
472 -
473 - if ! use networkmanager; then
474 - rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die
475 - fi
476 -
477 - epatch_user
478 -
479 - # python 2-and-3 shebang fixing craziness
480 - local p
481 - python_setup 'python3*'
482 - for p in $(grep -rl '#!.*python3'); do
483 - python_fix_shebang "${p}"
484 - done
485 -
486 - python_setup 'python2*'
487 - for p in $(grep -rl '#!.*python[^3]'); do
488 - python_fix_shebang "${p}"
489 - done
490 -
491 - eautoreconf
492 - gnome2_src_prepare
493 -}
494 -
495 -src_configure() {
496 - # https://bugs.gentoo.org/show_bug.cgi?id=536374
497 - # https://github.com/linuxmint/Cinnamon/issues/3843
498 - append-ldflags $(no-as-needed)
499 -
500 - gnome2_src_configure \
501 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
502 - --disable-rpath \
503 - --disable-jhbuild-wrapper-script \
504 - $(use_enable networkmanager) \
505 - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
506 - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
507 - --without-bluetooth
508 -}
509 -
510 -src_install() {
511 - gnome2_src_install
512 - python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
513 -
514 - # Required for gnome-shell on hardened/PaX, bug #398941
515 - pax-mark mr "${ED}usr/bin/cinnamon"
516 -
517 - # Doesn't exist on Gentoo, causing this to be a dead symlink
518 - rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
519 -
520 - # Ensure authentication-agent is started, bug #523958
521 - # https://github.com/linuxmint/Cinnamon/issues/3579
522 - insinto /etc/xdg/autostart/
523 - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
524 -}
525 -
526 -pkg_postinst() {
527 - gnome2_pkg_postinst
528 -
529 - if ! has_version 'media-libs/gst-plugins-good:1.0' || \
530 - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
531 - ewarn "To make use of Cinnamon's built-in screen recording utility,"
532 - ewarn "you need to either install media-libs/gst-plugins-good:1.0"
533 - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
534 - ewarn "org.cinnamon.recorder/pipeline to what you want to use."
535 - fi
536 -
537 - if ! has_version ">=x11-base/xorg-server-1.11"; then
538 - ewarn "If you use multiple screens, it is highly recommended that you"
539 - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
540 - ewarn "pointer barriers which will make it easier to use hot corners."
541 - fi
542 -
543 - if has_version "<x11-drivers/ati-drivers-12"; then
544 - ewarn "Cinnamon has been reported to show graphical corruption under"
545 - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
546 - ewarn "open-source drivers."
547 - fi
548 -}