Add dconf to fix problems like bug #375101

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

4 files changed, 42 insertions, 108 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index 94cf78051045..a2b56b1ba2cb 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-light
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.142 2011/03/22 20:13:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.143 2011/09/10 16:26:32 pacho Exp $
+
+*gnome-light-2.32.1-r1 (10 Sep 2011)
+
+  10 Sep 2011; Pacho Ramos <pacho@gentoo.org> -gnome-light-2.30.2.ebuild,
+  -gnome-light-2.30.2-r1.ebuild, +gnome-light-2.32.1-r1.ebuild:
+  Add dconf to fix problems like bug #375101
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-light-2.32.1.ebuild:
   Marking gnome-light-2.32.1 ppc stable for bug 353436
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index db40f1523df4..d0899596d53c 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,5 +1,14 @@
-EBUILD gnome-light-2.30.2-r1.ebuild 2498 RMD160 b2461c52f653d14f4070b3d14fd12b400936abf0 SHA1 51bf9c2d4a8f26d1f40f023f4950b0e7514681dc SHA256 758e2a9dc90c6f7f4982b5e8e3e03da5ff338e2157b544d8223128bb0ca69abd
-EBUILD gnome-light-2.30.2.ebuild 2494 RMD160 2b00f464c2ff8bdc6dd6cfc5f14802d147824c12 SHA1 b88096a9d05d62b2b240bfe05d54459aa5dbeea8 SHA256 58a2c5cbc1fb95498200167a2ffa0de48839c50aa6597751e2140b2a605db10e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD gnome-light-2.32.1-r1.ebuild 2536 RMD160 64e6081e8c2e54f385e5361cf962a4c8099f6517 SHA1 c98e6bfaa3193e98fb31d8e99ac75ee1eb50d0af SHA256 fbb274ec2dab28fde190b4d2a45857f36ecd0e475d50b1cded37c523f1ed3b52
 EBUILD gnome-light-2.32.1.ebuild 2497 RMD160 fb0bf3bbbf42364fdea3189cf23d9f9778baa49e SHA1 df3e54b80baa3c3a16a27f835411f9643a35d629 SHA256 4eddafffb28f398c7350f0378be815e5dcf41b2f395e4d553e26570c359063b4
-MISC ChangeLog 18676 RMD160 d3b2b0a5e00c9992149baf52b02ec9be12cfcf2e SHA1 b406d18dbe6d8aa815104275951d99deb7c8f54c SHA256 b94d3dacb91fedb4588ec75adbf33a5e6ec1d194b79a0df3f4fb83e11072623c
+MISC ChangeLog 18897 RMD160 8af4e2f56cef89be218b63ed9a5d1981e92f075a SHA1 b63b8e88511d8b9574735d639cc1d385d2123688 SHA256 8603210f343929a9dd6f52164303412b4675be7ad872362400d0a7148bf06f62
 MISC metadata.xml 279 RMD160 425eaa2938166644107600e18df529b9165c6762 SHA1 7970cc5cba9f910a52f7c7f41409845e4c8b50a3 SHA256 d395306479c3c72a60bd1488b63f844ebf54cc4a1a4cfe142cfa8a284b11f2c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5rj70ACgkQCaWpQKGI+9RAtACcCEucdedYnN/o3sPchSUY6IQA
