Fix networkmanager optional patch (#463920 by Chris Mayo and Frederic Romagne), drop old.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 44 insertions, 246 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 9eb47abe97c9..adf6be9da8ff 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.28 2013/03/28 22:43:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.29 2013/04/07 10:23:28 pacho Exp $
+
+  07 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-shell-3.8.0-networkmanager-flag-r1.patch,
+  -files/gnome-shell-3.8.0-networkmanager-flag.patch,
+  -gnome-shell-3.6.2-r1.ebuild, gnome-shell-3.8.0.1.ebuild:
+  Fix networkmanager optional patch (#463920 by Chris Mayo and Frederic
+  Romagne), drop old.
 
 *gnome-shell-3.8.0.1 (28 Mar 2013)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 02b5ca5f92db..740025f20549 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -6,22 +6,20 @@ AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 SHA256 487bfd9772799cdd
 AUX gnome-shell-3.5.x-bluetooth-flag.patch 1845 SHA256 c910495fe1bf93c6ab09252df17f8d0fcd4b6fe75fed709c8c97a55bf401970e SHA512 37e4d252d62abfe264c639e47906afa5cd17d159101072ff4ed5ddb5dfc62b4563d80c4632d50bf20c1c62cbc1bdc2a6dc2b34f4e5cc9387095dc3f5606917d8 WHIRLPOOL 6db0c6907947fc86b932f7e391f465712fce5fcd731c6be11da61678c6452e93686c818491b914155a2793ff7ff73ded540de77059ecc498ddadf81a7382714f
 AUX gnome-shell-3.6.0-networkmanager-flag.patch 8352 SHA256 90f971920a04d9d1a828008ca3230c4e215a0d5370ffdf9ab6bf740829f5e85d SHA512 ea85a20a3416da2a0cdd9ea20b5f868ab69f3a1326142da89d259c5e0d67e3f7b4a722ff0a6be29ba2cb224f72a998edec89eda5ee905342c4c5cadfa3964ee4 WHIRLPOOL 2a75f3b9d897aa5d368f124832e476b3b971c6794256a32e150157cd7a8055d62ae1076a3d0ddac16796535e5b0598df22ea267b6d0c2c58f9c1a0d61ed3e35b
 AUX gnome-shell-3.7.90-bluetooth-flag.patch 1769 SHA256 2b9a3f5f5a339d14d003b270dd0002da678d6da977b010154a70540bcdb05d3f SHA512 6bcb9d3f8067b475f38a31f09b82bf46ae7e8d85847e05ab38e80a656653b67903211480a38e272dc27cc8f96932c7d5a9a167536d458a46f2a62583f71562d0 WHIRLPOOL ad23c1556c1efd1b0832c9114bfab47cb4f55674f0dd10c0cc8ef379934c130496b2dbe10cc5897b106965e075033e1256b205d9a723f71fd0c39f08e91792e1
-AUX gnome-shell-3.8.0-networkmanager-flag.patch 7395 SHA256 dd4365b5c576308d292c0226c9a6ac50508203060fefde7ff6859cbe3d8ba918 SHA512 c9e930f25d8996b9ec388061aec53ec6099526f7e980707099f077db4bf0317df497c331a776c88c64cfa5ecf12afc7b241f3227955ca4e3843e9d320395d398 WHIRLPOOL 49ae9e38e5119fc51da24ada10c7e8f947cd2edff9925dc1addc093a692403c99458acacd0b7cfe13cd3a988af160219332d276ab374e2b63673cc6ee071883b
+AUX gnome-shell-3.8.0-networkmanager-flag-r1.patch 7511 SHA256 85f848ba179aada5f28d4157a95c79ea7cb0af25beca4f1ea9e4ef311a77cd58 SHA512 43cf1866aecb4da20af10fa3a1d6dbec75957514ccc35d33b477410315fc23479ca7d38c74fa1804de9ad89df692810db88a4acd04058bc89acf9516ad693c56 WHIRLPOOL ebe811a59f85ebd8ffbd352114b8f34aee22a1041c46cd69b1578d6ed92d803e08bbd4c8938758607b5b8f2cfe0ed14a8c97f3a4e0427d40912be14499fb5b0d
 AUX gnome-shell-3.8.0-suspend.patch 2069 SHA256 5f313b9ece9e184b3559ee7b0df0c467adfab02749f499afc320c73b54b63a8a SHA512 5bc3cd0da743a78387423cc03902aa815429a540922b9caa5a749b99b966a135b46a7ccde5800987d1394db20d3234d360468b593ec02f4989175a12885cd513 WHIRLPOOL b91edd9ec9bd5f53c77193e6e344a654f6672a939196315a918d97d9e63903360ab067dbccf2b89c616c25215ef38c2472eca88df9235c99a97818d273a770f6
 DIST gnome-shell-3.4.2.tar.xz 1257612 SHA256 3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720 SHA512 6d05c3c068e1a58aee1c96be88d9bf2332ff02f2b53b47bd405c94fa2345de528fcdddfbcd662eb30e50c96c6b8c70550fd72cee01547036845e7319e403a638 WHIRLPOOL 31010bc265f365a2e26a31eb36427b99443eb4efefc4d825a13857837b3fb1264b1776f17270861f686b600fe6edd53fe8dd108150e3b814631268a2a340e892
-DIST gnome-shell-3.6.2.tar.xz 1396196 SHA256 86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0 SHA512 5e03f12a2065bac698c232ae00ddcab2cccc5c88b1b6be586c4cb96a1c3fb10ab59258d4f8c47d2f299060ed485162c30a9dc1c511d4af51a4c49cda13f0fbca WHIRLPOOL 77ceb9a5f6e5ed6481eccf495f92dd3af7ce73550cc90f54bada055bac339f15edde02db58d59b2211ee7cd637f47484fe554f6845ad080e166d7d94ee92e5f7
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
 DIST gnome-shell-3.8.0.1.tar.xz 1500260 SHA256 cf98c3d038704fd057489c696a6cb9e2ee2ae5a10db5b45ddeba59fb82d507b8 SHA512 072834174293d9090fd5a16806a4a564b01c19bb68a1954ca6efb01223b58f12f3f43b30a4c6c3bab6bf57e72250bd3cc5960398e3a15f20a38d7742f0c7ad99 WHIRLPOOL 6906cac7d63841fd74801bca73c833728756b02cd87d59a07d52558b12101c1b010bacb242cf770f89e6007f6906b09bf35a2a9ead96e3392a98c536f6fbeae7
 EBUILD gnome-shell-3.4.2.ebuild 7081 SHA256 2f12f1c54921216d41f40fb8a136f1b3575b81e706a4521576e3d003d4177778 SHA512 34266e5f77dd7d84f7089e5b62f82beefc1929246c66d457b549ab1a0c8c7f225e76d48d2270fe8390a5830cc0ea728b6c66bd2cd3e87f52f2f30054903fa739 WHIRLPOOL 142870bf412db7854c094fb3bf043abfb856555ebec56014a232285ee3366bd60628801111a4c42e6c5e9162a990a220c3c852c3963c9da117ea5ec80e086ca3
-EBUILD gnome-shell-3.6.2-r1.ebuild 6904 SHA256 32ed1799ef744fbb4aff2c89995c0579ea667d83902782cfc1fe68bbe82d8c31 SHA512 4a580165f6f7820dee5a8c6ecaa6550f8047217579225cc9f8f6d4093be02c672f2e9ae043bedc12a6b17c2e31a92651b8c7a5e94cd211fd4fd0ae29245c85af WHIRLPOOL ed40e56f61d3ee41a8a09e4bc79e2e0fd364268734a1fdb8499346a4282b586d3f44901c7619037047298f3713a4df60449b258faff64ccd53664e7ff439003d
 EBUILD gnome-shell-3.6.3.1.ebuild 6899 SHA256 792178784239e1011601529411be6fd288a435117cf8e190fc653ffd65a735a9 SHA512 c7a08f461f3c80b2c9d47b71d83eeb092aeeb7081b2e293e87e0bd0784857f9a7c2b10011197a71051475a2a16ea212cb1fef743da1c0bde31bb05d767233a46 WHIRLPOOL 15e7c843d5b88ed79a966a969b5f86399a0c79c37c45c29d5f72713c07b827213fdb8b545463054f3a4df059ea1db9965eb13e17f4bd33d17c7bb121c5fc4bc4
-EBUILD gnome-shell-3.8.0.1.ebuild 6971 SHA256 6e2107fdb48a60817af364a74544a548f069d18f7c7c6e251d9c21d98c50513a SHA512 a3098849a9347f6d18b44c2eb2a04564c1576d22a0ab4f081eed44ecc81dcded101e324abacab0507582f6953a750755573893e292e659418f60c0d182d7362c WHIRLPOOL 77ba22970e312644ebf10f2934f5aa50aad6abeb276f08f1f08cb159fa0e7881aaae4ca1a42eba4377a782647ec426f8b91f00c49477f0d7de8ea010a0cc9696
-MISC ChangeLog 7371 SHA256 d91c2dec971554d57be5b95fa5cf9224fe858bebefb8a510349fb995676b06b0 SHA512 a9ef2726a0cc03b21179c4ea1fcf1426688f674179539afee064ef62632d281ac0e4e430e6649e4c71a18e2057b6fb0ba159497776b494ad00aa16146966c83f WHIRLPOOL f560205e2b6a102f3ce56a7f3468646213b63dc8788229fef496e7c74ea349e799a12204327580d4c47b94d1823cf51d43943a4c5e7c61887a42715ea7f7100c
+EBUILD gnome-shell-3.8.0.1.ebuild 6932 SHA256 124411f7395abd8d2d8b5ef2ae251506c2599c4f6776b082ab436a86b76842e2 SHA512 2113dfd1dec807720077036f83dd2f22b9d0587c6c06fc93c5be3e1a829b9537ca9ec15b3a566f152f4d3be543c24afc8a532293d5c54dd8e4135dab7656e5d9 WHIRLPOOL 9be8889bf33d072ca4ee36ec66bb7f65d68297915820599170879eb2da1e486a6b337f071971423d925b6654c713a6382f23987a70660447dbc08c8743f38d96
+MISC ChangeLog 7683 SHA256 8497d186dda0897994cbee062d1a34aa8a4d4c51ab29f6c2f97044f38a1fe12b SHA512 eec4a39235cd639e6a4a28a07a5b8256db1382f42eabc1e57fb0627b540984b6bb509a2bf53d0ec452e0af25fb62383ccb6fa49713452c117870f64f6d025d94 WHIRLPOOL a91be0b25942b37eee2d5ca1713eb9ee736f2f5da9cc9a56a7c14aea8c8361a46768917603b51ab81925b4302465cb7ee5e840959cd4cfe2bf6b9b16f60dd303
 MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUx48ACgkQCaWpQKGI+9T3mgCfaY7dw7RNSxELyfaPjSOEO/xh
-rKwAn15R7cPqJbG2WJEqmSnpFZKqKjm6
-=nY5v
+iEYEAREIAAYFAlFhSSEACgkQCaWpQKGI+9TXVACcCmQMnn/NDjUUh+dGejClOD5p
+iIsAnjenUotD305M3BxMu/V/TeOODY0C
+=tvuN
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag-r1.patch
index e9bff6160f84..f88657d3d56c 100755..100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.0-networkmanager-flag-r1.patch
@@ -1,9 +1,3 @@
-From 9522d27dfa364b64a0fe5d87585b8a3309fbb92a Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 12 Feb 2013 22:09:39 +0330
-Subject: [PATCH] gnome-shell-3.7.5-networkmanager-flag
-
-[ Alexandre Rostovtsev <tetromino@gentoo.org> :
   * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
   * take care to not import ui.status.network if nm is disabled;
   * do not try to reassign to const variables;
@@ -12,32 +6,32 @@ Subject: [PATCH] gnome-shell-3.7.5-networkmanager-flag
   * use "networkmanager" instead of "network_manager" because THE
     BIKESHED SHOULD BE BLUE, also because the upstream package name is
     NetworkManager, not Network_Manager. 
----
- configure.ac         | 42 ++++++++++++++++++++++++++++++++++++++++++
- js/Makefile.am       |  1 +
- js/misc/config.js.in |  2 ++
- js/ui/panel.js       | 12 +++++++-----
- js/ui/sessionMode.js |  7 ++++++-
- src/Makefile.am      | 15 ++++++++++++---
- 6 files changed, 70 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1a2b947..683a3db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -164,6 +164,36 @@ if test "$langinfo_ok" = "yes"; then
+--- a/configure.ac      2013-03-27 17:28:24.000000000 +0100
++++ b/configure.ac      2013-04-02 18:47:05.569818375 +0200
+@@ -94,8 +94,6 @@
+                               libcanberra libcanberra-gtk3
+                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
+-                               libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
+                                libsecret-unstable gcr-3 >= $GCR_MIN_VERSION)
+ 
+ PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
+@@ -154,6 +157,38 @@
              [Define if _NL_TIME_FIRST_WEEKDAY is available])
  fi
  
