Version bump, drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 25 insertions, 24 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index fe431731b448..22e15591a47b 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.32 2014/03/09 12:00:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.33 2014/03/29 17:57:11 pacho Exp $
+
+*gnome-user-share-3.10.2 (29 Mar 2014)
+
+  29 Mar 2014; Pacho Ramos <pacho@gentoo.org> +gnome-user-share-3.10.2.ebuild,
+  -gnome-user-share-3.8.3.ebuild:
+  Version bump, drop old
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-user-share-3.10.1.ebuild:
   x86 stable, bug 499954
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 7dfb12b29d4b..fe9d0583058f 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -4,16 +4,16 @@ Hash: SHA256
 AUX gnome-user-share-2.30.1-libnotify-0.7.patch 1340 SHA256 60fcfe4a7120b7a917e2aec227f3a40fe4993bc9c80f2722f856fbe4e6e4994e SHA512 93c8a5f1355d3a7f7da759c68e633d820e3206eaa72bf5c7a828a25c1d6fa79968c18c0c61f9003eee18d7e0a9c6af37d89867bc686d4d91155652e11d777d43 WHIRLPOOL bdc427c967186bcb6ac66476f50acf035fa7c3ae4c27a93d05afa645ed4c18998261b44ad2ece0dd5a238090d3e28c611faacb6ef1721212cffd3919eaf8bd84
 DIST gnome-user-share-2.30.1.tar.bz2 959747 SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
 DIST gnome-user-share-3.10.1.tar.xz 381772 SHA256 d76f9537180db1708f164bf7bfd4b37aee4610c46e7c3aa17fd0e56cf8b51458 SHA512 36455d58fc1b715f7ba182651b298df72d897eabb19a048ccb9be9acc8c1b07438d8ad3d012742b7c53ef0a92eb73e1daccddd8a9c945333b6c01854ee263446 WHIRLPOOL 131866def037ac0efc430a9875227fc4876c6880e7ec925d98971c7060ec34827e0de955563a3bcb082e3c6306d4284eee79a0021004da927ced55ddfe853051
-DIST gnome-user-share-3.8.3.tar.xz 1086060 SHA256 e6f36eaf66fafad2f6ec959ba2cb143b60ff00eb9a94a65b181411b366f2a26f SHA512 d1abc220301042c5252bb02bd05d857db6adc7dc1d411e195c69c0e2023097e95843ce0b845a07bc75ea9395d068e21d600fb26e4cfc511bf88489f719c77964 WHIRLPOOL f20370ab4ddd8171e0840ed9adedafbc804a522130b0aa076086f3757844f3841fbbf29bd60c4f8e89ae59b3ef06c935dc8c34a82e0ddbb1a47052d79fc51d86
+DIST gnome-user-share-3.10.2.tar.xz 383320 SHA256 1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f SHA512 792a7444475d6f02c53a9661192dc5550b2c7ca29975d5c9d33d9ef481440d9e4bca5f7f70861df4503e8331044a1db10fe6501cdaccc8f9d314c239c308078e WHIRLPOOL cf3c605ce1801797d5e915e266f7fa73aeb35b10efa07ca2b1a5b69cbb185910956b9342f7dc83ef4e5e3deb1ae0db3586b5e83566c48d4c1951fd6530a3abd1
 EBUILD gnome-user-share-2.30.1.ebuild 1637 SHA256 456a713dc4ae2f8d4e52d28db857fc4ca9b11660dc72e25a01e2b82d5c40086b SHA512 d2240550201ab0fdfb64c588f5a423718251f884545ea643b2644062db7752116922a385b1432713235fd5da0c503a177592322ca8be0d26ccdcf1558bdbaa72 WHIRLPOOL 02821c56fb26ae22f16084cc3aad0e5bbf3ade2320c5b14cee4bfce8abe54fc2f274012a707eaac67ee605ec5e29dcb85c7a54baeae826c73e5b6ec05ae20166
 EBUILD gnome-user-share-3.10.1.ebuild 1548 SHA256 0e694ab83f6a16a5f28be502acf82b9eb645a6d360980499d8764031fd5e93d7 SHA512 9aaf213cc2a6f01d43d385f417fe524980cf2aa9f78f2c672cecc95845478acce8b2f90bdffa0f06e4961813237afad628672fe2d864552ac32ef4d0d7c72049 WHIRLPOOL b5204e90b0c82f29179111593874e38336959acec5baebafd7712a5e1bd92a75331899648a132980547f8ede6f63ecd4917d26dfc2aaf5cf667ee851fe800d99
