gnome-base/gnome-shell: moved to gx86, sync 9999 with gx86

5 files changed, 11 insertions, 286 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index b7453e69..424100c1 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,7 +1,3 @@
 AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2
-AUX gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch 1137 RMD160 70ddaa8b6c08e78404b2325699ac309595a73bf5 SHA1 f21e78ba4fd2703c4e096ce2f63b2e9dba61b14a SHA256 ae1b5f47e29de890a9bec2bb425a29f66e965b5479a0dfe82a336149ef79bea7
-AUX gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch 1238 RMD160 0679b2b0aadbc00383890c1d739b7dc0c8549412 SHA1 1a89e077d956597e058c441f3df5646c5f950c97 SHA256 f5fd78df90bc3616765e5b9f04ab9aecc2436bdf124d23ea9d4498c483c0f3b3
 AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 RMD160 6519f66a7b189f8e837e23a79d0904bb45a38f7e SHA1 897771c4038c19c4be62576f104d9a1fc7c6dacb SHA256 487bfd9772799cdd1969b252056af4934870de4704a0bea581876b966e9c754c
-DIST gnome-shell-3.4.1.tar.xz 1254596 RMD160 098d5c2ce6efa318d47a561f6befae9d52dd3715 SHA1 cdadb4616a8e4b52d120905aed89223c295760fe SHA256 6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9
-EBUILD gnome-shell-3.4.1.ebuild 6679 RMD160 e21e542f3ba6f6cad2fc3ecd421a6cfd9fb684e0 SHA1 180e24fa90d5d9737409d9db33891d1f2450c3c1 SHA256 0eacfeb08b3bfe7464d2820f2a1f443241fd9e28a2c43b58c1dce3ccd63d7fd8
-EBUILD gnome-shell-9999.ebuild 6476 RMD160 5cc1d682263965d92640296c1869377cb47372f6 SHA1 efcdd8f4484caa4fe248458a74ea8360ec56549d SHA256 cba46ae210b60d57d87f12391b8b1c2d859fb2d72cde938e4952cec08b03ad8e
+EBUILD gnome-shell-9999.ebuild 6564 RMD160 0d434efa86652767dc31c5b7f27cb8786b3bccc6 SHA1 ed1f0a6c68d59a5d9140a510fd0c625ce539cffa SHA256 6d5f1e6e52cb678f760332a6e5e0a14087910480b2f2e37718c06397aad668da
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch
deleted file mode 100644
index 9f07884a..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 73f565d27166420bbf4a7bb49a30ea5bf5d98566 Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor@fishsoup.net>
-Date: Wed, 4 Apr 2012 17:48:47 -0400
-Subject: [PATCH] Link the gnome-shell binary to libgnome-shell-js.so
-
-Depending on the exact linker options and versions, rpath's written
-into the binary may, or may not, be honored by dlopen(). Work around
-this by simply linking the gnome-shell binary to gnome-shell-js, since
-then dlopen() doesn't need to search paths.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=670477
----
- src/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 95f1a41..7bafb6a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -187,7 +187,7 @@ libgnome_shell_la_gir_sources = \
- gnome_shell_real_SOURCES =		\
- 	main.c
- gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
--gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
-+gnome_shell_real_LDADD = libgnome-shell.la libgnome-shell-js.la $(libgnome_shell_la_LIBADD)
- gnome_shell_real_DEPENDENCIES = libgnome-shell.la
- 
- EXTRA_DIST += test-gapplication.js
--- 
-1.7.9.3
\ No newline at end of file
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch
deleted file mode 100644
index 718eb305..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6fa762baaee77c9d1a8aacc758ab5c3c3c33df43 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 6 Apr 2012 14:00:48 -0400
-Subject: [PATCH] Prevent the link to libgnome-shell-js.so from being removed
-
-Add a dummy call to shell_js_add_extension_importer() to ensure that the
-link to libgnome-shell-js.so is not removed when using -Wl,--as-needed,
-which is the default on many distros.
----
- src/main.c |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index bac9524..c11c8d7 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -24,6 +24,7 @@
- #include "shell-a11y.h"
- #include "shell-global.h"
- #include "shell-global-private.h"
-+#include "shell-js.h"
- #include "shell-perf-log.h"
- #include "st.h"
- 
-@@ -342,3 +343,15 @@ main (int argc, char **argv)
- 
-   return ecode;
- }
-+
-+/* HACK:
-+   Add a dummy function that calls into libgnome-shell-js.so to ensure it's
-+   linked to /usr/bin/gnome-shell even when linking with --as-needed.
-+   This function is never actually called.
-+   https://bugzilla.gnome.org/show_bug.cgi?id=670477
-+*/
-+
-+void _shell_link_to_shell_js(void) {
-+  shell_js_add_extension_importer (NULL, NULL, NULL, NULL);
-+}
-+
--- 
-1.7.8.5
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild
deleted file mode 100644
index 89241685..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit autotools eutils gnome2 multilib pax-utils python
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluetooth +networkmanager"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-COMMON_DEPEND=">=app-crypt/gcr-3.3.90
-	>=dev-libs/glib-2.31.6:2
-	>=dev-libs/gjs-1.31.22
-	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.3.9:3[introspection]
-	>=media-libs/clutter-1.9.16:1.0[introspection]
-	>=dev-libs/folks-0.5.2
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	>=gnome-base/gnome-keyring-3.3.90
-	>=gnome-base/gnome-menus-2.29.10:3[introspection]
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
-	>=media-libs/gst-plugins-base-0.10.16:0.10
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.17.5[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/mutter-3.4.1[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-libs/mesa
-	media-sound/pulseaudio
-	net-libs/libsoup: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.1.0[introspection] )
-	networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gnome-icon-theme-symbolic neeed for various icons
-# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[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
-
-	>=sys-apps/accountsservice-0.6.14
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-
-	x11-themes/gnome-icon-theme-symbolic
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	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
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		$(use_enable networkmanager)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins
-		--without-systemd"
-	# TODO: systemd support
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch"
-
-	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch"
-
-	# Force /usr/bin/gnome-shell to link to libgnome-shell-js; fixes extensions
-	# https://bugzilla.gnome.org/show_bug.cgi?id=670477
-	epatch "${FILESDIR}/${PN}-3.4.0-libgnome-shell-js.so-link"-{1,2}.patch
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-	gnome2_src_prepare
-
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/gnome-shell"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8'; 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-0.10.23"
-		ewarn "and media-plugins/gst-plugins-vp8, 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]"; 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]"; 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-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 809c7f50..9a7b3022 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluetooth +networkmanager"
+IUSE="+bluetooth +networkmanager systemd"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -66,6 +66,7 @@ COMMON_DEPEND=">=app-crypt/gcr-3.3.90
 
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] )
+	systemd? ( >=sys-apps/systemd-31 )
 "
 # Runtime-only deps are probably incomplete and approximate.
 # Each block:
@@ -89,9 +90,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-session-2.91.91
 
 	>=gnome-base/gnome-settings-daemon-2.91
-	>=gnome-base/gnome-control-center-2.91.92-r1
+	>=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?]
 
-	>=sys-apps/accountsservice-0.6.14
+	>=sys-apps/accountsservice-0.6.14[introspection]
 
 	>=app-accessibility/caribou-0.3
 
@@ -102,6 +103,8 @@ RDEPEND="${COMMON_DEPEND}
 	networkmanager? (
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
+
+	!systemd? ( sys-auth/consolekit )
 "
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
@@ -121,10 +124,9 @@ pkg_setup() {
 		--disable-jhbuild-wrapper-script
 		$(use_with bluetooth)
 		$(use_enable networkmanager)
+		$(use_with systemd)
 		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins
-		--without-systemd"
-	# TODO: systemd support
+		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
 	python_set_active_version 2
 	python_pkg_setup
 }
@@ -147,7 +149,7 @@ src_prepare() {
 
 src_install() {
 	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
+	python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool"
 
 	# Required for gnome-shell on hardened/PaX, bug #398941
 	pax-mark mr "${ED}usr/bin/gnome-shell"