Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
Date: Sat, 12 Jun 2021 03:55:42
Message-Id: 1623470120.035b8c7ddbe2114cc92a56c21876339f8043ef04.sam@gentoo
1 commit: 035b8c7ddbe2114cc92a56c21876339f8043ef04
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Fri Jun 11 16:53:11 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 12 03:55:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035b8c7d
7
8 gnome-extra/cinnamon: drop old
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
12 Closes: https://github.com/gentoo/gentoo/pull/21205
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 gnome-extra/cinnamon/Manifest | 1 -
16 gnome-extra/cinnamon/cinnamon-4.6.7.ebuild | 181 -----------------------------
17 2 files changed, 182 deletions(-)
18
19 diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
20 index cbab11c2bfa..5445a03c09f 100644
21 --- a/gnome-extra/cinnamon/Manifest
22 +++ b/gnome-extra/cinnamon/Manifest
23 @@ -1,3 +1,2 @@
24 -DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
25 DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
26 DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578
27
28 diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
29 deleted file mode 100644
30 index eceb8c0e5f4..00000000000
31 --- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
32 +++ /dev/null
33 @@ -1,181 +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 -PYTHON_COMPAT=( python3_{7,8} )
39 -PYTHON_REQ_USE="xml"
40 -
41 -inherit autotools eutils flag-o-matic gnome2-utils multilib 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/"
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="gtk-doc +nls +networkmanager"
50 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
51 -KEYWORDS="amd64 ~arm64 x86"
52 -
53 -COMMON_DEPEND="${PYTHON_DEPS}
54 - app-accessibility/at-spi2-atk:2
55 - app-misc/ca-certificates
56 - dev-libs/dbus-glib
57 - >=dev-libs/glib-2.35.0:2[dbus]
58 - >=dev-libs/gobject-introspection-1.29.15:=
59 - >=dev-libs/libcroco-0.6.2:0.6
60 - dev-libs/libxml2:2
61 - >=gnome-extra/cinnamon-desktop-4.6:0=
62 - >=gnome-extra/cinnamon-menus-4.6
63 - >=gnome-extra/cjs-4.6[cairo]
64 - >=gnome-base/gsettings-desktop-schemas-2.91.91
65 - media-libs/gstreamer:1.0
66 - media-libs/gst-plugins-base:1.0
67 - net-libs/libsoup:2.4[introspection]
68 - >=sys-auth/polkit-0.100[introspection]
69 - x11-libs/gdk-pixbuf:2[introspection]
70 - >=x11-libs/gtk+-3.12.0:3[introspection]
71 - x11-libs/pango[introspection]
72 - >=x11-libs/startup-notification-0.11
73 - x11-libs/libX11
74 - >=x11-libs/libXfixes-5.0
75 - >=x11-wm/muffin-4.0.3[introspection]
76 - dev-libs/keybinder:3[introspection]
77 - >=x11-libs/libnotify-0.7.3:0=[introspection]
78 -"
79 -# Runtime-only deps are probably incomplete and approximate.
80 -# Each block:
81 -# 2. Introspection stuff + dconf needed via imports.gi.*
82 -# 3. gnome-session is needed for gnome-session-quit
83 -# 4. Control shell settings
84 -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
85 -# user switching with gdm-3.1.x)
86 -# 6. caribou needed for on-screen keyboard
87 -# 7. xdg-utils needed for xdg-open, used by extension tool
88 -# 8. imaging, lxml needed for cinnamon-settings
89 -# 9. adwaita-icon-theme needed for various icons
90 -# 10. pygobject needed for menu editor
91 -# 11. nemo - default file manager, tightly integrated with cinnamon
92 -# 12. polkit-gnome - explicitly autostarted by us
93 -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
94 -RDEPEND="${COMMON_DEPEND}
95 - >=gnome-base/dconf-0.4.1
96 - >=gnome-base/libgnomekbd-2.91.4
97 - sys-power/upower[introspection]
98 -
99 - >=gnome-extra/cinnamon-session-4.6
100 - >=gnome-extra/cinnamon-settings-daemon-4.6
101 -
102 - >=app-accessibility/caribou-0.3
103 -
104 - dev-libs/libtimezonemap
105 - x11-misc/xdg-utils
106 - x11-libs/xapps[introspection]
107 -
108 - $(python_gen_cond_dep '
109 - dev-python/dbus-python[${PYTHON_USEDEP}]
110 - dev-python/distro[${PYTHON_USEDEP}]
111 - dev-python/pygobject:3[${PYTHON_USEDEP}]
112 - dev-python/pexpect[${PYTHON_USEDEP}]
113 - dev-python/pycairo[${PYTHON_USEDEP}]
114 - dev-python/pyinotify[${PYTHON_USEDEP}]
115 - dev-python/pypam[${PYTHON_USEDEP}]
116 - dev-python/pillow[${PYTHON_USEDEP}]
117 - dev-python/setproctitle[${PYTHON_USEDEP}]
118 - dev-python/tinycss2[${PYTHON_USEDEP}]
119 - dev-python/pytz[${PYTHON_USEDEP}]
120 - dev-python/xapp[${PYTHON_USEDEP}]
121 - ')
122 -
123 - x11-themes/gnome-themes-standard
124 - x11-themes/adwaita-icon-theme
125 -
126 - >=gnome-extra/nemo-4.6
127 - >=gnome-extra/cinnamon-control-center-4.6[networkmanager=]
128 - >=gnome-extra/cinnamon-screensaver-4.6
129 -
130 - gnome-extra/polkit-gnome
131 -
132 - nls? ( >=gnome-extra/cinnamon-translations-4.6 )
133 -"
134 -DEPEND="${COMMON_DEPEND}
135 - >=dev-util/intltool-0.40
136 - >=sys-devel/gettext-0.17
137 - virtual/pkgconfig
138 - gtk-doc? ( dev-util/gtk-doc )
139 -"
140 -
141 -PATCHES=(
142 - # Fix backgrounds path as cinnamon doesn't provide them
143 - # https://github.com/linuxmint/Cinnamon/issues/3575
144 - "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
145 -
146 - # Use wheel group instead of sudo (from Fedora/Arch)
147 - # https://github.com/linuxmint/Cinnamon/issues/3576
148 - "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
149 -)
150 -
151 -src_prepare() {
152 - xdg_src_prepare
153 - eautoreconf
154 - gnome2_disable_deprecation_warning
155 -
156 - # Add polkit agent to required components (from Fedora/Arch), bug #523958
157 - # https://github.com/linuxmint/Cinnamon/issues/3579
158 - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
159 - files/cinnamon*.session.in || die
160 -
161 - # shebang fixing craziness
162 - local p
163 - for p in $(grep -rl '#!.*python3'); do
164 - python_fix_shebang "${p}"
165 - done
166 -}
167 -
168 -src_configure() {
169 - econf \
170 - --disable-maintainer-mode \
171 - --disable-schemas-compile \
172 - --enable-compile-warnings=minimum \
173 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
174 - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
175 - $(use_enable gtk-doc) \
176 - $(use_enable networkmanager) \
177 - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
178 -}
179 -
180 -src_install() {
181 - default
182 - find "${D}" -name '*.la' -delete || die
183 -
184 - python_optimize "${ED}"/usr/share/cinnamon/
185 -
186 - # Required for gnome-shell on hardened/PaX, bug #398941
187 - pax-mark mr "${ED}"/usr/bin/cinnamon
188 -
189 - # Doesn't exist on Gentoo, causing this to be a dead symlink
190 - rm -f "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
191 -
192 - # Ensure authentication-agent is started, bug #523958
193 - # https://github.com/linuxmint/Cinnamon/issues/3579
194 - insinto /etc/xdg/autostart/
195 - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
196 -}
197 -
198 -pkg_postinst() {
199 - xdg_pkg_postinst
200 - gnome2_schemas_update
201 -
202 - if ! has_version 'media-libs/gst-plugins-good:1.0' || \
203 - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
204 - ewarn "To make use of Cinnamon's built-in screen recording utility,"
205 - ewarn "you need to either install media-libs/gst-plugins-good:1.0"
206 - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
207 - ewarn "org.cinnamon.recorder/pipeline to what you want to use."
208 - fi
209 -}
210 -
211 -pkg_postrm() {
212 - xdg_pkg_postinst
213 - gnome2_schemas_update
214 -}