Update gnome-desktop, plus dep fixes

svn path=/; revision=316

5 files changed, 61 insertions, 3 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 8daadeb..9138cb7 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,2 +1,4 @@
 DIST gnome-desktop-2.91.0.tar.bz2 1375768 RMD160 061f68670c7611358a863f1c172c73a921a99a6b SHA1 67dfad07430bcc88994af7016c7598a326695cb0 SHA256 e98d9469f0dec12952b392852a461643036cda4c5a831f1c89c0d5a0aaac0070
+DIST gnome-desktop-2.91.2.tar.bz2 1311060 RMD160 7dc6995bba20fb538370e1436248babbac0ae81b SHA1 70ac4511c203224293c6359ae618107e542b31c2 SHA256 854113701c6a2675afff82cd1e2a630b75851f48c2344c91b9f44d710ef17875
 EBUILD gnome-desktop-2.91.0.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
+EBUILD gnome-desktop-2.91.2.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild
new file mode 100644
index 0000000..6649847
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.91.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit gnome2 autotools eutils
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc"
+
+# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+RDEPEND=">=x11-libs/gtk+-2.91.0:3
+	>=dev-libs/glib-2.19.1
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2
+	>=x11-libs/gdk-pixbuf-2.21.3
+	>=x11-libs/startup-notification-0.5
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
+# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about,
+# etc. are installed.  Switch to doing things the other way around once
+# gnome-about no longer uses pygtk 2
+PDEPEND=">=gnome-base/gnome-desktop-2.31:2"
+
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-gnome-distributor=Gentoo
+		--disable-scrollkeeper
+		--disable-static
+		--disable-gnome-about
+		--disable-desktop-docs
+		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids"
+}
+
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 02fbc4b..0346cef 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,4 +2,4 @@ DIST gnome-shell-2.91.1.tar.bz2 803066 RMD160 c8a030427bea60a8edbd9baedde6fc4a68
 DIST gnome-shell-2.91.2.tar.bz2 809309 RMD160 140b1235cb767eb023120f14f7b8660c6a0050cd SHA1 934ea7729428954bba86cfc7170b1a897dc0c871 SHA256 b7a32b55a99193b552ac4e9cb574d76659874abbf9777cd7f74a5685e082ec0f
 EBUILD gnome-shell-2.91.1.ebuild 1312 RMD160 535bbb24a6010719a48f10c8c891ca1df95f3f74 SHA1 73e56abc4c81f3f784196231663d9070eb6db9d0 SHA256 f310f14eaace98391e9d7176034afe1893bd3e2c842bdf69b9412dc41579ae08
 EBUILD gnome-shell-2.91.2.ebuild 1314 RMD160 e712dafe2ed32ee5a1e98e028913da894cf6cf11 SHA1 f59eaabd6540d8e19add7113c2f8af2f00bd3cad SHA256 159f44171be7e51d2cce5e2444a7c94f05bf2aedd30d44a65f3715c68f2694cc
-EBUILD gnome-shell-9999.ebuild 1475 RMD160 c0f31268b30cb02f4416e3aa540bf7297de7f7d7 SHA1 f8b21fbb9d3c144aed58d14bd090c85784c05242 SHA256 575a507479d4ada92be7944b94bea7e2f4d45f237e4824f6f3da602e479f022c
+EBUILD gnome-shell-9999.ebuild 1477 RMD160 5cba45d01286d8810fb5d72ee685928ab26f4733 SHA1 315f807817419dec36b7ed9e074d1598ad10e239 SHA256 0824019c7369b24082653f6172d657b1e168bf7ebe1d03714da9b0b2cf44ebee
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index ace5bdf..02d8a1e 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -22,11 +22,11 @@ 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.91.0:3
+	>=gnome-base/gnome-desktop-2.91.2:3
 	>=dev-libs/gobject-introspection-0.9.5
 
 	dev-libs/dbus-glib
-	>=dev-libs/gjs-0.7
+	>=dev-libs/gjs-0.7.5
 	x11-libs/pango[introspection]
 	>=media-libs/clutter-1.4.0[introspection]
 	dev-libs/libcroco:0.6
diff --git a/profiles/package.mask b/profiles/package.mask
index b8faad9..723390b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,6 +14,9 @@
 =gnome-base/gsettings-desktop-schemas-9999
 =x11-wm/mutter-9999
 
+# New gnome-desktop, only works with live gnome-shell packages
+=gnome-base/gnome-desktop-2.91.2
+
 # GNOME 3 theme work, live ebuild
 =x11-themes/gtk-theme-engine-clearlooks-9999
 =x11-themes/gnome-themes-standard-9999