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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 27 insertions, 101 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/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 1a448b82a702..d24006b7531d 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gsettings-desktop-schemas-3.2.0-unix-software.patch 1436 SHA256 e7b9ccbf11ffd0c34b1de90b95eb36d3bb1fd35a72a657cae1d84197e22c3be5 SHA512 d54b9b365c375cc5bca9f3f6707d9a47d3d310f71ddcd45d43b7f06bea264238f62ef68160793ab3265fe09da6f3402e895525a2060cae9facf0e332982e8e45 WHIRLPOOL 19c165c92d8d2bd04cf50ce7d4107c7341b19d22ca55dae5db5364acd2a58d2ddfac04dd404d5afd73502cddd8417a45f2515fd3d26ffb0830da8493f0e1230b
-DIST gsettings-desktop-schemas-3.0.1.tar.bz2 136439 SHA256 6e72158a0e70ae50b8bb992e1486dd2fda43207f4ec4eb03a0d769f210363fd9 SHA512 5d2f39f5683bd2fea4c12f65bd3471dfe0816f0649a706ec144f2586bcac35e6bcf80cfc92b357d221c5caa1fa3ec110f493123596b8d9d68752f3e16ef019dc WHIRLPOOL e52cebe7c28c7958292fb5e03b20f0d1cf996463cad19885ff5c02eef31d0b46652882ccb7d512168b97374e236b271bd2c70258d9e0d327a9b4cc36b58dd1e7
-DIST gsettings-desktop-schemas-3.2.0.tar.xz 155604 SHA256 110ea92485eade7f8f850da55944ae9f40597a891f3c46831c8edad06657e21c SHA512 ac2a50e85da72f6d04f55817054112b650aa46b442d8ddcb1f401ee4805800debd81039aa3cf664ec7cd9da7ed3a1a7f7850c732c86d57c98c01966b1aa1d86e WHIRLPOOL 948ca0cca7113b803995953d6cc960628fbc6f10dd7ebc2529d9387146ed3600a23131e45f686bc4935794a12aa7bba147f2ef1f2db7591b88b629f8ec8a280f
-DIST gsettings-desktop-schemas-3.4.1.tar.xz 205788 SHA256 c7360fc77d82595e238e44345f83c2e1d7bc9a7c452c89df507ddd1cf2b3602b SHA512 0a2d0bae1821a94d39bb3bd7e9417d09d4392acc67260b300d565cb87021ccf48c68b0d56365dd8fb6428207666c19525cb4ceecd1db69ca0392a752262aa6bf WHIRLPOOL 486b59da95c82e30da97d1a6db2480d710be8685f5c4d98eac5c459eda53b4577e69a8cb274c774f908eda27076a5c74897814f8d76c3139493d044c4c02c509
 DIST gsettings-desktop-schemas-3.4.2.tar.xz 198476 SHA256 ce0a460128d52710b6842ca663690e38374ac921e2f6c1bdf5d54f46aa6eba4f SHA512 09201a0178ebf8644ec9737808751b44d34d454fd580dac97dfc603d2e703acb96583fcaf8f08a39362f56e6c3da2e5aedfc1971462692098453054dd2697ca2 WHIRLPOOL c8c6a7fec2db978dc803df9e79fa70b1cbe87b189bd907aa507c229585675bf21e159077d0236fbfb11c40ca95a1e6255ab3197b928a31ba051dc650fff1c2ca
-EBUILD gsettings-desktop-schemas-3.0.1.ebuild 709 SHA256 cff09d13055ae6e6079764a5558afc6c26b4e034d09d191ef5312d7a0e1ff6b8 SHA512 05d7e7cd520c79a86556235fbe3e718291b95317408a01d7dd1a6f0b95cb4d537952e04940253f3bf11a6b29320820bf2d44c9ba7dee3dd118b1ba99fb8ab250 WHIRLPOOL 00b1e9c812afd340ddec42c3493c8560562307fb4949184cb2332fc7a6b9ba9783f443253ac81bc04f472f34c4b6810957f3fcf15fb2d423aece38cee441da91
-EBUILD gsettings-desktop-schemas-3.2.0-r1.ebuild 906 SHA256 abaebb43a3a293d02e602e7284a215c89dfd33325ddc79bd991e857542ce90ad SHA512 85f509dff6ceb5ec2cf08084831b3f7811ec210b5400cdc538caa58e48eaf0c253fdb42bf8167873f3be2526acbd90aba0240c7aa820754f949aabeeac6e44c4 WHIRLPOOL 39063ee0620a7dec2b26873650d4cb98991dd8946fe3d82c39e500b2a711710c3af374160f098f76ab19d712c3dd062e9723242ad3aa5ab9c62518570b097500
-EBUILD gsettings-desktop-schemas-3.4.1.ebuild 891 SHA256 4dd9821f73e258c0b9021a2c3f1f500a235be2cfa04c3c8c73c0a1186368c807 SHA512 91d1d4bd150d8cd4c124df049788df25ed8e51538b96ec3945833360b50e2607c4b32a3a319a76d8bfef408651a8d5989d55e0672ae000d00a16edd051cdade2 WHIRLPOOL dbf367482c37574e55b7d660e5b8474b44e2883e7fd00a1970edf5f62256eab645fac64ce0c4391e506897352fecdfe00a3fede96f199b8564e2aa79d3a66961
+DIST gsettings-desktop-schemas-3.6.1.tar.xz 384248 SHA256 d9a877d209e668845d6cafcd62663b0f6e6154df5a96f581ff36f999050e67e6 SHA512 dc9d9173f4f89ece2f9b36748784d6832d28e73c5c90dabee3e7a4aa99a9f3e9f36986d85e64c9ddea8905d8de41fd5616b727b1a4b1818a30d37e66cf4ba9c4 WHIRLPOOL 87b756c86fd03ca665ec79819a92d7426190feb8ab07304ca7b7895e2de7fc98ed410bcfa494c18b0b162bd11cafa3929a83d71034dcae6025be1c84c8280788
 EBUILD gsettings-desktop-schemas-3.4.2.ebuild 897 SHA256 7790e741225035865441ba23e43ce6cd8efff9fc0530d58264ba21dc7f5bc236 SHA512 35d36796be579b1004ff13ffad4cadd3f0246b11f6b8717cf8e02338d99d0377a586140dc8635167a4c579ffcc73eeeadadd7dd00162396f3277d5170945ff87 WHIRLPOOL 209cf2505720c8aa965e0dba49c4bc42f14b8dbd50d4c06fe51e4e97793b728e3ca21ff4eaf28dfb41a9779985302cb7bb0c78e26a9895042225a11fd97aab6e
