Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: cinnamon-2.2.13.ebuild cinnamon-1.8.8.1-r2.ebuild ChangeLog
Date: Sun, 01 Jun 2014 08:25:26
Message-Id: 20140601082521.88EE92004E@flycatcher.gentoo.org
1 pacho 14/06/01 08:25:21
2
3 Modified: cinnamon-1.8.8.1-r2.ebuild ChangeLog
4 Added: cinnamon-2.2.13.ebuild
5 Log:
6 Version bump, disable bluetooth support as upstream doesn't plan to fix it shortly (#511648), old cinnamon needs old upower
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
9
10 Revision Changes Path
11 1.6 gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild?r1=1.5&r2=1.6
16
17 Index: cinnamon-1.8.8.1-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- cinnamon-1.8.8.1-r2.ebuild 31 May 2014 22:30:15 -0000 1.5
24 +++ cinnamon-1.8.8.1-r2.ebuild 1 Jun 2014 08:25:21 -0000 1.6
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v 1.5 2014/05/31 22:30:15 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.8.8.1-r2.ebuild,v 1.6 2014/06/01 08:25:21 pacho Exp $
30
31 EAPI="5"
32 GCONF_DEBUG="no"
33 @@ -89,7 +89,7 @@
34 RDEPEND="${COMMON_DEPEND}
35 >=gnome-base/dconf-0.4.1
36 >=gnome-base/libgnomekbd-2.91.4[introspection]
37 - || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
38 + || ( <sys-power/upower-0.99[introspection] sys-power/upower-pm-utils[introspection] )
39
40 >=gnome-base/gnome-session-3.8
41
42
43
44
45 1.41 gnome-extra/cinnamon/ChangeLog
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.41&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?rev=1.41&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/ChangeLog?r1=1.40&r2=1.41
50
51 Index: ChangeLog
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v
54 retrieving revision 1.40
55 retrieving revision 1.41
56 diff -u -r1.40 -r1.41
57 --- ChangeLog 31 May 2014 22:30:15 -0000 1.40
58 +++ ChangeLog 1 Jun 2014 08:25:21 -0000 1.41
59 @@ -1,6 +1,13 @@
60 # ChangeLog for gnome-extra/cinnamon
61 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
62 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.40 2014/05/31 22:30:15 ssuominen Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.41 2014/06/01 08:25:21 pacho Exp $
64 +
65 +*cinnamon-2.2.13 (01 Jun 2014)
66 +
67 + 01 Jun 2014; Pacho Ramos <pacho@g.o> +cinnamon-2.2.13.ebuild,
68 + cinnamon-1.8.8.1-r2.ebuild:
69 + Version bump, disable bluetooth support as upstream doesn't plan to fix it
70 + shortly (#511648), old cinnamon needs old upower
71
72 31 May 2014; Samuli Suominen <ssuominen@g.o>
73 cinnamon-1.8.8.1-r2.ebuild, cinnamon-2.2.9.ebuild:
74
75
76
77 1.1 gnome-extra/cinnamon/cinnamon-2.2.13.ebuild
78
79 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.13.ebuild?rev=1.1&view=markup
80 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.13.ebuild?rev=1.1&content-type=text/plain
81
82 Index: cinnamon-2.2.13.ebuild
83 ===================================================================
84 # Copyright 1999-2014 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.13.ebuild,v 1.1 2014/06/01 08:25:21 pacho Exp $
87
88 EAPI="5"
89 GCONF_DEBUG="no"
90 GNOME2_LA_PUNT="yes"
91 PYTHON_COMPAT=( python2_7 )
92 PYTHON_REQ_USE="xml"
93
94 inherit autotools eutils gnome2 multilib pax-utils python-single-r1
95
96 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
97 HOMEPAGE="http://cinnamon.linuxmint.com/"
98
99 MY_PV="${PV/_p/-UP}"
100 MY_P="${PN}-${MY_PV}"
101
102 SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
103
104 LICENSE="GPL-2+"
105 SLOT="0"
106 # bluetooth support dropped due bug #511648
107 IUSE="+l10n +networkmanager" #+bluetooth
108 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
109
110 KEYWORDS="~amd64 ~x86"
111
112 COMMON_DEPEND="
113 app-misc/ca-certificates
114 dev-libs/dbus-glib
115 >=dev-libs/glib-2.29.10:2
116 >=dev-libs/gobject-introspection-0.10.1
117 >=dev-libs/json-glib-0.13.2
118 >=dev-libs/libcroco-0.6.2:0.6
119 dev-libs/libxml2:2
120 gnome-base/gconf:2[introspection]
121 gnome-base/librsvg
122 >=gnome-extra/cinnamon-desktop-1.0:0=[introspection]
123 gnome-extra/cinnamon-menus[introspection]
124 >=gnome-extra/cjs-1.9.0
125 >=media-libs/clutter-1.7.5:1.0[introspection]
126 media-libs/cogl:1.0=[introspection]
127 >=gnome-base/gsettings-desktop-schemas-2.91.91
128 media-libs/gstreamer:1.0
129 media-libs/gst-plugins-base:1.0
130 media-libs/libcanberra
131 media-sound/pulseaudio:0=[glib]
132 net-libs/libsoup:2.4[introspection]
133 >=sys-auth/polkit-0.100[introspection]
134 x11-libs/gdk-pixbuf:2[introspection]
135 >=x11-libs/gtk+-3.0.0:3[introspection]
136 x11-libs/pango[introspection]
137 >=x11-libs/startup-notification-0.11
138 x11-libs/libX11
139 >=x11-libs/libXfixes-5.0
140 >=x11-wm/muffin-1.9.1[introspection]
141 ${PYTHON_DEPS}
142 networkmanager? (
143 gnome-base/libgnome-keyring
144 >=net-misc/networkmanager-0.8.999[introspection] )
145 "
146 #bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
147
148 # Runtime-only deps are probably incomplete and approximate.
149 # Each block:
150 # 2. Introspection stuff + dconf needed via imports.gi.*
151 # 3. gnome-session is needed for gnome-session-quit
152 # 4. Control shell settings
153 # 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
154 # user switching with gdm-3.1.x)
155 # 6. caribou needed for on-screen keyboard
156 # 7. xdg-utils needed for xdg-open, used by extension tool
157 # 8. gconf-python, imaging, lxml needed for cinnamon-settings
158 # 9. gnome-icon-theme-symbolic needed for various icons
159 # 10. pygobject needed for menu editor
160 # 11. nemo - default file manager, tightly integrated with cinnamon
161 # TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
162 # note: needs gksu, not gksu-polkit, due to extensive use of --message/-m arg
163 RDEPEND="${COMMON_DEPEND}
164 >=gnome-base/dconf-0.4.1
165 >=gnome-base/libgnomekbd-2.91.4[introspection]
166 || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
167
168 gnome-extra/cinnamon-session
169
170 gnome-extra/cinnamon-settings-daemon
171
172 >=sys-apps/accountsservice-0.6.14[introspection]
173
174 >=app-accessibility/caribou-0.3
175
176 x11-libs/gksu
177 x11-misc/xdg-utils
178
179 dev-python/dbus-python[${PYTHON_USEDEP}]
180 dev-python/gconf-python:2
181 dev-python/lxml[${PYTHON_USEDEP}]
182 dev-python/pexpect[${PYTHON_USEDEP}]
183 dev-python/pycairo[${PYTHON_USEDEP}]
184 dev-python/pygobject:3[${PYTHON_USEDEP}]
185 dev-python/pyinotify[${PYTHON_USEDEP}]
186 dev-python/pypam[${PYTHON_USEDEP}]
187 virtual/python-imaging[${PYTHON_USEDEP}]
188
189 x11-themes/gnome-icon-theme-symbolic
190
191 gnome-extra/nemo
192 gnome-extra/cinnamon-control-center
193 gnome-extra/cinnamon-screensaver
194
195 l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
196 networkmanager? (
197 gnome-extra/nm-applet
198 net-misc/mobile-broadband-provider-info
199 sys-libs/timezone-data )
200 "
201 #bluetooth? ( net-wireless/cinnamon-bluetooth )
202
203 DEPEND="${COMMON_DEPEND}
204 dev-python/polib[${PYTHON_USEDEP}]
205 >=sys-devel/gettext-0.17
206 virtual/pkgconfig
207 >=dev-util/intltool-0.40
208 gnome-base/gnome-common
209 !!=dev-lang/spidermonkey-1.8.2*
210 "
211 # libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
212 # https://bugs.gentoo.org/show_bug.cgi?id=360413
213
214 S="${WORKDIR}/Cinnamon-${PV}"
215
216 pkg_setup() {
217 python-single-r1_pkg_setup
218 }
219
220 src_prepare() {
221 # Fix GNOME 3.8 support
222 epatch "${FILESDIR}/background.patch"
223
224 # Fix automagic gnome-bluetooth dep, bug #398145
225 epatch "${FILESDIR}/${PN}-2.2.6-automagic-gnome-bluetooth.patch"
226
227 # Optional NetworkManager, bug #488684
228 epatch "${FILESDIR}/${PN}-2.2.6-optional-networkmanager.patch"
229
230 # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
231 sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
232 -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
233 -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
234 -i files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py \
235 -i files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
236 -i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
237 -i files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py \
238 -i files/usr/lib/cinnamon-settings/data/spices/applet-detail.html \
239 -i files/usr/lib/cinnamon-settings/bin/*.py \
240 -i files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py \
241 -i files/usr/lib/cinnamon-menu-editor/cme/*.py \
242 -i files/usr/bin/* || die "sed failed"
243 if [[ "$(get_libdir)" != lib ]]; then
244 mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
245 fi
246
247 if ! use networkmanager; then
248 rm -rv files/usr/share/cinnamon/applets/network@××××××××.org || die
249 fi
250
251 eautoreconf
252 gnome2_src_prepare
253 }
254
255 src_configure() {
256 # Don't error out on warnings
257 gnome2_src_configure \
258 --disable-jhbuild-wrapper-script \
259 $(use_enable networkmanager) \
260 --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
261 BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
262 --without-bluetooth
263 #$(use_with bluetooth)
264 }
265
266 src_install() {
267 gnome2_src_install
268 python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users}
269 # Fix broken shebangs
270 sed -e "s%#!.*python%#!${PYTHON}%" \
271 -i "${ED}usr/bin/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users} \
272 -i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
273
274 # Required for gnome-shell on hardened/PaX, bug #398941
275 pax-mark mr "${ED}usr/bin/cinnamon"
276
277 # Doesn't exist on Gentoo, causing this to be a dead symlink
278 rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
279 }
280
281 pkg_postinst() {
282 gnome2_pkg_postinst
283
284 if ! has_version 'media-libs/gst-plugins-good:1.0' || \
285 ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
286 ewarn "To make use of Cinnamon's built-in screen recording utility,"
287 ewarn "you need to either install media-libs/gst-plugins-good:1.0"
288 ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
289 ewarn "org.cinnamon.recorder/pipeline to what you want to use."
290 fi
291
292 if ! has_version ">=x11-base/xorg-server-1.11"; then
293 ewarn "If you use multiple screens, it is highly recommended that you"
294 ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
295 ewarn "pointer barriers which will make it easier to use hot corners."
296 fi
297
298 if has_version "<x11-drivers/ati-drivers-12"; then
299 ewarn "Cinnamon has been reported to show graphical corruption under"
300 ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
301 ewarn "open-source drivers."
302 fi
303
304 if has_version "media-libs/mesa[video_cards_radeon]" ||
305 has_version "media-libs/mesa[video_cards_r300]" ||
306 has_version "media-libs/mesa[video_cards_r600]"; then
307 elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
308 elog "Make sure that gallium architecture for r300 and r600 drivers is"
309 elog "selected using 'eselect mesa'."
310 if ! has_version "media-libs/mesa[gallium]"; then
311 ewarn "You will need to emerge media-libs/mesa with USE=gallium."
312 fi
313 fi
314 }
Report Message
Find on MARC Find on Google Groups