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

Gentoo Archives: gentoo-commits

From: Stephen Klimaszewski <steev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/steev:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
Date: Mon, 30 Dec 2013 00:40:33
Message-Id: 1388363878.cda7e06a08e3a0ca2fece107f19b0ff31506af30.steev@gentoo
1 commit: cda7e06a08e3a0ca2fece107f19b0ff31506af30
2 Author: Steev Klimaszewski <steev <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 30 00:37:58 2013 +0000
4 Commit: Stephen Klimaszewski <steev <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 30 00:37:58 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/steev.git;a=commit;h=cda7e06a
7
8 gnome-shell: Remove old version
9
10 ---
11 gnome-base/gnome-shell/Manifest | 5 -
12 ...ome-shell-3.2.1-automagic-gnome-bluetooth.patch | 44 -----
13 ...gnome-shell-3.2.1-optional-networkmanager.patch | 207 ---------------------
14 gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild | 193 -------------------
15 4 files changed, 449 deletions(-)
16
17 diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
18 deleted file mode 100644
19 index 8a7900c..0000000
20 --- a/gnome-base/gnome-shell/Manifest
21 +++ /dev/null
22 @@ -1,5 +0,0 @@
23 -AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2
24 -AUX gnome-shell-3.2.1-optional-networkmanager.patch 7873 RMD160 d0dd3e5ae9b6d0ac12b23e0fe8e2845e79ea13a5 SHA1 00350c0484d25e0f62b3e1fadef43f46333f9b63 SHA256 c7b67f665b42d8a21e2a4f51bca121aba48af676d30e35eb6d6ac7939775b70b
25 -DIST gnome-shell-3.2.2.1-patches-2.tar.xz 9428 RMD160 24a9b4f581eb74d4f4d633b5ee6f343d60c5eb55 SHA1 69c1c2a908ce812e51a59901112978919d5c79af SHA256 67833b66abc1784305afbd95560797deff60a162b51da7d678338ad4af593cb0
26 -DIST gnome-shell-3.2.2.1.tar.xz 1119984 RMD160 2a3d3360ce630e2644ccd82a7b58801a97ee01ff SHA1 46bbfa5f575fcdd8ff7c653123ce249e7ce93537 SHA256 209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f
27 -EBUILD gnome-shell-3.2.2.1.ebuild 6657 RMD160 26a4f209eafdd1223ba1ee0cb888ae25ea4a9243 SHA1 9c8915fbd3f43d343da735618b82a1d02dc469b9 SHA256 958277d3e7bc95ba3d6f25147a6debd9ba59f2f8802660028f0400df64139083
28
29 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch
30 deleted file mode 100644
31 index ae23a6c..0000000
32 --- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch
33 +++ /dev/null
34 @@ -1,44 +0,0 @@
35 -From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001
36 -From: root <admin@×××××××××.uk>
37 -Date: Sun, 8 Jan 2012 13:55:05 +0000
38 -Subject: [PATCH] Fix automagic gnome-bluetooth dependency
39 -
40 -https://bugs.gentoo.org/show_bug.cgi?id=398145
41 -
42 -Ed Catmur 2012-01-08 13:46:22 UTC
43 -libgnome-bluetooth-applet is a private library so they shouldn't be linking
44 -against it anyway. I tried to work out how to tell libtool to add it to rpath
45 -but got totally lost.
46 -
47 -I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
48 -so I can at least merge USE=-bluetooth.
49 ----
50 - configure.ac | 5 +++++
51 - 1 files changed, 5 insertions(+), 0 deletions(-)
52 -
53 -diff --git a/configure.ac b/configure.ac
54 -index 1c64122..a699838 100644
55 ---- a/configure.ac
56 -+++ b/configure.ac
57 -@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
58 - PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
59 -
60 - AC_MSG_CHECKING([for bluetooth support])
61 -+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
62 -+AS_IF([test "x$with_bluetooth" != "xno"], [
63 - PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
64 - [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
65 - BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
66 -@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
67 - [AC_DEFINE([HAVE_BLUETOOTH],[0])
68 - AC_SUBST([HAVE_BLUETOOTH],[0])
69 - AC_MSG_RESULT([no])])
70 -+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
71 -+ AC_SUBST([HAVE_BLUETOOTH],[0])
72 -+ AC_MSG_RESULT([no])])
73 -
74 - PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0)
75 - AC_SUBST(CALENDAR_SERVER_CFLAGS)
76 ---
77 -1.7.8.2
78 -
79
80 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch
81 deleted file mode 100644
82 index ba304c1..0000000
83 --- a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-optional-networkmanager.patch
84 +++ /dev/null
85 @@ -1,207 +0,0 @@
86 -From df21e761fc02cf1269a7bbee073b8a129cba1dcd Mon Sep 17 00:00:00 2001
87 -From: Michael Biebl <biebl@××××××.org>
88 -Date: Thu, 22 Dec 2011 22:04:12 +0100
89 -Subject: [PATCH] Make NM optional
90 -
91 -[ Alexandre Rostovtsev <tetromino@g.o> :
92 - * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
93 - * take care to not import ui.status.network if nm is disabled;
94 - * do not try to reassign to const variables;
95 - * no point really in fiddling with the list of installed js files;
96 - * don't build shell-mobile-providers if nm is disabled;
97 - * use "networkmanager" instead of "network_manager" because THE
98 - BIKESHED SHOULD BE BLUE, also because the upstream package name is
99 - NetworkManager, not Network_Manager. ]
100 ----
101 - configure.ac | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
102 - js/misc/config.js.in | 2 ++
103 - js/ui/main.js | 8 ++++++--
104 - js/ui/panel.js | 3 ++-
105 - src/Makefile.am | 18 +++++++++++++-----
106 - 5 files changed, 70 insertions(+), 10 deletions(-)
107 -
108 -diff --git a/configure.ac b/configure.ac
109 -index d1bea62..b972127 100644
110 ---- a/configure.ac
111 -+++ b/configure.ac
112 -@@ -95,8 +95,41 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-2.0 >= $GIO_MIN_VERSION
113 - libcanberra
114 - telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
115 - telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
116 -- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
117 -- libnm-glib libnm-util gnome-keyring-1)
118 -+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
119 -+
120 -+##########################
121 -+# Check for NetworkManager
122 -+##########################
123 -+NM_MIN_VERSION=0.9
124 -+AC_ARG_ENABLE(networkmanager,
125 -+ AS_HELP_STRING([--disable-networkmanager],
126 -+ [disable NetworkManager support @<:@default=auto@:>@]),,
127 -+ [enable_networkmanager=auto])
128 -+
129 -+if test "x$enable_networkmanager" != "xno"; then
130 -+ PKG_CHECK_MODULES(NETWORKMANAGER,
131 -+ [libnm-glib libnm-util gnome-keyring-1],
132 -+ [have_networkmanager=yes],
133 -+ [have_networkmanager=no])
134 -+
135 -+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
136 -+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
137 -+else
138 -+ have_networkmanager="no (disabled)"
139 -+fi
140 -+
141 -+if test "x$have_networkmanager" = "xyes"; then
142 -+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
143 -+ AC_SUBST([HAVE_NETWORKMANAGER], [1])
144 -+else
145 -+ if test "x$enable_networkmanager" = "xyes"; then
146 -+ AC_MSG_ERROR([Couldn't find NetworkManager.])
147 -+ fi
148 -+ AC_SUBST([HAVE_NETWORKMANAGER], [0])
149 -+fi
150 -+
151 -+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
152 -+
153 -
154 - PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
155 -
156 -@@ -256,3 +289,15 @@ AC_CONFIG_FILES([
157 - man/Makefile
158 - ])
159 - AC_OUTPUT
160 -+
161 -+echo "
162 -+Build configuration:
163 -+
164 -+ Prefix: ${prefix}
165 -+ Source code location: ${srcdir}
166 -+ Compiler: ${CC}
167 -+ Compiler Warnings: $enable_compile_warnings
168 -+
169 -+ Support for NetworkManager: $have_networkmanager
170 -+ Support for GStreamer recording: $build_recorder
171 -+"
172 -diff --git a/js/misc/config.js.in b/js/misc/config.js.in
173 -index a35fe28..4a09df6 100644
174 ---- a/js/misc/config.js.in
175 -+++ b/js/misc/config.js.in
176 -@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
177 - const GJS_VERSION = '@GJS_VERSION@';
178 - /* 1 if gnome-bluetooth is available, 0 otherwise */
179 - const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
180 -+/* 1 if networkmanager is available, 0 otherwise */
181 -+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
182 - /* The system TLS CA list */
183 - const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
184 -diff --git a/js/ui/main.js b/js/ui/main.js
185 -index 4c97440..828911b 100644
186 ---- a/js/ui/main.js
187 -+++ b/js/ui/main.js
188 -@@ -14,6 +14,7 @@ const St = imports.gi.St;
189 -
190 - const AutomountManager = imports.ui.automountManager;
191 - const AutorunManager = imports.ui.autorunManager;
192 -+const Config = imports.misc.config;
193 - const CtrlAltTab = imports.ui.ctrlAltTab;
194 - const EndSessionDialog = imports.ui.endSessionDialog;
195 - const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
196 -@@ -27,7 +28,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
197 - const RunDialog = imports.ui.runDialog;
198 - const Layout = imports.ui.layout;
199 - const LookingGlass = imports.ui.lookingGlass;
200 --const NetworkAgent = imports.ui.networkAgent;
201 -+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
202 - const NotificationDaemon = imports.ui.notificationDaemon;
203 - const WindowAttentionHandler = imports.ui.windowAttentionHandler;
204 - const Scripting = imports.ui.scripting;
205 -@@ -84,7 +85,10 @@ function _createUserSession() {
206 - telepathyClient = new TelepathyClient.Client();
207 - automountManager = new AutomountManager.AutomountManager();
208 - autorunManager = new AutorunManager.AutorunManager();
209 -- networkAgent = new NetworkAgent.NetworkAgent();
210 -+ if (Config.HAVE_NETWORKMANAGER) {
211 -+ networkAgent = new NetworkAgent.NetworkAgent();
212 -+ }
213 -+
214 - }
215 -
216 - function _createGDMSession() {
217 -diff --git a/js/ui/panel.js b/js/ui/panel.js
218 -index 2f78db9..63e472c 100644
219 ---- a/js/ui/panel.js
220 -+++ b/js/ui/panel.js
221 -@@ -40,7 +40,8 @@ if (Config.HAVE_BLUETOOTH)
222 - STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
223 -
224 - try {
225 -- STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
226 -+ if (Config.HAVE_NETWORKMANAGER)
227 -+ STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
228 - } catch(e) {
229 - log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
230 - }
231 -diff --git a/src/Makefile.am b/src/Makefile.am
232 -index 4f8a1da..ecf4d13 100644
233 ---- a/src/Makefile.am
234 -+++ b/src/Makefile.am
235 -@@ -108,9 +108,7 @@ shell_public_headers_h = \
236 - shell-generic-container.h \
237 - shell-gtk-embed.h \
238 - shell-global.h \
239 -- shell-mobile-providers.h \
240 - shell-mount-operation.h \
241 -- shell-network-agent.h \
242 - shell-perf-log.h \
243 - shell-slicer.h \
244 - shell-stack.h \
245 -@@ -122,6 +120,11 @@ shell_public_headers_h = \
246 - shell-wm.h \
247 - shell-xfixes-cursor.h
248 -
249 -+if HAVE_NETWORKMANAGER
250 -+shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
251 -+endif
252 -+
253 -+
254 - libgnome_shell_la_SOURCES = \
255 - $(shell_built_sources) \
256 - $(shell_public_headers_h) \
257 -@@ -145,9 +148,7 @@ libgnome_shell_la_SOURCES = \
258 - shell-generic-container.c \
259 - shell-gtk-embed.c \
260 - shell-global.c \
261 -- shell-mobile-providers.c \
262 - shell-mount-operation.c \
263 -- shell-network-agent.c \
264 - shell-perf-log.c \
265 - shell-polkit-authentication-agent.h \
266 - shell-polkit-authentication-agent.c \
267 -@@ -161,6 +162,10 @@ libgnome_shell_la_SOURCES = \
268 - shell-wm.c \
269 - shell-xfixes-cursor.c
270 -
271 -+if HAVE_NETWORKMANAGER
272 -+libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
273 -+endif
274 -+
275 - libgnome_shell_la_gir_sources = \
276 - $(filter-out %-private.h $(shell_recorder_non_gir_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
277 -
278 -@@ -272,7 +277,10 @@ libgnome_shell_la_LIBADD = \
279 - libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
280 -
281 - Shell-0.1.gir: libgnome-shell.la St-1.0.gir
282 --Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
283 -+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
284 -+if HAVE_NETWORKMANAGER
285 -+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
286 -+endif
287 - Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
288 - Shell_0_1_gir_LIBS = libgnome-shell.la
289 - Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
290 ---
291 -1.7.8.3
292 -
293
294 diff --git a/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
295 deleted file mode 100644
296 index fb05e89..0000000
297 --- a/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild
298 +++ /dev/null
299 @@ -1,193 +0,0 @@
300 -# Copyright 1999-2012 Gentoo Foundation
301 -# Distributed under the terms of the GNU General Public License v2
302 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.2.2.1.ebuild,v 1.3 2012/02/14 04:35:48 tetromino Exp $
303 -
304 -EAPI="4"
305 -GCONF_DEBUG="no"
306 -GNOME2_LA_PUNT="yes"
307 -PYTHON_DEPEND="2:2.5"
308 -
309 -inherit autotools eutils gnome2 multilib pax-utils python
310 -
311 -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
312 -HOMEPAGE="http://live.gnome.org/GnomeShell"
313 -
314 -SRC_URI="${SRC_URI}
315 - http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-2.tar.xz"
316 -
317 -LICENSE="GPL-2"
318 -SLOT="0"
319 -IUSE="+bluetooth +networkmanager"
320 -KEYWORDS="~amd64 ~x86"
321 -
322 -# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
323 -# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
324 -# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
325 -# libXfixes-5.0 needed for pointer barriers
326 -COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
327 - >=dev-libs/gjs-1.29.18
328 - >=dev-libs/gobject-introspection-0.10.1
329 - x11-libs/gdk-pixbuf:2[introspection]
330 - >=x11-libs/gtk+-3.0.0:3[introspection]
331 - >=media-libs/clutter-1.7.5:1.0[introspection]
332 - app-misc/ca-certificates
333 - >=dev-libs/folks-0.5.2
334 - >=dev-libs/json-glib-0.13.2
335 - >=gnome-base/gnome-desktop-2.91.2:3
336 - >=gnome-base/gsettings-desktop-schemas-2.91.91
337 - >=gnome-extra/evolution-data-server-2.91.6
338 - >=media-libs/gstreamer-0.10.16:0.10
339 - >=media-libs/gst-plugins-base-0.10.16:0.10
340 - >=net-im/telepathy-logger-0.2.4[introspection]
341 - net-libs/libsoup:2.4[introspection]
342 - >=net-libs/telepathy-glib-0.15.5[introspection]
343 - >=sys-auth/polkit-0.100[introspection]
344 - >=x11-wm/mutter-3.2.1[introspection]
345 -
346 - dev-libs/dbus-glib
347 - dev-libs/libxml2:2
348 - x11-libs/pango[introspection]
349 - >=dev-libs/libcroco-0.6.2:0.6
350 -
351 - gnome-base/gconf:2[introspection]
352 - >=gnome-base/gnome-menus-2.29.10:3[introspection]
353 - gnome-base/librsvg
354 - media-libs/libcanberra
355 - media-sound/pulseaudio
356 -
357 - >=x11-libs/startup-notification-0.11
358 - x11-libs/libX11
359 - >=x11-libs/libXfixes-5.0
360 - x11-apps/mesa-progs
361 -
362 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
363 - networkmanager? (
364 - gnome-base/libgnome-keyring
365 - >=net-misc/networkmanager-0.8.999[introspection] )"
366 -# Runtime-only deps are probably incomplete and approximate.
367 -# Each block:
368 -# 1. Pull in polkit-0.101 for pretty authorization dialogs
369 -# 2. Introspection stuff + dconf needed via imports.gi.*
370 -# 3. gnome-session is needed for gnome-session-quit
371 -# 4. Control shell settings
372 -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
373 -# user switching with gdm-3.1.x)
374 -# 6. caribou needed for on-screen keyboard
375 -# 7. xdg-utils needed for xdg-open, used by extension tool
376 -# 8. gnome-icon-theme-symbolic neeed for various icons
377 -# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
378 -RDEPEND="${COMMON_DEPEND}
379 - >=sys-auth/polkit-0.101[introspection]
380 -
381 - >=gnome-base/dconf-0.4.1
382 - >=gnome-base/libgnomekbd-2.91.4[introspection]
383 - sys-power/upower[introspection]
384 -
385 - >=gnome-base/gnome-session-2.91.91
386 -
387 - >=gnome-base/gnome-settings-daemon-2.91
388 - >=gnome-base/gnome-control-center-2.91.92-r1
389 -
390 - >=sys-apps/accountsservice-0.6.14[introspection]
391 -
392 - >=app-accessibility/caribou-0.3
393 -
394 - x11-misc/xdg-utils
395 -
396 - x11-themes/gnome-icon-theme-symbolic
397 -
398 - networkmanager? (
399 - net-misc/mobile-broadband-provider-info
400 - sys-libs/timezone-data )"
401 -DEPEND="${COMMON_DEPEND}
402 - >=sys-devel/gettext-0.17
403 - >=dev-util/pkgconfig-0.22
404 - >=dev-util/intltool-0.40
405 - gnome-base/gnome-common
406 - !!=dev-lang/spidermonkey-1.8.2*"
407 -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
408 -# https://bugs.gentoo.org/show_bug.cgi?id=360413
409 -
410 -pkg_setup() {
411 - DOCS="AUTHORS NEWS README"
412 - # Don't error out on warnings
413 - G2CONF="${G2CONF}
414 - --enable-compile-warnings=maximum
415 - --disable-schemas-compile
416 - --disable-jhbuild-wrapper-script
417 - $(use_with bluetooth)
418 - $(use_enable networkmanager)
419 - --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
420 - BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
421 - python_set_active_version 2
422 - python_pkg_setup
423 -}
424 -
425 -src_prepare() {
426 - # Useful patches from git master (not in gnome-3-2 branch yet)
427 - epatch ../patch/*.patch
428 -
429 - # Fix automagic gnome-bluetooth dep, bug #398145
430 - epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
431 -
432 - # Make networkmanager optional, bug #398593
433 - epatch "${FILESDIR}/${PN}-3.2.1-optional-networkmanager.patch"
434 -
435 - eautoreconf
436 - gnome2_src_prepare
437 -
438 - # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
439 - # Note: sed Makefile.in because it is generated from several Makefile.ams
440 - sed -e 's/-DG_DISABLE_DEPRECATED//g' \
441 - -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
442 -}
443 -
444 -src_install() {
445 - gnome2_src_install
446 - python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
447 -
448 - # Required for gnome-shell on hardened/PaX, bug #398941
449 - pax-mark mr "${ED}usr/bin/gnome-shell"
450 -}
451 -
452 -pkg_postinst() {
453 - gnome2_pkg_postinst
454 -
455 - if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
456 - ! has_version 'media-plugins/gst-plugins-vp8'; then
457 - ewarn "To make use of GNOME Shell's built-in screen recording utility,"
458 - ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
459 - ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
460 - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
461 - fi
462 -
463 - if ! has_version ">=x11-base/xorg-server-1.11"; then
464 - ewarn "If you use multiple screens, it is highly recommended that you"
465 - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
466 - ewarn "pointer barriers which will make it easier to use hot corners."
467 - fi
468 -
469 - if has_version "<x11-drivers/ati-drivers-12"; then
470 - ewarn "GNOME Shell has been reported to show graphical corruption under"
471 - ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
472 - ewarn "fallback mode, or switch to open-source drivers."
473 - fi
474 -
475 - if has_version "media-libs/mesa[video_cards_radeon]"; then
476 - elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
477 - elog "Make sure that gallium architecture for r300 and r600 drivers is"
478 - elog "selected using 'eselect mesa'."
479 - if ! has_version "media-libs/mesa[gallium]"; then
480 - ewarn "You will need to emerge media-libs/mesa with USE=gallium."
481 - fi
482 - fi
483 -
484 - if has_version "media-libs/mesa[video_cards_intel]"; then
485 - elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers."
486 - elog "Make sure that classic architecture for i915 and i965 drivers is"
487 - elog "selected using 'eselect mesa'."
488 - if ! has_version "media-libs/mesa[classic]"; then
489 - ewarn "You will need to emerge media-libs/mesa with USE=classic."
490 - fi
491 - fi
492 -}
Report Message
Find on MARC Find on Google Groups