-MISC ChangeLog 6727 SHA256 809a4624a72d5203ee4154bae4d3899193abb8fefd25a93a43f9b92969f7f724 SHA512 5f489e45d737e2e8e3aa20de1f99f5aa2b161c647802b145d2f657433845bc17a8be52d14ca5d199092a633e5e78c114fd85d39378107049be447fcffeede721 WHIRLPOOL 0f79e165058f61cc9a0097c2cc00af2e703bdef735f985e2b49beacddeb335fdd8e730bb0ebce676a064e648c7bda28ef5a181b4adbeac339e6971079875ad65
-MISC metadata.xml 273 SHA256 1037d3d44ee0093e00aa40642d3d5b2b59b27a90752d0bb677373d5248c87366 SHA512 fe53e2dd00902e7605b3d427e241ec5cbe7c9ddf81dd47f0da49521a90871d7c6d65f46a2b3ae6795bb003e18db89bdb4f7b1ad4ff25db7af024a5051039e67b WHIRLPOOL 8de0e3afba555d9ddd4b0c2e1a80fbe18ccde2c3371a3f9794f8314454ff44f47fa10e0083b50ac8677909ba6d441a54170efc47480d006814e33111c0bc1c6b
+EBUILD gsettings-desktop-schemas-3.6.1.ebuild 934 SHA256 8a12cbf47b90e2be45bf072d09b3e164f237b75ad9c9ed5ec135e5ffa06699ef SHA512 0b906ee64068c12848df775f5c6c4886b439b291659d4ec837cb8a21f1de40c9b3b348ebb3ffab1c7b516a7b4ddd0f949b9ac67c2f7c1f4a36546fa1c9bb33a2 WHIRLPOOL 128482f71abb833846d0fe6c9058a018b59d04e97baed67e0644003c21e37ed745ec9f4dc47748cf6b2ce8f4b77c208a8af5beae3a19530d33bffb1b4fd3ad25
+MISC ChangeLog 7165 SHA256 e875ae805627f3d8fac0bdbd9d71952d14d4661cb5b801182d195274e712718d SHA512 0d67dd1bbc63832589e36966db6043c91de0d8140561bb4d9d05e36b9cb03c4ac2a95f5b809c532ca862eaa1582f434885bf42b10f0ea6c15e3dba12364b5f22 WHIRLPOOL 504b23d55bb23390c9ff4c64a5b556934b928237930168b50e74dad7929c886bdf85537afcdb90a2b395dcf81a6b93cb4ba6636edf30f387a13248fbd5dd4a1c
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNVGgACgkQuQc30/atMkBLEQCfYrdERmq04sFkgIciv4ea5CVp
-V9AAoLWwmHM/jX91NJsWO8bRNTnXOM3g
-=xBRx
+iQEcBAEBCAAGBQJQ0WgpAAoJEJ0WA1zPCt1hzPAH/RbaZQcdqMqL3LFoeVkaQXl5
+rPKzv0i20EI6RB7O+vjS2hw5zZ/4L/rB8VeoEfPUweWdwQNUdd4zI+Fc96dzSv01
+EIquBSZeyyUS9VCb7jpX/f2/irGFHCt99LC7rh9wfjcO16kTEdXJx6n5cFZom2Fa
+QNFSxKPIShYphXmzXftXsrktwwgDOcnxdShCE1glX2sEs4wOFGLOQvrt0tpIotfe
+sLcUJwX5R7t8fGj7BWXvkKveyVaPGMwkIby5RZqIK+iUkb99B9h7F4HZdrIt5I0Y
+d5wMxVZCzLc53t8UnAivKsjyaOiqtDTOfnCu28A+5eC0UUkV4DfUhY46VPKejNI=
+=uLG3
 -----END PGP SIGNATURE-----
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>
-