Version bump. Port to GSettings.

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

2 files changed, 22 insertions, 11 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index 965e14a07de7..06a2a061cf3d 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-user-share
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.20 2012/05/06 05:39:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.21 2012/10/21 13:28:19 eva Exp $
+
+*gnome-user-share-3.0.3 (21 Oct 2012)
+
+  21 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-user-share-3.0.1.ebuild, +gnome-user-share-3.0.3.ebuild:
+  Version bump. Port to GSettings.
 
 *gnome-user-share-3.0.2 (06 May 2012)
 
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
index ffe5c6df625b..4bb102728d4c 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild,v 1.3 2012/05/06 05:39:00 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild,v 1.1 2012/10/21 13:28:19 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -19,12 +19,11 @@ IUSE=""
 # FIXME: could libnotify be made optional ?
 # FIXME: gnome-bluetooth is a hard-dep
 # bluetooth is pure runtime dep (dbus)
-RDEPEND=">=dev-libs/glib-2.16.0:2
-	>=x11-libs/gtk+-3.0.0:3
+# FIXME selinux automagic support
+RDEPEND=">=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3:3
 	>=app-mobilephone/obex-data-server-0.4
 	>=dev-libs/dbus-glib-0.70
-	dev-libs/libunique:3
-	>=gnome-base/gconf-2.10:2
 	>=gnome-base/nautilus-2.91.7
 	media-libs/libcanberra[gtk3]
 	>=net-wireless/gnome-bluetooth-2.91.5:2
@@ -32,17 +31,23 @@ RDEPEND=">=dev-libs/glib-2.16.0:2
 	>=sys-apps/dbus-1.1.1
 	>=www-apache/mod_dnssd-0.6
 	=www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	>=x11-libs/libnotify-0.7"
+	>=x11-libs/libnotify-0.7
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2"
+"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--with-httpd=apache2
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
+
+	# Rebuild marshalers for <glib-2.31 compatibility
+	rm -v src/marshal.{c,h} || die
+	gnome2_src_prepare
 }