Sync -9999. Remove conf file path patch and GConf magic, GSettings are used for config now. Pass proper --docdir.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 36 insertions, 31 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index 225050e97a2e..68fd9cef75bd 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/blueman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.33 2015/03/03 08:18:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.34 2015/04/04 08:52:43 mgorny Exp $
+
+  04 Apr 2015; Michał Górny <mgorny@gentoo.org> blueman-9999.ebuild:
+  Sync -9999. Remove conf file path patch and GConf magic, GSettings are used
+  for config now. Pass proper --docdir.
 
   03 Mar 2015; Michał Górny <mgorny@gentoo.org>
   files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch:
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 754230892403..cffbef8b7c1a 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -16,25 +16,25 @@ EBUILD blueman-1.23-r2.ebuild 2488 SHA256 99a27d58912568511a4febbe41a48c507ee069
 EBUILD blueman-1.23.ebuild 2318 SHA256 0c1626d9ec3db5bc63a01e10999f6baf8c7720bb8ea59e5080954c2db06ac550 SHA512 8b8408c02798bccec24b2ce6ef5cfcd7fb37701c84c678a4269bd61d2d40df1c9da6840c9b35fea0998f4ffbc262d32bf77af43fd81295ebbaaff7289eefe40c WHIRLPOOL cfad818e6fb3bfffedcc49486a46868d0fd21bdab22a65311f66dc54da15df5f3861a0b359cfd1a4a5046f91372b3f77e6f15b7f7a6cc58c40491617f4757ca9
 EBUILD blueman-1.23_p20140717-r1.ebuild 2755 SHA256 df2106cca7a2cf993ee646d6490b532325217dd2cc42252e344da9ca2136c73a SHA512 5bcb3fba0666e8b22611d53223fcaab2b28484c7646f33f1a0659f62110fdb918c2363936dbd02d12aa4c5a8732a78a474bab1626fb919baaf1aed7159ec3118 WHIRLPOOL 7ce9ad57a3a35da6ab6c9dc21c09ddebdd0e3157215aed09d8f330c279ed4dd2ec111387efd4d76fc04a234d8c0b3c62e494668e80def17661fca8cdc922cb18
 EBUILD blueman-1.98_p20150105.ebuild 2822 SHA256 59afad2427b1d1f1d7ae86893827bd840e5a2103d3f23f5e116c25787e288f62 SHA512 71b39c0ecd2e05a0543174626fabbbcf109f4fbf20f9f88c92e92712a3ce910284d1fa1f40dcda13f7be6f96f730d1f155e13c804e28bcf010692c5734c3e5e1 WHIRLPOOL 1d4d0745b278040f3dd468faeb892ddc56da63fc5eb05dffbdbcf869bdff7d0669a6cc7ea771f27e5c5a3956fb0a3b69911d9af6cb14dffcbc93e8ba30dd6be2
