Update gnome-shell live ebuilds, still not working, missing deps, but getting there...

svn path=/; revision=282

4 files changed, 35 insertions, 25 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 5c3aafd..7d301e2 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-2.31.2.tar.bz2 692948 RMD160 264205b60b702fa5ceafde5de362db9525de4442 SHA1 9df6117f9d3b9f9056e71f801cb1cefe66569ee9 SHA256 cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2
 EBUILD gnome-shell-2.31.2.ebuild 1122 RMD160 94c2bf2b89c0cb993dce7f87268a3eb84fe1a9c0 SHA1 3979cb86e04b9cf46d7198855dcb5e9c15f90ae8 SHA256 a361c691fed36cf892680e9a5a007bd79675981dc9fd98a389a4da25e814edcd
-EBUILD gnome-shell-9999.ebuild 1309 RMD160 60f1f46e74c85df763b0af2b08c5cd3ae0482fa6 SHA1 6b9c37dece1452a79db8cc40a5ec992e15ae146f SHA256 d0219a76c28743c3558c9dd22787b8f5f40f3c7044a1b698914125ca922818cd
+EBUILD gnome-shell-9999.ebuild 1391 RMD160 c4cf171cb9f2904bd6c916c5cd4e7cb28ec95084 SHA1 ad67283d68f736f8199c1018f327e80cdbdd8272 SHA256 f19ff26e41f2c08fc3617073e12526def3b14210d28be09975348c6b40a95600
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 6d58363..3c5e47f 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -5,10 +5,10 @@
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit autotools gnome2 git
-
 EGIT_REPO_URI="git://git.gnome.org/gnome-shell"
 
+inherit autotools gnome2 git
+
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
 SRC_URI=""
@@ -18,38 +18,39 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.16
+RDEPEND=">=dev-libs/glib-2.25.9
+	>=x11-libs/gtk+-2.91.0:3[introspection]
 	>=media-libs/gstreamer-0.10.16
 	>=media-libs/gst-plugins-base-0.10.16
-	>=gnome-base/gnome-desktop-2.26
-	>=dev-libs/gobject-introspection-0.6.9
+	>=gnome-base/gnome-desktop-2.91.0:3
+	>=dev-libs/gobject-introspection-0.9.5
 
 	dev-libs/dbus-glib
-	>=dev-libs/gjs-0.6
-	>=media-libs/clutter-1.2.0[opengl,introspection]
+	>=dev-libs/gjs-0.7
+	x11-libs/pango[introspection]
+	>=media-libs/clutter-1.4.0[introspection]
 	dev-libs/libcroco:0.6
 
-	gnome-base/gconf
+	gnome-base/gconf[introspection]
 	gnome-base/gnome-menus
 	x11-libs/startup-notification
 	x11-libs/libXfixes
-	>=x11-wm/mutter-2.29.1[introspection]
+	>=x11-wm/mutter-2.91.0[gtk3,introspection]
 	x11-apps/mesa-progs
+	dev-python/dbus-python
 "
 DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6
 	>=dev-lang/python-2.5
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
+	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.26
 	gnome-base/gnome-common
 "
-DOCS="AUTHORS ChangeLog NEWS README"
+DOCS="AUTHORS README"
 
-src_unpack() {
-	git_src_unpack
+src_prepare() {
 
-	cd ${S}
 	mkdir m4
 	intltoolize --force --copy --automake || die
 	eautoreconf
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 516a889..d0feaf7 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,3 @@
 DIST mutter-2.31.2.tar.bz2 1983139 RMD160 50de5de7fe6de9dde98ecb9476f8fcc5cba9307f SHA1 8bfd51c44323e492df1427c1b01816b73e72fb06 SHA256 7267018c2eb28213748810de7e1ccf6d4f059e8ab593ec335234588d0037578c
 EBUILD mutter-2.31.2.ebuild 1372 RMD160 5d4137a0b58397e3e219a9aeaf529a0e9c582c9d SHA1 ae72345c70cb9bbfa0553f73e7c4f30571f049c6 SHA256 a439e34d85a65b0887fdd3e5a23fb16276e0924f96405a351daffccb0ff501f2
-EBUILD mutter-9999.ebuild 1544 RMD160 990fd5301ab3bfd8012b05dc8057cc391cdfb1b9 SHA1 324388bcaeaa808c04780dda793917597dd2f336 SHA256 5723e379ac1036cb48cd9ef2c31769bc2b7ef9284786cd6caee03d135b318216
+EBUILD mutter-9999.ebuild 1876 RMD160 3dfc21e44ee3ec2f41c2e9fd74e035653ce2e830 SHA1 a3da4b80fac89766491e47c275e607f5461fca21 SHA256 32c1aabd070c67ff1735f7c37d69bc9a1f20b682b749ae184b1832ae85786aea
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 8ddb893..d7e5129 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -15,16 +15,19 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug introspection test xinerama"
+IUSE="debug +gtk3 +introspection +sound test xinerama"
 
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2[X]
+RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
+	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?]
+			sound? (  media-libs/libcanberra[gtk] ) )
+	gtk3? ( >=x11-libs/gtk+-2.90:3[introspection?]
+			sound? (  media-libs/libcanberra[gtk3] ) )
 	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
+	>=dev-libs/glib-2.14
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 
-	>=media-libs/clutter-1.2.0
+	>=media-libs/clutter-1.2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -59,14 +62,20 @@ pkg_setup() {
 		--enable-startup-notification
 		--enable-xsync
 		--enable-verbose-mode
+		--enable-compile-warnings
+		$(use_with sound libcanberra)
 		$(use_with introspection)
 		$(use_enable xinerama)"
+
+	if use gtk3; then
+		G2CONF="${G2CONF} --with-gtk=3.0"
+	else
+		G2CONF="${G2CONF} --with-gtk=2.0"
+	fi
 }
 
-src_unpack() {
-	git_src_unpack
+src_prepare() {
 
-	cd ${S}
 	intltoolize --force --copy --automake || die
 	eautoreconf
 }