Sync gnome-shell stuff to the ebuilds from the gnome overlay

svn path=/; revision=162

3 files changed, 53 insertions, 58 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index db9c542..8a072a4 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-2.27.3.tar.bz2 481213 RMD160 2e6b3ee8547f47d8ad3ef55a159f444ccd36d439 SHA1 794efcbb8e5cf18d80887c6a89c52158da7fd5a9 SHA256 22a5b0124abaf32b6833fb453c5836150eebb33da115c700a89dcc6298d41a3a
-EBUILD gnome-shell-2.27.3.ebuild 1171 RMD160 79d0b30924716fe91971e84320178c7176490778 SHA1 8763e2dcc1a0ee3b8ce71df404dba0fdc039537e SHA256 6f9b441f23cc55f0cdce9afcb4943684634bf74af7f7057e24b1311f5f9850f1
-EBUILD gnome-shell-9999.ebuild 1355 RMD160 9207e2abecb0bf51a0e7e6fbef8754f18a908a9b SHA1 57411c5930f3801451f955239dbac3b3fdb2a072 SHA256 cc2f570a7bc94a3ec6c6fda2a0d01358daba34f85b76264dc04136eee4f27aed
+EBUILD gnome-shell-2.27.3.ebuild 916 RMD160 cffb17f4398c5a5587e0d4c050a5fd24fa264eaa SHA1 8080c1982241015577b60e8b009036601b3b5035 SHA256 39c117506b8d6d19fb5537f21b3064a98a2aba82674b36171ad4f6bf30efa028
+EBUILD gnome-shell-9999.ebuild 1243 RMD160 4f94818b825c0a15e3ed37204791a716432e68e3 SHA1 8543c3a0fe7e6afc0d18d952bbdc0e3354ff1304 SHA256 e0374ad5822e0297f3f936c8d6912310dc18ad9118b562df6ecadb7c78e41b55
diff --git a/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild b/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild
index 1ed570d..68f2c74 100644
--- a/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild
@@ -6,45 +6,38 @@ EAPI="2"
 
 inherit gnome2
 
-DESCRIPTION="The GNOME Shell for GNOME 3.0"
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gnome-desktop-2.26.0
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.15.1
-	>=x11-wm/mutter-2.27.3
-	>=dev-libs/gjs-0.4
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-2.16
+	>=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.5
-	>=dev-libs/gir-repository-0.6.4[pango]
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
+	
+	dev-libs/dbus-glib
+	dev-libs/gjs
+	media-libs/clutter:1.0[opengl,introspection]
+
+	gnome-base/gconf
+	gnome-base/gnome-menus
 	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	x11-apps/mesa-progs
-	>=x11-libs/startup-notification-0.10"
+
+	x11-libs/startup-notification
+	x11-libs/libXfixes
+	x11-wm/mutter[introspection]
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/python-2.5
-	gnome-base/gnome-common
-	>=app-text/gnome-doc-utils-0.3.2
+	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	>=dev-util/gtk-doc-am-1"
-
-DOCS="AUTHORS README"
-
-pkg_postinst() {
-
-	elog " Start with 'gnome-shell --replace' "
-	elog " or add gnome-shell.desktop to ~/.config/autostart/ "
-
-	gnome2_pkg_postinst
-
-}
+	>=dev-util/intltool-0.26
+	gnome-base/gnome-common
+"
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 018a75c..93fd5aa 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -4,44 +4,46 @@
 
 EAPI="2"
 
-inherit autotools eutils gnome2 git
+inherit autotools gnome2 git
 
 EGIT_REPO_URI="git://git.gnome.org/gnome-shell"
 
-DESCRIPTION="The GNOME Shell for GNOME 3.0"
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
 SRC_URI=""
 
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=gnome-base/gnome-desktop-2.26.0
-	>=dev-libs/glib-2.18.0
-	>=x11-libs/gtk+-2.15.1
-	>=x11-wm/mutter-2.27.3
-	>=dev-libs/gjs-0.4
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-2.16
+	>=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.5
-	>=dev-libs/gir-repository-0.6.4[pango]
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-menus-2.11.1
+	
+	dev-libs/dbus-glib
+	dev-libs/gjs
+	media-libs/clutter:1.0[opengl,introspection]
+
+	gnome-base/gconf
+	gnome-base/gnome-menus
 	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.71
-	>=sys-apps/dbus-1.1.2
-	x11-libs/libXau
-	x11-apps/mesa-progs
-	>=x11-libs/startup-notification-0.10"
+
+	x11-libs/startup-notification
+	x11-libs/libXfixes
+	x11-wm/mutter[introspection]
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/python-2.5
-	gnome-base/gnome-common
-	>=app-text/gnome-doc-utils-0.3.2
+	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40
-	~app-text/docbook-xml-dtd-4.1.2
-	>=dev-util/gtk-doc-am-1"
-
-DOCS="AUTHORS README"
+	>=dev-util/intltool-0.26
+	gnome-base/gnome-common
+"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_unpack() {
 	git_src_unpack