Add gnome-base/gnome-shell-3.3.92, incomplete

* Patches to amke NM and Bluetooth optional need to be ported

3 files changed, 293 insertions, 27 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 7e0b5e37..66d749a7 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1 +1,3 @@
-EBUILD gnome-shell-9999.ebuild 4364 RMD160 7e1369919f0d7824aca81e5f28822bb1cde92259 SHA1 be3273dae07b52443c0603c130a01cf47db153f1 SHA256 c2fde283790fc65adfd835025edecdc0a10702bced67a6beefa503af44453988
+DIST gnome-shell-3.3.92.tar.xz 1276064 RMD160 732d36368aa4e22178ef7411bf17efb070ad4427 SHA1 237b869d804f23abaf63553544225024bd22dcd5 SHA256 1c66198324512742c3be6879d15294c41239941480a7669cd547d7f8106977fe
+EBUILD gnome-shell-3.3.92.ebuild 6650 RMD160 fd1bcffc7f800a8c220b5be7092831762af4d28a SHA1 e17267d1075eecfa2e81d0d948e53626ca45059c SHA256 5f226ea106239e4656345d9fa11880217498d84f8b129149bb5727cd98550fa9
+EBUILD gnome-shell-9999.ebuild 6650 RMD160 fd1bcffc7f800a8c220b5be7092831762af4d28a SHA1 e17267d1075eecfa2e81d0d948e53626ca45059c SHA256 5f226ea106239e4656345d9fa11880217498d84f8b129149bb5727cd98550fa9
diff --git a/gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild b/gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild
new file mode 100644
index 00000000..1fc49c67
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild
@@ -0,0 +1,201 @@
+# 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"
+# TODO: reinstate this
+#IUSE="+bluetooth +networkmanager"
+IUSE=""
+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=">=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-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.3.92[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
+
+	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
+	gnome-base/libgnome-keyring
+	>=net-misc/networkmanager-0.8.999[introspection]
+"
+#	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+#	networkmanager? (
+#		gnome-base/libgnome-keyring
+#		>=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
+
+	net-misc/mobile-broadband-provider-info
+	sys-libs/timezone-data
+"
+#	networkmanager? (
+#		net-misc/mobile-broadband-provider-info
+#		sys-libs/timezone-data )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/pkgconfig-0.22
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=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
+		--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.4.0-automagic-gnome-bluetooth.patch"
+
+	# Make networkmanager optional, bug #398593
+	#epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.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 6cffe0b3..1fc49c67 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
 
-inherit gnome2 python
+inherit autotools eutils gnome2 multilib pax-utils python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -17,6 +17,8 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
+# TODO: reinstate this
+#IUSE="+bluetooth +networkmanager"
 IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -25,48 +27,51 @@ else
 fi
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# FIXME: Automagic gnome-bluetooth[introspection] support.
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
 # 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=">=dev-libs/glib-2.25.9:2
-	>=dev-libs/gjs-1.29.18
+COMMON_DEPEND=">=dev-libs/glib-2.31.6:2
+	>=dev-libs/gjs-1.31.22
 	>=dev-libs/gobject-introspection-0.10.1
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	app-misc/ca-certificates
+	>=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/libgnome-keyring
+	>=gnome-base/gnome-keyring-3.3.90
+	>=gnome-base/gnome-menus-2.29.10:3[introspection]
 	>=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/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.5[introspection]
-	>=net-misc/networkmanager-0.8.999[introspection]
-	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
+	>=net-libs/telepathy-glib-0.17.5[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.2.1[introspection]
+	>=x11-libs/libXfixes-5.0
+	>=x11-wm/mutter-3.3.92[introspection]
+	>=x11-libs/startup-notification-0.11
 
+	app-misc/ca-certificates
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	>=dev-libs/libcroco-0.6.2:0.6
-
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-menus-2.29.10:3[introspection]
 	gnome-base/librsvg
 	media-libs/libcanberra
+	media-libs/mesa
 	media-sound/pulseaudio
-
-	>=x11-libs/startup-notification-0.11
+	net-libs/libsoup:2.4[introspection]
 	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-apps/mesa-progs"
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/pango[introspection]
+	x11-apps/mesa-progs
+
+	>=net-wireless/gnome-bluetooth-3.1.0[introspection]
+	gnome-base/libgnome-keyring
+	>=net-misc/networkmanager-0.8.999[introspection]
+"
+#	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+#	networkmanager? (
+#		gnome-base/libgnome-keyring
+#		>=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
@@ -76,6 +81,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 # 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]
 
@@ -90,7 +98,18 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=sys-apps/accountsservice-0.6.14
 
-	>=app-accessibility/caribou-0.3"
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	x11-themes/gnome-icon-theme-symbolic
+
+	net-misc/mobile-broadband-provider-info
+	sys-libs/timezone-data
+"
+#	networkmanager? (
+#		net-misc/mobile-broadband-provider-info
+#		sys-libs/timezone-data )"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=dev-util/pkgconfig-0.22
@@ -108,13 +127,23 @@ pkg_setup() {
 		--disable-schemas-compile
 		--disable-jhbuild-wrapper-script
 		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+		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.4.0-automagic-gnome-bluetooth.patch"
+
+	# Make networkmanager optional, bug #398593
+	#epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.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' \
@@ -124,10 +153,14 @@ src_prepare() {
 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,"
@@ -135,4 +168,34 @@ pkg_postinst() {
 		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
 }