new snapshot

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 351 insertions, 2 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index 0782d7d61e94..9d901080d992 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/blueman
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.28 2014/12/07 19:17:58 maksbotan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.29 2015/01/05 19:50:38 zerochaos Exp $
+
+*blueman-1.98_p20150105 (05 Jan 2015)
+
+  05 Jan 2015;  <zero@gentoo.org> +blueman-1.98_p20150105.ebuild,
+  +files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch,
+  metadata.xml:
+  new snapshot
 
   07 Dec 2014; Maxim Koltsov <maksbotan@gentoo.org>
   blueman-1.23_p20140717-r1.ebuild:
diff --git a/net-wireless/blueman/blueman-1.98_p20150105.ebuild b/net-wireless/blueman/blueman-1.98_p20150105.ebuild
new file mode 100644
index 000000000000..f7d48ffd1d37
--- /dev/null
+++ b/net-wireless/blueman/blueman-1.98_p20150105.ebuild
@@ -0,0 +1,101 @@
+# 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-1.98_p20150105.ebuild,v 1.1 2015/01/05 19:50:38 zerochaos Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+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/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}-project/${PN}.git"
+	KEYWORDS=""
+else
+	#SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+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:3
+	>=net-wireless/bluez-4.61:=
+	${PYTHON_DEPS}"
+DEPEND="${CDEPEND}
+	nls? ( dev-util/intltool sys-devel/gettext )
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-mobilephone/obex-data-server-0.4.4
+	sys-apps/dbus
+	x11-themes/hicolor-icon-theme
+	gconf? ( dev-python/gconf-python[${PYTHON_USEDEP}] )
+	gnome? ( gnome-base/nautilus )
+	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 )
+"
+# 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-plugins-conf-file.patch" \
+		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable policykit polkit) \
+		$(use_enable gnome nautilus-sendto) \
+		$(use_enable nls) \
+		$(use_enable thunar thunar-sendto)
+}
+
+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 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; }
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch
new file mode 100644
index 000000000000..ce341c866cd9
--- /dev/null
+++ b/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch
@@ -0,0 +1,239 @@
+diff --git a/apps/blueman-adapters b/apps/blueman-adapters
+index ed80a4f..9f27b9e 100755
+--- a/apps/blueman-adapters
++++ b/apps/blueman-adapters
+@@ -6,6 +6,7 @@ from gi.repository import Pango
+ import os.path
+ import sys
+ import signal
++from locale import bind_textdomain_codeset
+ 
+ #support running uninstalled
+ _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+@@ -34,6 +35,7 @@ class BluemanAdapters:
+ 
+         builder = Gtk.Builder()
+         builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         builder.add_from_file(UI_PATH + "/adapters.ui")
+         self.dialog = builder.get_object("dialog")
+ 
+diff --git a/apps/blueman-assistant b/apps/blueman-assistant
+index 7e602c8..fab3355 100755
+--- a/apps/blueman-assistant
++++ b/apps/blueman-assistant
+@@ -16,6 +16,7 @@ import random
+ 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:
+ 
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         self.Builder.add_from_file(UI_PATH + "/assistant.ui")
+         self.assistant = self.Builder.get_object("assistant")
+         self.assistant.set_title(_("Bluetooth Assistant"))
+diff --git a/apps/blueman-manager b/apps/blueman-manager
+index b152044..395257b 100755
+--- a/apps/blueman-manager
++++ b/apps/blueman-manager
+@@ -7,6 +7,7 @@ import dbus, dbus.glib
+ 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
+@@ -43,6 +44,7 @@ class Blueman:
+ 
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
+ 
+         self.window = self.Builder.get_object("window")
+diff --git a/apps/blueman-sendto b/apps/blueman-sendto
+index 852f99a..fdbff01 100755
+--- a/apps/blueman-sendto
++++ b/apps/blueman-sendto
+@@ -13,6 +13,7 @@ from optparse import OptionParser
+ import gettext
+ import urllib
+ import time
++from locale import bind_textdomain_codeset
+ 
+ from blueman.Constants import *
+ import gi
+@@ -46,6 +47,7 @@ class Sender(GObject.GObject):
+         GObject.GObject.__init__(self)
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
+         self.window = self.Builder.get_object("window")
+ 
+diff --git a/apps/blueman-services b/apps/blueman-services
+index 25a529b..4b4419c 100755
+--- a/apps/blueman-services
++++ b/apps/blueman-services
+@@ -2,6 +2,7 @@
+ 
+ import os
+ import sys
++from locale import bind_textdomain_codeset
+ #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:
+ 
+         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()
+diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
+index ee07e62..e58277b 100644
+--- a/blueman/gui/GsmSettings.py
++++ b/blueman/gui/GsmSettings.py
+@@ -21,6 +21,7 @@ from blueman.Functions import *
+ from blueman.Constants import *
+ 
+ from gi.repository import Gtk
++from locale import bind_textdomain_codeset
+ 
+ class GsmSettings(Gtk.Dialog):
+ 	def __init__(self, bd_address):
+@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog):
+ 		
+ 		self.Builder = Gtk.Builder()
+ 		self.Builder.set_translation_domain("blueman")
++		bind_textdomain_codeset("blueman", "UTF-8")
+ 		self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui")
+ 		
+ 		vbox = self.Builder.get_object("vbox1")
+diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
+index f994cc9..84d6370 100644
+--- a/blueman/gui/applet/PluginDialog.py
++++ b/blueman/gui/applet/PluginDialog.py
+@@ -23,6 +23,7 @@ from blueman.Functions import *
+ 
+ from blueman.gui.GenericList import GenericList
+ import weakref
++from locale import bind_textdomain_codeset
+ 
+ class SettingsWidget(Gtk.VBox):
+ 	def __init__(self, inst):
+@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog):
+ 		
+ 		self.Builder = Gtk.Builder()
+ 		self.Builder.set_translation_domain("blueman")
++		bind_textdomain_codeset("blueman", "UTF-8")
+ 		self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui")
+ 		
+ 		self.set_title(_("Plugins"))
+diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py
+index 072958d..207659c 100644
+--- a/blueman/main/applet/BluezAgent.py
++++ b/blueman/main/applet/BluezAgent.py
+@@ -7,6 +7,7 @@ from gi.repository import Gtk
+ from gi.repository import GObject
+ from gi.types import GObjectMeta
+ import cgi
++from locale import bind_textdomain_codeset
+ import blueman.bluez as Bluez
+ from blueman.Sdp import *
+ from blueman.Constants import *
+@@ -50,6 +51,7 @@ class CommonAgent(GObject.GObject, Agent):
+                 editable.stop_emission("insert-text")
+ 
+         builder = Gtk.Builder()
++        bind_textdomain_codeset("blueman", "UTF-8")
+         builder.add_from_file(UI_PATH + "/applet-passkey.ui")
+         builder.set_translation_domain("blueman")
+         dialog = builder.get_object("dialog")
+diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
+index 9fd93c7..d6bc492 100644
+--- a/blueman/plugins/applet/NetUsage.py
++++ b/blueman/plugins/applet/NetUsage.py
+@@ -17,7 +17,7 @@ import dbus
+ import time
+ import datetime
+ import gettext
+-
++from locale import bind_textdomain_codeset
+ 
+ class MonitorBase(GObject.GObject):
+     __gsignals__ = {
+@@ -134,6 +134,7 @@ class Dialog:
+         builder = Gtk.Builder()
+         builder.add_from_file(UI_PATH + "/net-usage.ui")
+         builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+ 
+         self.dialog = builder.get_object("dialog")
+         self.dialog.connect("response", self.on_response)
+diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py
+index b44d6b5..4b13e8f 100644
+--- a/blueman/plugins/services/Audio.py
++++ b/blueman/plugins/services/Audio.py
+@@ -19,6 +19,7 @@
+ 
+ from gi.repository import Gtk
+ import dbus
++from locale import bind_textdomain_codeset
+ from blueman.Constants import *
+ from blueman.plugins.ServicePlugin import ServicePlugin
+ 
+@@ -35,6 +36,7 @@ class Audio(ServicePlugin):
+ 		
+ 		self.Builder = Gtk.Builder()
+ 		self.Builder.set_translation_domain("blueman")
++		bind_textdomain_codeset("blueman", "UTF-8")
+ 		self.Builder.add_from_file(UI_PATH +"/services-audio.ui")
+ 		self.widget = self.Builder.get_object("audio")
+ 		
+diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
+index 5fab49a..0dd88d9 100644
+--- a/blueman/plugins/services/Network.py
++++ b/blueman/plugins/services/Network.py
+@@ -18,6 +18,7 @@
+ # 
+ 
+ from gi.repository import Gtk
++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
+@@ -36,6 +37,7 @@ class Network(ServicePlugin):
+ 		
+ 		self.Builder = Gtk.Builder()
+ 		self.Builder.set_translation_domain("blueman")
++		bind_textdomain_codeset("blueman", "UTF-8")
+ 		self.Builder.add_from_file(UI_PATH +"/services-network.ui")
+ 		self.widget = self.Builder.get_object("network")
+ 		
+diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
+index 189d0cc..8fa65d0 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
+ 
+@@ -14,6 +15,7 @@ class Transfer(ServicePlugin):
+ 
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         self.Builder.add_from_file(UI_PATH + "/services-transfer.ui")
+         self.widget = self.Builder.get_object("transfer")
+ 
diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml
index 5a8469d3dc1e..5b59d4522b6d 100644
--- a/net-wireless/blueman/metadata.xml
+++ b/net-wireless/blueman/metadata.xml
@@ -8,5 +8,7 @@
 		<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>
+		<flag name="gnome">Install the sendto-plugin for <pkg>gnome-base/nautilus</pkg></flag>
+		<flag name="thunar">Install the sendto-plugin for <pkg>xfce-base/thunar</pkg></flag>
 	</use>
 </pkgmetadata>