Version bump with schema install fix to the live ebuild.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 328 insertions, 3 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index b617dd0963ee..0f7cc46863c9 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2015/08/08 15:11:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.37 2015/08/08 15:35:02 mgorny Exp $
+
+*blueman-2.0 (08 Aug 2015)
+
+  08 Aug 2015; Michał Górny <mgorny@gentoo.org> +blueman-2.0.ebuild,
+  +files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch,
+  blueman-9999.ebuild:
+  Version bump with schema install fix to the live ebuild.
 
   08 Aug 2015; Michał Górny <mgorny@gentoo.org> blueman-9999.ebuild:
   Fix USE=appindicator and deps for USE=pulseaudio.
diff --git a/net-wireless/blueman/blueman-2.0.ebuild b/net-wireless/blueman/blueman-2.0.ebuild
new file mode 100644
index 000000000000..386a10e8eebe
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.0.ebuild
@@ -0,0 +1,96 @@
+# 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-2.0.ebuild,v 1.1 2015/08/08 15:35:02 mgorny 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="https://github.com/blueman-project/blueman"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="appindicator network nls policykit pulseaudio thunar"
+
+COMMON_DEPEND="
+	dev-python/pygobject:3
+	>=net-wireless/bluez-4.61:=
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	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-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[bluetooth] )
+	thunar? ( xfce-base/thunar )
+	!net-wireless/gnome-bluetooth
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-runtime-deps-check \
+		--disable-static \
+		$(use_enable policykit polkit) \
+		$(use_enable nls) \
+		$(use_enable thunar thunar-sendto)
+}
+
+src_install() {
+	default
+
+	python_fix_shebang "${D}"
+	rm "${D}"/$(python_get_sitedir)/*.la || die
+
+	use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
+	use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index f0f2621f1a80..dbcf31398bc4 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.10 2015/08/08 15:11:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.11 2015/08/08 15:35:02 mgorny Exp $
 
 EAPI="5"
 
@@ -57,7 +57,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch"
-	eautoreconf
+	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
@@ -81,12 +81,15 @@ src_install() {
 
 pkg_preinst() {
 	gnome2_icon_savelist
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
 	gnome2_icon_cache_update
+	gnome2_schemas_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	gnome2_schemas_update
 }
diff --git a/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
new file mode 100644
index 000000000000..02747d178d36
--- /dev/null
+++ b/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
@@ -0,0 +1,219 @@
+From aebfe594584e7c5cca30062d643618fc2ab8144b 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
+
+---
+ 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(-)
+
+diff --git a/apps/blueman-adapters b/apps/blueman-adapters
+index a961480..3759ba8 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__), '..'))
+@@ -36,6 +37,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 7d96ec7..c322256 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 666f16c..af23015 100755
+--- a/apps/blueman-manager
++++ b/apps/blueman-manager
+@@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop
+ 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:
+ 
+         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 06ad626..a7099ab 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
+@@ -48,6 +49,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 fb1428d..e3e708b 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 b12f77f..cc80492 100644
+--- a/blueman/gui/GsmSettings.py
++++ b/blueman/gui/GsmSettings.py
+@@ -3,6 +3,7 @@ from blueman.Functions import *
+ from blueman.Constants import *
+ 
+ from gi.repository import Gtk
++from locale import bind_textdomain_codeset
+ 
+ 
+ class GsmSettings(Gtk.Dialog):
+@@ -13,6 +14,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 71dd742..3a1f932 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 *
+ 
+@@ -97,7 +98,8 @@ 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.set_title(_("Plugins"))
+         self.props.icon_name = "blueman"
+diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
+index f6acb1f..5545112 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/Network.py b/blueman/plugins/services/Network.py
+index 278121e..e688e68 100644
+--- a/blueman/plugins/services/Network.py
++++ b/blueman/plugins/services/Network.py
+@@ -1,4 +1,5 @@
+ 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
+@@ -19,7 +20,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")
+         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
+--- 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")
+ 
+-- 
+2.3.1
+