Version bump for Gnome 3.10

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

3 files changed, 25 insertions, 71 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index 440594459626..2eaddd3b41e6 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.27 2013/12/08 18:52:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.28 2013/12/24 17:05:29 pacho Exp $
+
+*gnome-user-share-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-user-share-3.10.1.ebuild,
+  -gnome-user-share-3.0.4.ebuild, -gnome-user-share-3.8.0.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-user-share-3.8.3.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.4.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.4.ebuild
deleted file mode 100644
index 8bdb302075c5..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.4.ebuild,v 1.1 2012/10/28 16:17:29 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# 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
-	>=gnome-base/nautilus-2.91.7
-	media-libs/libcanberra[gtk3]
-	>=net-wireless/gnome-bluetooth-2.91.5:2
-	>=net-wireless/bluez-4.18
-	>=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
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		ITSTOOL=$(type -P true)
-		--disable-schemas-compile
-		--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
-}
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.10.1.ebuild
index e63209d0a9dc..e4856ce606b9 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-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-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild,v 1.2 2013/03/29 22:43:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.10.1.ebuild,v 1.1 2013/12/24 17:05:29 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -9,30 +9,30 @@ GNOME2_LA_PUNT="yes"
 inherit gnome2 multilib
 
 DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="bluetooth"
 
 # FIXME: could libnotify be made optional ?
-# FIXME selinux automagic support
+# 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
 	>=gnome-base/nautilus-2.91.7
 	media-libs/libcanberra[gtk3]
-	>=net-wireless/gnome-bluetooth-2.91.5:2
-	>=net-wireless/bluez-4.18
-	>=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]
+	>=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:=
+	bluetooth? (
+		>=app-mobilephone/obex-data-server-0.4
+		>=net-wireless/gnome-bluetooth-3.9.3:2
+		>=net-wireless/bluez-4.18 )
 "
 DEPEND="${RDEPEND}
+	!<gnome-base/gnome-control-center-3.9
 	app-text/yelp-tools
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.35
@@ -40,15 +40,17 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Rebuild marshalers for <glib-2.31 compatibility
-	rm -v src/marshal.{c,h} || die
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
+		$(use_enable bluetooth) \
 		ITSTOOL=$(type -P true) \
 		--with-httpd=apache2 \
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
 }
+
+src_install() {
+	gnome2_src_install
+
+	# FIXME: looks like upstream forgot about this
+	rm "${D}"/etc/xdg/autostart/gnome-user-share-obexpush.desktop || die
+}