gnome-base/gnome-shell: update dependencies

3 files changed, 33 insertions, 33 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 48f23400..6e20cd98 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-shell-3.5.x-bluetooth-flag.patch 1845 SHA256 c910495fe1bf93c6ab09252df17f8d0fcd4b6fe75fed709c8c97a55bf401970e SHA512 37e4d252d62abfe264c639e47906afa5cd17d159101072ff4ed5ddb5dfc62b4563d80c4632d50bf20c1c62cbc1bdc2a6dc2b34f4e5cc9387095dc3f5606917d8 WHIRLPOOL 6db0c6907947fc86b932f7e391f465712fce5fcd731c6be11da61678c6452e93686c818491b914155a2793ff7ff73ded540de77059ecc498ddadf81a7382714f
 AUX gnome-shell-3.5.x-networkmanager-flag.patch 7952 SHA256 a4b4d2325799d9b255d4d79aca56ad884df6159ad7f6bf67a9d19a7dead5f862 SHA512 23bfaddb0c02316befc5388c8be17fc4acc724fa387c4fff46641d953a063bf866279e6993b8b9291297b4a6909aadd118e3e13d17a28efc8a57db8f8ea7ca64 WHIRLPOOL e90d6235e129eb9f4f7b23b51110687da6807383337f9a4859725d514a05a15c4debf180421c3ee354f687417bd59d33f0eceb6ccd47d02f208ce07064450a80
 DIST gnome-shell-3.5.91.tar.xz 1382004 SHA256 d39ffe40388f6aaa62bf753d716bfb3d1c11a6ef827bb572256fc3b2dee86efb SHA512 dc5053efd28acad4331b2865324b7dff3c65ef36799c15e50d89c8b3669c58d580cf8df22f73167375db364f60275185c37fd36a9f36e1277422ecf39e3ecbc4 WHIRLPOOL dbfa3f6c3f1347f55d0976758df7271fa4107f981def84640bb5ec385aeddfc4636f6c77d799c9334b9edbd30555cc7287cac9c6fba2ba16ce4fdfad95172bc7
-EBUILD gnome-shell-3.5.91.ebuild 6909 SHA256 5fc54fa5723369a7d8507c1b351e2550e98ef86d07d1a0276226f7d4b8d145c9 SHA512 73532005f2622e84b548cf363d8ee092040997371707821131dd0c532d00b7500194c93f4526a43170a2c5aad1dc40721f1c7e12766164008cff5ed86a4c54b8 WHIRLPOOL 3f8db82472cdf21db89578052a3ad091a22d87f9d44393badda4615688205102f3e21a3edffa827fc28d8626fe1a761d5726101d7ddf83075255c1163d92707c
-EBUILD gnome-shell-9999.ebuild 6909 SHA256 5fc54fa5723369a7d8507c1b351e2550e98ef86d07d1a0276226f7d4b8d145c9 SHA512 73532005f2622e84b548cf363d8ee092040997371707821131dd0c532d00b7500194c93f4526a43170a2c5aad1dc40721f1c7e12766164008cff5ed86a4c54b8 WHIRLPOOL 3f8db82472cdf21db89578052a3ad091a22d87f9d44393badda4615688205102f3e21a3edffa827fc28d8626fe1a761d5726101d7ddf83075255c1163d92707c
+EBUILD gnome-shell-3.5.91.ebuild 6937 SHA256 fe1ffb2e3a3db0ae62c1a253675add1eacba2c4cbd6bb9b6fafa08802759674c SHA512 4cde8cb770716e1d859658a27e2c37fe35a7c1ce28fe8edd734cfb9e580b27f8d3c56728b08c964ad4b00827b80bc41d477996ac457afdf96733a25000a3f03c WHIRLPOOL 260b8f31fe035aab7c7182d1b3e05d21e293760020f57a93e5d89b944345d1c0fdbe659fde2ec3e2e5d942975fa098668b29e41dd7c0f7f6b299b7e380b55303
+EBUILD gnome-shell-9999.ebuild 6939 SHA256 1f08f652283924c5b55dd1cb4b0b7e94f4dcf8e7df3514d808ccace5ad620255 SHA512 6a362c1ed0a9c1c90e70c2364f8150c3d8317e772511be6485e40da466b2dedcea416d564e608c90e48f9173088d77f29646a73dce140225b517025596a2f168 WHIRLPOOL 02b28001894359ead6e29db964a68eb0846672f626697eee6b2836811658de329523ee5a6c09ffb4b15e6fb568e1ac7825716ab005111b0c24061a20c770642e
diff --git a/gnome-base/gnome-shell/gnome-shell-3.5.91.ebuild b/gnome-base/gnome-shell/gnome-shell-3.5.91.ebuild
index 3cd02d4f..da18094b 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.5.91.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.5.91.ebuild
@@ -17,14 +17,13 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluetooth +networkmanager systemd"
+IUSE="+bluetooth +i18n +networkmanager systemd"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
 # libXfixes-5.0 needed for pointer barriers
 # TODO: gstreamer support is currently automagical:
 # gstreamer? ( >=media-libs/gstreamer-0.11.92 )
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=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
+	>=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]
@@ -46,7 +45,7 @@ COMMON_DEPEND="
 	>=gnome-extra/evolution-data-server-3.5.3
 	>=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]
+	>=net-libs/telepathy-glib-0.19[introspection]
 	>=sys-auth/polkit-0.100[introspection]
 	>=x11-libs/libXfixes-5.0
 	>=x11-wm/mutter-3.5.91[introspection]
@@ -64,27 +63,30 @@ COMMON_DEPEND="
 	x11-libs/pango[introspection]
 	x11-apps/mesa-progs
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	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 + dconf needed via imports.gi.*
+# 2. Introspection stuff 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
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. gnome-icon-theme-symbolic neeed for various icons
+# 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]
 
-	>=gnome-base/dconf-0.4.1
+	>=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
@@ -92,14 +94,12 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-2.91
 	>=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?]
 
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
 
 	x11-misc/xdg-utils
 
 	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 )
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 3cd02d4f..73ca92b7 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -17,14 +17,13 @@ HOMEPAGE="http://live.gnome.org/GnomeShell"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluetooth +networkmanager systemd"
+IUSE="+bluetooth +i18n +networkmanager systemd"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
 # libXfixes-5.0 needed for pointer barriers
 # TODO: gstreamer support is currently automagical:
 # gstreamer? ( >=media-libs/gstreamer-0.11.92 )
@@ -38,7 +37,7 @@ COMMON_DEPEND="
 	>=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
+	>=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]
@@ -64,27 +63,30 @@ COMMON_DEPEND="
 	x11-libs/pango[introspection]
 	x11-apps/mesa-progs
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	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 + dconf needed via imports.gi.*
+# 2. Introspection stuff 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
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. gnome-icon-theme-symbolic neeed for various icons
+# 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]
 
-	>=gnome-base/dconf-0.4.1
+	>=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
@@ -92,14 +94,12 @@ RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/gnome-settings-daemon-2.91
 	>=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?]
 
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
 
 	x11-misc/xdg-utils
 
 	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 )