1 |
commit: 6b8bd5b3932f194ae75083ca70bee0b83c7aa024 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 26 11:10:39 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 26 11:30:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8bd5b3 |
7 |
|
8 |
gnome-extra/cinnamon: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
11 |
|
12 |
gnome-extra/cinnamon/Manifest | 6 - |
13 |
gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild | 238 --------------------- |
14 |
gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild | 238 --------------------- |
15 |
gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild | 238 --------------------- |
16 |
gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild | 238 --------------------- |
17 |
gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild | 234 -------------------- |
18 |
gnome-extra/cinnamon/cinnamon-3.4.6.ebuild | 234 -------------------- |
19 |
.../cinnamon-2.6.7-optional-networkmanager.patch | 88 -------- |
20 |
.../cinnamon/files/cinnamon-2.8.3-set-wheel.patch | 56 ----- |
21 |
9 files changed, 1570 deletions(-) |
22 |
|
23 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
24 |
index 84de26ffc09..d5fec8d0789 100644 |
25 |
--- a/gnome-extra/cinnamon/Manifest |
26 |
+++ b/gnome-extra/cinnamon/Manifest |
27 |
@@ -1,7 +1 @@ |
28 |
-DIST cinnamon-3.0.7.tar.gz 3065791 BLAKE2B cd2cef9e71a77c9e8be384e96864a8d92d0e0922ea5992117a980e7d22eeaf9fb3a47a94fcac54bbd302b580d5e496784558c45abcb455516a8a975469fb8dd8 SHA512 db3f2532525c71b0841ce22245518502f8e905fd353c22e41dc57551cf68422ab6b53a57e4089664e8db9035a7723214756de78d2b5d5a92e11515216b15afbf |
29 |
-DIST cinnamon-3.2.0.tar.gz 2216495 BLAKE2B 1a1ccf54c939af4a33da9b247858211fc9b983e823292d80110780ccff18759227b68b5fcbe4689e52e125891d8ca30eec9cb488f8a62d307cee7595dc1b7249 SHA512 340530d77e68a5680cfa44afa3efc157552a7319f9badb251456d43e4e0a4e8c7cecf8e273c6cedec05e8248d68bbbdca2f8bb9d1766c418a6bc10d386e38302 |
30 |
-DIST cinnamon-3.2.6.tar.gz 2225445 BLAKE2B 93e402aa7caccee79c455a49d0f3eb8a42829f42b7e5d1e90caab57451ff685f832d8f303083876f565fe840b746c5fa802195b78db58b8e1f9b718a5016dd1f SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb |
31 |
-DIST cinnamon-3.2.7.tar.gz 2226152 BLAKE2B f62e9405b1373daa696bee9f9c82af34ab76753ea4e897ee82674b4b14a4719905f3829de2f1a8c0bb75d84368ca23d39e10e9a19348d6e944709967534a53e9 SHA512 0da8ddb6e894b5ceda0cb92dc54e6b42618425f3b993b551b49aafbd4b9db95a6023083151fae75b9e60413484ff5235ed5058e9b2178c65dd108f806defe4df |
32 |
-DIST cinnamon-3.4.2.tar.gz 2213346 BLAKE2B 90a4013ff417a05f14b716025da6acddd3f81c59976bcf4a734312682880a0622bf22a0d63c1acef2dcf27165726c7efd0723e20784d5269565bbaa5f64e7211 SHA512 dee9027788a2e8c9b6d536d27f4afcf28434ab7e52bcd0d26a6426f010f64ac6d3c29e7f225dae794e8215972d744d2eebb7fb9c102451269498a663e4c5dfb7 |
33 |
-DIST cinnamon-3.4.6.tar.gz 2217209 BLAKE2B 87a01ffe8806fd7d252035533be25bd197e06f29f02644197132a9d5fa3eb766760fb0df5fc00c61e5f35b3d45b8464824def510e233fa93c84038c28aea5ccc SHA512 b5fa337dc236204a09a3650ca40d2c2a996c9d1ff6f789834e757d50d68939914bf56d2d623ee5b6e57a180c02b803dbae6349ce1a9dd969b7a4c8bad1b9d8bd |
34 |
DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642 |
35 |
|
36 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild |
37 |
deleted file mode 100644 |
38 |
index 17231388f28..00000000000 |
39 |
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,238 +0,0 @@ |
42 |
-# Copyright 1999-2017 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
- |
45 |
-EAPI=6 |
46 |
-GNOME2_LA_PUNT="yes" |
47 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
48 |
-PYTHON_REQ_USE="xml" |
49 |
- |
50 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
51 |
- |
52 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
53 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
54 |
- |
55 |
-MY_PV="${PV/_p/-UP}" |
56 |
-MY_P="${PN}-${MY_PV}" |
57 |
- |
58 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
59 |
- |
60 |
-LICENSE="GPL-2+" |
61 |
-SLOT="0" |
62 |
- |
63 |
-# bluetooth support dropped due to bug #511648 |
64 |
-IUSE="+nls +networkmanager" #+bluetooth |
65 |
- |
66 |
-# We need *both* python 2.x and 3.x |
67 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
68 |
- || ( $(python_gen_useflags 'python2*') ) |
69 |
- || ( $(python_gen_useflags 'python3*') ) |
70 |
-" |
71 |
- |
72 |
-KEYWORDS="amd64 x86" |
73 |
- |
74 |
-COMMON_DEPEND="${PYTHON_DEPS} |
75 |
- app-accessibility/at-spi2-atk:2 |
76 |
- app-misc/ca-certificates |
77 |
- dev-libs/dbus-glib |
78 |
- >=dev-libs/glib-2.35.0:2[dbus] |
79 |
- >=dev-libs/gobject-introspection-0.10.1:= |
80 |
- >=dev-libs/json-glib-0.13.2 |
81 |
- >=dev-libs/libcroco-0.6.2:0.6 |
82 |
- dev-libs/libxml2:2 |
83 |
- gnome-base/gconf:2[introspection] |
84 |
- gnome-base/librsvg |
85 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
86 |
- gnome-extra/cinnamon-menus[introspection] |
87 |
- >=gnome-extra/cjs-2.8.0 |
88 |
- >=media-libs/clutter-1.10:1.0[introspection] |
89 |
- media-libs/cogl:1.0=[introspection] |
90 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
91 |
- media-libs/gstreamer:1.0 |
92 |
- media-libs/gst-plugins-base:1.0 |
93 |
- net-libs/libsoup:2.4[introspection] |
94 |
- >=sys-auth/polkit-0.100[introspection] |
95 |
- x11-libs/gdk-pixbuf:2[introspection] |
96 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
97 |
- x11-libs/pango[introspection] |
98 |
- >=x11-libs/startup-notification-0.11 |
99 |
- x11-libs/libX11 |
100 |
- >=x11-libs/libXfixes-5.0 |
101 |
- >=x11-wm/muffin-3.0.0[introspection] |
102 |
- networkmanager? ( |
103 |
- gnome-base/libgnome-keyring |
104 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
105 |
-" |
106 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
107 |
- |
108 |
-# Runtime-only deps are probably incomplete and approximate. |
109 |
-# Each block: |
110 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
111 |
-# 3. gnome-session is needed for gnome-session-quit |
112 |
-# 4. Control shell settings |
113 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
114 |
-# user switching with gdm-3.1.x) |
115 |
-# 6. caribou needed for on-screen keyboard |
116 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
117 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
118 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
119 |
-# 10. pygobject needed for menu editor |
120 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
121 |
-# 12. polkit-gnome - explicitly autostarted by us |
122 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
123 |
-RDEPEND="${COMMON_DEPEND} |
124 |
- >=gnome-base/dconf-0.4.1 |
125 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
126 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
127 |
- |
128 |
- >=gnome-extra/cinnamon-session-2.4 |
129 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
130 |
- |
131 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
132 |
- |
133 |
- >=app-accessibility/caribou-0.3 |
134 |
- |
135 |
- x11-misc/xdg-utils |
136 |
- |
137 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
138 |
- $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]' 'python2*') |
139 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
140 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
141 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
142 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
143 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
144 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
145 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
146 |
- |
147 |
- x11-themes/gnome-themes-standard |
148 |
- x11-themes/adwaita-icon-theme |
149 |
- |
150 |
- >=gnome-extra/nemo-2.4 |
151 |
- >=gnome-extra/cinnamon-control-center-2.4 |
152 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
153 |
- |
154 |
- gnome-extra/polkit-gnome |
155 |
- |
156 |
- networkmanager? ( |
157 |
- gnome-extra/nm-applet |
158 |
- net-misc/mobile-broadband-provider-info |
159 |
- sys-libs/timezone-data ) |
160 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
161 |
-" |
162 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
163 |
- |
164 |
-DEPEND="${COMMON_DEPEND} |
165 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
166 |
- dev-util/gtk-doc |
167 |
- >=dev-util/intltool-0.4 |
168 |
- >=sys-devel/gettext-0.17 |
169 |
- virtual/pkgconfig |
170 |
- gnome-base/gnome-common |
171 |
- !!=dev-lang/spidermonkey-1.8.2* |
172 |
-" |
173 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
174 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
175 |
- |
176 |
-S="${WORKDIR}/Cinnamon-${PV}" |
177 |
- |
178 |
-pkg_setup() { |
179 |
- python_setup |
180 |
-} |
181 |
- |
182 |
-src_prepare() { |
183 |
- # Fix backgrounds path as cinnamon doesn't provide them |
184 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
185 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
186 |
- |
187 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
188 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
189 |
- |
190 |
- # Optional NetworkManager, bug #488684 |
191 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
192 |
- |
193 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
194 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
195 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
196 |
- |
197 |
- # Use pkexec instead of gksu (from Arch) |
198 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
199 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
200 |
- |
201 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
202 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
203 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
204 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
205 |
- |
206 |
- if ! use networkmanager; then |
207 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
208 |
- fi |
209 |
- |
210 |
- # python 2-and-3 shebang fixing craziness |
211 |
- local p |
212 |
- python_setup 'python3*' |
213 |
- for p in $(grep -rl '#!.*python3'); do |
214 |
- python_fix_shebang "${p}" |
215 |
- done |
216 |
- |
217 |
- python_setup 'python2*' |
218 |
- for p in $(grep -rl '#!.*python[^3]'); do |
219 |
- python_fix_shebang "${p}" |
220 |
- done |
221 |
- |
222 |
- eautoreconf |
223 |
- gnome2_src_prepare |
224 |
-} |
225 |
- |
226 |
-src_configure() { |
227 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
228 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
229 |
- append-ldflags $(no-as-needed) |
230 |
- |
231 |
- gnome2_src_configure \ |
232 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
233 |
- --disable-rpath \ |
234 |
- --disable-jhbuild-wrapper-script \ |
235 |
- $(use_enable networkmanager) \ |
236 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
237 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
238 |
- --without-bluetooth |
239 |
-} |
240 |
- |
241 |
-src_install() { |
242 |
- gnome2_src_install |
243 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
244 |
- |
245 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
246 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
247 |
- |
248 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
249 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
250 |
- |
251 |
- # Ensure authentication-agent is started, bug #523958 |
252 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
253 |
- insinto /etc/xdg/autostart/ |
254 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
255 |
-} |
256 |
- |
257 |
-pkg_postinst() { |
258 |
- gnome2_pkg_postinst |
259 |
- |
260 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
261 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
262 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
263 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
264 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
265 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
266 |
- fi |
267 |
- |
268 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
269 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
270 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
271 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
272 |
- fi |
273 |
- |
274 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
275 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
276 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
277 |
- ewarn "open-source drivers." |
278 |
- fi |
279 |
-} |
280 |
|
281 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild |
282 |
deleted file mode 100644 |
283 |
index ccb09ba1331..00000000000 |
284 |
--- a/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild |
285 |
+++ /dev/null |
286 |
@@ -1,238 +0,0 @@ |
287 |
-# Copyright 1999-2017 Gentoo Foundation |
288 |
-# Distributed under the terms of the GNU General Public License v2 |
289 |
- |
290 |
-EAPI=6 |
291 |
-GNOME2_LA_PUNT="yes" |
292 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
293 |
-PYTHON_REQ_USE="xml" |
294 |
- |
295 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
296 |
- |
297 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
298 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
299 |
- |
300 |
-MY_PV="${PV/_p/-UP}" |
301 |
-MY_P="${PN}-${MY_PV}" |
302 |
- |
303 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
304 |
- |
305 |
-LICENSE="GPL-2+" |
306 |
-SLOT="0" |
307 |
- |
308 |
-# bluetooth support dropped due to bug #511648 |
309 |
-IUSE="+nls +networkmanager" #+bluetooth |
310 |
- |
311 |
-# We need *both* python 2.x and 3.x |
312 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
313 |
- || ( $(python_gen_useflags 'python2*') ) |
314 |
- || ( $(python_gen_useflags 'python3*') ) |
315 |
-" |
316 |
- |
317 |
-KEYWORDS="~amd64 ~x86" |
318 |
- |
319 |
-COMMON_DEPEND="${PYTHON_DEPS} |
320 |
- app-accessibility/at-spi2-atk:2 |
321 |
- app-misc/ca-certificates |
322 |
- dev-libs/dbus-glib |
323 |
- >=dev-libs/glib-2.35.0:2[dbus] |
324 |
- >=dev-libs/gobject-introspection-0.10.1:= |
325 |
- >=dev-libs/json-glib-0.13.2 |
326 |
- >=dev-libs/libcroco-0.6.2:0.6 |
327 |
- dev-libs/libxml2:2 |
328 |
- gnome-base/gconf:2[introspection] |
329 |
- gnome-base/librsvg |
330 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
331 |
- gnome-extra/cinnamon-menus[introspection] |
332 |
- >=gnome-extra/cjs-2.8.0 |
333 |
- >=media-libs/clutter-1.10:1.0[introspection] |
334 |
- media-libs/cogl:1.0=[introspection] |
335 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
336 |
- media-libs/gstreamer:1.0 |
337 |
- media-libs/gst-plugins-base:1.0 |
338 |
- net-libs/libsoup:2.4[introspection] |
339 |
- >=sys-auth/polkit-0.100[introspection] |
340 |
- x11-libs/gdk-pixbuf:2[introspection] |
341 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
342 |
- x11-libs/pango[introspection] |
343 |
- >=x11-libs/startup-notification-0.11 |
344 |
- x11-libs/libX11 |
345 |
- >=x11-libs/libXfixes-5.0 |
346 |
- >=x11-wm/muffin-3.0.0[introspection] |
347 |
- networkmanager? ( |
348 |
- gnome-base/libgnome-keyring |
349 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
350 |
-" |
351 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
352 |
- |
353 |
-# Runtime-only deps are probably incomplete and approximate. |
354 |
-# Each block: |
355 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
356 |
-# 3. gnome-session is needed for gnome-session-quit |
357 |
-# 4. Control shell settings |
358 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
359 |
-# user switching with gdm-3.1.x) |
360 |
-# 6. caribou needed for on-screen keyboard |
361 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
362 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
363 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
364 |
-# 10. pygobject needed for menu editor |
365 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
366 |
-# 12. polkit-gnome - explicitly autostarted by us |
367 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
368 |
-RDEPEND="${COMMON_DEPEND} |
369 |
- >=gnome-base/dconf-0.4.1 |
370 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
371 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
372 |
- |
373 |
- >=gnome-extra/cinnamon-session-2.4 |
374 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
375 |
- |
376 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
377 |
- |
378 |
- >=app-accessibility/caribou-0.3 |
379 |
- |
380 |
- x11-misc/xdg-utils |
381 |
- x11-libs/xapps |
382 |
- |
383 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
384 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
385 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
386 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
387 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
388 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
389 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
390 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
391 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
392 |
- |
393 |
- x11-themes/gnome-themes-standard |
394 |
- x11-themes/adwaita-icon-theme |
395 |
- |
396 |
- >=gnome-extra/nemo-2.4 |
397 |
- >=gnome-extra/cinnamon-control-center-2.4 |
398 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
399 |
- |
400 |
- gnome-extra/polkit-gnome |
401 |
- |
402 |
- networkmanager? ( |
403 |
- gnome-extra/nm-applet |
404 |
- net-misc/mobile-broadband-provider-info |
405 |
- sys-libs/timezone-data ) |
406 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
407 |
-" |
408 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
409 |
- |
410 |
-DEPEND="${COMMON_DEPEND} |
411 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
412 |
- dev-util/gtk-doc |
413 |
- >=dev-util/intltool-0.4 |
414 |
- >=sys-devel/gettext-0.17 |
415 |
- virtual/pkgconfig |
416 |
- gnome-base/gnome-common |
417 |
- !!=dev-lang/spidermonkey-1.8.2* |
418 |
-" |
419 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
420 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
421 |
- |
422 |
-S="${WORKDIR}/Cinnamon-${PV}" |
423 |
- |
424 |
-pkg_setup() { |
425 |
- python_setup |
426 |
-} |
427 |
- |
428 |
-src_prepare() { |
429 |
- # Fix backgrounds path as cinnamon doesn't provide them |
430 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
431 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
432 |
- |
433 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
434 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
435 |
- |
436 |
- # Optional NetworkManager, bug #488684 |
437 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
438 |
- |
439 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
440 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
441 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
442 |
- |
443 |
- # Use pkexec instead of gksu (from Arch) |
444 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
445 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
446 |
- |
447 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
448 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
449 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
450 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
451 |
- |
452 |
- if ! use networkmanager; then |
453 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
454 |
- fi |
455 |
- |
456 |
- # python 2-and-3 shebang fixing craziness |
457 |
- local p |
458 |
- python_setup 'python3*' |
459 |
- for p in $(grep -rl '#!.*python3'); do |
460 |
- python_fix_shebang "${p}" |
461 |
- done |
462 |
- |
463 |
- python_setup 'python2*' |
464 |
- for p in $(grep -rl '#!.*python[^3]'); do |
465 |
- python_fix_shebang "${p}" |
466 |
- done |
467 |
- |
468 |
- eautoreconf |
469 |
- gnome2_src_prepare |
470 |
-} |
471 |
- |
472 |
-src_configure() { |
473 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
474 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
475 |
- append-ldflags $(no-as-needed) |
476 |
- |
477 |
- gnome2_src_configure \ |
478 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
479 |
- --disable-jhbuild-wrapper-script \ |
480 |
- $(use_enable networkmanager) \ |
481 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
482 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
483 |
- --without-bluetooth |
484 |
-} |
485 |
- |
486 |
-src_install() { |
487 |
- gnome2_src_install |
488 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
489 |
- |
490 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
491 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
492 |
- |
493 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
494 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
495 |
- |
496 |
- # Ensure authentication-agent is started, bug #523958 |
497 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
498 |
- insinto /etc/xdg/autostart/ |
499 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
500 |
-} |
501 |
- |
502 |
-pkg_postinst() { |
503 |
- gnome2_pkg_postinst |
504 |
- |
505 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
506 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
507 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
508 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
509 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
510 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
511 |
- fi |
512 |
- |
513 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
514 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
515 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
516 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
517 |
- fi |
518 |
- |
519 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
520 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
521 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
522 |
- ewarn "open-source drivers." |
523 |
- fi |
524 |
-} |
525 |
|
526 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild |
527 |
deleted file mode 100644 |
528 |
index 198a26d014d..00000000000 |
529 |
--- a/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild |
530 |
+++ /dev/null |
531 |
@@ -1,238 +0,0 @@ |
532 |
-# Copyright 1999-2017 Gentoo Foundation |
533 |
-# Distributed under the terms of the GNU General Public License v2 |
534 |
- |
535 |
-EAPI=6 |
536 |
-GNOME2_LA_PUNT="yes" |
537 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
538 |
-PYTHON_REQ_USE="xml" |
539 |
- |
540 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
541 |
- |
542 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
543 |
-HOMEPAGE="http://developer.linuxmint.com/" |
544 |
- |
545 |
-MY_PV="${PV/_p/-UP}" |
546 |
-MY_P="${PN}-${MY_PV}" |
547 |
- |
548 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
549 |
- |
550 |
-LICENSE="GPL-2+" |
551 |
-SLOT="0" |
552 |
- |
553 |
-# bluetooth support dropped due to bug #511648 |
554 |
-IUSE="+nls +networkmanager" #+bluetooth |
555 |
- |
556 |
-# We need *both* python 2.x and 3.x |
557 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
558 |
- || ( $(python_gen_useflags 'python2*') ) |
559 |
- || ( $(python_gen_useflags 'python3*') ) |
560 |
-" |
561 |
- |
562 |
-KEYWORDS="~amd64 ~x86" |
563 |
- |
564 |
-COMMON_DEPEND="${PYTHON_DEPS} |
565 |
- app-accessibility/at-spi2-atk:2 |
566 |
- app-misc/ca-certificates |
567 |
- dev-libs/dbus-glib |
568 |
- >=dev-libs/glib-2.35.0:2[dbus] |
569 |
- >=dev-libs/gobject-introspection-0.10.1:= |
570 |
- >=dev-libs/json-glib-0.13.2 |
571 |
- >=dev-libs/libcroco-0.6.2:0.6 |
572 |
- dev-libs/libxml2:2 |
573 |
- gnome-base/gconf:2[introspection] |
574 |
- gnome-base/librsvg |
575 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
576 |
- gnome-extra/cinnamon-menus[introspection] |
577 |
- >=gnome-extra/cjs-2.8.0 |
578 |
- >=media-libs/clutter-1.10:1.0[introspection] |
579 |
- media-libs/cogl:1.0=[introspection] |
580 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
581 |
- media-libs/gstreamer:1.0 |
582 |
- media-libs/gst-plugins-base:1.0 |
583 |
- net-libs/libsoup:2.4[introspection] |
584 |
- >=sys-auth/polkit-0.100[introspection] |
585 |
- x11-libs/gdk-pixbuf:2[introspection] |
586 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
587 |
- x11-libs/pango[introspection] |
588 |
- >=x11-libs/startup-notification-0.11 |
589 |
- x11-libs/libX11 |
590 |
- >=x11-libs/libXfixes-5.0 |
591 |
- >=x11-wm/muffin-3.0.0[introspection] |
592 |
- networkmanager? ( |
593 |
- gnome-base/libgnome-keyring |
594 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
595 |
-" |
596 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
597 |
- |
598 |
-# Runtime-only deps are probably incomplete and approximate. |
599 |
-# Each block: |
600 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
601 |
-# 3. gnome-session is needed for gnome-session-quit |
602 |
-# 4. Control shell settings |
603 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
604 |
-# user switching with gdm-3.1.x) |
605 |
-# 6. caribou needed for on-screen keyboard |
606 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
607 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
608 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
609 |
-# 10. pygobject needed for menu editor |
610 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
611 |
-# 12. polkit-gnome - explicitly autostarted by us |
612 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
613 |
-RDEPEND="${COMMON_DEPEND} |
614 |
- >=gnome-base/dconf-0.4.1 |
615 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
616 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
617 |
- |
618 |
- >=gnome-extra/cinnamon-session-2.4 |
619 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
620 |
- |
621 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
622 |
- |
623 |
- >=app-accessibility/caribou-0.3 |
624 |
- |
625 |
- x11-misc/xdg-utils |
626 |
- x11-libs/xapps |
627 |
- |
628 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
629 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
630 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
631 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
632 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
633 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
634 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
635 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
636 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
637 |
- |
638 |
- x11-themes/gnome-themes-standard |
639 |
- x11-themes/adwaita-icon-theme |
640 |
- |
641 |
- >=gnome-extra/nemo-2.4 |
642 |
- >=gnome-extra/cinnamon-control-center-2.4 |
643 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
644 |
- |
645 |
- gnome-extra/polkit-gnome |
646 |
- |
647 |
- networkmanager? ( |
648 |
- gnome-extra/nm-applet |
649 |
- net-misc/mobile-broadband-provider-info |
650 |
- sys-libs/timezone-data ) |
651 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
652 |
-" |
653 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
654 |
- |
655 |
-DEPEND="${COMMON_DEPEND} |
656 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
657 |
- dev-util/gtk-doc |
658 |
- >=dev-util/intltool-0.4 |
659 |
- >=sys-devel/gettext-0.17 |
660 |
- virtual/pkgconfig |
661 |
- gnome-base/gnome-common |
662 |
- !!=dev-lang/spidermonkey-1.8.2* |
663 |
-" |
664 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
665 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
666 |
- |
667 |
-S="${WORKDIR}/Cinnamon-${PV}" |
668 |
- |
669 |
-pkg_setup() { |
670 |
- python_setup |
671 |
-} |
672 |
- |
673 |
-src_prepare() { |
674 |
- # Fix backgrounds path as cinnamon doesn't provide them |
675 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
676 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
677 |
- |
678 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
679 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
680 |
- |
681 |
- # Optional NetworkManager, bug #488684 |
682 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
683 |
- |
684 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
685 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
686 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
687 |
- |
688 |
- # Use pkexec instead of gksu (from Arch) |
689 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
690 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
691 |
- |
692 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
693 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
694 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
695 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
696 |
- |
697 |
- if ! use networkmanager; then |
698 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
699 |
- fi |
700 |
- |
701 |
- # python 2-and-3 shebang fixing craziness |
702 |
- local p |
703 |
- python_setup 'python3*' |
704 |
- for p in $(grep -rl '#!.*python3'); do |
705 |
- python_fix_shebang "${p}" |
706 |
- done |
707 |
- |
708 |
- python_setup 'python2*' |
709 |
- for p in $(grep -rl '#!.*python[^3]'); do |
710 |
- python_fix_shebang "${p}" |
711 |
- done |
712 |
- |
713 |
- eautoreconf |
714 |
- gnome2_src_prepare |
715 |
-} |
716 |
- |
717 |
-src_configure() { |
718 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
719 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
720 |
- append-ldflags $(no-as-needed) |
721 |
- |
722 |
- gnome2_src_configure \ |
723 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
724 |
- --disable-jhbuild-wrapper-script \ |
725 |
- $(use_enable networkmanager) \ |
726 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
727 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
728 |
- --without-bluetooth |
729 |
-} |
730 |
- |
731 |
-src_install() { |
732 |
- gnome2_src_install |
733 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
734 |
- |
735 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
736 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
737 |
- |
738 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
739 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
740 |
- |
741 |
- # Ensure authentication-agent is started, bug #523958 |
742 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
743 |
- insinto /etc/xdg/autostart/ |
744 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
745 |
-} |
746 |
- |
747 |
-pkg_postinst() { |
748 |
- gnome2_pkg_postinst |
749 |
- |
750 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
751 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
752 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
753 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
754 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
755 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
756 |
- fi |
757 |
- |
758 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
759 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
760 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
761 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
762 |
- fi |
763 |
- |
764 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
765 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
766 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
767 |
- ewarn "open-source drivers." |
768 |
- fi |
769 |
-} |
770 |
|
771 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild |
772 |
deleted file mode 100644 |
773 |
index 198a26d014d..00000000000 |
774 |
--- a/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild |
775 |
+++ /dev/null |
776 |
@@ -1,238 +0,0 @@ |
777 |
-# Copyright 1999-2017 Gentoo Foundation |
778 |
-# Distributed under the terms of the GNU General Public License v2 |
779 |
- |
780 |
-EAPI=6 |
781 |
-GNOME2_LA_PUNT="yes" |
782 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
783 |
-PYTHON_REQ_USE="xml" |
784 |
- |
785 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
786 |
- |
787 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
788 |
-HOMEPAGE="http://developer.linuxmint.com/" |
789 |
- |
790 |
-MY_PV="${PV/_p/-UP}" |
791 |
-MY_P="${PN}-${MY_PV}" |
792 |
- |
793 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
794 |
- |
795 |
-LICENSE="GPL-2+" |
796 |
-SLOT="0" |
797 |
- |
798 |
-# bluetooth support dropped due to bug #511648 |
799 |
-IUSE="+nls +networkmanager" #+bluetooth |
800 |
- |
801 |
-# We need *both* python 2.x and 3.x |
802 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
803 |
- || ( $(python_gen_useflags 'python2*') ) |
804 |
- || ( $(python_gen_useflags 'python3*') ) |
805 |
-" |
806 |
- |
807 |
-KEYWORDS="~amd64 ~x86" |
808 |
- |
809 |
-COMMON_DEPEND="${PYTHON_DEPS} |
810 |
- app-accessibility/at-spi2-atk:2 |
811 |
- app-misc/ca-certificates |
812 |
- dev-libs/dbus-glib |
813 |
- >=dev-libs/glib-2.35.0:2[dbus] |
814 |
- >=dev-libs/gobject-introspection-0.10.1:= |
815 |
- >=dev-libs/json-glib-0.13.2 |
816 |
- >=dev-libs/libcroco-0.6.2:0.6 |
817 |
- dev-libs/libxml2:2 |
818 |
- gnome-base/gconf:2[introspection] |
819 |
- gnome-base/librsvg |
820 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
821 |
- gnome-extra/cinnamon-menus[introspection] |
822 |
- >=gnome-extra/cjs-2.8.0 |
823 |
- >=media-libs/clutter-1.10:1.0[introspection] |
824 |
- media-libs/cogl:1.0=[introspection] |
825 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
826 |
- media-libs/gstreamer:1.0 |
827 |
- media-libs/gst-plugins-base:1.0 |
828 |
- net-libs/libsoup:2.4[introspection] |
829 |
- >=sys-auth/polkit-0.100[introspection] |
830 |
- x11-libs/gdk-pixbuf:2[introspection] |
831 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
832 |
- x11-libs/pango[introspection] |
833 |
- >=x11-libs/startup-notification-0.11 |
834 |
- x11-libs/libX11 |
835 |
- >=x11-libs/libXfixes-5.0 |
836 |
- >=x11-wm/muffin-3.0.0[introspection] |
837 |
- networkmanager? ( |
838 |
- gnome-base/libgnome-keyring |
839 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
840 |
-" |
841 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
842 |
- |
843 |
-# Runtime-only deps are probably incomplete and approximate. |
844 |
-# Each block: |
845 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
846 |
-# 3. gnome-session is needed for gnome-session-quit |
847 |
-# 4. Control shell settings |
848 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
849 |
-# user switching with gdm-3.1.x) |
850 |
-# 6. caribou needed for on-screen keyboard |
851 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
852 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
853 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
854 |
-# 10. pygobject needed for menu editor |
855 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
856 |
-# 12. polkit-gnome - explicitly autostarted by us |
857 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
858 |
-RDEPEND="${COMMON_DEPEND} |
859 |
- >=gnome-base/dconf-0.4.1 |
860 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
861 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
862 |
- |
863 |
- >=gnome-extra/cinnamon-session-2.4 |
864 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
865 |
- |
866 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
867 |
- |
868 |
- >=app-accessibility/caribou-0.3 |
869 |
- |
870 |
- x11-misc/xdg-utils |
871 |
- x11-libs/xapps |
872 |
- |
873 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
874 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
875 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
876 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
877 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
878 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
879 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
880 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
881 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
882 |
- |
883 |
- x11-themes/gnome-themes-standard |
884 |
- x11-themes/adwaita-icon-theme |
885 |
- |
886 |
- >=gnome-extra/nemo-2.4 |
887 |
- >=gnome-extra/cinnamon-control-center-2.4 |
888 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
889 |
- |
890 |
- gnome-extra/polkit-gnome |
891 |
- |
892 |
- networkmanager? ( |
893 |
- gnome-extra/nm-applet |
894 |
- net-misc/mobile-broadband-provider-info |
895 |
- sys-libs/timezone-data ) |
896 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
897 |
-" |
898 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
899 |
- |
900 |
-DEPEND="${COMMON_DEPEND} |
901 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
902 |
- dev-util/gtk-doc |
903 |
- >=dev-util/intltool-0.4 |
904 |
- >=sys-devel/gettext-0.17 |
905 |
- virtual/pkgconfig |
906 |
- gnome-base/gnome-common |
907 |
- !!=dev-lang/spidermonkey-1.8.2* |
908 |
-" |
909 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
910 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
911 |
- |
912 |
-S="${WORKDIR}/Cinnamon-${PV}" |
913 |
- |
914 |
-pkg_setup() { |
915 |
- python_setup |
916 |
-} |
917 |
- |
918 |
-src_prepare() { |
919 |
- # Fix backgrounds path as cinnamon doesn't provide them |
920 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
921 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
922 |
- |
923 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
924 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
925 |
- |
926 |
- # Optional NetworkManager, bug #488684 |
927 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
928 |
- |
929 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
930 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
931 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
932 |
- |
933 |
- # Use pkexec instead of gksu (from Arch) |
934 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
935 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
936 |
- |
937 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
938 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
939 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
940 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
941 |
- |
942 |
- if ! use networkmanager; then |
943 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
944 |
- fi |
945 |
- |
946 |
- # python 2-and-3 shebang fixing craziness |
947 |
- local p |
948 |
- python_setup 'python3*' |
949 |
- for p in $(grep -rl '#!.*python3'); do |
950 |
- python_fix_shebang "${p}" |
951 |
- done |
952 |
- |
953 |
- python_setup 'python2*' |
954 |
- for p in $(grep -rl '#!.*python[^3]'); do |
955 |
- python_fix_shebang "${p}" |
956 |
- done |
957 |
- |
958 |
- eautoreconf |
959 |
- gnome2_src_prepare |
960 |
-} |
961 |
- |
962 |
-src_configure() { |
963 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
964 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
965 |
- append-ldflags $(no-as-needed) |
966 |
- |
967 |
- gnome2_src_configure \ |
968 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
969 |
- --disable-jhbuild-wrapper-script \ |
970 |
- $(use_enable networkmanager) \ |
971 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
972 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
973 |
- --without-bluetooth |
974 |
-} |
975 |
- |
976 |
-src_install() { |
977 |
- gnome2_src_install |
978 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
979 |
- |
980 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
981 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
982 |
- |
983 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
984 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
985 |
- |
986 |
- # Ensure authentication-agent is started, bug #523958 |
987 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
988 |
- insinto /etc/xdg/autostart/ |
989 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
990 |
-} |
991 |
- |
992 |
-pkg_postinst() { |
993 |
- gnome2_pkg_postinst |
994 |
- |
995 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
996 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
997 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
998 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
999 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
1000 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
1001 |
- fi |
1002 |
- |
1003 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
1004 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
1005 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
1006 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
1007 |
- fi |
1008 |
- |
1009 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
1010 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
1011 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
1012 |
- ewarn "open-source drivers." |
1013 |
- fi |
1014 |
-} |
1015 |
|
1016 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild |
1017 |
deleted file mode 100644 |
1018 |
index 7a62d8ff83f..00000000000 |
1019 |
--- a/gnome-extra/cinnamon/cinnamon-3.4.2-r1.ebuild |
1020 |
+++ /dev/null |
1021 |
@@ -1,234 +0,0 @@ |
1022 |
-# Copyright 1999-2017 Gentoo Foundation |
1023 |
-# Distributed under the terms of the GNU General Public License v2 |
1024 |
- |
1025 |
-EAPI=6 |
1026 |
-GNOME2_LA_PUNT="yes" |
1027 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
1028 |
-PYTHON_REQ_USE="xml" |
1029 |
- |
1030 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
1031 |
- |
1032 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
1033 |
-HOMEPAGE="http://developer.linuxmint.com/" |
1034 |
- |
1035 |
-MY_PV="${PV/_p/-UP}" |
1036 |
-MY_P="${PN}-${MY_PV}" |
1037 |
- |
1038 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
1039 |
- |
1040 |
-LICENSE="GPL-2+" |
1041 |
-SLOT="0" |
1042 |
- |
1043 |
-# bluetooth support dropped due to bug #511648 |
1044 |
-IUSE="+nls +networkmanager" #+bluetooth |
1045 |
- |
1046 |
-# We need *both* python 2.x and 3.x |
1047 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
1048 |
- || ( $(python_gen_useflags 'python2*') ) |
1049 |
- || ( $(python_gen_useflags 'python3*') ) |
1050 |
-" |
1051 |
- |
1052 |
-KEYWORDS="~amd64 ~x86" |
1053 |
- |
1054 |
-COMMON_DEPEND="${PYTHON_DEPS} |
1055 |
- app-accessibility/at-spi2-atk:2 |
1056 |
- app-misc/ca-certificates |
1057 |
- dev-libs/dbus-glib |
1058 |
- >=dev-libs/glib-2.35.0:2[dbus] |
1059 |
- >=dev-libs/gobject-introspection-0.10.1:= |
1060 |
- >=dev-libs/json-glib-0.13.2 |
1061 |
- >=dev-libs/libcroco-0.6.2:0.6 |
1062 |
- dev-libs/libxml2:2 |
1063 |
- gnome-base/gconf:2[introspection] |
1064 |
- gnome-base/librsvg |
1065 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
1066 |
- >=gnome-extra/cinnamon-menus-3.0[introspection] |
1067 |
- >=gnome-extra/cjs-3.2.0 |
1068 |
- >=media-libs/clutter-1.10:1.0[introspection] |
1069 |
- media-libs/cogl:1.0=[introspection] |
1070 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
1071 |
- media-libs/gstreamer:1.0 |
1072 |
- media-libs/gst-plugins-base:1.0 |
1073 |
- net-libs/libsoup:2.4[introspection] |
1074 |
- >=sys-auth/polkit-0.100[introspection] |
1075 |
- x11-libs/gdk-pixbuf:2[introspection] |
1076 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
1077 |
- x11-libs/pango[introspection] |
1078 |
- >=x11-libs/startup-notification-0.11 |
1079 |
- x11-libs/libX11 |
1080 |
- >=x11-libs/libXfixes-5.0 |
1081 |
- >=x11-wm/muffin-3.2.0[introspection] |
1082 |
- networkmanager? ( |
1083 |
- gnome-base/libgnome-keyring |
1084 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
1085 |
-" |
1086 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
1087 |
- |
1088 |
-# Runtime-only deps are probably incomplete and approximate. |
1089 |
-# Each block: |
1090 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
1091 |
-# 3. gnome-session is needed for gnome-session-quit |
1092 |
-# 4. Control shell settings |
1093 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
1094 |
-# user switching with gdm-3.1.x) |
1095 |
-# 6. caribou needed for on-screen keyboard |
1096 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
1097 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
1098 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
1099 |
-# 10. pygobject needed for menu editor |
1100 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
1101 |
-# 12. polkit-gnome - explicitly autostarted by us |
1102 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
1103 |
-RDEPEND="${COMMON_DEPEND} |
1104 |
- >=gnome-base/dconf-0.4.1 |
1105 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
1106 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
1107 |
- |
1108 |
- >=gnome-extra/cinnamon-session-2.4 |
1109 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
1110 |
- |
1111 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
1112 |
- |
1113 |
- >=app-accessibility/caribou-0.3 |
1114 |
- |
1115 |
- x11-misc/xdg-utils |
1116 |
- x11-libs/xapps |
1117 |
- |
1118 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
1119 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
1120 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
1121 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
1122 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
1123 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
1124 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
1125 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
1126 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
1127 |
- |
1128 |
- x11-themes/gnome-themes-standard |
1129 |
- x11-themes/adwaita-icon-theme |
1130 |
- |
1131 |
- >=gnome-extra/nemo-2.4 |
1132 |
- >=gnome-extra/cinnamon-control-center-2.4 |
1133 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
1134 |
- |
1135 |
- gnome-extra/polkit-gnome |
1136 |
- |
1137 |
- networkmanager? ( |
1138 |
- gnome-extra/nm-applet |
1139 |
- net-misc/mobile-broadband-provider-info |
1140 |
- sys-libs/timezone-data ) |
1141 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
1142 |
-" |
1143 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
1144 |
- |
1145 |
-DEPEND="${COMMON_DEPEND} |
1146 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
1147 |
- dev-util/gtk-doc |
1148 |
- >=dev-util/intltool-0.4 |
1149 |
- >=sys-devel/gettext-0.17 |
1150 |
- virtual/pkgconfig |
1151 |
- gnome-base/gnome-common |
1152 |
- !!=dev-lang/spidermonkey-1.8.2* |
1153 |
-" |
1154 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
1155 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
1156 |
- |
1157 |
-S="${WORKDIR}/Cinnamon-${PV}" |
1158 |
- |
1159 |
-pkg_setup() { |
1160 |
- python_setup |
1161 |
-} |
1162 |
- |
1163 |
-src_prepare() { |
1164 |
- # Fix backgrounds path as cinnamon doesn't provide them |
1165 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
1166 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
1167 |
- |
1168 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
1169 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
1170 |
- |
1171 |
- # Optional NetworkManager, bug #488684 |
1172 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
1173 |
- |
1174 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
1175 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
1176 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
1177 |
- |
1178 |
- # Use pkexec instead of gksu (from Arch) |
1179 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
1180 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
1181 |
- |
1182 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
1183 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
1184 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
1185 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
1186 |
- |
1187 |
- if ! use networkmanager; then |
1188 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
1189 |
- fi |
1190 |
- |
1191 |
- # python 2-and-3 shebang fixing craziness |
1192 |
- local p |
1193 |
- python_setup 'python3*' |
1194 |
- for p in $(grep -rl '#!.*python3'); do |
1195 |
- python_fix_shebang "${p}" |
1196 |
- done |
1197 |
- |
1198 |
- python_setup 'python2*' |
1199 |
- for p in $(grep -rl '#!.*python[^3]'); do |
1200 |
- python_fix_shebang "${p}" |
1201 |
- done |
1202 |
- |
1203 |
- eautoreconf |
1204 |
- gnome2_src_prepare |
1205 |
-} |
1206 |
- |
1207 |
-src_configure() { |
1208 |
- gnome2_src_configure \ |
1209 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
1210 |
- --disable-jhbuild-wrapper-script \ |
1211 |
- $(use_enable networkmanager) \ |
1212 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
1213 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
1214 |
- --without-bluetooth |
1215 |
-} |
1216 |
- |
1217 |
-src_install() { |
1218 |
- gnome2_src_install |
1219 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
1220 |
- |
1221 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
1222 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
1223 |
- |
1224 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
1225 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
1226 |
- |
1227 |
- # Ensure authentication-agent is started, bug #523958 |
1228 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
1229 |
- insinto /etc/xdg/autostart/ |
1230 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
1231 |
-} |
1232 |
- |
1233 |
-pkg_postinst() { |
1234 |
- gnome2_pkg_postinst |
1235 |
- |
1236 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
1237 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
1238 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
1239 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
1240 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
1241 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
1242 |
- fi |
1243 |
- |
1244 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
1245 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
1246 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
1247 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
1248 |
- fi |
1249 |
- |
1250 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
1251 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
1252 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
1253 |
- ewarn "open-source drivers." |
1254 |
- fi |
1255 |
-} |
1256 |
|
1257 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild b/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild |
1258 |
deleted file mode 100644 |
1259 |
index 7a62d8ff83f..00000000000 |
1260 |
--- a/gnome-extra/cinnamon/cinnamon-3.4.6.ebuild |
1261 |
+++ /dev/null |
1262 |
@@ -1,234 +0,0 @@ |
1263 |
-# Copyright 1999-2017 Gentoo Foundation |
1264 |
-# Distributed under the terms of the GNU General Public License v2 |
1265 |
- |
1266 |
-EAPI=6 |
1267 |
-GNOME2_LA_PUNT="yes" |
1268 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
1269 |
-PYTHON_REQ_USE="xml" |
1270 |
- |
1271 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
1272 |
- |
1273 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
1274 |
-HOMEPAGE="http://developer.linuxmint.com/" |
1275 |
- |
1276 |
-MY_PV="${PV/_p/-UP}" |
1277 |
-MY_P="${PN}-${MY_PV}" |
1278 |
- |
1279 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
1280 |
- |
1281 |
-LICENSE="GPL-2+" |
1282 |
-SLOT="0" |
1283 |
- |
1284 |
-# bluetooth support dropped due to bug #511648 |
1285 |
-IUSE="+nls +networkmanager" #+bluetooth |
1286 |
- |
1287 |
-# We need *both* python 2.x and 3.x |
1288 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
1289 |
- || ( $(python_gen_useflags 'python2*') ) |
1290 |
- || ( $(python_gen_useflags 'python3*') ) |
1291 |
-" |
1292 |
- |
1293 |
-KEYWORDS="~amd64 ~x86" |
1294 |
- |
1295 |
-COMMON_DEPEND="${PYTHON_DEPS} |
1296 |
- app-accessibility/at-spi2-atk:2 |
1297 |
- app-misc/ca-certificates |
1298 |
- dev-libs/dbus-glib |
1299 |
- >=dev-libs/glib-2.35.0:2[dbus] |
1300 |
- >=dev-libs/gobject-introspection-0.10.1:= |
1301 |
- >=dev-libs/json-glib-0.13.2 |
1302 |
- >=dev-libs/libcroco-0.6.2:0.6 |
1303 |
- dev-libs/libxml2:2 |
1304 |
- gnome-base/gconf:2[introspection] |
1305 |
- gnome-base/librsvg |
1306 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
1307 |
- >=gnome-extra/cinnamon-menus-3.0[introspection] |
1308 |
- >=gnome-extra/cjs-3.2.0 |
1309 |
- >=media-libs/clutter-1.10:1.0[introspection] |
1310 |
- media-libs/cogl:1.0=[introspection] |
1311 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
1312 |
- media-libs/gstreamer:1.0 |
1313 |
- media-libs/gst-plugins-base:1.0 |
1314 |
- net-libs/libsoup:2.4[introspection] |
1315 |
- >=sys-auth/polkit-0.100[introspection] |
1316 |
- x11-libs/gdk-pixbuf:2[introspection] |
1317 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
1318 |
- x11-libs/pango[introspection] |
1319 |
- >=x11-libs/startup-notification-0.11 |
1320 |
- x11-libs/libX11 |
1321 |
- >=x11-libs/libXfixes-5.0 |
1322 |
- >=x11-wm/muffin-3.2.0[introspection] |
1323 |
- networkmanager? ( |
1324 |
- gnome-base/libgnome-keyring |
1325 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
1326 |
-" |
1327 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
1328 |
- |
1329 |
-# Runtime-only deps are probably incomplete and approximate. |
1330 |
-# Each block: |
1331 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
1332 |
-# 3. gnome-session is needed for gnome-session-quit |
1333 |
-# 4. Control shell settings |
1334 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
1335 |
-# user switching with gdm-3.1.x) |
1336 |
-# 6. caribou needed for on-screen keyboard |
1337 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
1338 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
1339 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
1340 |
-# 10. pygobject needed for menu editor |
1341 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
1342 |
-# 12. polkit-gnome - explicitly autostarted by us |
1343 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
1344 |
-RDEPEND="${COMMON_DEPEND} |
1345 |
- >=gnome-base/dconf-0.4.1 |
1346 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
1347 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
1348 |
- |
1349 |
- >=gnome-extra/cinnamon-session-2.4 |
1350 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
1351 |
- |
1352 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
1353 |
- |
1354 |
- >=app-accessibility/caribou-0.3 |
1355 |
- |
1356 |
- x11-misc/xdg-utils |
1357 |
- x11-libs/xapps |
1358 |
- |
1359 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
1360 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
1361 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
1362 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
1363 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
1364 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
1365 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
1366 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
1367 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
1368 |
- |
1369 |
- x11-themes/gnome-themes-standard |
1370 |
- x11-themes/adwaita-icon-theme |
1371 |
- |
1372 |
- >=gnome-extra/nemo-2.4 |
1373 |
- >=gnome-extra/cinnamon-control-center-2.4 |
1374 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
1375 |
- |
1376 |
- gnome-extra/polkit-gnome |
1377 |
- |
1378 |
- networkmanager? ( |
1379 |
- gnome-extra/nm-applet |
1380 |
- net-misc/mobile-broadband-provider-info |
1381 |
- sys-libs/timezone-data ) |
1382 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
1383 |
-" |
1384 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
1385 |
- |
1386 |
-DEPEND="${COMMON_DEPEND} |
1387 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
1388 |
- dev-util/gtk-doc |
1389 |
- >=dev-util/intltool-0.4 |
1390 |
- >=sys-devel/gettext-0.17 |
1391 |
- virtual/pkgconfig |
1392 |
- gnome-base/gnome-common |
1393 |
- !!=dev-lang/spidermonkey-1.8.2* |
1394 |
-" |
1395 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
1396 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
1397 |
- |
1398 |
-S="${WORKDIR}/Cinnamon-${PV}" |
1399 |
- |
1400 |
-pkg_setup() { |
1401 |
- python_setup |
1402 |
-} |
1403 |
- |
1404 |
-src_prepare() { |
1405 |
- # Fix backgrounds path as cinnamon doesn't provide them |
1406 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
1407 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
1408 |
- |
1409 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
1410 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
1411 |
- |
1412 |
- # Optional NetworkManager, bug #488684 |
1413 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
1414 |
- |
1415 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
1416 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
1417 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
1418 |
- |
1419 |
- # Use pkexec instead of gksu (from Arch) |
1420 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
1421 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
1422 |
- |
1423 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
1424 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
1425 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
1426 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
1427 |
- |
1428 |
- if ! use networkmanager; then |
1429 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
1430 |
- fi |
1431 |
- |
1432 |
- # python 2-and-3 shebang fixing craziness |
1433 |
- local p |
1434 |
- python_setup 'python3*' |
1435 |
- for p in $(grep -rl '#!.*python3'); do |
1436 |
- python_fix_shebang "${p}" |
1437 |
- done |
1438 |
- |
1439 |
- python_setup 'python2*' |
1440 |
- for p in $(grep -rl '#!.*python[^3]'); do |
1441 |
- python_fix_shebang "${p}" |
1442 |
- done |
1443 |
- |
1444 |
- eautoreconf |
1445 |
- gnome2_src_prepare |
1446 |
-} |
1447 |
- |
1448 |
-src_configure() { |
1449 |
- gnome2_src_configure \ |
1450 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
1451 |
- --disable-jhbuild-wrapper-script \ |
1452 |
- $(use_enable networkmanager) \ |
1453 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
1454 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
1455 |
- --without-bluetooth |
1456 |
-} |
1457 |
- |
1458 |
-src_install() { |
1459 |
- gnome2_src_install |
1460 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
1461 |
- |
1462 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
1463 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
1464 |
- |
1465 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
1466 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
1467 |
- |
1468 |
- # Ensure authentication-agent is started, bug #523958 |
1469 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
1470 |
- insinto /etc/xdg/autostart/ |
1471 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
1472 |
-} |
1473 |
- |
1474 |
-pkg_postinst() { |
1475 |
- gnome2_pkg_postinst |
1476 |
- |
1477 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
1478 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
1479 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
1480 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
1481 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
1482 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
1483 |
- fi |
1484 |
- |
1485 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
1486 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
1487 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
1488 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
1489 |
- fi |
1490 |
- |
1491 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
1492 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
1493 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
1494 |
- ewarn "open-source drivers." |
1495 |
- fi |
1496 |
-} |
1497 |
|
1498 |
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch |
1499 |
deleted file mode 100644 |
1500 |
index 6af4f8642f7..00000000000 |
1501 |
--- a/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch |
1502 |
+++ /dev/null |
1503 |
@@ -1,88 +0,0 @@ |
1504 |
-From 3dbb6dc0b3dd08e6d5ae24fa079d9443c1b66ab9 Mon Sep 17 00:00:00 2001 |
1505 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
1506 |
-Date: Sat, 10 May 2014 15:14:05 -0400 |
1507 |
-Subject: [PATCH] Make networkmanager dependency optional for Gentoo |
1508 |
- |
1509 |
---- |
1510 |
- configure.ac | 35 ++++++++++++++++++++++++++++++++++- |
1511 |
- js/misc/config.js.in | 2 ++ |
1512 |
- src/Makefile.am | 5 ++++- |
1513 |
- 3 files changed, 40 insertions(+), 2 deletions(-) |
1514 |
- |
1515 |
-diff --git a/configure.ac b/configure.ac |
1516 |
-index b5668f4..5f600dd 100644 |
1517 |
---- a/configure.ac |
1518 |
-+++ b/configure.ac |
1519 |
-@@ -82,7 +82,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION |
1520 |
- libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION |
1521 |
- gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION |
1522 |
- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes |
1523 |
-- libnm-glib libnm-util gnome-keyring-1 atk-bridge-2.0) |
1524 |
-+ atk-bridge-2.0) |
1525 |
-+ |
1526 |
-+########################## |
1527 |
-+# Check for NetworkManager |
1528 |
-+########################## |
1529 |
-+NM_MIN_VERSION=0.9 |
1530 |
-+AC_ARG_ENABLE(networkmanager, |
1531 |
-+ AS_HELP_STRING([--disable-networkmanager], |
1532 |
-+ [disable NetworkManager support @<:@default=auto@:>@]),, |
1533 |
-+ [enable_networkmanager=auto]) |
1534 |
-+ |
1535 |
-+if test "x$enable_networkmanager" != "xno"; then |
1536 |
-+ PKG_CHECK_MODULES(NETWORKMANAGER, |
1537 |
-+ [libnm-glib libnm-util gnome-keyring-1], |
1538 |
-+ [have_networkmanager=yes], |
1539 |
-+ [have_networkmanager=no]) |
1540 |
-+ |
1541 |
-+ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS" |
1542 |
-+ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS" |
1543 |
-+else |
1544 |
-+ have_networkmanager="no (disabled)" |
1545 |
-+fi |
1546 |
-+ |
1547 |
-+if test "x$have_networkmanager" = "xyes"; then |
1548 |
-+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager]) |
1549 |
-+ AC_SUBST([HAVE_NETWORKMANAGER], [1]) |
1550 |
-+else |
1551 |
-+ if test "x$enable_networkmanager" = "xyes"; then |
1552 |
-+ AC_MSG_ERROR([Couldn't find NetworkManager.]) |
1553 |
-+ fi |
1554 |
-+ AC_SUBST([HAVE_NETWORKMANAGER], [0]) |
1555 |
-+fi |
1556 |
-+ |
1557 |
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") |
1558 |
- |
1559 |
- PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION) |
1560 |
- |
1561 |
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in |
1562 |
-index 704989b..df7e014 100644 |
1563 |
---- a/js/misc/config.js.in |
1564 |
-+++ b/js/misc/config.js.in |
1565 |
-@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; |
1566 |
- const GJS_VERSION = '@GJS_VERSION@'; |
1567 |
- /* 1 if gnome-bluetooth is available, 0 otherwise */ |
1568 |
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; |
1569 |
-+/* 1 if networkmanager is available, 0 otherwise */ |
1570 |
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; |
1571 |
- /* The system TLS CA list */ |
1572 |
- const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; |
1573 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
1574 |
-index 0b0a4a9..cf3a606 100644 |
1575 |
---- a/src/Makefile.am |
1576 |
-+++ b/src/Makefile.am |
1577 |
-@@ -290,7 +290,10 @@ libcinnamon_la_LIBADD = \ |
1578 |
- libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) |
1579 |
- |
1580 |
- Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir |
1581 |
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0 |
1582 |
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 |
1583 |
-+if HAVE_NETWORKMANAGER |
1584 |
-+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 |
1585 |
-+endif |
1586 |
- Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) |
1587 |
- Cinnamon_0_1_gir_LIBS = libcinnamon.la |
1588 |
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) |
1589 |
--- |
1590 |
-2.4.3 |
1591 |
- |
1592 |
|
1593 |
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch |
1594 |
deleted file mode 100644 |
1595 |
index a018013e60d..00000000000 |
1596 |
--- a/gnome-extra/cinnamon/files/cinnamon-2.8.3-set-wheel.patch |
1597 |
+++ /dev/null |
1598 |
@@ -1,56 +0,0 @@ |
1599 |
---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py |
1600 |
-+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py |
1601 |
-@@ -147,12 +147,11 @@ |
1602 |
- |
1603 |
- class PasswordDialog(Gtk.Dialog): |
1604 |
- |
1605 |
-- def __init__ (self, user, password_mask, group_mask): |
1606 |
-+ def __init__ (self, user, password_mask): |
1607 |
- super(PasswordDialog, self).__init__() |
1608 |
- |
1609 |
- self.user = user |
1610 |
- self.password_mask = password_mask |
1611 |
-- self.group_mask = group_mask |
1612 |
- |
1613 |
- self.set_modal(True) |
1614 |
- self.set_skip_taskbar_hint(True) |
1615 |
-@@ -218,14 +217,7 @@ |
1616 |
- def change_password(self): |
1617 |
- newpass = self.new_password.get_text() |
1618 |
- self.user.set_password(newpass, "") |
1619 |
-- mask = self.group_mask.get_text() |
1620 |
-- if "nopasswdlogin" in mask: |
1621 |
-- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"]) |
1622 |
-- mask = mask.split(", ") |
1623 |
-- mask.remove("nopasswdlogin") |
1624 |
-- mask = ", ".join(mask) |
1625 |
-- self.group_mask.set_text(mask) |
1626 |
-- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') |
1627 |
-+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') |
1628 |
- self.destroy() |
1629 |
- |
1630 |
- def set_passwords_visibility(self): |
1631 |
-@@ -563,7 +555,7 @@ |
1632 |
- model, treeiter = self.users_treeview.get_selection().get_selected() |
1633 |
- if treeiter != None: |
1634 |
- user = model[treeiter][INDEX_USER_OBJECT] |
1635 |
-- dialog = PasswordDialog(user, self.password_mask, self.groups_label) |
1636 |
-+ dialog = PasswordDialog(user, self.password_mask) |
1637 |
- response = dialog.run() |
1638 |
- |
1639 |
- def _on_groups_button_clicked(self, widget): |
1640 |
-@@ -807,11 +799,11 @@ |
1641 |
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) |
1642 |
- description = "<b>%s</b>\n%s" % (fullname, username) |
1643 |
- piter = self.users.append(None, [new_user, pixbuf, description]) |
1644 |
-- # Add the user to his/her own group and sudo if Administrator was selected |
1645 |
-+ # Add the user to his/her own group and wheel if Administrator was selected |
1646 |
- if dialog.account_type_combo.get_active() == 1: |
1647 |
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username]) |
1648 |
-+ subprocess.call(["usermod", username, "-G", "%s,wheel" % username]) |
1649 |
- else: |
1650 |
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username]) |
1651 |
-+ subprocess.call(["usermod", username, "-G", "%s" % username]) |
1652 |
- self.load_groups() |
1653 |
- dialog.destroy() |
1654 |
- |