-EBUILD blueman-9999.ebuild 2543 SHA256 962e0e4c39b8c6f84bd09207d1a8dc43197460c09f9ec345683af9cdfbbf6e24 SHA512 fbcdbb320f5b7286e362f18aac0c1d36b467ed9d4474007449af47daf4c5377c5c909c036b22a11435badfa1fb4e1020ccb29236291bc410d0c15a443143f866 WHIRLPOOL 3d6559cdcbd2ea73df036eab3e3668d733b81a57b250e2405c881517b71e56d6f6bf0360c5995d4bf1226d833e66f64d0bb2099ce81c1e416f1133103800448e
-MISC ChangeLog 6652 SHA256 5905018941e9be25ea3b0df0d4f52454cd3bab821bb26336d6e2233cfcdfe0e8 SHA512 f2277c9dd1f2a9704a556f39d815c324a0d348e3333be97bfad45992bced94305be81915c7b7c46836fe453ac34c55a56ea42afd6499bd2e2ad0a18195aea623 WHIRLPOOL 4259b707f3e432c5a03c1f0880becb510fca79b2f58e40f421b5ca7327c1984cba88bdfb4521cda0a4068b5ef7d4fa45d83f98537bf1baded348edb4a0e9ce8a
+EBUILD blueman-9999.ebuild 2639 SHA256 f6ab55bd72f411edabf31f5233ba6b4d00fd678d51bdc693bc335b935b7390c9 SHA512 77d0a09a2f84cfe141fdfe1ed4a39fe613634b674def896be6a4cb672665ee75575d243da01a59d4ecb83825fc2fa866ee7e4457d3773270d77adc73824027fc WHIRLPOOL 4b83e0180846a8f673565b4bc59537fb8a327512298ea2019934d83c549911ee6f5864057dbe9ab0dc95117161b39e6f9e4bfdb5e2ce84f8e115a8143e785646
+MISC ChangeLog 6842 SHA256 4d69793deb7acd3bcf180f7f2b9c9c8e966b8ba007ea1460ef295d853308f48e SHA512 1356f1b65fba6eff9f62cfd96ec22db469393d97e7e3f4b89ccc39676ea3fe687180ec48b9b456cc5ec8702ae1f452da3c665566aeaf5e3c964b8215881c3cf6 WHIRLPOOL 03cd4dd93ec7ff6fa10f2dbabff04d1be0910855082191b35dff50ba6d6ecc0cf1a23fed5bcdeda9d09230854dfb2558b7fcfaee9082de012dfa4bcc9c7078aa
 MISC metadata.xml 701 SHA256 a0ed231e8f9e226f385fd1eaff0bf5fb143d6c31539ecdeadf9ae821654e62c5 SHA512 93d0c843079e4870d3221c123af7591a27d6fc4982886502e8ee3ff0cd5e99bd689eee741a63b772e7e641f9b99d10c87d85aae455234a4f401ee6a93417ba16 WHIRLPOOL 57b6ddbcf4d320bde6dd90dbeefa5e584e1d2eaecb02f6e1c060e6fdc8dfb37e4c3b2481100cc7022be1f9ab695d4d233ef47e1a3f5741d3079f26ab9c54558a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU9W5tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVH6ZjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfe4QAMF3a47o4KpU4pr4vF4Dubyy
-dW6OEl2t4AN8d6+V7epBTLCf7Zp8IxvdoB04/Wg5Pk6f7XlH/xxquL5QlBDweQSC
-67qiWuNln9rqrZzrRvKU+UQbOBfFiJQiL5UfLIj6FwZK6SF0qzP5/Cx96Z8oUg17
-wpdWjF+ppNwwXMb2b0mXSCKb4OB6gmGMD0dYdsOnhP2UXtIrDtti61eAVhG8xHeV
-sLc/18bpsp8NdAvLSWE1dYzRxzQDuYOdsS38ONtfep0g3oCc7lXfaxfl9M4HBCHU
-H/TBszaFfdNghSf1hgtsGsMywSKFTugEl9/X/NanZqbRX7GZc3VlMVVwjfLrWVJk
-wKOCOvrCzGN2+5iLwBbWXi7JfdUv2FpWVwiTRjoDEBn5DycuPa+nBwEVdKWY+j7i
-IVJ+nw2K3+78s5fNdrS6dbL9yUPmSgfrtxEzijRhelIvHneIsgLfq11pQku6hUbR
-OBa4su79bP2emBMIoWwshmKXdOGEKoPgkQtTEMwPzB6swcvd3qtxk8oI1e8Z3dhK
-afrZMg2pBwKtA0N+CSE3snTxLMYTR1y6RHE3fmlKeRVe/naC02iejWVq2oT80bX2
-M6ju0mlq/kJKlXmJntQ8Mivc0NLH82GgmPuu/0mRqTs9ojgzErf/HU2mOiyn0LTM
-DYUhLfz92b+LnRx77S4b
-=Z2Fz
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOM4EP/3c1YWtTH6uD85SattUxsP/L
+XVqB86oBruMLQKvOsEqfRSSIolNYwhva1qiOlkkiAtcM8kePvT/Qz2T5bKVRNN6e
+x94duftyrs13jrzhjJ+jtjlRJhhkYhOdocvaWOaseh+WTjoTaNLOZYnqqfoJLKGr
+kBhOAMRkrTaBvcAug2qO4O+2W7NfqmDcxT8waysoI4GmsEQ6apG99YsiAF0tY/Bd
+TzV2UoJNPULrpFGQZ8nSM+wivn3SM2D2MkI+sL+V+au35Gt6iBS0Vhqk5+2lkT26
+IGuSQXSlz56Uv+x5p2bkpItEoeBHKGrnkAPM+qIc0wzXsh3dQ8hQFhwcqbP0xVP1
+g2R9xq8PLs6pp2MmWxEna2ASdLRuG4Mkqjqx9Yetll9ic4fNoAaNToUd7YMlaK3c
+sSlPFLAYi9JfRH7ikpVB+voDtazI1YANuz7WYdi+dDTc9FdwdtaCJAN61lusNmNq
+tyQGY5B8A/t24VdGzlmmE2UVyWpL6NFaaLYThyWS4A6NLRL7oFAwdo5kH+dxqhsj
+7VLWeYzUYSREEQu7jXn82/PFZQgT/HqhBUG7nNhbnlcpGsBZsM0zH2+bPgaP0iAu
+T/8JeaXGbKv4scbAUMtRmtIaNhzz/Q0AEV3IP53tBOzMcg7KrOjfjyYzubUNj6rm
+2wKtrW7WduFzwPUUY62D
+=UiDt
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 4c145ebfce1c..8fbf71607b11 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.7 2015/01/05 19:56:01 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.8 2015/04/04 08:52:43 mgorny Exp $
 
 EAPI="5"
 
