SystemD is required for suspend support (dropping non-working Debian patch), apply upstream fixes from 3.8 branch.

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

3 files changed, 230 insertions, 6 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 60e5889a675a..82e21b8b3127 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2013/06/14 18:57:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.39 2013/07/20 10:36:46 pacho Exp $
+
+*gnome-shell-3.8.3-r2 (20 Jul 2013)
+
+  20 Jul 2013; Pacho Ramos <pacho@gentoo.org> +gnome-shell-3.8.3-r2.ebuild:
+  SystemD is required for suspend support (dropping non-working Debian patch),
+  apply upstream fixes from 3.8 branch.
 
   14 Jun 2013; Pacho Ramos <pacho@gentoo.org> -gnome-shell-3.8.3.ebuild,
   gnome-shell-3.8.3-r1.ebuild:
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 50019f447042..0bae653586fa 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -9,15 +9,17 @@ AUX gnome-shell-3.8.0-suspend.patch 2069 SHA256 5f313b9ece9e184b3559ee7b0df0c467
 AUX gnome-shell-3.8.3-networkmanager-flag.patch 7516 SHA256 eebb33213a2c028348557cdc0e1d8da1304c3844f551b2897975c85cb1b016f7 SHA512 daf4dca864d0aceedc2b8a5d4e0f958c7b56606952db90e97092a072cfc2313d9f88ddf25d25208fd167a5e2c0daea71d3b8a1f12d32fa7cec86aa4e6cc20ef2 WHIRLPOOL 755cdd491e78bb325b2bffd378ec3a2e0c0cd73fcc05edf20c2c24dde843e6ad22005159c8d66d94614f7637da09c2f37327a99dd54d9648b3a15e1a2f3daaf5
 AUX gnome-shell-3.8.3-relock-screen.patch 7530 SHA256 e2a0f02e9f3580935333552b56166f1afc2d573283d2cd5d0d6cf292392193a0 SHA512 897923003874752c6c4c2c16dc5b8a00aa4c2d18e2b07271eddf329e35530ed936003360c584263801684ce77414dc9fdcc91c2d0c14f43e115fa32ed68f82fc WHIRLPOOL d8c1bae3263b95f389bc03b657dc72d834f1bfe7df2792f47a77458feca293ccad7c0853773ffc825349aafa20081717cd75ae9ae6774a32526d0056c5e03fcb
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
+DIST gnome-shell-3.8.3-patches.tar.xz 6520 SHA256 d197856e1ba4cf56f57f0c05b048ef8db4309cc83fa801fb9a7a49d92b1d1a43 SHA512 a5b592d8eb57de5c8b469e83546236830c70913806fc0439774e53e86da51d63a9dcdee7613295c81633ee4b8dd5ea7286de80ac85d846399ae4919344e12f33 WHIRLPOOL 4b9bce733852d1db23bb4b5af87166e858161e4ec1f08b41557ff8a83d767f82132c89924b7b494ffde377284e579bdbfb700e1f481bbea5d75ea1a719673892
 DIST gnome-shell-3.8.3.tar.xz 1513636 SHA256 145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22 SHA512 d95a7ce24073046ea196b1f299bef1a1f4581b3357da364162b7e1cc53d051e628625c0b74bcd835d60f77d39874c8e0f86e3f66c0205539179f64cbe983a16b WHIRLPOOL 9ed4566761115346f0db8e35b0da9f5409418e78176b5159a41541a6723e511bbdaa50b0808c387f8339651066452934732c5c384fabaa7a5427be8ab5e9ec9e
 EBUILD gnome-shell-3.6.3.1.ebuild 7138 SHA256 e8e1bf07cb3768a303714db4fd16b3ba59adc67624ee4b83de35a8b1a3d17f25 SHA512 600e3a5c38dfe9742d4d0540b8cc6a87fc5bf663d99cd76fcc160a0ce97f967e3d93fb750120e30abee8580c84c00cf8ba08190e9f856e34938afdb01ab3574b WHIRLPOOL 30c66e7a010818f69d0387c145041bdcc2354f44e83939796c9b3ace20e77b5e469838f055da342451baa24e940474f0aec4e74fce8e92434fbb98c0334de6c6
 EBUILD gnome-shell-3.8.3-r1.ebuild 7495 SHA256 273bb41e5e94b5c7d4aa60479f4e7ab7bd879a8a2c8dd8df81ead908f2ebe791 SHA512 7ba5100b00703cac02b8250475af9fff39ce26544b068ad35dc7e068fb02b899dc904bcb6eaadee917183f421ec5d74eb9dfa7c6b5a5be33d30cee8635a9dd35 WHIRLPOOL 92af13771f371a3c46512446490d3c7ac0ba94b98ab4233927dd554da86d8e07a18b5810e6ca68c515421962d4af1b7e2afbf8aa1c70407dcfdbdef9a3658b8b