-EBUILD gnome-user-share-3.8.3.ebuild 1466 SHA256 1dcfe8288b362c7dab98044a4ed3bf952b9f782b2f628c963d3f07ee7d7a4c6d SHA512 d1aa648baa53419dab0c3b18c224b684d16cbd01670a6f761dd5d88ee05955b0f830670bd74640a9ad4312f16586a9ab32e7d10614a63fd3f95a800f2a0160e4 WHIRLPOOL f12cf285badf58a0f9f79687f889699267ff58fa050f74507de91ad51391c520d0a985adb1af86bdc613ecdbdd056f0fc6e78954e87e57c6389927d18bfef88c
-MISC ChangeLog 5479 SHA256 2a8d0db82496ae121f4868856eb2c40bf919f3333149c799fd09f1548cede79b SHA512 8e0a95c294c37d18827ecaa607500b7355665b511d48c688ec6c3b29e1000305fa17bae81d41ec31487f03daf67a475a530dac06d334d9496d59b5e203852e64 WHIRLPOOL 53fec9f63dbf24ecb46753f068dd84cd8b9b08904aa20ea11d1d5cc18ac191f830b2d7d9c01f8c8b308a6d1a8942273727cebd769ab92237377d8fe71abc89c0
+EBUILD gnome-user-share-3.10.2.ebuild 1392 SHA256 04d3532157b9c021886f67c9ecc8cfe366a0b5dd773fada87ad06a491ff93de8 SHA512 1b9281583bceef2d6a36405d08c7a1ef08e97ed7745b06a697873ebcf98d435f0ceb868506e1a850118e73bf5f90431ae37813a5aaebae1b91f46672349f1257 WHIRLPOOL 2f2693422ff1a6292afaa31a6b03f42a6bb04858e1ee0355bab1034c53c02301901040471b6b955b78ca4c334092d9d5cae72393134a24092f66ba0dcad410dc
+MISC ChangeLog 5658 SHA256 50776782e850bb72fafecdc42590416026671d79559822b3a62bf08ffd0ca842 SHA512 dea76e8007c48925d7ea70c272b680fb2b0380da258ba4281219b19f50b52dc01739c8e1506e9ed9fa182706c4737b13a852cd3ecaca0ba5eb5b91f507f743fa WHIRLPOOL 85df540a48974294a067e1e4214babbae3009db274309b4b997504187f1f23333c745b42ad5dc4f3d1f9f8c84ec11cfb911e9cd42bba68f9b5fb2ed7e45b092f
 MISC metadata.xml 306 SHA256 185c811ac4adbf390d2d997eaba05f7a5115bc35e1b1baa5e75165a9afe1cb18 SHA512 29dd6f73edaf9bc1cd3963758834c9b070b4781a5cc8e25be9ae236b8534d83d5b585a9f5e1a488e1605ac051af6793462d7e226318d228f460b0a77ae2c7915 WHIRLPOOL bc260875f60e4b96d4f2bcf6a976f6a4486be064bbaf26de72a37e3da79957b14ce04f5fd2214c5e9a4dd29a6a5e4c9b8dea4fe42acd4c8dadf6dd1b5e0c1534
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcV98ACgkQCaWpQKGI+9Q9BwCfSl06gGCcBXpYOAO/hQ4Kyi+1
-UE0An2MYJ4rPQNyqsZyyC4/qNwGzuil3
-=Z6dq
+iEYEAREIAAYFAlM3CXgACgkQCaWpQKGI+9S8oQCfVerdcYOOAh25KX5oXEmpe1Bw
+HcwAmQFH73CfSP8Y/OUpxHvHEkzAiJ1r
+=hneS
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.8.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild
index cb8b232bf8e7..85dde8241901 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.8.3.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.3.ebuild,v 1.3 2013/12/08 18:52:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.10.2.ebuild,v 1.1 2014/03/29 17:57:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,26 +13,26 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+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,14 +40,9 @@ 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/