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.eec27ea30eee2802803302d12baafabf9d77bd7b.juippis@gentoo
1 commit: eec27ea30eee2802803302d12baafabf9d77bd7b
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Sat Jul 24 20:24:56 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=eec27ea3
7
8 gnome-extra/cinnamon: drop old
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 Closes: https://github.com/gentoo/gentoo/pull/21788
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 gnome-extra/cinnamon/Manifest | 1 -
16 gnome-extra/cinnamon/cinnamon-5.0.4.ebuild | 175 -----------------------------
17 2 files changed, 176 deletions(-)
18
19 diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
20 index 5ce7329cf08..1231e7f1213 100644
21 --- a/gnome-extra/cinnamon/Manifest
22 +++ b/gnome-extra/cinnamon/Manifest
23 @@ -1,3 +1,2 @@
24 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
25 -DIST cinnamon-5.0.4.tar.gz 2397469 BLAKE2B d71d5c0a1d6386f77951629491fbc14f1c6e139b2a1f7ed87684ed3588897deecfe0158478ca52af18b18da250e8415822f56ce3ca758053a4b373b691627c6b SHA512 ac3eb6384fcbacab77a8a7bff1f28572df4ee62d3e9f0e0d02f9406ef690b3093355652201194d4c324bc13b6f806d27715434701a57c3b7544ad715aee27ad1
26 DIST cinnamon-5.0.5.tar.gz 2397561 BLAKE2B c7f523bde1b36564155e90735a719de7d6d125dfd41c0559c68aaf02c2a3f963e7b039cabf3b47e88a527aaf333b1ad154cad04497752b3b75370dbd4491a9c4 SHA512 a54437a3b76748612e4ce3c357e94be6911087616d08cab1c20e37e9a97813eea29db2513bbc384489b223375fd02dbdb61a130f87a40fd8f353b7ca46df26eb
27
28 diff --git a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
29 deleted file mode 100644
30 index 521a040ceb6..00000000000
31 --- a/gnome-extra/cinnamon/cinnamon-5.0.4.ebuild
32 +++ /dev/null
33 @@ -1,175 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{7,8,9} )
40 -PYTHON_REQ_USE="xml"
41 -
42 -inherit meson gnome2-utils pax-utils python-single-r1 xdg
43 -
44 -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
45 -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
46 -SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
47 -
48 -LICENSE="GPL-2+"
49 -SLOT="0"
50 -IUSE="+gstreamer gtk-doc +nls +networkmanager"
51 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
52 -KEYWORDS="~amd64 ~arm64 ~x86"
53 -
54 -DEPEND="
55 - ${PYTHON_DEPS}
56 - app-accessibility/at-spi2-atk:2
57 - >=dev-libs/glib-2.52.0:2[dbus]
58 - >=dev-libs/gobject-introspection-1.29.15:=
59 - dev-libs/libxml2:2
60 - >=gnome-extra/cinnamon-desktop-5.0:0=
61 - >=gnome-extra/cinnamon-menus-5.0
62 - >=gnome-extra/cjs-5.0[cairo]
63 - net-libs/libsoup:2.4[introspection]
64 - sys-apps/dbus
65 - >=sys-auth/polkit-0.100[introspection]
66 - virtual/opengl
67 - x11-libs/gdk-pixbuf:2[introspection]
68 - >=x11-libs/gtk+-3.12.0:3[introspection]
69 - >=x11-libs/libnotify-0.7.3:0=[introspection]
70 - x11-libs/libX11
71 - >=x11-libs/libXfixes-5.0
72 - x11-libs/pango[introspection]
73 - >=x11-libs/startup-notification-0.11
74 - >=x11-wm/muffin-5.0[introspection]
75 -
76 - gstreamer? (
77 - media-libs/gst-plugins-base:1.0
78 - media-libs/gstreamer:1.0
79 - )
80 - networkmanager? (
81 - net-misc/networkmanager[introspection]
82 - )
83 -"
84 -# caribou used by onscreen keyboard
85 -# libtimezonemap used by datetime settings
86 -# iso-flag-png (unpackaged) used by keyboard layout settings
87 -RDEPEND="
88 - ${DEPEND}
89 - >=app-accessibility/caribou-0.3
90 - dev-libs/keybinder:3[introspection]
91 - dev-libs/libtimezonemap
92 - $(python_gen_cond_dep '
93 - dev-python/dbus-python[${PYTHON_USEDEP}]
94 - dev-python/distro[${PYTHON_USEDEP}]
95 - dev-python/pexpect[${PYTHON_USEDEP}]
96 - dev-python/pillow[${PYTHON_USEDEP}]
97 - dev-python/pycairo[${PYTHON_USEDEP}]
98 - dev-python/pygobject:3[${PYTHON_USEDEP}]
99 - dev-python/pyinotify[${PYTHON_USEDEP}]
100 - dev-python/pypam[${PYTHON_USEDEP}]
101 - dev-python/pytz[${PYTHON_USEDEP}]
102 - dev-python/setproctitle[${PYTHON_USEDEP}]
103 - dev-python/tinycss2[${PYTHON_USEDEP}]
104 - >=dev-python/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/xapps-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 -}