Update and clean up the live ebuild and patches.

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

6 files changed, 177 insertions, 157 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index 68fd9cef75bd..85523c38f81b 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,12 @@
 # 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.34 2015/04/04 08:52:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.35 2015/08/08 15:03:18 mgorny Exp $
+
+  08 Aug 2015; Michał Górny <mgorny@gentoo.org>
+  -files/blueman-9999-plugins-conf-file.patch, blueman-9999.ebuild,
+  files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch,
+  metadata.xml:
+  Update and clean up the live ebuild and patches.
 
   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
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index cffbef8b7c1a..451fbbef4834 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -6,8 +6,7 @@ AUX blueman-1.23-plugins-conf-file.patch 988 SHA256 58132546cf913af396d189503e7e
 AUX blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch 9343 SHA256 6d2cd72f41fc054f023dfeb894bb4049441fc01e6e0f936120603021c305bbcc SHA512 0f264599331b518ce5c6573324fffad9b202b66c993284d907db38b6736a25f3d62d38973ac78adb542381bd0c8d09d710612ba0f373f0ba9153d70fbacb6302 WHIRLPOOL 1e29293f77b919cad790e43391231bee07304d938d44b981a67fd806a392547c8b1c426debf881a0cebb9c0df37e4d43bd97ef237ca76a5d23613e05b20a9096
 AUX blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch 8717 SHA256 91f6351614a8bdbb51155399f77c384a86407deb609c9e7bb61ffac17a56d81d SHA512 524afc7729564b5355f38648840b783426cf5aeaffd1bf157f725100b780d35b7524bc81144d3453e34683ea9f7af6982176d45b4488c8176c10224f74452f4d WHIRLPOOL ed053972b26a018276c221a51893bc0b1ab7b2b15e3900905444cfce03a41dd5eade845cd3e4ce3511ebf724e5a1c4e9dbd1f5024518ad8834fa2779bd1253a1
 AUX blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch 8655 SHA256 f6acf4c846d3ccc1168a9dbc7fb31ecebae7488e544cc9778ec15ec5b468d23d SHA512 7d3834476d3a82e05853404733b26408fad76a6a4fa809f7f4eeb2de48fca7820a98fd28022d5e92b401c4c80ff1ea2992b97550172ac4dc4b433a840d32d355 WHIRLPOOL be7a9785a7a80b00f5966423585ace349effbc75a7ed8e77ce251809b5c3a9cae33636274e78175ce9051e4af30c32aca8f29499a7eed32dfb69336568e678fe
