Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
Date: Sat, 31 Jul 2021 08:36:06
Message-Id: 1627720550.1605a77a18877a19f2efef8593097c6b5b87f224.juippis@gentoo
1 commit: 1605a77a18877a19f2efef8593097c6b5b87f224
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Sat Jul 24 20:23:23 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 31 08:35:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1605a77a
7
8 gnome-extra/cinnamon: 5.0.5 version bump
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 gnome-extra/cinnamon/Manifest | 1 +
15 gnome-extra/cinnamon/cinnamon-5.0.5.ebuild | 175 +++++++++++++++++++++++++++++
16 2 files changed, 176 insertions(+)
17
18 diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
19 index 9096cf6a15e..5ce7329cf08 100644
20 --- a/gnome-extra/cinnamon/Manifest
21 +++ b/gnome-extra/cinnamon/Manifest
22 @@ -1,2 +1,3 @@
23 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
24 DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1
25 +DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb
26
27 diff --git a/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
28 new file mode 100644
29 index 00000000000..521a040ceb6
30 --- /dev/null
31 +++ b/gnome-extra/cinnamon/cinnamon-5.0.5.ebuild
32 @@ -0,0 +1,175 @@
33 +# Copyright 1999-2021 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 ~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/setproctitle[${PYTHON_USEDEP}]
102 + dev-python/tinycss2[${PYTHON_USEDEP}]
103 + >=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
104 + ')
105 + >=gnome-base/dconf-0.4.1
106 + >=gnome-base/gsettings-desktop-schemas-2.91.91
107 + >=gnome-base/libgnomekbd-2.91.4
108 + >=gnome-extra/cinnamon-control-center-5.0[networkmanager=]
109 + >=gnome-extra/cinnamon-screensaver-5.0
110 + >=gnome-extra/cinnamon-session-5.0
111 + >=gnome-extra/cinnamon-settings-daemon-5.0
112 + >=gnome-extra/nemo-5.0
113 + gnome-extra/polkit-gnome
114 + net-misc/wget
115 + sys-apps/accountsservice[introspection]
116 + sys-power/upower[introspection]
117 + >=x11-libs/xapps-2.2.0[introspection]
118 + x11-misc/xdg-utils
119 + x11-themes/adwaita-icon-theme
120 + x11-themes/gnome-themes-standard
121 +
122 + nls? (
123 + >=gnome-extra/cinnamon-translations-5.0
124 + )
125 +"
126 +BDEPEND="
127 + >=dev-util/intltool-0.40
128 + >=sys-devel/gettext-0.17
129 + virtual/pkgconfig
130 +
131 + gtk-doc? ( dev-util/gtk-doc )
132 +"
133 +
134 +PATCHES=(
135 + # Fix backgrounds path as cinnamon doesn't provide them
136 + # https://github.com/linuxmint/Cinnamon/issues/3575
137 + "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
138 +
139 + # Use wheel group instead of sudo (from Fedora/Arch)
140 + # https://github.com/linuxmint/Cinnamon/issues/3576
141 + "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
142 +)
143 +
144 +src_prepare() {
145 + xdg_src_prepare
146 +
147 + # Add polkit agent to required components
148 + # https://github.com/linuxmint/Cinnamon/issues/3579
149 + sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
150 +
151 + # shebang fixing craziness
152 + local p
153 + for p in $(grep -rl '#!.*python3' || die); do
154 + python_fix_shebang "${p}"
155 + done
156 +}
157 +
158 +src_configure() {
159 + local emesonargs=(
160 + $(meson_use gstreamer build_recorder)
161 + $(meson_use gtk-doc docs)
162 + -Ddisable_networkmanager=$(usex networkmanager false true)
163 + -Dpy3modules_dir="$(python_get_sitedir)"
164 + )
165 + meson_src_configure
166 +}
167 +
168 +src_install() {
169 + meson_src_install
170 +
171 + python_optimize "${D}$(python_get_sitedir)"
172 + python_optimize "${ED}"/usr/share/cinnamon/
173 +
174 + # Required for gnome-shell on hardened/PaX, bug #398941
175 + pax-mark mr "${ED}"/usr/bin/cinnamon
176 +
177 + # Doesn't exist on Gentoo, causing this to be a dead symlink
178 + rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
179 +
180 + # Ensure authentication-agent is started, bug #523958
181 + # https://github.com/linuxmint/Cinnamon/issues/3579
182 + insinto /etc/xdg/autostart/
183 + doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
184 +}
185 +
186 +pkg_postinst() {
187 + xdg_pkg_postinst
188 + gnome2_schemas_update
189 +
190 + if use gstreamer; then
191 + if ! has_version 'media-libs/gst-plugins-good:1.0' || \
192 + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
193 + ewarn "To make use of Cinnamon's built-in screen recording utility,"
194 + ewarn "you need to either install media-libs/gst-plugins-good:1.0"
195 + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
196 + ewarn "org.cinnamon.recorder/pipeline to what you want to use."
197 + fi
198 + else
199 + ewarn "Cinnamon's built-in screen recording utility is not installed"
200 + ewarn "because gstreamer support is disabled."
201 + fi
202 +}
203 +
204 +pkg_postrm() {
205 + xdg_pkg_postinst
206 + gnome2_schemas_update
207 +}