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: Sun, 27 Dec 2020 05:06:49
Message-Id: 1609045595.a397db4600e452c457f7511e5d5dc705303095b3.sam@gentoo
1 commit: a397db4600e452c457f7511e5d5dc705303095b3
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Thu Dec 24 06:46:22 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 27 05:06:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a397db46
7
8 gnome-extra/cinnamon: Remove old
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
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-4.4.8.ebuild | 176 -----------------------------
16 2 files changed, 177 deletions(-)
17
18 diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
19 index c586ce36dba..8bcf7676aeb 100644
20 --- a/gnome-extra/cinnamon/Manifest
21 +++ b/gnome-extra/cinnamon/Manifest
22 @@ -1,2 +1 @@
23 -DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
24 DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
25
26 diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
27 deleted file mode 100644
28 index 8fb8410e1ee..00000000000
29 --- a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
30 +++ /dev/null
31 @@ -1,176 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -GNOME2_LA_PUNT="yes"
37 -PYTHON_COMPAT=( python3_{6,7} )
38 -PYTHON_REQ_USE="xml"
39 -
40 -inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
41 -
42 -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
43 -HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
44 -
45 -MY_PV="${PV/_p/-UP}"
46 -MY_P="${PN}-${MY_PV}"
47 -
48 -SRC_URI="https://github.com/linuxmint/cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
49 -
50 -LICENSE="GPL-2+"
51 -SLOT="0"
52 -
53 -IUSE="gtk-doc +nls +networkmanager"
54 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
55 -
56 -KEYWORDS="~amd64 ~x86"
57 -
58 -COMMON_DEPEND="${PYTHON_DEPS}
59 - app-accessibility/at-spi2-atk:2
60 - app-misc/ca-certificates
61 - dev-libs/dbus-glib
62 - >=dev-libs/glib-2.35.0:2[dbus]
63 - >=dev-libs/gobject-introspection-1.29.15:=
64 - >=dev-libs/libcroco-0.6.2:0.6
65 - dev-libs/libxml2:2
66 - >=gnome-extra/cinnamon-desktop-4.4:0=
67 - >=gnome-extra/cinnamon-menus-4.4
68 - >=gnome-extra/cjs-4.4.0[cairo]
69 - >=gnome-base/gsettings-desktop-schemas-2.91.91
70 - media-libs/gstreamer:1.0
71 - media-libs/gst-plugins-base:1.0
72 - net-libs/libsoup:2.4[introspection]
73 - >=sys-auth/polkit-0.100[introspection]
74 - x11-libs/gdk-pixbuf:2[introspection]
75 - >=x11-libs/gtk+-3.12.0:3[introspection]
76 - x11-libs/pango[introspection]
77 - >=x11-libs/startup-notification-0.11
78 - x11-libs/libX11
79 - >=x11-libs/libXfixes-5.0
80 - >=x11-wm/muffin-4.0.3[introspection]
81 - dev-libs/keybinder:3[introspection]
82 - >=x11-libs/libnotify-0.7.3:0=[introspection]
83 -"
84 -# Runtime-only deps are probably incomplete and approximate.
85 -# Each block:
86 -# 2. Introspection stuff + dconf needed via imports.gi.*
87 -# 3. gnome-session is needed for gnome-session-quit
88 -# 4. Control shell settings
89 -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
90 -# user switching with gdm-3.1.x)
91 -# 6. caribou needed for on-screen keyboard
92 -# 7. xdg-utils needed for xdg-open, used by extension tool
93 -# 8. imaging, lxml needed for cinnamon-settings
94 -# 9. gnome-icon-theme-symbolic needed for various icons
95 -# 10. pygobject needed for menu editor
96 -# 11. nemo - default file manager, tightly integrated with cinnamon
97 -# 12. polkit-gnome - explicitly autostarted by us
98 -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
99 -RDEPEND="${COMMON_DEPEND}
100 - >=gnome-base/dconf-0.4.1
101 - >=gnome-base/libgnomekbd-2.91.4
102 - sys-power/upower[introspection]
103 -
104 - >=gnome-extra/cinnamon-session-4.4
105 - >=gnome-extra/cinnamon-settings-daemon-4.4
106 -
107 - >=app-accessibility/caribou-0.3
108 -
109 - dev-libs/libtimezonemap
110 - x11-misc/xdg-utils
111 - x11-libs/xapps[introspection]
112 -
113 - $(python_gen_cond_dep '
114 - dev-python/dbus-python[${PYTHON_USEDEP}]
115 - dev-python/pygobject:3[${PYTHON_USEDEP}]
116 - dev-python/pexpect[${PYTHON_USEDEP}]
117 - dev-python/pycairo[${PYTHON_USEDEP}]
118 - dev-python/pyinotify[${PYTHON_USEDEP}]
119 - dev-python/pypam[${PYTHON_USEDEP}]
120 - dev-python/pillow[${PYTHON_USEDEP}]
121 - dev-python/setproctitle[${PYTHON_USEDEP}]
122 - dev-python/tinycss[${PYTHON_USEDEP}]
123 - dev-python/pytz[${PYTHON_USEDEP}]
124 - dev-python/xapp[${PYTHON_USEDEP}]
125 - ')
126 -
127 - x11-themes/gnome-themes-standard
128 - x11-themes/adwaita-icon-theme
129 -
130 - >=gnome-extra/nemo-4.4
131 - >=gnome-extra/cinnamon-control-center-4.4[networkmanager=]
132 - >=gnome-extra/cinnamon-screensaver-4.4
133 -
134 - gnome-extra/polkit-gnome
135 -
136 - nls? ( >=gnome-extra/cinnamon-translations-4.4 )
137 -"
138 -DEPEND="${COMMON_DEPEND}
139 - >=dev-util/intltool-0.40
140 - >=sys-devel/gettext-0.17
141 - virtual/pkgconfig
142 - !!=dev-lang/spidermonkey-1.8.2*
143 - gtk-doc? ( dev-util/gtk-doc )
144 -"
145 -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
146 -# https://bugs.gentoo.org/show_bug.cgi?id=360413
147 -
148 -src_prepare() {
149 - # Fix backgrounds path as cinnamon doesn't provide them
150 - # https://github.com/linuxmint/Cinnamon/issues/3575
151 - eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
152 -
153 - # Use wheel group instead of sudo (from Fedora/Arch)
154 - # https://github.com/linuxmint/Cinnamon/issues/3576
155 - eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
156 -
157 - # Add polkit agent to required components (from Fedora/Arch), bug #523958
158 - # https://github.com/linuxmint/Cinnamon/issues/3579
159 - sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
160 - files/cinnamon*.session.in || die
161 -
162 - # shebang fixing craziness
163 - local p
164 - for p in $(grep -rl '#!.*python3'); do
165 - python_fix_shebang "${p}"
166 - done
167 -
168 - eautoreconf
169 - gnome2_src_prepare
170 -}
171 -
172 -src_configure() {
173 - gnome2_src_configure \
174 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
175 - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
176 - $(use_enable gtk-doc) \
177 - $(use_enable networkmanager) \
178 - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
179 -}
180 -
181 -src_install() {
182 - gnome2_src_install
183 - python_optimize "${ED}"usr/share/cinnamon/
184 -
185 - # Required for gnome-shell on hardened/PaX, bug #398941
186 - pax-mark mr "${ED}usr/bin/cinnamon"
187 -
188 - # Doesn't exist on Gentoo, causing this to be a dead symlink
189 - rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
190 -
191 - # Ensure authentication-agent is started, bug #523958
192 - # https://github.com/linuxmint/Cinnamon/issues/3579
193 - insinto /etc/xdg/autostart/
194 - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
195 -}
196 -
197 -pkg_postinst() {
198 - gnome2_pkg_postinst
199 -
200 - if ! has_version 'media-libs/gst-plugins-good:1.0' || \
201 - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
202 - ewarn "To make use of Cinnamon's built-in screen recording utility,"
203 - ewarn "you need to either install media-libs/gst-plugins-good:1.0"
204 - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
205 - ewarn "org.cinnamon.recorder/pipeline to what you want to use."
206 - fi
207 -}