Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 12 insertions, 11 deletions

diff --git a/gnome-base/gsettings-desktop-schemas/ChangeLog b/gnome-base/gsettings-desktop-schemas/ChangeLog
index cead72e2d7ad..43476181ccc3 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.59 2013/12/22 16:03:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/ChangeLog,v 1.60 2013/12/24 16:35:36 pacho Exp $
+
+*gsettings-desktop-schemas-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +gsettings-desktop-schemas-3.10.1.ebuild,
+  -gsettings-desktop-schemas-3.8.0-r1.ebuild:
+  Version bump for Gnome 3.10
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org>
   gsettings-desktop-schemas-3.8.2.ebuild:
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.ebuild
index 6a38e56e4d3c..f4dd1ef6a82a 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.8.0-r1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.0-r1.ebuild,v 1.1 2013/05/12 10:03:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.10.1.ebuild,v 1.1 2013/12/24 16:35:36 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 inherit gnome2
 
 DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -18,20 +18,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 RDEPEND="
 	>=dev-libs/glib-2.31:2
 	introspection? ( >=dev-libs/gobject-introspection-1.31.0 )
+	!<gnome-base/gdm-3.8
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	>=dev-util/intltool-0.40
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Don't migrate metacity theme for consistency with the rest of
-	# Gnome 3 theming (as other themes are not migrated), upstream bug #700154
-	epatch "${FILESDIR}/${PN}-3.8.0-metacity-theme.patch"
-	gnome2_src_prepare
-}
-
 src_configure() {
 	DOCS="AUTHORS HACKING NEWS README"
 	gnome2_src_configure $(use_enable introspection)