+pLMAn2ke8ckE2d3gx+F5jOiW2z8fk6qW
+=7uru
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-light/gnome-light-2.30.2.ebuild b/gnome-base/gnome-light/gnome-light-2.30.2.ebuild
deleted file mode 100644
index a85c429b8e54..000000000000
--- a/gnome-base/gnome-light/gnome-light-2.30.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.30.2.ebuild,v 1.10 2011/03/16 10:41:44 nirbheek Exp $
-
-EAPI="2"
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-IUSE="+automount"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-#  Note to developers:
-#  This is a wrapper for the 'light' Gnome2 desktop,
-#  This should only consist of the bare minimum of libs/apps needed
-#  It is basicly the gnome-base/gnome without all extra apps
-
-#  This is currently in it's test phase, if you feel like some dep
-#  should be added or removed from this pack file a bug to
-#  gnome@gentoo.org on bugs.gentoo.org
-
-#	>=media-gfx/eog-2.30.2
-
-RDEPEND="!gnome-base/gnome
-
-	>=dev-libs/glib-2.24.1:2
-	>=x11-libs/gtk+-2.20.1:2
-	>=dev-libs/atk-1.30.0
-	>=x11-libs/pango-1.28.1
-
-	>=gnome-base/orbit-2.14.18:2
-
-	>=x11-libs/libwnck-2.30.2:1
-	>=x11-wm/metacity-2.30.1
-
-	>=gnome-base/gconf-2.28.0:2
-
-	>=gnome-base/libbonobo-2.24.3
-	>=gnome-base/libbonoboui-2.24.3
-	>=gnome-base/libgnome-2.30.0
-	>=gnome-base/libgnomeui-2.24.3
-	>=gnome-base/libgnomecanvas-2.30.1
-	>=gnome-base/libglade-2.6.4:2.0
-
-	>=gnome-base/gnome-settings-daemon-2.30.2
-	>=gnome-base/gnome-control-center-2.30.1
-
-	>=gnome-base/nautilus-2.30.1
-
-	>=gnome-base/gnome-desktop-2.30.2:2
-	>=gnome-base/gnome-session-2.30.0
-	>=gnome-base/gnome-panel-2.30.0
-
-	>=x11-themes/gnome-icon-theme-2.30.3
-	>=x11-themes/gnome-themes-2.30.2
-
-	>=x11-terms/gnome-terminal-2.30.2
-
-	>=gnome-base/librsvg-2.26.3:2
-
-	>=gnome-extra/yelp-2.30.1"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.2
-	automount? ( >=gnome-base/gvfs-1.6.2[gdu] )"
-
-pkg_postinst () {
-# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
-# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost
-# FIXME: support for it, but we don't ship with gnome-session-2.24 yet
-#	elog "Note that to change windowmanager to metacity do: "
-#	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-#	elog "of course this works for all other window managers as well"
-#	elog
-
-	elog "Use gnome-base/gnome for the full GNOME Desktop"
-	elog "as released by the GNOME team."
-}
diff --git a/gnome-base/gnome-light/gnome-light-2.30.2-r1.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
index 42d2f90c9274..1988aca7ac14 100644
--- a/gnome-base/gnome-light/gnome-light-2.30.2-r1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.30.2-r1.ebuild,v 1.5 2011/03/16 10:41:44 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r1.ebuild,v 1.1 2011/09/10 16:26:32 pacho Exp $
 
-EAPI="2"
+EAPI="4"
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -13,7 +13,7 @@ IUSE="+automount"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 #  Note to developers:
 #  This is a wrapper for the 'light' Gnome2 desktop,
@@ -28,45 +28,46 @@ KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~
 
 RDEPEND="!gnome-base/gnome
 
-	>=dev-libs/glib-2.24.2:2
-	>=x11-libs/gtk+-2.20.1:2
-	>=dev-libs/atk-1.30.0
+	>=dev-libs/glib-2.26.1:2
+	>=x11-libs/gtk+-2.22.1-r1:2
+	>=x11-libs/gdk-pixbuf-2.22.1:2
+	>=dev-libs/atk-1.32.0
 	>=x11-libs/pango-1.28.3
 
 	>=gnome-base/orbit-2.14.19:2
 
-	>=x11-libs/libwnck-2.30.5:1
+	>=x11-libs/libwnck-2.30.6:1
 	>=x11-wm/metacity-2.30.3
 
-	>=gnome-base/gconf-2.28.1:2
+	>=gnome-base/gconf-2.32.0-r1:2
+	>=gnome-base/dconf-0.5.1-r2
 
 	>=gnome-base/libbonobo-2.24.3
 	>=gnome-base/libbonoboui-2.24.4
-	>=gnome-base/libgnome-2.30.0
-	>=gnome-base/libgnomeui-2.24.4
+	>=gnome-base/libgnome-2.32.0
 	>=gnome-base/libgnomecanvas-2.30.2
 	>=gnome-base/libglade-2.6.4:2.0
 
-	>=gnome-base/gnome-settings-daemon-2.30.2
-	>=gnome-base/gnome-control-center-2.30.1
+	>=gnome-base/gnome-settings-daemon-2.32.1
+	>=gnome-base/gnome-control-center-2.32.0
 
-	>=gnome-base/nautilus-2.30.1
+	>=gnome-base/nautilus-2.32.1
 
-	>=gnome-base/gnome-desktop-2.30.2:2
-	>=gnome-base/gnome-session-2.30.2
-	>=gnome-base/gnome-panel-2.30.2
+	>=gnome-base/gnome-desktop-2.32.1:2
+	>=gnome-base/gnome-session-2.32.1
+	>=gnome-base/gnome-panel-2.32.1
 
-	>=x11-themes/gnome-icon-theme-2.30.3
-	>=x11-themes/gnome-themes-2.30.2
+	>=x11-themes/gnome-icon-theme-2.31.0
+	>=x11-themes/gnome-themes-2.32.1
 
-	>=x11-terms/gnome-terminal-2.30.2
+	>=x11-terms/gnome-terminal-2.32.1
 
-	>=gnome-base/librsvg-2.26.3:2
+	>=gnome-base/librsvg-2.32.1:2
 
 	>=gnome-extra/yelp-2.30.2"
 DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.4
-	automount? ( >=gnome-base/gvfs-1.6.4[gdu] )"
+PDEPEND=">=gnome-base/gvfs-1.6.6
+	automount? ( >=gnome-base/gvfs-1.6.6[gdu] )"
 
 pkg_postinst () {
 # FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway