Gentoo Archives: gentoo-commits

From: Kristian Fiskerstrand <k_f@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
Date: Mon, 27 Nov 2017 22:20:33
Message-Id: 1511821209.a0634e24ea76261055ba0236baa221b0d5276066.k_f@gentoo
1 commit: a0634e24ea76261055ba0236baa221b0d5276066
2 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 27 22:18:34 2017 +0000
4 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 27 22:20:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0634e24
7
8 gnome-extra/cinnamon: Increase min deps
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.3
11
12 gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild | 229 ++++++++++++++++++++++++++
13 1 file changed, 229 insertions(+)
14
15 diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
16 new file mode 100644
17 index 00000000000..25619ca438c
18 --- /dev/null
19 +++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
20 @@ -0,0 +1,229 @@
21 +# Copyright 1999-2017 Gentoo Foundation
22 +# Distributed under the terms of the GNU General Public License v2
23 +
24 +EAPI=6
25 +GNOME2_LA_PUNT="yes"
26 +PYTHON_COMPAT=( python{2_7,3_4,3_5} )
27 +PYTHON_REQ_USE="xml"
28 +
29 +inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
30 +
31 +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
32 +HOMEPAGE="http://developer.linuxmint.com/"
33 +
34 +MY_PV="${PV/_p/-UP}"
35 +MY_P="${PN}-${MY_PV}"
36 +
37 +SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
38 +
39 +LICENSE="GPL-2+"
40 +SLOT="0"
41 +
42 +# bluetooth support dropped due to bug #511648
43 +IUSE="+nls +networkmanager" #+bluetooth
44 +
45 +# We need *both* python 2.x and 3.x
46 +REQUIRED_USE="${PYTHON_REQUIRED_USE}
47 + || ( $(python_gen_useflags 'python2*') )
48 + || ( $(python_gen_useflags 'python3*') )
49 +"
50 +
51 +KEYWORDS="~amd64 ~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-0.10.1:=
59 + >=dev-libs/json-glib-0.13.2
60 + >=dev-libs/libcroco-0.6.2:0.6
61 + dev-libs/libxml2:2
62 + gnome-base/gconf:2[introspection]
63 + gnome-base/librsvg
64 + >=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
65 + >=gnome-extra/cinnamon-menus-3.6[introspection]
66 + >=gnome-extra/cjs-3.6.0
67 + >=media-libs/clutter-1.10:1.0[introspection]
68 + media-libs/cogl:1.0=[introspection]
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.9.12: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-3.6.0[introspection]
81 + networkmanager? (
82 + gnome-base/libgnome-keyring
83 + >=net-misc/networkmanager-0.8.999:=[introspection] )
84 +"
85 +#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
86 +
87 +# Runtime-only deps are probably incomplete and approximate.
88 +# Each block:
89 +# 2. Introspection stuff + dconf needed via imports.gi.*
90 +# 3. gnome-session is needed for gnome-session-quit
91 +# 4. Control shell settings
92 +# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
93 +# user switching with gdm-3.1.x)
94 +# 6. caribou needed for on-screen keyboard
95 +# 7. xdg-utils needed for xdg-open, used by extension tool
96 +# 8. gconf-python, imaging, lxml needed for cinnamon-settings
97 +# 9. gnome-icon-theme-symbolic needed for various icons
98 +# 10. pygobject needed for menu editor
99 +# 11. nemo - default file manager, tightly integrated with cinnamon
100 +# 12. polkit-gnome - explicitly autostarted by us
101 +# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
102 +RDEPEND="${COMMON_DEPEND}
103 + >=gnome-base/dconf-0.4.1
104 + >=gnome-base/libgnomekbd-2.91.4[introspection]
105 + || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
106 +
107 + >=gnome-extra/cinnamon-session-3.6
108 + >=gnome-extra/cinnamon-settings-daemon-3.6
109 +
110 + >=app-accessibility/caribou-0.3
111 +
112 + x11-misc/xdg-utils
113 + x11-libs/xapps[introspection]
114 +
115 + dev-python/dbus-python[${PYTHON_USEDEP}]
116 + dev-python/pygobject:3[${PYTHON_USEDEP}]
117 + $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
118 + $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
119 + $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
120 + $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
121 + $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
122 + $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
123 + $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
124 +
125 + x11-themes/gnome-themes-standard
126 + x11-themes/adwaita-icon-theme
127 +
128 + >=gnome-extra/nemo-3.6
129 + >=gnome-extra/cinnamon-control-center-3.6
130 + >=gnome-extra/cinnamon-screensaver-3.6
131 +
132 + gnome-extra/polkit-gnome
133 +
134 + networkmanager? (
135 + gnome-extra/nm-applet
136 + net-misc/mobile-broadband-provider-info
137 + sys-libs/timezone-data )
138 + nls? ( >=gnome-extra/cinnamon-translations-2.4 )
139 +"
140 +#bluetooth? ( net-wireless/cinnamon-bluetooth )
141 +
142 +DEPEND="${COMMON_DEPEND}
143 + $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
144 + dev-util/gtk-doc
145 + >=dev-util/intltool-0.4
146 + >=sys-devel/gettext-0.17
147 + virtual/pkgconfig
148 + gnome-base/gnome-common
149 + !!=dev-lang/spidermonkey-1.8.2*
150 +"
151 +# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
152 +# https://bugs.gentoo.org/show_bug.cgi?id=360413
153 +
154 +S="${WORKDIR}/Cinnamon-${PV}"
155 +
156 +pkg_setup() {
157 + python_setup
158 +}
159 +
160 +src_prepare() {
161 + # Fix backgrounds path as cinnamon doesn't provide them
162 + # https://github.com/linuxmint/Cinnamon/issues/3575
163 + eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
164 +
165 + # Fix automagic gnome-bluetooth dep, bug #398145
166 + eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
167 +
168 + # Use wheel group instead of sudo (from Fedora/Arch)
169 + # https://github.com/linuxmint/Cinnamon/issues/3576
170 + eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
171 +
172 + # Use pkexec instead of gksu (from Arch)
173 + # https://github.com/linuxmint/Cinnamon/issues/3565
174 + sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
175 +
176 + # Add polkit agent to required components (from Fedora/Arch), bug #523958
177 + # https://github.com/linuxmint/Cinnamon/issues/3579
178 + sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
179 + files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
180 +
181 + if ! use networkmanager; then
182 + rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die
183 + fi
184 +
185 + # python 2-and-3 shebang fixing craziness
186 + local p
187 + python_setup 'python3*'
188 + for p in $(grep -rl '#!.*python3'); do
189 + python_fix_shebang "${p}"
190 + done
191 +
192 + python_setup 'python2*'
193 + for p in $(grep -rl '#!.*python[^3]'); do
194 + python_fix_shebang "${p}"
195 + done
196 +
197 + eautoreconf
198 + gnome2_src_prepare
199 +}
200 +
201 +src_configure() {
202 + gnome2_src_configure \
203 + --libdir="${EPREFIX}/usr/$(get_libdir)" \
204 + --disable-jhbuild-wrapper-script \
205 + $(use_enable networkmanager) \
206 + --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
207 + BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
208 + --without-bluetooth
209 +}
210 +
211 +src_install() {
212 + gnome2_src_install
213 + python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
214 +
215 + # Required for gnome-shell on hardened/PaX, bug #398941
216 + pax-mark mr "${ED}usr/bin/cinnamon"
217 +
218 + # Doesn't exist on Gentoo, causing this to be a dead symlink
219 + rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
220 +
221 + # Ensure authentication-agent is started, bug #523958
222 + # https://github.com/linuxmint/Cinnamon/issues/3579
223 + insinto /etc/xdg/autostart/
224 + doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
225 +}
226 +
227 +pkg_postinst() {
228 + gnome2_pkg_postinst
229 +
230 + if ! has_version 'media-libs/gst-plugins-good:1.0' || \
231 + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
232 + ewarn "To make use of Cinnamon's built-in screen recording utility,"
233 + ewarn "you need to either install media-libs/gst-plugins-good:1.0"
234 + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
235 + ewarn "org.cinnamon.recorder/pipeline to what you want to use."
236 + fi
237 +
238 + if ! has_version ">=x11-base/xorg-server-1.11"; then
239 + ewarn "If you use multiple screens, it is highly recommended that you"
240 + ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
241 + ewarn "pointer barriers which will make it easier to use hot corners."
242 + fi
243 +
244 + if has_version "<x11-drivers/ati-drivers-12"; then
245 + ewarn "Cinnamon has been reported to show graphical corruption under"
246 + ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
247 + ewarn "open-source drivers."
248 + fi
249 +}