-AUX blueman-9999-plugins-conf-file.patch 1083 SHA256 a97c052b107beaf1c6615f47809ce08c5bd2c0cb1d2096f61f47c3bdb25af654 SHA512 4500b68061fda3672f2261d8035acbd6a3623d5c3d6836a6e06fb3c4c81f8143fc1ad14ee3109fb159aef8e980f494593fdc3a904294d17309d9ad2e0d6ce0b5 WHIRLPOOL b9d5f52a35ec6fd2cfef9b06ff98b3834946412859b30d187f598c883eb8ad235276f60b6cc3cc507c456fd753467f354dc47fd70bf717cce6983d0406920b5c
-AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 8113 SHA256 42e18bc6e5e1562a1773c22c8935cf054a9583918691cfc5c560749440333735 SHA512 81ec04a7b4ea0cd71e94ba2f5bdd36354e7958a42a5386faccb7e1b9c743edc7f218e2f1110eaeaae85a327dc451f335b284444f43d20cad25b69b661bf9494f WHIRLPOOL 3f919130553144e779f111c0902c1b2460a474f73e4b6a53e973cac540652a557143f0b8a4af6a8e0848e4eec546bda168d809f84e42ad822668641821239f7a
+AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 10085 SHA256 dd1189f5d0f38ee2db43f0281f62c18772f7992bfa833d8778190050ebac75ac SHA512 b8fffff0887efef5d5e3e1fbc475a94c3b90a0b35b7466ab728edc428f262d9806b22c938b4365db5e6d35ba1f326b53beea4d2a726e2e037497ef5083ea80ca WHIRLPOOL cbed09b5ae3ebffec1b88ff70cf21ccc6c66347c1bccf037507aa7c69724a263c657e7d35fe0168ec193be35843b502e0d644df09eb964411ef6c10459cd4da1
 DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542
 DIST blueman-1.23_p20140717.tar.xz 1679284 SHA256 3b4bbd68e6613299b7577e6a73a9efb86fa1ee2b033e0eb5849e6acd61135fc9 SHA512 ce279aaa7ed85dedc1329534c99f0d660c00c1b887efb543f7b62217bc329c03d400f60847e01b1a25ea4dbbad8f67077b865ac484d88e0e00a4791dcd8c4156 WHIRLPOOL f1b01633062c6a779be6755e039065d7a3ebefefc26025ddc28156968ea1b39c7509ee05f077d574786293d999d586bd2e0ca1eb18da05cf3593b06b28110cc9
 DIST blueman-1.98_p20150105.tar.xz 1698524 SHA256 cb610b0c4799d87989a2f6147059fb850f71984909f761af875c3106f51d543a SHA512 c988ff6cf9769d7653be252bda59bb41388a4d41d7b1f5aa01df63278018fc637634ea96a08b183b78cb5b966c3d2dc189021f437eabf674e8f93812798d4a6b WHIRLPOOL 7070a1bff973fe682af3b0103c99424401e5c3c5bc5632aefbaa9b5c9835d3f001b0656a17893feaffdcc3bfe173aac0c17789b634f937c54906774c9acde22f
@@ -16,25 +15,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 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
+EBUILD blueman-9999.ebuild 2224 SHA256 86d45a537c0cdd8e3d660be8239a7daf3de0fcf65a9ea75dd78c40420fa454b0 SHA512 6543643a5df4795f473f10366d63fa8f2ffd0ceb97a1cfd28d489cd35a4b68c68be1af5fcdaf2c830f08f96c669f375ef058ece374052708ddce3bf89340d107 WHIRLPOOL 7ba9a4f050d4b7a4166ec378bc62c459646f8bacde4bcdb319c5760b38fe2316576e228276ee166b508addaaad2a9796e32dd8ae5003b4ba178aaa64a67bda13
+MISC ChangeLog 7096 SHA256 8119528d861d21e4b43036a86e5774b98f0ce6db33e561354f40ec11e899e7e4 SHA512 c02014e3c9f5f77f99a502a2f9e9a053b13396548b57ad7da56a954e6fd726366b6ffbf939003591f9c8b30653feef3e22d16de1b7ebb4d50b1599c713601994 WHIRLPOOL fd5c439fd9dbd49154f9a534126cae52a2513cf914918f52f72e28ecbe0d204d1add2a175ab98ddf46bb17a66fd4e7c054ef528cf2e5764d2a95feb1884d92f3
+MISC metadata.xml 905 SHA256 a09e159e540efe4f25a9ec03094e5df5f1e75c86554f9501b31aa87d5c7710cd SHA512 47c056ea98bb3910a3515cb766841d60509d914ecced9fc9059f8805d700a3607a9c46e0a483a2fee2a94bb8fcb426247557ed3609de36550fabc5d9e0ea98b2 WHIRLPOOL 76cfd935e45cb63afb6447836b6b84f8559cdc7723acce30358bb2f36379813858b5f010c9f2517b0b67a04c5fdbcb6474caccd96807900cfbaf8f389626ef63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVH6ZjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVxho7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-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
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXxYQAMbHIFPHDcEB0ADwVOTHAa2B
+vDXjAlnEqAefvTWD1pKuhYHLLtWYSihOywYGNz3Bx8M8SLeN1tO7MBXGjZ1RPQDJ
+xfRc+/GHsRLgJfWiNzOCKndyQhMYIRNhcxNGhTM8b08i6lnf85E0A+A7Cf9gp1v0
+OQrqBlHA781bCupbSUJvOEGpzpY6sEQ+VqK0kE2frvkVpwgZODrhrtFmpJMzxtfX
+CSCcC9zoI7Wef/opLIcnucLC4obIl6iaOsjvcnx2FUH6S6MyBsk0YmLsqQ2nRyIH
+yk1kTEU9nvBanpJlxSQ34nSZyq//qmdO38OYCKLexXCGZSxJctRtlpFiZ1d/92r/
+XZf0rYy0y78rulDm+bKjY0WxyB7E5G0XsuC9hWcGm/qBBH4XOSFxtPvvDWOyRV2S
+ZtWU5cMDqjgMBeLvUrFGwb/nSMzQEFmJanRqSuB4AyQk7XI2lVKpBnVINNeWjwhY
+8egQH/j3Pq4f2U3BS11sta3Wm3SnsF6+iO48/Fs+8tUH7jB4CNzdv/Rvco+bzUU/
+0oDvwNCQg4fVfnU2bJN9MeSsv/U9dPqH9M6SjBQXouBI3qyMPRMtUm5P2OE09+7g
+o8yRWqIELRUeLMOwPjjLKuRqBxvjXkrFOjLpdZsJAwOylQrQ/TN7a/uPnLTEWNGw
+SIH/HVEn5f0VItLaPGts
+=wRPq
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 8fbf71607b11..3124240d4d6a 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,63 +1,60 @@
 # 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.8 2015/04/04 08:52:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.9 2015/08/08 15:03:18 mgorny Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4} )
 inherit eutils python-single-r1 gnome2-utils autotools
 
 DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-HOMEPAGE="http://blueman-project.org/"
