Bump to 3.2.0 from the gnome overlay. Adds schemas needed for gnome-3.2.

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

3 files changed, 64 insertions, 1 deletions

diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog
index a83bafe5cab4..664815e8a3f3 100644
--- a/gnome-base/gsettings-desktop-schemas/ChangeLog
+++ b/gnome-base/gsettings-desktop-schemas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gsettings-desktop-schemas
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.17 2011/10/28 20:08:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.18 2011/10/29 06:45:15 tetromino Exp $
+
+*gsettings-desktop-schemas-3.2.0-r1 (29 Oct 2011)
+
+  29 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gsettings-desktop-schemas-3.2.0-r1.ebuild,
+  +files/gsettings-desktop-schemas-3.2.0-unix-software.patch:
+  Bump to 3.2.0 from the gnome overlay. Adds schemas needed for gnome-3.2.
 
   28 Oct 2011; Markus Meier <maekke@gentoo.org>
   gsettings-desktop-schemas-3.0.1.ebuild:
diff --git a/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch
new file mode 100644
index 000000000000..428f5ac198eb
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch
@@ -0,0 +1,26 @@
+From 96bf58048800f1336aa8424c475f951702ce4858 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Mon, 03 Oct 2011 19:56:46 +0000
+Subject: media: change x-content/software to x-content/unix-software
+
+The Nautilus handler doesn't claim x-content/software at all now, and
+we're really interested in autorunning UNIX software rather than Win32
+one anyway.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660803
+---
+diff --git a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
+index a1bd398..1df7aea 100644
+--- a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
++++ b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
+@@ -16,7 +16,7 @@
+       <_description>If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted.</_description>
+     </key>
+     <key name="autorun-x-content-start-app" type="as">
+-      <default>[ 'x-content/software' ]</default>
++      <default>[ 'x-content/unix-software' ]</default>
+       <_summary>List of x-content/* types where the preferred application will be launched</_summary>
+       <_description>List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types.</_description>
+     </key>
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..71bee9a26c84
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild,v 1.1 2011/10/29 06:45:15 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/glib-2.21:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.40"
+
+DOCS="AUTHORS HACKING NEWS README"
+
+src_prepare() {
+	# Upstream patch to use x-content/unix-software like all of gnome-3.2.1,
+	# will be in next release
+	epatch "${FILESDIR}/${P}-unix-software.patch"
+	gnome2_src_prepare
+}