-MISC ChangeLog 9369 SHA256 2502a0c3fe071b844d488ec85793f7c325f2e8cd7d65a1f61e32d1bb6b82eb98 SHA512 894e35df64997027d037a5e31d7d410fd4e8c627069409fb483598a67587b4c0c5990fe51e986619ec8ead6e3c537bde10a137b8f546b5771d1a762dfbb7c807 WHIRLPOOL de89074fc60fd5a85d6ef45d511bb9156cdfd38ab1bf3f1bc48171215981d4b51723cdccc74b0204390b10820b11a32f1826b6e543e5a73a3cdccb6de95e5a0a
+EBUILD gnome-shell-3.8.3-r2.ebuild 7562 SHA256 d46bf5fc3057d2fac6ee0d63d88dc6837437f5fcd57f0f1f96c2b24b0423de45 SHA512 72b5cd46a984b1aa89771bfc819e30ac873457a74ac1623658ec5548db754220160d517472acc4f35d51312e59cdef5aec8f1a2de7dd088722ccfb5ceb1ede36 WHIRLPOOL f940928668cca67ae3496fa679aa3501e989419834d341791548c7731f42583a517a14a2ea85ab27a0646fb23737cf1bfb59c9c00c461d2e837852b45b3c91b2
+MISC ChangeLog 9602 SHA256 451d47540906ca2c14546cd58f7f693742fa9d5379e117e048dd8d18c8bcb13b SHA512 eac500b900a9ac47f1360d52dfc86fb4062a4f50b3fc23302ca500110fa6b460f1607fca70bc2461e85fe3494f6c60633e4e2ffc5cc470e66a049e3a8398507e WHIRLPOOL c6555d2dd7dc7a24a25b388f23d50f23d574be22e67e0cd3b54ed82d47778cd43b3db62ffc2e21247709c444ce5d5903022d5491f484f8b5a65e677f38dc8550
 MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG7Z5gACgkQCaWpQKGI+9Q1RgCeLVdv3Ls9V7J1qk1iL+H1O5Qs
-V1UAni4dDef64KKfLzJVyboZ/KXWQH+I
-=rQm2
+iEYEAREIAAYFAlHqaD8ACgkQCaWpQKGI+9TbNgCfZQ8NI7Se5cD6lHKzZYR6sEZl
+iaAAnjufFykoaSmDvtQ6BsfMqcS42UtS
+=RL65
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.3-r2.ebuild
new file mode 100644
index 000000000000..4d79a459fe5f
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.3-r2.ebuild
@@ -0,0 +1,216 @@
+# 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.3-r2.ebuild,v 1.1 2013/07/20 10:36:46 pacho 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"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +i18n +networkmanager"
+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 )
+#
+# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
+# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2[introspection]
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.35:2
+	>=dev-libs/gjs-1.35.8
+	>=dev-libs/gobject-introspection-0.10.1
+	>=x11-libs/gtk+-3.7.9:3[introspection]
+	>=media-libs/clutter-1.13.4:1.0[introspection]
+	>=dev-libs/json-glib-0.13.2
+	>=dev-libs/libcroco-0.6.2:0.6
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.7.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-3.8.3[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[gtk3]
+	media-libs/mesa
+	>=media-sound/pulseaudio-2
+	>=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.9.6[introspection] )
+"
+# 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. Systemd needed for suspending support
+# 6. xdg-utils needed for xdg-open, used by extension tool
+# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
+# 8. IBus is needed for i18n integration
+# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.101[introspection]
+
+	>=app-accessibility/caribou-0.4.8
+	>=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-3.8.3
+	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
+
+	>=sys-apps/systemd-31
+
+	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 )
+"
+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
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-3.7.90-bluetooth-flag.patch"
+
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-3.8.3-networkmanager-flag.patch"
+
+	# Re-lock the screen if we're restarted from a previously crashed shell (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.3-relock-screen.patch"
+
+	# Apply patches from gnome-3.8 branch
+	epatch "${WORKDIR}/${P}-patches/"*.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do not error out on warnings
+	gnome2_src_configure \
+		--enable-man \
+		--disable-jhbuild-wrapper-script \
+		$(use_with bluetooth) \
+		$(use_enable networkmanager) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
+}
+
+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
+	# Required for gnome-shell on hardened/PaX #457146 and #457194
+	# PaX EMUTRAMP need to be on
+	if has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+		pax-mark E "${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
+}