1 |
commit: 2ca6628f3dd84a484b59b1825b5df6e51e0d32a4 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 2 14:16:30 2017 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 2 14:17:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ca6628f |
7 |
|
8 |
gnome-extra/cinnamon: remove old that still had USE=gtk dep on gnome-themes-standard |
9 |
|
10 |
The gnome-themes-standard versions that had IUSE=gtk got cleaned up, so need to |
11 |
clean up here too to fix repoman in cinnamon |
12 |
|
13 |
Gentoo-bug: 596556 |
14 |
Acked-by: Kristian Fiskerstrand <k_f <AT> gentoo.org> |
15 |
|
16 |
gnome-extra/cinnamon/Manifest | 2 - |
17 |
gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild | 243 --------------------- |
18 |
gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild | 238 -------------------- |
19 |
gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild | 238 -------------------- |
20 |
.../cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch | 11 - |
21 |
5 files changed, 732 deletions(-) |
22 |
|
23 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
24 |
index 0bcbd88d9b1..6566485a98a 100644 |
25 |
--- a/gnome-extra/cinnamon/Manifest |
26 |
+++ b/gnome-extra/cinnamon/Manifest |
27 |
@@ -1,5 +1,3 @@ |
28 |
-DIST cinnamon-2.8.8.tar.gz 3026643 SHA256 33f838cb9c1d4213ebb18d5869949757dda97a6e0745f224d06be75de69caee7 SHA512 e41fae744ea2dfcb3589a47f689b230369a8dc4c3682f3cc15836a9be6c67fd1cd872223084b518cd422057431ea77f7df67055757b5cd43e5e96cb3cb3a2ec5 WHIRLPOOL 1cb5e0b13814d4b21e7711ad0d5754aa85c36e4616d48e7dbebad1bd7d34b928a5b4d4d55b6fd12fb2b44c96b22535ca68b3b6542af99306a609cbc58ea59784 |
29 |
-DIST cinnamon-3.0.6.tar.gz 3065823 SHA256 1a3aafe4339948e44b2866b25ac6ecc70b021ef8edb674a9e2af0a59ef42d405 SHA512 ed97986d688281055d14896e1f6bd2c2835b5c87b7f756e9385c91ab05554ccb638b925156032147bd784a7f96acfc7bf3d922db27397c1de3315b15cae5f8c4 WHIRLPOOL bb60479a72b9c0a5537419e497b4c877e4d900c2131b4e7dab78d72cd61e152a4c7134112fa88dfc5cd5107cbade9d466ede82223f4e97107dcaaf081d9bf92c |
30 |
DIST cinnamon-3.0.7.tar.gz 3065791 SHA256 0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f SHA512 db3f2532525c71b0841ce22245518502f8e905fd353c22e41dc57551cf68422ab6b53a57e4089664e8db9035a7723214756de78d2b5d5a92e11515216b15afbf WHIRLPOOL 7f7e0f3841d8790f332342e9d0696c8f70e81657ea02e1374871505be1c5ecdb7e9d4fc4fd0d600bf69fcd856123a58d5b272b4de03f9dd7d4c7d3d8278154b0 |
31 |
DIST cinnamon-3.2.0.tar.gz 2216495 SHA256 c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d SHA512 340530d77e68a5680cfa44afa3efc157552a7319f9badb251456d43e4e0a4e8c7cecf8e273c6cedec05e8248d68bbbdca2f8bb9d1766c418a6bc10d386e38302 WHIRLPOOL 58c749c9679f582a7ef088f4a8026d7027c84368be5d2c07ba9dd29c9a0781ad962fdbb4342538bb3b801f2fce60c483a0b806008e6fecb2698b367969aefc52 |
32 |
DIST cinnamon-3.2.6.tar.gz 2225445 SHA256 ab2e5681e4780e065ebf4aebf4b909e9b723a69d7d437ea490c7a9a39ffce8a5 SHA512 b21f762341c523a0292de27e37b664e758adafeeb658bb056a08f5aa3ec6c29709cf9db78ab48a9ab21982b7e1bfc0674f79395995348ff0b877c2c04e7038fb WHIRLPOOL 2d1c8c7662a3e76dae733300a86057962a159ad4fd7946f73b84bfdf624d6c6fb23b863847786879233d7dd2f3a8bc037c64fb065977732259f0c3b60857039f |
33 |
|
34 |
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild |
35 |
deleted file mode 100644 |
36 |
index c7179a515f0..00000000000 |
37 |
--- a/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,243 +0,0 @@ |
40 |
-# Copyright 1999-2017 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=6 |
44 |
-GNOME2_LA_PUNT="yes" |
45 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
46 |
-PYTHON_REQ_USE="xml" |
47 |
- |
48 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
49 |
- |
50 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
51 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
52 |
- |
53 |
-MY_PV="${PV/_p/-UP}" |
54 |
-MY_P="${PN}-${MY_PV}" |
55 |
- |
56 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
57 |
- |
58 |
-LICENSE="GPL-2+" |
59 |
-SLOT="0" |
60 |
- |
61 |
-# bluetooth support dropped due to bug #511648 |
62 |
-IUSE="+nls +networkmanager" #+bluetooth |
63 |
- |
64 |
-# We need *both* python 2.x and 3.x |
65 |
-REQUIRED_USE=" |
66 |
- || ( $(python_gen_useflags 'python2*') ) |
67 |
- || ( $(python_gen_useflags 'python3*') ) |
68 |
-" |
69 |
- |
70 |
-KEYWORDS="amd64 x86" |
71 |
- |
72 |
-COMMON_DEPEND="${PYTHON_DEPS} |
73 |
- app-accessibility/at-spi2-atk:2 |
74 |
- app-misc/ca-certificates |
75 |
- dev-libs/dbus-glib |
76 |
- >=dev-libs/glib-2.35.0:2[dbus] |
77 |
- >=dev-libs/gobject-introspection-0.10.1:= |
78 |
- >=dev-libs/json-glib-0.13.2 |
79 |
- >=dev-libs/libcroco-0.6.2:0.6 |
80 |
- dev-libs/libxml2:2 |
81 |
- gnome-base/gconf:2[introspection] |
82 |
- gnome-base/librsvg |
83 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
84 |
- gnome-extra/cinnamon-menus[introspection] |
85 |
- >=gnome-extra/cjs-2.8.0 |
86 |
- >=media-libs/clutter-1.10:1.0[introspection] |
87 |
- media-libs/cogl:1.0=[introspection] |
88 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
89 |
- media-libs/gstreamer:1.0 |
90 |
- media-libs/gst-plugins-base:1.0 |
91 |
- media-sound/pulseaudio:0=[glib] |
92 |
- net-libs/libsoup:2.4[introspection] |
93 |
- >=sys-auth/polkit-0.100[introspection] |
94 |
- x11-libs/gdk-pixbuf:2[introspection] |
95 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
96 |
- x11-libs/pango[introspection] |
97 |
- >=x11-libs/startup-notification-0.11 |
98 |
- x11-libs/libX11 |
99 |
- >=x11-libs/libXfixes-5.0 |
100 |
- >=x11-wm/muffin-2.5[introspection] |
101 |
- networkmanager? ( |
102 |
- gnome-base/libgnome-keyring |
103 |
- >=net-misc/networkmanager-0.8.999[introspection] ) |
104 |
-" |
105 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
106 |
- |
107 |
-# Runtime-only deps are probably incomplete and approximate. |
108 |
-# Each block: |
109 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
110 |
-# 3. gnome-session is needed for gnome-session-quit |
111 |
-# 4. Control shell settings |
112 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
113 |
-# user switching with gdm-3.1.x) |
114 |
-# 6. caribou needed for on-screen keyboard |
115 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
116 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
117 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
118 |
-# 10. pygobject needed for menu editor |
119 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
120 |
-# 12. polkit-gnome - explicitly autostarted by us |
121 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
122 |
-RDEPEND="${COMMON_DEPEND} |
123 |
- >=gnome-base/dconf-0.4.1 |
124 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
125 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
126 |
- |
127 |
- >=gnome-extra/cinnamon-session-2.4 |
128 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
129 |
- |
130 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
131 |
- |
132 |
- >=app-accessibility/caribou-0.3 |
133 |
- |
134 |
- x11-misc/xdg-utils |
135 |
- |
136 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
137 |
- $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]' 'python2*') |
138 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
139 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
140 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
141 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
142 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
143 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
144 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
145 |
- |
146 |
- x11-themes/gnome-themes-standard[gtk] |
147 |
- x11-themes/adwaita-icon-theme |
148 |
- |
149 |
- >=gnome-extra/nemo-2.4 |
150 |
- >=gnome-extra/cinnamon-control-center-2.4 |
151 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
152 |
- |
153 |
- gnome-extra/polkit-gnome |
154 |
- |
155 |
- networkmanager? ( |
156 |
- gnome-extra/nm-applet |
157 |
- net-misc/mobile-broadband-provider-info |
158 |
- sys-libs/timezone-data ) |
159 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
160 |
-" |
161 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
162 |
- |
163 |
-DEPEND="${COMMON_DEPEND} |
164 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
165 |
- dev-util/gtk-doc |
166 |
- >=dev-util/intltool-0.4 |
167 |
- >=sys-devel/gettext-0.17 |
168 |
- virtual/pkgconfig |
169 |
- gnome-base/gnome-common |
170 |
- !!=dev-lang/spidermonkey-1.8.2* |
171 |
-" |
172 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
173 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
174 |
- |
175 |
-S="${WORKDIR}/Cinnamon-${PV}" |
176 |
- |
177 |
-pkg_setup() { |
178 |
- python_setup |
179 |
-} |
180 |
- |
181 |
-src_prepare() { |
182 |
- # Fix backgrounds path as cinnamon doesn't provide them |
183 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
184 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
185 |
- |
186 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
187 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
188 |
- |
189 |
- # Optional NetworkManager, bug #488684 |
190 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
191 |
- |
192 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
193 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
194 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
195 |
- |
196 |
- # Fix GNOME 3.14 support (from Fedora/Arch) |
197 |
- # https://github.com/linuxmint/Cinnamon/issues/3577 |
198 |
- eapply "${FILESDIR}"/${PN}-2.8.3-gnome-3.14.patch |
199 |
- |
200 |
- # Use pkexec instead of gksu (from Arch) |
201 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
202 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
203 |
- |
204 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
205 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
206 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
207 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
208 |
- |
209 |
- if ! use networkmanager; then |
210 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
211 |
- fi |
212 |
- |
213 |
- # python 2-and-3 shebang fixing craziness |
214 |
- local p |
215 |
- python_setup 'python3*' |
216 |
- for p in $(grep -rl '#!.*python3'); do |
217 |
- python_fix_shebang "${p}" |
218 |
- done |
219 |
- |
220 |
- python_setup 'python2*' |
221 |
- for p in $(grep -rl '#!.*python[^3]'); do |
222 |
- python_fix_shebang "${p}" |
223 |
- done |
224 |
- |
225 |
- eautoreconf |
226 |
- gnome2_src_prepare |
227 |
-} |
228 |
- |
229 |
-src_configure() { |
230 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
231 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
232 |
- append-ldflags $(no-as-needed) |
233 |
- |
234 |
- gnome2_src_configure \ |
235 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
236 |
- --disable-rpath \ |
237 |
- --disable-jhbuild-wrapper-script \ |
238 |
- $(use_enable networkmanager) \ |
239 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
240 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
241 |
- --without-bluetooth |
242 |
-} |
243 |
- |
244 |
-src_install() { |
245 |
- gnome2_src_install |
246 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
247 |
- |
248 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
249 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
250 |
- |
251 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
252 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
253 |
- |
254 |
- # Ensure authentication-agent is started, bug #523958 |
255 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
256 |
- insinto /etc/xdg/autostart/ |
257 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
258 |
-} |
259 |
- |
260 |
-pkg_postinst() { |
261 |
- gnome2_pkg_postinst |
262 |
- |
263 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
264 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
265 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
266 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
267 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
268 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
269 |
- fi |
270 |
- |
271 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
272 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
273 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
274 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
275 |
- fi |
276 |
- |
277 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
278 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
279 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
280 |
- ewarn "open-source drivers." |
281 |
- fi |
282 |
-} |
283 |
|
284 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild |
285 |
deleted file mode 100644 |
286 |
index 45c4dc6b9a6..00000000000 |
287 |
--- a/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild |
288 |
+++ /dev/null |
289 |
@@ -1,238 +0,0 @@ |
290 |
-# Copyright 1999-2017 Gentoo Foundation |
291 |
-# Distributed under the terms of the GNU General Public License v2 |
292 |
- |
293 |
-EAPI=6 |
294 |
-GNOME2_LA_PUNT="yes" |
295 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
296 |
-PYTHON_REQ_USE="xml" |
297 |
- |
298 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
299 |
- |
300 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
301 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
302 |
- |
303 |
-MY_PV="${PV/_p/-UP}" |
304 |
-MY_P="${PN}-${MY_PV}" |
305 |
- |
306 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
307 |
- |
308 |
-LICENSE="GPL-2+" |
309 |
-SLOT="0" |
310 |
- |
311 |
-# bluetooth support dropped due to bug #511648 |
312 |
-IUSE="+nls +networkmanager" #+bluetooth |
313 |
- |
314 |
-# We need *both* python 2.x and 3.x |
315 |
-REQUIRED_USE=" |
316 |
- || ( $(python_gen_useflags 'python2*') ) |
317 |
- || ( $(python_gen_useflags 'python3*') ) |
318 |
-" |
319 |
- |
320 |
-KEYWORDS="~amd64 ~x86" |
321 |
- |
322 |
-COMMON_DEPEND="${PYTHON_DEPS} |
323 |
- app-accessibility/at-spi2-atk:2 |
324 |
- app-misc/ca-certificates |
325 |
- dev-libs/dbus-glib |
326 |
- >=dev-libs/glib-2.35.0:2[dbus] |
327 |
- >=dev-libs/gobject-introspection-0.10.1:= |
328 |
- >=dev-libs/json-glib-0.13.2 |
329 |
- >=dev-libs/libcroco-0.6.2:0.6 |
330 |
- dev-libs/libxml2:2 |
331 |
- gnome-base/gconf:2[introspection] |
332 |
- gnome-base/librsvg |
333 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
334 |
- gnome-extra/cinnamon-menus[introspection] |
335 |
- >=gnome-extra/cjs-2.8.0 |
336 |
- >=media-libs/clutter-1.10:1.0[introspection] |
337 |
- media-libs/cogl:1.0=[introspection] |
338 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
339 |
- media-libs/gstreamer:1.0 |
340 |
- media-libs/gst-plugins-base:1.0 |
341 |
- net-libs/libsoup:2.4[introspection] |
342 |
- >=sys-auth/polkit-0.100[introspection] |
343 |
- x11-libs/gdk-pixbuf:2[introspection] |
344 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
345 |
- x11-libs/pango[introspection] |
346 |
- >=x11-libs/startup-notification-0.11 |
347 |
- x11-libs/libX11 |
348 |
- >=x11-libs/libXfixes-5.0 |
349 |
- >=x11-wm/muffin-3.0.0[introspection] |
350 |
- networkmanager? ( |
351 |
- gnome-base/libgnome-keyring |
352 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
353 |
-" |
354 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
355 |
- |
356 |
-# Runtime-only deps are probably incomplete and approximate. |
357 |
-# Each block: |
358 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
359 |
-# 3. gnome-session is needed for gnome-session-quit |
360 |
-# 4. Control shell settings |
361 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
362 |
-# user switching with gdm-3.1.x) |
363 |
-# 6. caribou needed for on-screen keyboard |
364 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
365 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
366 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
367 |
-# 10. pygobject needed for menu editor |
368 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
369 |
-# 12. polkit-gnome - explicitly autostarted by us |
370 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
371 |
-RDEPEND="${COMMON_DEPEND} |
372 |
- >=gnome-base/dconf-0.4.1 |
373 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
374 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
375 |
- |
376 |
- >=gnome-extra/cinnamon-session-2.4 |
377 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
378 |
- |
379 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
380 |
- |
381 |
- >=app-accessibility/caribou-0.3 |
382 |
- |
383 |
- x11-misc/xdg-utils |
384 |
- |
385 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
386 |
- $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]' 'python2*') |
387 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
388 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
389 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
390 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
391 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
392 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
393 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
394 |
- |
395 |
- x11-themes/gnome-themes-standard[gtk] |
396 |
- x11-themes/adwaita-icon-theme |
397 |
- |
398 |
- >=gnome-extra/nemo-2.4 |
399 |
- >=gnome-extra/cinnamon-control-center-2.4 |
400 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
401 |
- |
402 |
- gnome-extra/polkit-gnome |
403 |
- |
404 |
- networkmanager? ( |
405 |
- gnome-extra/nm-applet |
406 |
- net-misc/mobile-broadband-provider-info |
407 |
- sys-libs/timezone-data ) |
408 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
409 |
-" |
410 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
411 |
- |
412 |
-DEPEND="${COMMON_DEPEND} |
413 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
414 |
- dev-util/gtk-doc |
415 |
- >=dev-util/intltool-0.4 |
416 |
- >=sys-devel/gettext-0.17 |
417 |
- virtual/pkgconfig |
418 |
- gnome-base/gnome-common |
419 |
- !!=dev-lang/spidermonkey-1.8.2* |
420 |
-" |
421 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
422 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
423 |
- |
424 |
-S="${WORKDIR}/Cinnamon-${PV}" |
425 |
- |
426 |
-pkg_setup() { |
427 |
- python_setup |
428 |
-} |
429 |
- |
430 |
-src_prepare() { |
431 |
- # Fix backgrounds path as cinnamon doesn't provide them |
432 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
433 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
434 |
- |
435 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
436 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
437 |
- |
438 |
- # Optional NetworkManager, bug #488684 |
439 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
440 |
- |
441 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
442 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
443 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
444 |
- |
445 |
- # Use pkexec instead of gksu (from Arch) |
446 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
447 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
448 |
- |
449 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
450 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
451 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
452 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
453 |
- |
454 |
- if ! use networkmanager; then |
455 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
456 |
- fi |
457 |
- |
458 |
- # python 2-and-3 shebang fixing craziness |
459 |
- local p |
460 |
- python_setup 'python3*' |
461 |
- for p in $(grep -rl '#!.*python3'); do |
462 |
- python_fix_shebang "${p}" |
463 |
- done |
464 |
- |
465 |
- python_setup 'python2*' |
466 |
- for p in $(grep -rl '#!.*python[^3]'); do |
467 |
- python_fix_shebang "${p}" |
468 |
- done |
469 |
- |
470 |
- eautoreconf |
471 |
- gnome2_src_prepare |
472 |
-} |
473 |
- |
474 |
-src_configure() { |
475 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
476 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
477 |
- append-ldflags $(no-as-needed) |
478 |
- |
479 |
- gnome2_src_configure \ |
480 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
481 |
- --disable-rpath \ |
482 |
- --disable-jhbuild-wrapper-script \ |
483 |
- $(use_enable networkmanager) \ |
484 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
485 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
486 |
- --without-bluetooth |
487 |
-} |
488 |
- |
489 |
-src_install() { |
490 |
- gnome2_src_install |
491 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
492 |
- |
493 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
494 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
495 |
- |
496 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
497 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
498 |
- |
499 |
- # Ensure authentication-agent is started, bug #523958 |
500 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
501 |
- insinto /etc/xdg/autostart/ |
502 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
503 |
-} |
504 |
- |
505 |
-pkg_postinst() { |
506 |
- gnome2_pkg_postinst |
507 |
- |
508 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
509 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
510 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
511 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
512 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
513 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
514 |
- fi |
515 |
- |
516 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
517 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
518 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
519 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
520 |
- fi |
521 |
- |
522 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
523 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
524 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
525 |
- ewarn "open-source drivers." |
526 |
- fi |
527 |
-} |
528 |
|
529 |
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild |
530 |
deleted file mode 100644 |
531 |
index 81153441342..00000000000 |
532 |
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild |
533 |
+++ /dev/null |
534 |
@@ -1,238 +0,0 @@ |
535 |
-# Copyright 1999-2017 Gentoo Foundation |
536 |
-# Distributed under the terms of the GNU General Public License v2 |
537 |
- |
538 |
-EAPI=6 |
539 |
-GNOME2_LA_PUNT="yes" |
540 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
541 |
-PYTHON_REQ_USE="xml" |
542 |
- |
543 |
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1 |
544 |
- |
545 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
546 |
-HOMEPAGE="http://cinnamon.linuxmint.com/" |
547 |
- |
548 |
-MY_PV="${PV/_p/-UP}" |
549 |
-MY_P="${PN}-${MY_PV}" |
550 |
- |
551 |
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
552 |
- |
553 |
-LICENSE="GPL-2+" |
554 |
-SLOT="0" |
555 |
- |
556 |
-# bluetooth support dropped due to bug #511648 |
557 |
-IUSE="+nls +networkmanager" #+bluetooth |
558 |
- |
559 |
-# We need *both* python 2.x and 3.x |
560 |
-REQUIRED_USE=" |
561 |
- || ( $(python_gen_useflags 'python2*') ) |
562 |
- || ( $(python_gen_useflags 'python3*') ) |
563 |
-" |
564 |
- |
565 |
-KEYWORDS="amd64 x86" |
566 |
- |
567 |
-COMMON_DEPEND="${PYTHON_DEPS} |
568 |
- app-accessibility/at-spi2-atk:2 |
569 |
- app-misc/ca-certificates |
570 |
- dev-libs/dbus-glib |
571 |
- >=dev-libs/glib-2.35.0:2[dbus] |
572 |
- >=dev-libs/gobject-introspection-0.10.1:= |
573 |
- >=dev-libs/json-glib-0.13.2 |
574 |
- >=dev-libs/libcroco-0.6.2:0.6 |
575 |
- dev-libs/libxml2:2 |
576 |
- gnome-base/gconf:2[introspection] |
577 |
- gnome-base/librsvg |
578 |
- >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] |
579 |
- gnome-extra/cinnamon-menus[introspection] |
580 |
- >=gnome-extra/cjs-2.8.0 |
581 |
- >=media-libs/clutter-1.10:1.0[introspection] |
582 |
- media-libs/cogl:1.0=[introspection] |
583 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
584 |
- media-libs/gstreamer:1.0 |
585 |
- media-libs/gst-plugins-base:1.0 |
586 |
- net-libs/libsoup:2.4[introspection] |
587 |
- >=sys-auth/polkit-0.100[introspection] |
588 |
- x11-libs/gdk-pixbuf:2[introspection] |
589 |
- >=x11-libs/gtk+-3.9.12:3[introspection] |
590 |
- x11-libs/pango[introspection] |
591 |
- >=x11-libs/startup-notification-0.11 |
592 |
- x11-libs/libX11 |
593 |
- >=x11-libs/libXfixes-5.0 |
594 |
- >=x11-wm/muffin-3.0.0[introspection] |
595 |
- networkmanager? ( |
596 |
- gnome-base/libgnome-keyring |
597 |
- >=net-misc/networkmanager-0.8.999:=[introspection] ) |
598 |
-" |
599 |
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) |
600 |
- |
601 |
-# Runtime-only deps are probably incomplete and approximate. |
602 |
-# Each block: |
603 |
-# 2. Introspection stuff + dconf needed via imports.gi.* |
604 |
-# 3. gnome-session is needed for gnome-session-quit |
605 |
-# 4. Control shell settings |
606 |
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast |
607 |
-# user switching with gdm-3.1.x) |
608 |
-# 6. caribou needed for on-screen keyboard |
609 |
-# 7. xdg-utils needed for xdg-open, used by extension tool |
610 |
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings |
611 |
-# 9. gnome-icon-theme-symbolic needed for various icons |
612 |
-# 10. pygobject needed for menu editor |
613 |
-# 11. nemo - default file manager, tightly integrated with cinnamon |
614 |
-# 12. polkit-gnome - explicitly autostarted by us |
615 |
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory |
616 |
-RDEPEND="${COMMON_DEPEND} |
617 |
- >=gnome-base/dconf-0.4.1 |
618 |
- >=gnome-base/libgnomekbd-2.91.4[introspection] |
619 |
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) |
620 |
- |
621 |
- >=gnome-extra/cinnamon-session-2.4 |
622 |
- >=gnome-extra/cinnamon-settings-daemon-2.4 |
623 |
- |
624 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
625 |
- |
626 |
- >=app-accessibility/caribou-0.3 |
627 |
- |
628 |
- x11-misc/xdg-utils |
629 |
- |
630 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
631 |
- $(python_gen_cond_dep 'dev-python/dbus-python[${PYTHON_USEDEP}]' 'python2*') |
632 |
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*') |
633 |
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*') |
634 |
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*') |
635 |
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*') |
636 |
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*') |
637 |
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*') |
638 |
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*') |
639 |
- |
640 |
- x11-themes/gnome-themes-standard[gtk] |
641 |
- x11-themes/adwaita-icon-theme |
642 |
- |
643 |
- >=gnome-extra/nemo-2.4 |
644 |
- >=gnome-extra/cinnamon-control-center-2.4 |
645 |
- >=gnome-extra/cinnamon-screensaver-2.4 |
646 |
- |
647 |
- gnome-extra/polkit-gnome |
648 |
- |
649 |
- networkmanager? ( |
650 |
- gnome-extra/nm-applet |
651 |
- net-misc/mobile-broadband-provider-info |
652 |
- sys-libs/timezone-data ) |
653 |
- nls? ( >=gnome-extra/cinnamon-translations-2.4 ) |
654 |
-" |
655 |
-#bluetooth? ( net-wireless/cinnamon-bluetooth ) |
656 |
- |
657 |
-DEPEND="${COMMON_DEPEND} |
658 |
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*') |
659 |
- dev-util/gtk-doc |
660 |
- >=dev-util/intltool-0.4 |
661 |
- >=sys-devel/gettext-0.17 |
662 |
- virtual/pkgconfig |
663 |
- gnome-base/gnome-common |
664 |
- !!=dev-lang/spidermonkey-1.8.2* |
665 |
-" |
666 |
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
667 |
-# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
668 |
- |
669 |
-S="${WORKDIR}/Cinnamon-${PV}" |
670 |
- |
671 |
-pkg_setup() { |
672 |
- python_setup |
673 |
-} |
674 |
- |
675 |
-src_prepare() { |
676 |
- # Fix backgrounds path as cinnamon doesn't provide them |
677 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
678 |
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch |
679 |
- |
680 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
681 |
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch |
682 |
- |
683 |
- # Optional NetworkManager, bug #488684 |
684 |
- eapply "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch |
685 |
- |
686 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
687 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
688 |
- eapply "${FILESDIR}"/${PN}-2.8.3-set-wheel.patch |
689 |
- |
690 |
- # Use pkexec instead of gksu (from Arch) |
691 |
- # https://github.com/linuxmint/Cinnamon/issues/3565 |
692 |
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die |
693 |
- |
694 |
- # Add polkit agent to required components (from Fedora/Arch), bug #523958 |
695 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
696 |
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ |
697 |
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die |
698 |
- |
699 |
- if ! use networkmanager; then |
700 |
- rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die |
701 |
- fi |
702 |
- |
703 |
- # python 2-and-3 shebang fixing craziness |
704 |
- local p |
705 |
- python_setup 'python3*' |
706 |
- for p in $(grep -rl '#!.*python3'); do |
707 |
- python_fix_shebang "${p}" |
708 |
- done |
709 |
- |
710 |
- python_setup 'python2*' |
711 |
- for p in $(grep -rl '#!.*python[^3]'); do |
712 |
- python_fix_shebang "${p}" |
713 |
- done |
714 |
- |
715 |
- eautoreconf |
716 |
- gnome2_src_prepare |
717 |
-} |
718 |
- |
719 |
-src_configure() { |
720 |
- # https://bugs.gentoo.org/show_bug.cgi?id=536374 |
721 |
- # https://github.com/linuxmint/Cinnamon/issues/3843 |
722 |
- append-ldflags $(no-as-needed) |
723 |
- |
724 |
- gnome2_src_configure \ |
725 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
726 |
- --disable-rpath \ |
727 |
- --disable-jhbuild-wrapper-script \ |
728 |
- $(use_enable networkmanager) \ |
729 |
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ |
730 |
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ |
731 |
- --without-bluetooth |
732 |
-} |
733 |
- |
734 |
-src_install() { |
735 |
- gnome2_src_install |
736 |
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-* |
737 |
- |
738 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
739 |
- pax-mark mr "${ED}usr/bin/cinnamon" |
740 |
- |
741 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
742 |
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die |
743 |
- |
744 |
- # Ensure authentication-agent is started, bug #523958 |
745 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
746 |
- insinto /etc/xdg/autostart/ |
747 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
748 |
-} |
749 |
- |
750 |
-pkg_postinst() { |
751 |
- gnome2_pkg_postinst |
752 |
- |
753 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
754 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
755 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
756 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
757 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
758 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
759 |
- fi |
760 |
- |
761 |
- if ! has_version ">=x11-base/xorg-server-1.11"; then |
762 |
- ewarn "If you use multiple screens, it is highly recommended that you" |
763 |
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
764 |
- ewarn "pointer barriers which will make it easier to use hot corners." |
765 |
- fi |
766 |
- |
767 |
- if has_version "<x11-drivers/ati-drivers-12"; then |
768 |
- ewarn "Cinnamon has been reported to show graphical corruption under" |
769 |
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to" |
770 |
- ewarn "open-source drivers." |
771 |
- fi |
772 |
-} |
773 |
|
774 |
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch |
775 |
deleted file mode 100644 |
776 |
index 26f7e05073e..00000000000 |
777 |
--- a/gnome-extra/cinnamon/files/cinnamon-2.8.3-gnome-3.14.patch |
778 |
+++ /dev/null |
779 |
@@ -1,11 +0,0 @@ |
780 |
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py |
781 |
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py |
782 |
-@@ -91,7 +91,7 @@ |
783 |
- |
784 |
- def _load_icon_themes(self): |
785 |
- dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons")) |
786 |
-- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme"))) |
787 |
-+ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme"))) |
788 |
- valid.sort(lambda a,b: cmp(a.lower(), b.lower())) |
789 |
- res = [] |
790 |
- for i in valid: |