1 |
commit: 0ca65bbe2e52ae9384086f5923c18b3fb002f394 |
2 |
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> |
3 |
AuthorDate: Tue May 3 21:08:59 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 11 02:10:17 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca65bbe |
7 |
|
8 |
gnome-extra/cinnamon: Remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
gnome-extra/cinnamon/Manifest | 1 - |
15 |
gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild | 176 ------------------------ |
16 |
gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild | 186 -------------------------- |
17 |
3 files changed, 363 deletions(-) |
18 |
|
19 |
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest |
20 |
index b167c58a3b6c..374d935ffcda 100644 |
21 |
--- a/gnome-extra/cinnamon/Manifest |
22 |
+++ b/gnome-extra/cinnamon/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST cinnamon-5.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962 |
25 |
DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733 |
26 |
|
27 |
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index d6c3792cf966..000000000000 |
30 |
--- a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,176 +0,0 @@ |
33 |
-# Copyright 1999-2022 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
39 |
-PYTHON_REQ_USE="xml" |
40 |
- |
41 |
-inherit meson gnome2-utils pax-utils python-single-r1 xdg |
42 |
- |
43 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
44 |
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" |
45 |
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-2+" |
48 |
-SLOT="0" |
49 |
-IUSE="+gstreamer gtk-doc +nls +networkmanager" |
50 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
51 |
-KEYWORDS="amd64 ~arm64 ~riscv x86" |
52 |
- |
53 |
-DEPEND=" |
54 |
- ${PYTHON_DEPS} |
55 |
- app-accessibility/at-spi2-atk:2 |
56 |
- >=dev-libs/glib-2.52.0:2[dbus] |
57 |
- >=dev-libs/gobject-introspection-1.29.15:= |
58 |
- dev-libs/libxml2:2 |
59 |
- >=gnome-extra/cinnamon-desktop-5.0:0= |
60 |
- >=gnome-extra/cinnamon-menus-5.0 |
61 |
- >=gnome-extra/cjs-5.0[cairo] |
62 |
- net-libs/libsoup:2.4[introspection] |
63 |
- sys-apps/dbus |
64 |
- >=sys-auth/polkit-0.100[introspection] |
65 |
- virtual/opengl |
66 |
- x11-libs/gdk-pixbuf:2[introspection] |
67 |
- >=x11-libs/gtk+-3.12.0:3[introspection] |
68 |
- >=x11-libs/libnotify-0.7.3:0=[introspection] |
69 |
- x11-libs/libX11 |
70 |
- >=x11-libs/libXfixes-5.0 |
71 |
- x11-libs/pango[introspection] |
72 |
- >=x11-libs/startup-notification-0.11 |
73 |
- >=x11-wm/muffin-5.0[introspection] |
74 |
- |
75 |
- gstreamer? ( |
76 |
- media-libs/gst-plugins-base:1.0 |
77 |
- media-libs/gstreamer:1.0 |
78 |
- ) |
79 |
- networkmanager? ( |
80 |
- net-misc/networkmanager[introspection] |
81 |
- ) |
82 |
-" |
83 |
-# caribou used by onscreen keyboard |
84 |
-# libtimezonemap used by datetime settings |
85 |
-# iso-flag-png (unpackaged) used by keyboard layout settings |
86 |
-RDEPEND=" |
87 |
- ${DEPEND} |
88 |
- >=app-accessibility/caribou-0.3 |
89 |
- dev-libs/keybinder:3[introspection] |
90 |
- dev-libs/libtimezonemap |
91 |
- $(python_gen_cond_dep ' |
92 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
93 |
- dev-python/distro[${PYTHON_USEDEP}] |
94 |
- dev-python/pexpect[${PYTHON_USEDEP}] |
95 |
- dev-python/pillow[${PYTHON_USEDEP}] |
96 |
- dev-python/pycairo[${PYTHON_USEDEP}] |
97 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
98 |
- dev-python/pyinotify[${PYTHON_USEDEP}] |
99 |
- dev-python/pypam[${PYTHON_USEDEP}] |
100 |
- dev-python/pytz[${PYTHON_USEDEP}] |
101 |
- dev-python/requests[${PYTHON_USEDEP}] |
102 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
103 |
- dev-python/tinycss2[${PYTHON_USEDEP}] |
104 |
- >=dev-python/python3-xapp-2.2.0[${PYTHON_USEDEP}] |
105 |
- ') |
106 |
- >=gnome-base/dconf-0.4.1 |
107 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
108 |
- >=gnome-base/libgnomekbd-2.91.4 |
109 |
- >=gnome-extra/cinnamon-control-center-5.0[networkmanager=] |
110 |
- >=gnome-extra/cinnamon-screensaver-5.0 |
111 |
- >=gnome-extra/cinnamon-session-5.0 |
112 |
- >=gnome-extra/cinnamon-settings-daemon-5.0 |
113 |
- >=gnome-extra/nemo-5.0 |
114 |
- gnome-extra/polkit-gnome |
115 |
- net-misc/wget |
116 |
- sys-apps/accountsservice[introspection] |
117 |
- sys-power/upower[introspection] |
118 |
- >=x11-libs/xapp-2.2.0[introspection] |
119 |
- x11-misc/xdg-utils |
120 |
- x11-themes/adwaita-icon-theme |
121 |
- x11-themes/gnome-themes-standard |
122 |
- |
123 |
- nls? ( |
124 |
- >=gnome-extra/cinnamon-translations-5.0 |
125 |
- ) |
126 |
-" |
127 |
-BDEPEND=" |
128 |
- >=dev-util/intltool-0.40 |
129 |
- >=sys-devel/gettext-0.17 |
130 |
- virtual/pkgconfig |
131 |
- |
132 |
- gtk-doc? ( dev-util/gtk-doc ) |
133 |
-" |
134 |
- |
135 |
-PATCHES=( |
136 |
- # Fix backgrounds path as cinnamon doesn't provide them |
137 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
138 |
- "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch |
139 |
- |
140 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
141 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
142 |
- "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch |
143 |
-) |
144 |
- |
145 |
-src_prepare() { |
146 |
- xdg_src_prepare |
147 |
- |
148 |
- # Add polkit agent to required components |
149 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
150 |
- sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die |
151 |
- |
152 |
- # shebang fixing craziness |
153 |
- local p |
154 |
- for p in $(grep -rl '#!.*python3' || die); do |
155 |
- python_fix_shebang "${p}" |
156 |
- done |
157 |
-} |
158 |
- |
159 |
-src_configure() { |
160 |
- local emesonargs=( |
161 |
- $(meson_use gstreamer build_recorder) |
162 |
- $(meson_use gtk-doc docs) |
163 |
- -Ddisable_networkmanager=$(usex networkmanager false true) |
164 |
- -Dpy3modules_dir="$(python_get_sitedir)" |
165 |
- ) |
166 |
- meson_src_configure |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- meson_src_install |
171 |
- |
172 |
- python_optimize "${D}$(python_get_sitedir)" |
173 |
- python_optimize "${ED}"/usr/share/cinnamon/ |
174 |
- |
175 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
176 |
- pax-mark mr "${ED}"/usr/bin/cinnamon |
177 |
- |
178 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
179 |
- rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die |
180 |
- |
181 |
- # Ensure authentication-agent is started, bug #523958 |
182 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
183 |
- insinto /etc/xdg/autostart/ |
184 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
185 |
-} |
186 |
- |
187 |
-pkg_postinst() { |
188 |
- xdg_pkg_postinst |
189 |
- gnome2_schemas_update |
190 |
- |
191 |
- if use gstreamer; then |
192 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
193 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
194 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
195 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
196 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
197 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
198 |
- fi |
199 |
- else |
200 |
- ewarn "Cinnamon's built-in screen recording utility is not installed" |
201 |
- ewarn "because gstreamer support is disabled." |
202 |
- fi |
203 |
-} |
204 |
- |
205 |
-pkg_postrm() { |
206 |
- xdg_pkg_postinst |
207 |
- gnome2_schemas_update |
208 |
-} |
209 |
|
210 |
diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild |
211 |
deleted file mode 100644 |
212 |
index 5237a3b90b2a..000000000000 |
213 |
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild |
214 |
+++ /dev/null |
215 |
@@ -1,186 +0,0 @@ |
216 |
-# Copyright 1999-2022 Gentoo Authors |
217 |
-# Distributed under the terms of the GNU General Public License v2 |
218 |
- |
219 |
-EAPI=7 |
220 |
- |
221 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
222 |
-PYTHON_REQ_USE="xml" |
223 |
- |
224 |
-inherit meson gnome2-utils pax-utils python-single-r1 xdg |
225 |
- |
226 |
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" |
227 |
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" |
228 |
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" |
229 |
- |
230 |
-LICENSE="GPL-2+" |
231 |
-SLOT="0" |
232 |
-IUSE="+eds +gstreamer gtk-doc +nls +networkmanager" |
233 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
234 |
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86" |
235 |
- |
236 |
-DEPEND=" |
237 |
- ${PYTHON_DEPS} |
238 |
- app-accessibility/at-spi2-atk:2 |
239 |
- >=dev-libs/glib-2.52.0:2[dbus] |
240 |
- >=dev-libs/gobject-introspection-1.29.15:= |
241 |
- dev-libs/libxml2:2 |
242 |
- >=gnome-extra/cinnamon-desktop-5.2:0= |
243 |
- >=gnome-extra/cinnamon-menus-5.2 |
244 |
- >=gnome-extra/cjs-5.2[cairo] |
245 |
- net-libs/libsoup:2.4[introspection] |
246 |
- sys-apps/dbus |
247 |
- >=sys-auth/polkit-0.100[introspection] |
248 |
- virtual/opengl |
249 |
- x11-libs/gdk-pixbuf:2[introspection] |
250 |
- >=x11-libs/gtk+-3.12.0:3[introspection] |
251 |
- >=x11-libs/libnotify-0.7.3:0=[introspection] |
252 |
- x11-libs/libX11 |
253 |
- >=x11-libs/libXfixes-5.0 |
254 |
- x11-libs/pango[introspection] |
255 |
- >=x11-libs/startup-notification-0.11 |
256 |
- >=x11-wm/muffin-5.2[introspection] |
257 |
- |
258 |
- eds? ( |
259 |
- gnome-extra/evolution-data-server |
260 |
- ) |
261 |
- gstreamer? ( |
262 |
- media-libs/gst-plugins-base:1.0 |
263 |
- media-libs/gstreamer:1.0 |
264 |
- ) |
265 |
- networkmanager? ( |
266 |
- net-misc/networkmanager[introspection] |
267 |
- ) |
268 |
-" |
269 |
-# caribou used by onscreen keyboard |
270 |
-# libtimezonemap used by datetime settings |
271 |
-# iso-flag-png (unpackaged) used by keyboard layout settings |
272 |
-RDEPEND=" |
273 |
- ${DEPEND} |
274 |
- >=app-accessibility/caribou-0.3 |
275 |
- dev-libs/keybinder:3[introspection] |
276 |
- dev-libs/libtimezonemap |
277 |
- $(python_gen_cond_dep ' |
278 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
279 |
- dev-python/distro[${PYTHON_USEDEP}] |
280 |
- dev-python/pexpect[${PYTHON_USEDEP}] |
281 |
- dev-python/pillow[${PYTHON_USEDEP}] |
282 |
- dev-python/pycairo[${PYTHON_USEDEP}] |
283 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
284 |
- dev-python/pyinotify[${PYTHON_USEDEP}] |
285 |
- dev-python/pypam[${PYTHON_USEDEP}] |
286 |
- dev-python/pytz[${PYTHON_USEDEP}] |
287 |
- dev-python/requests[${PYTHON_USEDEP}] |
288 |
- dev-python/setproctitle[${PYTHON_USEDEP}] |
289 |
- dev-python/tinycss2[${PYTHON_USEDEP}] |
290 |
- >=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}] |
291 |
- ') |
292 |
- >=gnome-base/dconf-0.4.1 |
293 |
- >=gnome-base/gsettings-desktop-schemas-2.91.91 |
294 |
- >=gnome-base/libgnomekbd-2.91.4 |
295 |
- >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] |
296 |
- >=gnome-extra/cinnamon-screensaver-5.2 |
297 |
- >=gnome-extra/cinnamon-session-5.2 |
298 |
- >=gnome-extra/cinnamon-settings-daemon-5.2 |
299 |
- >=gnome-extra/nemo-5.2 |
300 |
- gnome-extra/polkit-gnome |
301 |
- net-misc/wget |
302 |
- sys-apps/accountsservice[introspection] |
303 |
- sys-power/upower[introspection] |
304 |
- >=x11-libs/xapp-2.2.8[introspection] |
305 |
- x11-misc/xdg-utils |
306 |
- x11-themes/adwaita-icon-theme |
307 |
- x11-themes/gnome-themes-standard |
308 |
- |
309 |
- nls? ( |
310 |
- >=gnome-extra/cinnamon-translations-5.2 |
311 |
- ) |
312 |
-" |
313 |
-BDEPEND=" |
314 |
- >=dev-util/intltool-0.40 |
315 |
- >=sys-devel/gettext-0.17 |
316 |
- virtual/pkgconfig |
317 |
- |
318 |
- gtk-doc? ( dev-util/gtk-doc ) |
319 |
-" |
320 |
- |
321 |
-PATCHES=( |
322 |
- # Fix backgrounds path as cinnamon doesn't provide them |
323 |
- # https://github.com/linuxmint/Cinnamon/issues/3575 |
324 |
- "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch |
325 |
- |
326 |
- # Use wheel group instead of sudo (from Fedora/Arch) |
327 |
- # https://github.com/linuxmint/Cinnamon/issues/3576 |
328 |
- "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch |
329 |
- |
330 |
- # Make evolution-data-server integration optional |
331 |
- "${FILESDIR}"/${PN}-5.2.7-eds-detection.patch |
332 |
- |
333 |
- # Meson fixes |
334 |
- "${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch |
335 |
- "${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch |
336 |
-) |
337 |
- |
338 |
-src_prepare() { |
339 |
- xdg_src_prepare |
340 |
- |
341 |
- # Add polkit agent to required components |
342 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
343 |
- sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die |
344 |
- |
345 |
- # shebang fixing craziness |
346 |
- local p |
347 |
- for p in $(grep -rl '#!.*python3' || die); do |
348 |
- python_fix_shebang "${p}" |
349 |
- done |
350 |
-} |
351 |
- |
352 |
-src_configure() { |
353 |
- local emesonargs=( |
354 |
- $(meson_use gstreamer build_recorder) |
355 |
- $(meson_use gtk-doc docs) |
356 |
- -Ddisable_networkmanager=$(usex networkmanager false true) |
357 |
- -Dpy3modules_dir="$(python_get_sitedir)" |
358 |
- ) |
359 |
- meson_src_configure |
360 |
-} |
361 |
- |
362 |
-src_install() { |
363 |
- meson_src_install |
364 |
- |
365 |
- python_optimize "${D}$(python_get_sitedir)" |
366 |
- python_optimize "${ED}"/usr/share/cinnamon/ |
367 |
- |
368 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
369 |
- pax-mark mr "${ED}"/usr/bin/cinnamon |
370 |
- |
371 |
- # Doesn't exist on Gentoo, causing this to be a dead symlink |
372 |
- rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die |
373 |
- |
374 |
- # Ensure authentication-agent is started, bug #523958 |
375 |
- # https://github.com/linuxmint/Cinnamon/issues/3579 |
376 |
- insinto /etc/xdg/autostart/ |
377 |
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop |
378 |
-} |
379 |
- |
380 |
-pkg_postinst() { |
381 |
- xdg_pkg_postinst |
382 |
- gnome2_schemas_update |
383 |
- |
384 |
- if use gstreamer; then |
385 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
386 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
387 |
- ewarn "To make use of Cinnamon's built-in screen recording utility," |
388 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
389 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
390 |
- ewarn "org.cinnamon.recorder/pipeline to what you want to use." |
391 |
- fi |
392 |
- else |
393 |
- ewarn "Cinnamon's built-in screen recording utility is not installed" |
394 |
- ewarn "because gstreamer support is disabled." |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-pkg_postrm() { |
399 |
- xdg_pkg_postinst |
400 |
- gnome2_schemas_update |
401 |
-} |