Version bump for gnome-3.6. Switch to global introspection flag. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

6 files changed, 16 insertions, 89 deletions

diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog
index 192049eb1377..9d63a524bf93 100644
--- a/gnome-base/gsettings-desktop-schemas/ChangeLog
+++ b/gnome-base/gsettings-desktop-schemas/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gsettings-desktop-schemas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.41 2012/10/28 15:51:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.42 2012/12/19 07:09:28 tetromino Exp $
+
+*gsettings-desktop-schemas-3.6.1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gsettings-desktop-schemas-3.0.1.ebuild,
+  -gsettings-desktop-schemas-3.2.0-r1.ebuild,
+  -files/gsettings-desktop-schemas-3.2.0-unix-software.patch,
+  -gsettings-desktop-schemas-3.4.1.ebuild,
+  +gsettings-desktop-schemas-3.6.1.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Switch to global introspection flag. Drop old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
   gsettings-desktop-schemas-3.4.2.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
deleted file mode 100644
index 428f5ac198eb..000000000000
--- a/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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.0.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.0.1.ebuild
deleted file mode 100644
index 74be1087fd11..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 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.0.1.ebuild,v 1.9 2012/09/27 22:16:07 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-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"
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
deleted file mode 100644
index 783e1133ecb3..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 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.9 2012/09/27 22:16:07 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-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
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild
index 52eeec7c0f09..3c0c0d51f09e 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.4.1.ebuild,v 1.2 2012/09/27 22:16:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild,v 1.1 2012/12/19 07:09:28 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.31:2
 	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
@@ -22,8 +22,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_configure() {
 	G2CONF="${G2CONF}
 		$(use_enable introspection)"
 	DOCS="AUTHORS HACKING NEWS README"
+	gnome2_src_configure
 }
diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml b/gnome-base/gsettings-desktop-schemas/metadata.xml
index 18742e69dbb7..da6fd63d0085 100644
--- a/gnome-base/gsettings-desktop-schemas/metadata.xml
+++ b/gnome-base/gsettings-desktop-schemas/metadata.xml
@@ -2,9 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
-</use>
 </pkgmetadata>
-