-+NM_MIN_VERSION=0.9.6
 +AC_ARG_ENABLE(networkmanager,
-+	      AS_HELP_STRING([--disable-networkmanager],
-+			     [disable NetworkManager support  @<:@default=auto@:>@]),,
++             AS_HELP_STRING([--disable-networkmanager],
++                            [disable NetworkManager support  @<:@default=auto@:>@]),,
 +              [enable_networkmanager=auto])
 +
 +if test "x$enable_networkmanager" != "xno"; then
 +   PKG_CHECK_MODULES(NETWORKMANAGER,
-+                     [libnm-glib libnm-util gnome-keyring-1],
++                     [libnm-glib 
++                     libnm-util >= $NETWORKMANAGER_MIN_VERSION
++                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION 
++                     gnome-keyring-1],
 +                     [have_networkmanager=yes],
 +                     [have_networkmanager=no])
 +
@@ -62,7 +56,7 @@ index 1a2b947..683a3db 100644
  # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
  AM_PATH_GLIB_2_0()
  
-@@ -209,3 +239,15 @@ AC_CONFIG_FILES([
+@@ -199,3 +234,15 @@
    man/Makefile
  ])
  AC_OUTPUT
@@ -70,13 +64,13 @@ index 1a2b947..683a3db 100644
 +echo "
 +Build configuration:
 +
