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

Gentoo Archives: gentoo-commits

From: Alexandre Restovtsev <tetromino@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
Date: Tue, 03 Apr 2012 06:37:10
Message-Id: 1333434899.28ca58306aa5a5b22e860e93d46fcef1326adc72.tetromino@gentoo
1 commit: 28ca58306aa5a5b22e860e93d46fcef1326adc72
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 3 06:09:08 2012 +0000
4 Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
5 CommitDate: Tue Apr 3 06:34:59 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=28ca5830
7
8 gnome-base/gnome-shell: 3.3.92 → 3.4.0 + optional bt and nm patches
9
10 ---
11 ...ome-shell-3.2.1-automagic-gnome-bluetooth.patch | 44 ++++
12 ...gnome-shell-3.4.0-optional-networkmanager.patch | 220 ++++++++++++++++++++
13 ...hell-3.3.92.ebuild => gnome-shell-3.4.0.ebuild} | 30 +--
14 gnome-base/gnome-shell/gnome-shell-9999.ebuild | 30 +--
15 4 files changed, 288 insertions(+), 36 deletions(-)
16
17 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
18 new file mode 100644
19 index 0000000..ae23a6c
20 --- /dev/null
21 +++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch
22 @@ -0,0 +1,44 @@
23 +From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001
24 +From: root <admin@×××××××××.uk>
25 +Date: Sun, 8 Jan 2012 13:55:05 +0000
26 +Subject: [PATCH] Fix automagic gnome-bluetooth dependency
27 +
28 +https://bugs.gentoo.org/show_bug.cgi?id=398145
29 +
30 +Ed Catmur 2012-01-08 13:46:22 UTC
31 +libgnome-bluetooth-applet is a private library so they shouldn't be linking
32 +against it anyway. I tried to work out how to tell libtool to add it to rpath
33 +but got totally lost.
34 +
35 +I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
36 +so I can at least merge USE=-bluetooth.
37 +---
38 + configure.ac | 5 +++++
39 + 1 files changed, 5 insertions(+), 0 deletions(-)
40 +
41 +diff --git a/configure.ac b/configure.ac
42 +index 1c64122..a699838 100644
43 +--- a/configure.ac
44 ++++ b/configure.ac
45 +@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
46 + PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
47 +
48 + AC_MSG_CHECKING([for bluetooth support])
49 ++AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
50 ++AS_IF([test "x$with_bluetooth" != "xno"], [
51 + PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
52 + [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
53 + BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
54 +@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
55 + [AC_DEFINE([HAVE_BLUETOOTH],[0])
56 + AC_SUBST([HAVE_BLUETOOTH],[0])
57 + AC_MSG_RESULT([no])])
58 ++], [AC_DEFINE([HAVE_BLUETOOTH],[0])
59 ++ AC_SUBST([HAVE_BLUETOOTH],[0])
60 ++ AC_MSG_RESULT([no])])
61 +
62 + 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)
63 + AC_SUBST(CALENDAR_SERVER_CFLAGS)
64 +--
65 +1.7.8.2
66 +
67
68 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-optional-networkmanager.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-optional-networkmanager.patch
69 new file mode 100644
70 index 0000000..ee9d0af
71 --- /dev/null
72 +++ b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-optional-networkmanager.patch
73 @@ -0,0 +1,220 @@
74 +From 411d751935c9bdc485b113678284edf0cc9e545e Mon Sep 17 00:00:00 2001
75 +From: Michael Biebl <biebl@××××××.org>
76 +Date: Thu, 22 Dec 2011 22:04:12 +0100
77 +Subject: [PATCH] Make NM optional
78 +
79 +[ Alexandre Rostovtsev <tetromino@g.o> :
80 + * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
81 + * take care to not import ui.status.network if nm is disabled;
82 + * do not try to reassign to const variables;
83 + * no point really in fiddling with the list of installed js files;
84 + * don't build shell-mobile-providers if nm is disabled;
85 + * use "networkmanager" instead of "network_manager" because THE
86 + BIKESHED SHOULD BE BLUE, also because the upstream package name is
87 + NetworkManager, not Network_Manager. ]
88 +---
89 + configure.ac | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
90 + js/Makefile.am | 1 +
91 + js/misc/config.js.in | 2 ++
92 + js/ui/main.js | 8 ++++++--
93 + js/ui/panel.js | 3 ++-
94 + src/Makefile.am | 17 ++++++++++++-----
95 + 6 files changed, 69 insertions(+), 9 deletions(-)
96 +
97 +diff --git a/configure.ac b/configure.ac
98 +index c6ad636..f228ebd 100644
99 +--- a/configure.ac
100 ++++ b/configure.ac
101 +@@ -94,9 +94,42 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
102 + telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
103 + telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
104 + polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
105 +- libnm-glib libnm-util gnome-keyring-1
106 ++ gnome-keyring-1
107 + gcr-3 >= $GCR_MIN_VERSION)
108 +
109 ++##########################
110 ++# Check for NetworkManager
111 ++##########################
112 ++NM_MIN_VERSION=0.9
113 ++AC_ARG_ENABLE(networkmanager,
114 ++ AS_HELP_STRING([--disable-networkmanager],
115 ++ [disable NetworkManager support @<:@default=auto@:>@]),,
116 ++ [enable_networkmanager=auto])
117 ++
118 ++if test "x$enable_networkmanager" != "xno"; then
119 ++ PKG_CHECK_MODULES(NETWORKMANAGER,
120 ++ [libnm-glib libnm-util gnome-keyring-1],
121 ++ [have_networkmanager=yes],
122 ++ [have_networkmanager=no])
123 ++
124 ++ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
125 ++ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
126 ++else
127 ++ have_networkmanager="no (disabled)"
128 ++fi
129 ++
130 ++if test "x$have_networkmanager" = "xyes"; then
131 ++ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
132 ++ AC_SUBST([HAVE_NETWORKMANAGER], [1])
133 ++else
134 ++ if test "x$enable_networkmanager" = "xyes"; then
135 ++ AC_MSG_ERROR([Couldn't find NetworkManager.])
136 ++ fi
137 ++ AC_SUBST([HAVE_NETWORKMANAGER], [0])
138 ++fi
139 ++
140 ++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
141 ++
142 + PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
143 +
144 + PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
145 +@@ -289,3 +322,15 @@ AC_CONFIG_FILES([
146 + man/Makefile
147 + ])
148 + AC_OUTPUT
149 ++
150 ++echo "
151 ++Build configuration:
152 ++
153 ++ Prefix: ${prefix}
154 ++ Source code location: ${srcdir}
155 ++ Compiler: ${CC}
156 ++ Compiler Warnings: $enable_compile_warnings
157 ++
158 ++ Support for NetworkManager: $have_networkmanager
159 ++ Support for GStreamer recording: $build_recorder
160 ++"
161 +diff --git a/js/Makefile.am b/js/Makefile.am
162 +index e7751cc..5eb4c18 100644
163 +--- a/js/Makefile.am
164 ++++ b/js/Makefile.am
165 +@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
166 + -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
167 + -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
168 + -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
169 ++ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
170 + -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
171 + -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
172 + -e "s|[@]datadir@|$(datadir)|g" \
173 +diff --git a/js/misc/config.js.in b/js/misc/config.js.in
174 +index 4a0db16..3df3394 100644
175 +--- a/js/misc/config.js.in
176 ++++ b/js/misc/config.js.in
177 +@@ -8,6 +8,8 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
178 + const GJS_VERSION = '@GJS_VERSION@';
179 + /* 1 if gnome-bluetooth is available, 0 otherwise */
180 + const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
181 ++/* 1 if networkmanager is available, 0 otherwise */
182 ++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
183 + /* The system TLS CA list */
184 + const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
185 + /* gettext package */
186 +diff --git a/js/ui/main.js b/js/ui/main.js
187 +index ac9330c..7ca91ee 100644
188 +--- a/js/ui/main.js
189 ++++ b/js/ui/main.js
190 +@@ -12,6 +12,7 @@ const St = imports.gi.St;
191 +
192 + const AutomountManager = imports.ui.automountManager;
193 + const AutorunManager = imports.ui.autorunManager;
194 ++const Config = imports.misc.config;
195 + const CtrlAltTab = imports.ui.ctrlAltTab;
196 + const EndSessionDialog = imports.ui.endSessionDialog;
197 + const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
198 +@@ -26,7 +27,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
199 + const RunDialog = imports.ui.runDialog;
200 + const Layout = imports.ui.layout;
201 + const LookingGlass = imports.ui.lookingGlass;
202 +-const NetworkAgent = imports.ui.networkAgent;
203 ++const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
204 + const NotificationDaemon = imports.ui.notificationDaemon;
205 + const WindowAttentionHandler = imports.ui.windowAttentionHandler;
206 + const Scripting = imports.ui.scripting;
207 +@@ -85,7 +86,10 @@ function _createUserSession() {
208 + telepathyClient = new TelepathyClient.Client();
209 + automountManager = new AutomountManager.AutomountManager();
210 + autorunManager = new AutorunManager.AutorunManager();
211 +- networkAgent = new NetworkAgent.NetworkAgent();
212 ++ if (Config.HAVE_NETWORKMANAGER) {
213 ++ networkAgent = new NetworkAgent.NetworkAgent();
214 ++ }
215 ++
216 + }
217 +
218 + function _createGDMSession() {
219 +diff --git a/js/ui/panel.js b/js/ui/panel.js
220 +index 329f118..865ce05 100644
221 +--- a/js/ui/panel.js
222 ++++ b/js/ui/panel.js
223 +@@ -45,7 +45,8 @@ if (Config.HAVE_BLUETOOTH)
224 + STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
225 +
226 + try {
227 +- STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
228 ++ if (Config.HAVE_NETWORKMANAGER)
229 ++ STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
230 + } catch(e) {
231 + log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
232 + }
233 +diff --git a/src/Makefile.am b/src/Makefile.am
234 +index 95f1a41..637455e 100644
235 +--- a/src/Makefile.am
236 ++++ b/src/Makefile.am
237 +@@ -110,9 +110,7 @@ shell_public_headers_h = \
238 + shell-gtk-embed.h \
239 + shell-global.h \
240 + shell-idle-monitor.h \
241 +- shell-mobile-providers.h \
242 + shell-mount-operation.h \
243 +- shell-network-agent.h \
244 + shell-perf-log.h \
245 + shell-screenshot.h \
246 + shell-screen-grabber.h \
247 +@@ -134,6 +132,10 @@ shell_private_sources = \
248 + gactionobserver.h \
249 + gactionobserver.c
250 +
251 ++if HAVE_NETWORKMANAGER
252 ++shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h
253 ++endif
254 ++
255 + libgnome_shell_la_SOURCES = \
256 + $(shell_built_sources) \
257 + $(shell_public_headers_h) \
258 +@@ -159,9 +161,7 @@ libgnome_shell_la_SOURCES = \
259 + shell-idle-monitor.c \
260 + shell-keyring-prompt.h \
261 + shell-keyring-prompt.c \
262 +- shell-mobile-providers.c \
263 + shell-mount-operation.c \
264 +- shell-network-agent.c \
265 + shell-perf-log.c \
266 + shell-polkit-authentication-agent.h \
267 + shell-polkit-authentication-agent.c \
268 +@@ -181,6 +181,10 @@ libgnome_shell_la_SOURCES = \
269 + $(NULL)
270 +
271 +
272 ++if HAVE_NETWORKMANAGER
273 ++libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
274 ++endif
275 ++
276 + libgnome_shell_la_gir_sources = \
277 + $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
278 +
279 +@@ -296,7 +300,10 @@ libgnome_shell_la_LIBADD = \
280 + libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
281 +
282 + Shell-0.1.gir: libgnome-shell.la St-1.0.gir
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 NetworkManager-1.0 NMClient-1.0 Folks-0.6
284 ++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
285 ++if HAVE_NETWORKMANAGER
286 ++Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
287 ++endif
288 + Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
289 + Shell_0_1_gir_LIBS = libgnome-shell.la
290 + Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
291 +--
292 +1.7.8.5
293 +
294
295 diff --git a/gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild b/gnome-base/gnome-shell/gnome-shell-3.4.0.ebuild
296 similarity index 89%
297 rename from gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild
298 rename to gnome-base/gnome-shell/gnome-shell-3.4.0.ebuild
299 index 1fc49c6..e653998 100644
300 --- a/gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild
301 +++ b/gnome-base/gnome-shell/gnome-shell-3.4.0.ebuild
302 @@ -17,9 +17,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
303
304 LICENSE="GPL-2"
305 SLOT="0"
306 -# TODO: reinstate this
307 -#IUSE="+bluetooth +networkmanager"
308 -IUSE=""
309 +IUSE="+bluetooth +networkmanager"
310 if [[ ${PV} = 9999 ]]; then
311 KEYWORDS=""
312 else
313 @@ -41,6 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.6:2
314 >=gnome-base/gsettings-desktop-schemas-2.91.91
315 >=gnome-base/gnome-keyring-3.3.90
316 >=gnome-base/gnome-menus-2.29.10:3[introspection]
317 + gnome-base/libgnome-keyring
318 >=gnome-extra/evolution-data-server-2.91.6
319 >=media-libs/gstreamer-0.10.16:0.10
320 >=media-libs/gst-plugins-base-0.10.16:0.10
321 @@ -64,14 +63,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.6:2
322 x11-libs/pango[introspection]
323 x11-apps/mesa-progs
324
325 - >=net-wireless/gnome-bluetooth-3.1.0[introspection]
326 - gnome-base/libgnome-keyring
327 - >=net-misc/networkmanager-0.8.999[introspection]
328 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
329 + networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
330 "
331 -# bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
332 -# networkmanager? (
333 -# gnome-base/libgnome-keyring
334 -# >=net-misc/networkmanager-0.8.999[introspection] )"
335 # Runtime-only deps are probably incomplete and approximate.
336 # Each block:
337 # 1. Pull in polkit-0.101 for pretty authorization dialogs
338 @@ -104,12 +98,10 @@ RDEPEND="${COMMON_DEPEND}
339
340 x11-themes/gnome-icon-theme-symbolic
341
342 - net-misc/mobile-broadband-provider-info
343 - sys-libs/timezone-data
344 + networkmanager? (
345 + net-misc/mobile-broadband-provider-info
346 + sys-libs/timezone-data )
347 "
348 -# networkmanager? (
349 -# net-misc/mobile-broadband-provider-info
350 -# sys-libs/timezone-data )"
351 DEPEND="${COMMON_DEPEND}
352 >=sys-devel/gettext-0.17
353 >=dev-util/pkgconfig-0.22
354 @@ -126,6 +118,8 @@ pkg_setup() {
355 --enable-compile-warnings=maximum
356 --disable-schemas-compile
357 --disable-jhbuild-wrapper-script
358 + $(use_with bluetooth)
359 + $(use_enable networkmanager)
360 --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
361 BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins
362 --without-systemd"
363 @@ -136,12 +130,12 @@ pkg_setup() {
364
365 src_prepare() {
366 # Fix automagic gnome-bluetooth dep, bug #398145
367 - #epatch "${FILESDIR}/${PN}-3.4.0-automagic-gnome-bluetooth.patch"
368 + epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
369
370 # Make networkmanager optional, bug #398593
371 - #epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
372 + epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
373
374 - #[[ ${PV} != 9999 ]] && eautoreconf
375 + [[ ${PV} != 9999 ]] && eautoreconf
376 gnome2_src_prepare
377
378 # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
379
380 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
381 index 1fc49c6..e653998 100644
382 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
383 +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
384 @@ -17,9 +17,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
385
386 LICENSE="GPL-2"
387 SLOT="0"
388 -# TODO: reinstate this
389 -#IUSE="+bluetooth +networkmanager"
390 -IUSE=""
391 +IUSE="+bluetooth +networkmanager"
392 if [[ ${PV} = 9999 ]]; then
393 KEYWORDS=""
394 else
395 @@ -41,6 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.6:2
396 >=gnome-base/gsettings-desktop-schemas-2.91.91
397 >=gnome-base/gnome-keyring-3.3.90
398 >=gnome-base/gnome-menus-2.29.10:3[introspection]
399 + gnome-base/libgnome-keyring
400 >=gnome-extra/evolution-data-server-2.91.6
401 >=media-libs/gstreamer-0.10.16:0.10
402 >=media-libs/gst-plugins-base-0.10.16:0.10
403 @@ -64,14 +63,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.6:2
404 x11-libs/pango[introspection]
405 x11-apps/mesa-progs
406
407 - >=net-wireless/gnome-bluetooth-3.1.0[introspection]
408 - gnome-base/libgnome-keyring
409 - >=net-misc/networkmanager-0.8.999[introspection]
410 + bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
411 + networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
412 "
413 -# bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
414 -# networkmanager? (
415 -# gnome-base/libgnome-keyring
416 -# >=net-misc/networkmanager-0.8.999[introspection] )"
417 # Runtime-only deps are probably incomplete and approximate.
418 # Each block:
419 # 1. Pull in polkit-0.101 for pretty authorization dialogs
420 @@ -104,12 +98,10 @@ RDEPEND="${COMMON_DEPEND}
421
422 x11-themes/gnome-icon-theme-symbolic
423
424 - net-misc/mobile-broadband-provider-info
425 - sys-libs/timezone-data
426 + networkmanager? (
427 + net-misc/mobile-broadband-provider-info
428 + sys-libs/timezone-data )
429 "
430 -# networkmanager? (
431 -# net-misc/mobile-broadband-provider-info
432 -# sys-libs/timezone-data )"
433 DEPEND="${COMMON_DEPEND}
434 >=sys-devel/gettext-0.17
435 >=dev-util/pkgconfig-0.22
436 @@ -126,6 +118,8 @@ pkg_setup() {
437 --enable-compile-warnings=maximum
438 --disable-schemas-compile
439 --disable-jhbuild-wrapper-script
440 + $(use_with bluetooth)
441 + $(use_enable networkmanager)
442 --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
443 BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins
444 --without-systemd"
445 @@ -136,12 +130,12 @@ pkg_setup() {
446
447 src_prepare() {
448 # Fix automagic gnome-bluetooth dep, bug #398145
449 - #epatch "${FILESDIR}/${PN}-3.4.0-automagic-gnome-bluetooth.patch"
450 + epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
451
452 # Make networkmanager optional, bug #398593
453 - #epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
454 + epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
455
456 - #[[ ${PV} != 9999 ]] && eautoreconf
457 + [[ ${PV} != 9999 ]] && eautoreconf
458 gnome2_src_prepare
459
460 # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
Report Message
Find on MARC Find on Google Groups