@@ -21,16 +21,13 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gconf sendto network nls policykit pulseaudio"
+IUSE="gconf gnome network nls policykit pulseaudio thunar"
 
 CDEPEND="dev-libs/glib:2=
 	x11-libs/gtk+:3=
 	x11-libs/startup-notification:=
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	|| (
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-	)
+	dev-python/pygobject:3
 	>=net-wireless/bluez-4.61:=
 	${PYTHON_DEPS}"
 DEPEND="${CDEPEND}
@@ -42,12 +39,17 @@ RDEPEND="${CDEPEND}
 	sys-apps/dbus
 	x11-themes/hicolor-icon-theme
 	gconf? ( dev-python/gconf-python[${PYTHON_USEDEP}] )
-	sendto? ( gnome-base/nautilus )
+	gnome? ( gnome-base/nautilus )
 	network? ( || ( net-dns/dnsmasq
 		net-misc/dhcp
 		>=net-misc/networkmanager-0.8 ) )
 	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio )"
+	pulseaudio? ( media-sound/pulseaudio )
+	!net-wireless/gnome-bluetooth
+	x11-themes/gnome-icon-theme
+	thunar? ( xfce-base/thunar )
+"
+# See bug 455320 and https://github.com/blueman-project/blueman/issues/112 for reason for gnome-icon-theme dep
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -57,18 +59,18 @@ src_prepare() {
 		data/blueman-manager.desktop.in || die "sed failed"
 
 	epatch \
-		"${FILESDIR}/${PN}-9999-plugins-conf-file.patch" \
 		"${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch"
 	eautoreconf
 }
 
 src_configure() {
 	econf \
+		--docdir=/usr/share/doc/${PF} \
 		--disable-static \
 		$(use_enable policykit polkit) \
-		$(use_enable sendto) \
-		--disable-hal \
-		$(use_enable nls)
+		$(use_enable gnome nautilus-sendto) \
+		$(use_enable nls) \
+		$(use_enable thunar thunar-sendto)
 }
 
 src_install() {
@@ -77,10 +79,9 @@ src_install() {
 	python_fix_shebang "${D}"
 
 	rm "${D}"/$(python_get_sitedir)/*.la || die
-	use sendto && { rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la || die; }
+	use gnome && { rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la || die; }
 
 	# Note: Python 3 support would need __pycache__ file removal too
-	use gconf || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py* || die; }
 	use policykit || { rm -rf "${D}"/usr/share/polkit-1 || die; }
 	use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
 }