+HOMEPAGE="https://github.com/blueman-project/blueman"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-project/${PN}.git"
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
 	KEYWORDS=""
 else
-	SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gconf gnome network nls policykit pulseaudio thunar"
+IUSE="appindicator network nls policykit pulseaudio thunar"
 
-CDEPEND="dev-libs/glib:2=
-	x11-libs/gtk+:3=
-	x11-libs/startup-notification:=
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+COMMON_DEPEND="
 	dev-python/pygobject:3
-	>=net-wireless/bluez-4.61:=
+	>=net-wireless/bluez-5:=
 	${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
-	nls? ( dev-util/intltool sys-devel/gettext )
+DEPEND="${COMMON_DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-mobilephone/obex-data-server-0.4.4
+	nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
 	sys-apps/dbus
-	x11-themes/hicolor-icon-theme
-	gconf? ( dev-python/gconf-python[${PYTHON_USEDEP}] )
-	gnome? ( gnome-base/nautilus )
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	|| (
+		x11-themes/faenza-icon-theme
+		x11-themes/gnome-icon-theme
+		x11-themes/mate-icon-theme
+	)
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
 	network? ( || ( net-dns/dnsmasq
 		net-misc/dhcp
 		>=net-misc/networkmanager-0.8 ) )
 	policykit? ( sys-auth/polkit )
 	pulseaudio? ( media-sound/pulseaudio )
-	!net-wireless/gnome-bluetooth
-	x11-themes/gnome-icon-theme
 	thunar? ( xfce-base/thunar )
+	!net-wireless/gnome-bluetooth
 "
-# See bug 455320 and https://github.com/blueman-project/blueman/issues/112 for reason for gnome-icon-theme dep
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
-	sed -i \
-		-e '/^Encoding/d' \
-		data/blueman-manager.desktop.in || die "sed failed"
-
 	epatch \
 		"${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch"
 	eautoreconf
@@ -66,10 +63,11 @@ src_prepare() {
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
+		--disable-runtime-deps-check \
 		--disable-static \
 		$(use_enable policykit polkit) \
-		$(use_enable gnome nautilus-sendto) \
 		$(use_enable nls) \
+		$(use_enable pulseaudio) \
 		$(use_enable thunar thunar-sendto)
 }
 
@@ -77,13 +75,7 @@ src_install() {
 	default
 
 	python_fix_shebang "${D}"
-
 	rm "${D}"/$(python_get_sitedir)/*.la || die
-	use gnome && { rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la || die; }
-
-	# Note: Python 3 support would need __pycache__ file removal too
-	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; }
 }
 
 pkg_preinst() {
diff --git a/net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch b/net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch
deleted file mode 100644
index 62724db1c8e3..000000000000
--- a/net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/blueman/plugins/config/File.py b/blueman/plugins/config/File.py
-index 3beccb4..c17fe77 100644
---- a/blueman/plugins/config/File.py
-+++ b/blueman/plugins/config/File.py
-@@ -22,7 +22,12 @@ signal.signal(signal.SIGHUP, sighandler)
- 
- dbus.service.Object.SUPPORTS_MULTIPLE_OBJECT_PATHS = True
- 
--cfg_path = os.path.expanduser('~/.config/blueman/blueman.cfg')
-+cfg_dir = os.path.expanduser('~/.config/blueman')
-+
-+if os.environ.has_key('XDG_CONFIG_HOME'):
-+    cfg_dir = '%s/blueman' % os.environ['XDG_CONFIG_HOME']
-+
-+cfg_path = '%s/blueman.cfg' % cfg_dir
- 
- 
- class Monitor(dbus.service.Object):
-@@ -77,9 +82,9 @@ class File(ConfigPlugin):
-     def on_load(self, section):
- 
-         if not File.__db__:
--            if not os.path.exists(os.path.expanduser('~/.config/blueman')):
-+            if not os.path.exists(os.path.expanduser(cfg_dir)):
-                 try:
--                    os.makedirs(os.path.expanduser('~/.config/blueman'))
-+                    os.makedirs(os.path.expanduser(cfg_dir))
-                 except:
-                     pass
-             try:
diff --git a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
index 02747d178d36..fa536b27c429 100644
--- a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
+++ b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
@@ -1,26 +1,28 @@
-From aebfe594584e7c5cca30062d643618fc2ab8144b Mon Sep 17 00:00:00 2001
+From a28a982ba05a3b84dcfed43e5bd6801067b5d0c5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 1 Mar 2015 23:08:02 +0100
-Subject: [PATCH] set codeset for gettext to utf-8
+Date: Sat, 8 Aug 2015 14:57:51 +0200
+Subject: [PATCH] Always set codeset for gettext to utf8
 
 ---
- apps/blueman-adapters                |  2 ++
- apps/blueman-assistant               |  2 ++
- apps/blueman-manager                 |  2 ++
- apps/blueman-sendto                  |  2 ++
- apps/blueman-services                |  2 ++
- blueman/gui/GsmSettings.py           |  2 ++
- blueman/gui/applet/PluginDialog.py   |  4 +++-
- blueman/plugins/applet/NetUsage.py   |  3 ++-
- blueman/plugins/services/Network.py  |  3 ++-
- blueman/plugins/services/Transfer.py |  2 ++
- 11 files changed, 29 insertions(+), 6 deletions(-)
+ apps/blueman-adapters                    | 2 ++
+ apps/blueman-assistant                   | 2 ++
+ apps/blueman-manager                     | 2 ++
+ apps/blueman-sendto                      | 2 ++
+ apps/blueman-services                    | 2 ++
+ blueman/gui/GsmSettings.py               | 3 +++
+ blueman/gui/applet/PluginDialog.py       | 3 +++
+ blueman/gui/manager/ManagerDeviceMenu.py | 2 ++
+ blueman/main/applet/BluezAgent.py        | 2 ++
+ blueman/plugins/applet/NetUsage.py       | 3 ++-
+ blueman/plugins/services/Network.py      | 2 ++
+ blueman/plugins/services/Transfer.py     | 3 +++
+ 12 files changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index a961480..3759ba8 100755
+index 4ac81fe..c8d8c06 100755
 --- a/apps/blueman-adapters
 +++ b/apps/blueman-adapters
-@@ -6,6 +6,7 @@ from gi.repository import Pango
+@@ -11,6 +11,7 @@ from gi.repository import Pango
  import os.path
  import sys
  import signal
@@ -28,7 +30,7 @@ index a961480..3759ba8 100755
  
  #support running uninstalled
  _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -36,6 +37,7 @@ class BluemanAdapters:
+@@ -40,6 +41,7 @@ class BluemanAdapters:
  
          builder = Gtk.Builder()
          builder.set_translation_domain("blueman")
@@ -37,18 +39,18 @@ index a961480..3759ba8 100755
          self.dialog = builder.get_object("dialog")
  
 diff --git a/apps/blueman-assistant b/apps/blueman-assistant
-index 7d96ec7..c322256 100755
+index 0b8544b..b23150f 100755
 --- a/apps/blueman-assistant
 +++ b/apps/blueman-assistant
-@@ -16,6 +16,7 @@ import random
+@@ -19,6 +19,7 @@ import os
+ import sys
  import signal
- import dbus.glib
  from optparse import OptionParser
 +from locale import bind_textdomain_codeset
  
  #support running uninstalled
  _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -62,6 +63,7 @@ class Assistant:
+@@ -60,6 +61,7 @@ class Assistant:
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -57,18 +59,18 @@ index 7d96ec7..c322256 100755
          self.assistant = self.Builder.get_object("assistant")
          self.assistant.set_title(_("Bluetooth Assistant"))
 diff --git a/apps/blueman-manager b/apps/blueman-manager
-index 666f16c..af23015 100755
+index d276692..e272528 100755
 --- a/apps/blueman-manager
 +++ b/apps/blueman-manager
-@@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop
- from blueman.Constants import *
+@@ -14,6 +14,7 @@ from blueman.Constants import *
  import gi
  gi.require_version("Gtk", "3.0")
-+from locale import bind_textdomain_codeset
  from gi.repository import Gtk
- from gi.repository import GObject
- from blueman.bluez.BlueZInterface import BlueZInterface
-@@ -46,6 +47,7 @@ class Blueman:
++from locale import bind_textdomain_codeset
+ 
+ #support running uninstalled
+ _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+@@ -47,6 +48,7 @@ class Blueman:
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -77,10 +79,10 @@ index 666f16c..af23015 100755
  
          self.window = self.Builder.get_object("window")
 diff --git a/apps/blueman-sendto b/apps/blueman-sendto
-index 06ad626..a7099ab 100755
+index 54e30b4..3f99d1e 100755
 --- a/apps/blueman-sendto
 +++ b/apps/blueman-sendto
-@@ -13,6 +13,7 @@ from optparse import OptionParser
+@@ -17,6 +17,7 @@ from optparse import OptionParser
  import gettext
  import urllib
  import time
@@ -88,7 +90,7 @@ index 06ad626..a7099ab 100755
  
  from blueman.Constants import *
  import gi
-@@ -48,6 +49,7 @@ class Sender(GObject.GObject):
+@@ -52,6 +53,7 @@ class Sender(GObject.GObject):
          GObject.GObject.__init__(self)
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -97,10 +99,10 @@ index 06ad626..a7099ab 100755
          self.window = self.Builder.get_object("window")
  
 diff --git a/apps/blueman-services b/apps/blueman-services
-index fb1428d..e3e708b 100755
+index 3e343ca..5e41261 100755
 --- a/apps/blueman-services
 +++ b/apps/blueman-services
-@@ -2,6 +2,7 @@
+@@ -7,6 +7,7 @@ from __future__ import unicode_literals
  
  import os
  import sys
@@ -108,27 +110,28 @@ index fb1428d..e3e708b 100755
  #support running uninstalled
  _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
  if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
-@@ -29,6 +30,7 @@ class BluemanServices:
+@@ -35,6 +36,7 @@ class BluemanServices:
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
 +        bind_textdomain_codeset("blueman", "UTF-8")
          self.Builder.add_from_file(UI_PATH + "/services.ui")
  
-         self.Config = Config()
+         self.Config = Config("org.blueman.general")
 diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
-index b12f77f..cc80492 100644
+index 2919a69..3cb7057 100644
 --- a/blueman/gui/GsmSettings.py
 +++ b/blueman/gui/GsmSettings.py
-@@ -3,6 +3,7 @@ from blueman.Functions import *
- from blueman.Constants import *
+@@ -3,6 +3,8 @@ from __future__ import division
+ from __future__ import absolute_import
+ from __future__ import unicode_literals
  
- from gi.repository import Gtk
 +from locale import bind_textdomain_codeset
- 
- 
- class GsmSettings(Gtk.Dialog):
-@@ -13,6 +14,7 @@ class GsmSettings(Gtk.Dialog):
++
+ from blueman.main.Config import Config
+ from blueman.Functions import *
+ from blueman.Constants import *
+@@ -20,6 +22,7 @@ class GsmSettings(Gtk.Dialog):
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -137,30 +140,71 @@ index b12f77f..cc80492 100644
  
          vbox = self.Builder.get_object("vbox1")
 diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
-index 71dd742..3a1f932 100644
+index eb70b45..def7e48 100644
 --- a/blueman/gui/applet/PluginDialog.py
 +++ b/blueman/gui/applet/PluginDialog.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.Functions import *
+@@ -3,6 +3,8 @@ from __future__ import division
+ from __future__ import absolute_import
+ from __future__ import unicode_literals
  
-@@ -97,7 +98,8 @@ class PluginDialog(Gtk.Dialog):
++from locale import bind_textdomain_codeset
++
+ import gi
+ gi.require_version("Gtk", "3.0")
+ from gi.repository import Gtk
+@@ -105,6 +107,7 @@ class PluginDialog(Gtk.Dialog):
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
--        self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
 +        bind_textdomain_codeset("blueman", "UTF-8")
-+        self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
+         self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
  
          self.set_title(_("Plugins"))
-         self.props.icon_name = "blueman"
+diff --git a/blueman/gui/manager/ManagerDeviceMenu.py b/blueman/gui/manager/ManagerDeviceMenu.py
+index f0dea5a..031b456 100644
+--- a/blueman/gui/manager/ManagerDeviceMenu.py
++++ b/blueman/gui/manager/ManagerDeviceMenu.py
+@@ -3,6 +3,7 @@ from __future__ import division
+ from __future__ import absolute_import
+ from __future__ import unicode_literals
+ 
++from locale import bind_textdomain_codeset
+ from operator import itemgetter
+ from blueman.Sdp import uuid128_to_uuid16, SERIAL_PORT_SVCLASS_ID, OBEX_OBJPUSH_SVCLASS_ID, OBEX_FILETRANS_SVCLASS_ID
+ from blueman.Functions import *
+@@ -312,6 +313,7 @@ class ManagerDeviceMenu(Gtk.Menu):
+ 
+             builder = Gtk.Builder()
+             builder.set_translation_domain("blueman")
++            bind_textdomain_codeset("blueman", "UTF-8")
+             builder.add_from_file(UI_PATH + "/rename-device.ui")
+             dialog = builder.get_object("dialog")
+             dialog.set_transient_for(self.Blueman.window)
+diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py
+index f49946d..e930963 100644
+--- a/blueman/main/applet/BluezAgent.py
++++ b/blueman/main/applet/BluezAgent.py
+@@ -6,6 +6,7 @@ from __future__ import unicode_literals
+ import dbus
+ from dbus.mainloop.glib import DBusGMainLoop
+ import dbus.service
++from locale import bind_textdomain_codeset
+ from blueman.Functions import get_icon, dprint
+ 
+ import gi
+@@ -68,6 +69,7 @@ class BluezAgent(_GObjectAgent, Agent, GObject.GObject):
+         builder = Gtk.Builder()
+         builder.add_from_file(UI_PATH + "/applet-passkey.ui")
+         builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         dialog = builder.get_object("dialog")
+ 
+         dialog.props.icon_name = "blueman"
 diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index f6acb1f..5545112 100644
+index 1f3ad04..a498f98 100644
 --- a/blueman/plugins/applet/NetUsage.py
 +++ b/blueman/plugins/applet/NetUsage.py
-@@ -17,7 +17,7 @@ import dbus
+@@ -24,7 +24,7 @@ import dbus
  import time
  import datetime
  import gettext
@@ -169,7 +213,7 @@ index f6acb1f..5545112 100644
  
  class MonitorBase(GObject.GObject):
      __gsignals__ = {
-@@ -134,6 +134,7 @@ class Dialog:
+@@ -135,6 +135,7 @@ class Dialog:
          builder = Gtk.Builder()
          builder.add_from_file(UI_PATH + "/net-usage.ui")
          builder.set_translation_domain("blueman")
@@ -178,35 +222,39 @@ index f6acb1f..5545112 100644
          self.dialog = builder.get_object("dialog")
          self.dialog.connect("response", self.on_response)
 diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
-index 278121e..e688e68 100644
+index 59e1da3..f36691a 100644
 --- a/blueman/plugins/services/Network.py
 +++ b/blueman/plugins/services/Network.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
+@@ -18,6 +18,7 @@ from blueman.main.Mechanism import Mechanism
+ from blueman.main.AppletService import AppletService
+ from blueman.gui.Dialogs import NetworkErrorDialog
+ from random import randint
 +from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.Functions import have, dprint, mask_ip4_address
- from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask
-@@ -19,7 +20,7 @@ class Network(ServicePlugin):
+ 
+ 
+ class Network(ServicePlugin):
+@@ -27,6 +28,7 @@ class Network(ServicePlugin):
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
--        self.Builder.add_from_file(UI_PATH + "/services-network.ui")
-+        bind_textdomain_codeset("blueman", "UTF-8")        self.Builder.add_from_file(UI_PATH + "/services-network.ui")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         self.Builder.add_from_file(UI_PATH + "/services-network.ui")
          self.widget = self.Builder.get_object("network")
  
-         self.ignored_keys = []
 diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
-index d14d0eb..c3e71ad 100644
+index 61b9db1..4474e93 100644
 --- a/blueman/plugins/services/Transfer.py
 +++ b/blueman/plugins/services/Transfer.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
+@@ -3,6 +3,8 @@ from __future__ import division
+ from __future__ import absolute_import
+ from __future__ import unicode_literals
  
-@@ -14,6 +15,7 @@ class Transfer(ServicePlugin):
++from locale import bind_textdomain_codeset
++
+ import gi
+ gi.require_version("Gtk", "3.0")
+ from gi.repository import Gtk
+@@ -21,6 +23,7 @@ class Transfer(ServicePlugin):
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -215,5 +263,5 @@ index d14d0eb..c3e71ad 100644
          self.widget = self.Builder.get_object("transfer")
  
 -- 
-2.3.1
+2.5.0
 
diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml
index 5b59d4522b6d..555ea971ea87 100644
--- a/net-wireless/blueman/metadata.xml
+++ b/net-wireless/blueman/metadata.xml
@@ -4,7 +4,12 @@
 	<maintainer>
 		<email>dev-zero@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<use>
+		<flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options</flag>
 		<flag name="gconf">Enable the GConf configuration backend</flag>
 		<flag name="network">Add functionality to setup (host) PAN connections using either <pkg>net-dns/dnsmasq</pkg> or <pkg>net-misc/dhcp</pkg></flag>
 		<flag name="sendto">Install the sendto-plugin for <pkg>gnome-base/nautilus</pkg></flag>