[gentoo-commits] proj/gnome:master commit in: gnome-base/gsettings-desktop-schemas/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

commit:     4a124863bc9d22fb2f25aa00b25a82b59ede253d
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 08:32:16 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 08:32:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4a124863

gnome-base/gsettings-desktop-schemas: moved to gx86

Sync live with gx86

---
 .../gsettings-desktop-schemas-3.6.1.ebuild         |   36 --------------------
 .../gsettings-desktop-schemas-9999.ebuild          |    7 ++--
 gnome-base/gsettings-desktop-schemas/metadata.xml  |    4 --
 3 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild
deleted file mode 100644
index 77d655a..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-fi
-
-RDEPEND=">=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-	DOCS="AUTHORS HACKING NEWS README"
-}

diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
index 77d655a..44c56a2 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -19,7 +19,7 @@ IUSE="+introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~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"
 fi
 
 RDEPEND=">=dev-libs/glib-2.31:2
@@ -29,8 +29,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 afc72e7..6e0e2ec 100644
--- a/gnome-base/gsettings-desktop-schemas/metadata.xml
+++ b/gnome-base/gsettings-desktop-schemas/metadata.xml
@@ -2,8 +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>