-+	Prefix:                                 ${prefix}
-+	Source code location:                   ${srcdir}
-+	Compiler:                               ${CC}
-+	Compiler Warnings:                      $enable_compile_warnings
++       Prefix:                                 ${prefix}
++       Source code location:                   ${srcdir}
++       Compiler:                               ${CC}
++       Compiler Warnings:                      $enable_compile_warnings
 +
-+	Support for NetworkManager:             $have_networkmanager
-+	Support for GStreamer recording:        $build_recorder
++       Support for NetworkManager:             $have_networkmanager
++       Support for GStreamer recording:        $build_recorder
 +"
 diff --git a/js/Makefile.am b/js/Makefile.am
 index 323cd1b..d17111a 100644
diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild
deleted file mode 100644
index 065bba499028..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.6.2-r1.ebuild,v 1.8 2013/02/02 22:36:13 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit autotools eutils gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +i18n +networkmanager systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# TODO: gstreamer support is currently automagical:
-# gstreamer? ( >=media-libs/gstreamer-0.11.92 )
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.3.90[introspection]
-	>=dev-libs/glib-2.31.6:2
-	>=dev-libs/gjs-1.33.2
-	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.3.9:3[introspection]
-	>=media-libs/clutter-1.11.11:1.0[introspection]
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	>=gnome-base/gnome-desktop-3.5.1:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.5.4
-	>=gnome-base/gnome-keyring-3.3.90
-	>=gnome-base/gnome-menus-3.5.3:3[introspection]
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-3.5.3:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/mutter-${PV}[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-libs/mesa
-	media-sound/pulseaudio
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] )
-	networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
-	systemd? ( >=sys-apps/systemd-31 )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 7. IBus is needed for i18n integration
-# 8. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=app-accessibility/caribou-0.3
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	media-libs/cogl[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-2.91
-	>=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?]
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	x11-themes/gnome-icon-theme-symbolic
-
-	i18n? ( >=app-i18n/ibus-1.4.99[dconf,gtk3,introspection] )
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-
-	!systemd? ( sys-auth/consolekit )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch"
-
-	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	G2CONF="${G2CONF}
-		--enable-man
-		--enable-compile-warnings=maximum
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		$(use_enable networkmanager)
-		$(use_with systemd)
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
-		ewarn "fallback mode, or switch to open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-
-	if has_version "media-libs/mesa[video_cards_intel]" ||
-	   has_version "media-libs/mesa[video_cards_i915]" ||
-	   has_version "media-libs/mesa[video_cards_i965]"; then
-		elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers."
-		elog "Make sure that classic architecture for i915 and i965 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[classic]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=classic."
-		fi
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild
index c80ca296055d..9966076f117f 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild,v 1.1 2013/03/28 22:43:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.0.1.ebuild,v 1.2 2013/04/07 10:23:28 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -116,16 +116,11 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.7.90-bluetooth-flag.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.8.0-networkmanager-flag.patch"
+	epatch "${FILESDIR}/${PN}-3.8.0-networkmanager-flag-r1.patch"
 
 	# Revert suspend break, upstream bug #693162 (from Debian)
 	epatch "${FILESDIR}/${PN}-3.8.0-suspend.patch"
 
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
 	# Do not error out on warnings
 	G2CONF="${G2CONF}
 		--enable-man
@@ -134,7 +129,9 @@ src_configure() {
 		$(use_with bluetooth)
 		$(use_enable networkmanager)
 		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	gnome2_src_configure
+
+	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {