1 |
eva 12/12/26 22:47:32 |
2 |
|
3 |
Modified: gnome-shell-3.4.2.ebuild ChangeLog metadata.xml |
4 |
Added: gnome-shell-3.6.2-r1.ebuild |
5 |
Removed: gnome-shell-3.4.1.ebuild gnome-shell-3.2.2.1.ebuild |
6 |
Log: |
7 |
Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass. Clean up old revisions. |
8 |
|
9 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
10 |
|
11 |
Revision Changes Path |
12 |
1.4 gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild?rev=1.4&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild?rev=1.4&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild?r1=1.3&r2=1.4 |
17 |
|
18 |
Index: gnome-shell-3.4.2.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild,v |
21 |
retrieving revision 1.3 |
22 |
retrieving revision 1.4 |
23 |
diff -u -r1.3 -r1.4 |
24 |
--- gnome-shell-3.4.2.ebuild 7 Nov 2012 21:48:09 -0000 1.3 |
25 |
+++ gnome-shell-3.4.2.ebuild 26 Dec 2012 22:47:32 -0000 1.4 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2012 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild,v 1.3 2012/11/07 21:48:09 tetromino Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.4.2.ebuild,v 1.4 2012/12/26 22:47:32 eva Exp $ |
31 |
|
32 |
EAPI="4" |
33 |
GCONF_DEBUG="no" |
34 |
@@ -151,7 +151,7 @@ |
35 |
pax-mark mr "${ED}usr/bin/gnome-shell" |
36 |
elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then |
37 |
pax-mark m "${ED}usr/bin/gnome-shell" |
38 |
- fi |
39 |
+ fi |
40 |
} |
41 |
|
42 |
pkg_postinst() { |
43 |
|
44 |
|
45 |
|
46 |
1.19 gnome-base/gnome-shell/ChangeLog |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/ChangeLog?rev=1.19&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/ChangeLog?rev=1.19&content-type=text/plain |
50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/ChangeLog?r1=1.18&r2=1.19 |
51 |
|
52 |
Index: ChangeLog |
53 |
=================================================================== |
54 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v |
55 |
retrieving revision 1.18 |
56 |
retrieving revision 1.19 |
57 |
diff -u -r1.18 -r1.19 |
58 |
--- ChangeLog 7 Nov 2012 21:48:09 -0000 1.18 |
59 |
+++ ChangeLog 26 Dec 2012 22:47:32 -0000 1.19 |
60 |
@@ -1,6 +1,20 @@ |
61 |
# ChangeLog for gnome-base/gnome-shell |
62 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
63 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.18 2012/11/07 21:48:09 tetromino Exp $ |
64 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.19 2012/12/26 22:47:32 eva Exp $ |
65 |
+ |
66 |
+*gnome-shell-3.6.2-r1 (26 Dec 2012) |
67 |
+ |
68 |
+ 26 Dec 2012; Gilles Dartiguelongue <eva@g.o> |
69 |
+ -files/gnome-shell-3.2.1-optional-networkmanager.patch, |
70 |
+ -gnome-shell-3.2.2.1.ebuild, |
71 |
+ -files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch, |
72 |
+ -files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch, |
73 |
+ -gnome-shell-3.4.1.ebuild, gnome-shell-3.4.2.ebuild, |
74 |
+ +files/gnome-shell-3.5.x-bluetooth-flag.patch, |
75 |
+ +files/gnome-shell-3.6.0-networkmanager-flag.patch, |
76 |
+ +gnome-shell-3.6.2-r1.ebuild, metadata.xml: |
77 |
+ Version bump for Gnome 3.6. Switch to EAPI=5 and python-r1.eclass. Clean up |
78 |
+ old revisions. |
79 |
|
80 |
07 Nov 2012; Alexandre Rostovtsev <tetromino@g.o> |
81 |
gnome-shell-3.2.2.1.ebuild, gnome-shell-3.4.1.ebuild, |
82 |
|
83 |
|
84 |
|
85 |
1.4 gnome-base/gnome-shell/metadata.xml |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/metadata.xml?rev=1.4&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/metadata.xml?rev=1.4&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/metadata.xml?r1=1.3&r2=1.4 |
90 |
|
91 |
Index: metadata.xml |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/metadata.xml,v |
94 |
retrieving revision 1.3 |
95 |
retrieving revision 1.4 |
96 |
diff -u -r1.3 -r1.4 |
97 |
--- metadata.xml 14 May 2012 00:04:36 -0000 1.3 |
98 |
+++ metadata.xml 26 Dec 2012 22:47:32 -0000 1.4 |
99 |
@@ -3,6 +3,8 @@ |
100 |
<pkgmetadata> |
101 |
<herd>gnome</herd> |
102 |
<use> |
103 |
+ <flag name="i18n">Enable support for enhanced input methods through |
104 |
+ <pkg>app-i18n/ibus</pkg></flag> |
105 |
<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of |
106 |
<pkg>sys-auth/consolekit</pkg> for session tracking</flag> |
107 |
</use> |
108 |
|
109 |
|
110 |
|
111 |
1.1 gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild |
112 |
|
113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild?rev=1.1&view=markup |
114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild?rev=1.1&content-type=text/plain |
115 |
|
116 |
Index: gnome-shell-3.6.2-r1.ebuild |
117 |
=================================================================== |
118 |
# Copyright 1999-2012 Gentoo Foundation |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild,v 1.1 2012/12/26 22:47:32 eva Exp $ |
121 |
|
122 |
EAPI="5" |
123 |
GCONF_DEBUG="no" |
124 |
GNOME2_LA_PUNT="yes" |
125 |
PYTHON_COMPAT=( python2_{6,7} ) |
126 |
|
127 |
inherit autotools eutils gnome2 multilib pax-utils python-r1 |
128 |
|
129 |
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" |
130 |
HOMEPAGE="http://live.gnome.org/GnomeShell" |
131 |
|
132 |
LICENSE="GPL-2+ LGPL-2+" |
133 |
SLOT="0" |
134 |
IUSE="+bluetooth +i18n +networkmanager systemd" |
135 |
KEYWORDS="~amd64 ~x86" |
136 |
|
137 |
# libXfixes-5.0 needed for pointer barriers |
138 |
# TODO: gstreamer support is currently automagical: |
139 |
# gstreamer? ( >=media-libs/gstreamer-0.11.92 ) |
140 |
COMMON_DEPEND=" |
141 |
>=app-accessibility/at-spi2-atk-2.5.3 |
142 |
>=dev-libs/atk-2[introspection] |
143 |
>=app-crypt/gcr-3.3.90[introspection] |
144 |
>=dev-libs/glib-2.31.6:2 |
145 |
>=dev-libs/gjs-1.33.2 |
146 |
>=dev-libs/gobject-introspection-0.10.1 |
147 |
>=x11-libs/gtk+-3.3.9:3[introspection] |
148 |
>=media-libs/clutter-1.11.11:1.0[introspection] |
149 |
>=dev-libs/json-glib-0.13.2 |
150 |
>=dev-libs/libcroco-0.6.2:0.6 |
151 |
>=gnome-base/gnome-desktop-3.5.1:3=[introspection] |
152 |
>=gnome-base/gsettings-desktop-schemas-3.5.4 |
153 |
>=gnome-base/gnome-keyring-3.3.90 |
154 |
>=gnome-base/gnome-menus-3.5.3:3[introspection] |
155 |
gnome-base/libgnome-keyring |
156 |
>=gnome-extra/evolution-data-server-3.5.3:= |
157 |
>=media-libs/gstreamer-0.11.92:1.0 |
158 |
>=net-im/telepathy-logger-0.2.4[introspection] |
159 |
>=net-libs/telepathy-glib-0.19[introspection] |
160 |
>=sys-auth/polkit-0.100[introspection] |
161 |
>=x11-libs/libXfixes-5.0 |
162 |
>=x11-wm/mutter-${PV}[introspection] |
163 |
>=x11-libs/startup-notification-0.11 |
164 |
|
165 |
${PYTHON_DEPS} |
166 |
dev-python/pygobject:3[${PYTHON_USEDEP}] |
167 |
|
168 |
dev-libs/dbus-glib |
169 |
dev-libs/libxml2:2 |
170 |
gnome-base/librsvg |
171 |
media-libs/libcanberra |
172 |
media-libs/mesa |
173 |
media-sound/pulseaudio |
174 |
net-libs/libsoup:2.4[introspection] |
175 |
x11-libs/libX11 |
176 |
x11-libs/gdk-pixbuf:2[introspection] |
177 |
x11-libs/pango[introspection] |
178 |
x11-apps/mesa-progs |
179 |
|
180 |
bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) |
181 |
networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) |
182 |
systemd? ( >=sys-apps/systemd-31 ) |
183 |
" |
184 |
# Runtime-only deps are probably incomplete and approximate. |
185 |
# Introspection deps generated using: |
186 |
# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq |
187 |
# Each block: |
188 |
# 1. Pull in polkit-0.101 for pretty authorization dialogs |
189 |
# 2. Introspection stuff needed via imports.gi.* |
190 |
# 3. gnome-session is needed for gnome-session-quit |
191 |
# 4. Control shell settings |
192 |
# 5. xdg-utils needed for xdg-open, used by extension tool |
193 |
# 6. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows |
194 |
# 7. IBus is needed for i18n integration |
195 |
# 8. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c |
196 |
RDEPEND="${COMMON_DEPEND} |
197 |
>=sys-auth/polkit-0.101[introspection] |
198 |
|
199 |
>=app-accessibility/caribou-0.3 |
200 |
>=gnome-base/gdm-3.5[introspection] |
201 |
>=gnome-base/libgnomekbd-2.91.4[introspection] |
202 |
media-libs/cogl[introspection] |
203 |
>=sys-apps/accountsservice-0.6.14[introspection] |
204 |
sys-power/upower[introspection] |
205 |
|
206 |
>=gnome-base/gnome-session-2.91.91 |
207 |
>=gnome-base/gnome-settings-daemon-2.91 |
208 |
>=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] |
209 |
|
210 |
x11-misc/xdg-utils |
211 |
|
212 |
media-fonts/dejavu |
213 |
x11-themes/gnome-icon-theme-symbolic |
214 |
|
215 |
i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] ) |
216 |
networkmanager? ( |
217 |
net-misc/mobile-broadband-provider-info |
218 |
sys-libs/timezone-data ) |
219 |
|
220 |
!systemd? ( sys-auth/consolekit ) |
221 |
" |
222 |
DEPEND="${COMMON_DEPEND} |
223 |
dev-libs/libxslt |
224 |
>=dev-util/gtk-doc-am-1.17 |
225 |
>=dev-util/intltool-0.40 |
226 |
gnome-base/gnome-common |
227 |
>=sys-devel/gettext-0.17 |
228 |
virtual/pkgconfig |
229 |
!!=dev-lang/spidermonkey-1.8.2*" |
230 |
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time |
231 |
# https://bugs.gentoo.org/show_bug.cgi?id=360413 |
232 |
|
233 |
src_prepare() { |
234 |
# Fix automagic gnome-bluetooth dep, bug #398145 |
235 |
epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" |
236 |
|
237 |
# Make networkmanager optional, bug #398593 |
238 |
epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch" |
239 |
|
240 |
eautoreconf |
241 |
gnome2_src_prepare |
242 |
} |
243 |
|
244 |
src_configure() { |
245 |
# Do not error out on warnings |
246 |
G2CONF="${G2CONF} |
247 |
--enable-man |
248 |
--enable-compile-warnings=maximum |
249 |
--disable-jhbuild-wrapper-script |
250 |
$(use_with bluetooth) |
251 |
$(use_enable networkmanager) |
252 |
$(use_with systemd) |
253 |
BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" |
254 |
gnome2_src_configure |
255 |
} |
256 |
|
257 |
src_install() { |
258 |
gnome2_src_install |
259 |
python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" |
260 |
python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" |
261 |
|
262 |
# Required for gnome-shell on hardened/PaX, bug #398941 |
263 |
# Future-proof for >=spidermonkey-1.8.7 following polkit's example |
264 |
if has_version '<dev-lang/spidermonkey-1.8.7'; then |
265 |
pax-mark mr "${ED}usr/bin/gnome-shell" |
266 |
elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then |
267 |
pax-mark m "${ED}usr/bin/gnome-shell" |
268 |
fi |
269 |
} |
270 |
|
271 |
pkg_postinst() { |
272 |
gnome2_pkg_postinst |
273 |
|
274 |
if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
275 |
! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
276 |
ewarn "To make use of GNOME Shell's built-in screen recording utility," |
277 |
ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
278 |
ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
279 |
ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." |
280 |
fi |
281 |
|
282 |
if ! has_version ">=x11-base/xorg-server-1.11"; then |
283 |
ewarn "If you use multiple screens, it is highly recommended that you" |
284 |
ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" |
285 |
ewarn "pointer barriers which will make it easier to use hot corners." |
286 |
fi |
287 |
|
288 |
if has_version "<x11-drivers/ati-drivers-12"; then |
289 |
ewarn "GNOME Shell has been reported to show graphical corruption under" |
290 |
ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in" |
291 |
ewarn "fallback mode, or switch to open-source drivers." |
292 |
fi |
293 |
|
294 |
if has_version "media-libs/mesa[video_cards_radeon]" || |
295 |
has_version "media-libs/mesa[video_cards_r300]" || |
296 |
has_version "media-libs/mesa[video_cards_r600]"; then |
297 |
elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers." |
298 |
elog "Make sure that gallium architecture for r300 and r600 drivers is" |
299 |
elog "selected using 'eselect mesa'." |
300 |
if ! has_version "media-libs/mesa[gallium]"; then |
301 |
ewarn "You will need to emerge media-libs/mesa with USE=gallium." |
302 |
fi |
303 |
fi |
304 |
|
305 |
if has_version "media-libs/mesa[video_cards_intel]" || |
306 |
has_version "media-libs/mesa[video_cards_i915]" || |
307 |
has_version "media-libs/mesa[video_cards_i965]"; then |
308 |
elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers." |
309 |
elog "Make sure that classic architecture for i915 and i965 drivers is" |
310 |
elog "selected using 'eselect mesa'." |
311 |
if ! has_version "media-libs/mesa[classic]"; then |
312 |
ewarn "You will need to emerge media-libs/mesa with USE=classic." |
313 |
fi |
314 |
fi |
315 |
} |