Version bump (bug #386575, thanks to Leho Kraav for the hint for the broken status icon), also fixes bug #337947 by depending on the hicolor-icon-theme package, bug #351647 based on the patch by Vince C. and modified by me and bug #392241 by now using the gconf USE flag instead of gnome.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

6 files changed, 189 insertions, 3 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index d5f63e556861..0bb7bae6e0d0 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-wireless/blueman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.12 2012/05/04 06:41:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.13 2012/06/13 08:31:27 dev-zero Exp $
+
+*blueman-1.23 (13 Jun 2012)
+
+  13 Jun 2012; Tiziano Müller <dev-zero@gentoo.org> +blueman-1.23.ebuild,
+  +files/blueman-1.23-fix-broken-status-icon.patch,
+  +files/blueman-1.23-plugins-conf-file.patch, metadata.xml:
+  Version bump (bug #386575, thanks to Leho Kraav for the hint for the broken
+  status icon), also fixes bug #337947 by depending on the hicolor-icon-theme
+  package, bug #351647 based on the patch by Vince C. and modified by me and bug
+  #392241 by now using the gconf USE flag instead of gnome.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> blueman-1.21-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 22b9c390bbcc..3795dc7b13b1 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX blueman-1.23-fix-broken-status-icon.patch 1174 RMD160 d17b01c21587cd5f9c83dbee7e24f49fe49d450e SHA1 1e343aa5cf0a6f01434660a0f3053b7092ebcebf SHA256 b6fe3d426d90e2d212a005aaa7bae2f800bb69df407aa90058f7b1029ba7c296
+AUX blueman-1.23-plugins-conf-file.patch 988 RMD160 cc08d1ef91eaf9e2a60c41ba23e28e62d248a51d SHA1 f8879e8c74d52e629d6de91d7969b9a7be4e56da SHA256 58132546cf913af396d189503e7e3aee53d6e626486343757169b6f0ec34d913
 DIST blueman-1.21.tar.gz 1086099 RMD160 d13479615d11a4848d5629ca541b2f8f995befec SHA1 ec513e1a1c7bc99dd695baf7b934e38e7ea86cd6 SHA256 86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
+DIST blueman-1.23.tar.gz 1223094 RMD160 8e6d181e9f41b5b0bb99b3299a0d81f6c765e988 SHA1 3a6bb994e399c56d297abc84aae2ddcdfd459858 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011
 EBUILD blueman-1.21-r1.ebuild 2096 RMD160 1e159023c86005c6965d8ad803d6aef535d8c292 SHA1 bae51e7527505ea0abff55dd27f377e9bd88bbbd SHA256 102d7467189e55e8878b7d4f01d7d79a3971122d27b3afc9db309aa51fd3cfaa
-MISC ChangeLog 2295 RMD160 30a067ef409f0652bc1811654d80fbbb944a95a8 SHA1 0ff35f9bcb8fda01289e5907b62c8756fbdfc4a7 SHA256 969dff4d133a017223f1644811068434721069592285075b3e0264a0bfb10678
-MISC metadata.xml 389 RMD160 927c639a1d47d4ce89bfa7f141efbcd4630a72e5 SHA1 de4e94bb8c1958a3cee35a79e24641fd49405f95 SHA256 5da178f7b84f7858ca7bee032dcff7c963c46d42800c2929e3e0a4daecd413eb
+EBUILD blueman-1.23.ebuild 2299 RMD160 447fa3bba1c839cc4e3563d933f658bdfb748878 SHA1 c5bad9f5e8f0fcffc7f34815727b0c252508b570 SHA256 0c657a9c249d8dde3f4ff4c36678607e5e12580cd5007a3aba343ab77e0b60cc
+MISC ChangeLog 2812 RMD160 be1fa80e8d2b14cef6d62446e2db11485827b935 SHA1 3617925315cd13be1eda524c55f96adf043e46bb SHA256 a7d0cdecace3aae3bf63a1f6215d5991c38897251bd120d349a07f0b80992c44
+MISC metadata.xml 546 RMD160 a34c912242b54be23d9386e3fa532388c8b2c7dd SHA1 c018ca31d0ae013d41b39b5f1b68c5a10fcf3913 SHA256 4008067dce9d94b43ef71f0f39b1d41113ac96a30305fd6b9bfb6970cee99029
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/YT+kACgkQGwVqY66cHjBQVwCfeZrSVbEyfBPeCZu+38s71H67
+OpQAnjGcR+nKNQWIq2J0igHkjdTM5tcv
+=d+eS
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/blueman/blueman-1.23.ebuild b/net-wireless/blueman/blueman-1.23.ebuild
new file mode 100644
index 000000000000..64d9bc656787
--- /dev/null
+++ b/net-wireless/blueman/blueman-1.23.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23.ebuild,v 1.1 2012/06/13 08:31:27 dev-zero Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+
+inherit eutils python gnome2-utils
+
+DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks."
+HOMEPAGE="http://blueman-project.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gconf sendto network nls policykit pulseaudio"
+
+CDEPEND="dev-libs/glib:2
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/startup-notification
+	dev-python/pygobject:2
+	>=net-wireless/bluez-4.21"
+DEPEND="${CDEPEND}
+	nls? ( dev-util/intltool sys-devel/gettext )
+	virtual/pkgconfig
+	>=dev-python/pyrex-0.9.8"
+RDEPEND="${CDEPEND}
+	>=app-mobilephone/obex-data-server-0.4.4
+	sys-apps/dbus
+	dev-python/pygtk
+	dev-python/notify-python
+	dev-python/dbus-python
+	x11-themes/hicolor-icon-theme
+	gconf? ( dev-python/gconf-python )
+	sendto? ( gnome-base/nautilus )
+	network? ( || ( net-dns/dnsmasq
+		=net-misc/dhcp-3*
+		>=net-misc/networkmanager-0.8 ) )
+	policykit? ( sys-auth/polkit )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# disable pyc compiling
+	ln -sf $(type -P true) py-compile
+
+	sed -i \
+		-e '/^Encoding/d' \
+		data/blueman-manager.desktop.in || die "sed failed"
+
+	epatch \
+		"${FILESDIR}/${P}-plugins-conf-file.patch" \
+		"${FILESDIR}/${P}-fix-broken-status-icon.patch"
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable policykit polkit) \
+		$(use_enable sendto) \
+		--disable-hal \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	rm "${D}"/$(python_get_sitedir)/*.la
+	use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
+
+	use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
+	use policykit || rm -rf "${D}"/usr/share/polkit-1
+	use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
+
+	python_need_rebuild
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+	gnome2_icon_cache_update
+}
diff --git a/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch b/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch
new file mode 100644
index 000000000000..58931eba3982
--- /dev/null
+++ b/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch
@@ -0,0 +1,34 @@
+From 4588e22cc486cf297517168f52f0274133577827 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Wed, 13 Jun 2012 09:52:40 +0200
+Subject: [PATCH] fix broken status icon
+
+---
+ blueman/plugins/applet/StatusIcon.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/blueman/plugins/applet/StatusIcon.py b/blueman/plugins/applet/StatusIcon.py
+index fb02593..ed352ea 100644
+--- a/blueman/plugins/applet/StatusIcon.py
++++ b/blueman/plugins/applet/StatusIcon.py
+@@ -68,7 +68,7 @@ class StatusIcon(AppletPlugin, gtk.StatusIcon):
+ 		entry.connect("changed", self.on_entry_changed, ic, image)
+ 		
+ 	__options__ = {"icon": {"type": str,
+-							"default": "blueman-tray",
++							"default": "blueman",
+ 							"name": _("Icon Name"),
+ 							"desc": _("Custom icon to use for the notification area"),
+ 							"decorator": widget_decorator
+@@ -166,7 +166,7 @@ class StatusIcon(AppletPlugin, gtk.StatusIcon):
+ 		self.QueryVisibility()
+ 		
+ 	def on_status_icon_resized(self):
+-		self.icon = "blueman-tray"
++		self.icon = "blueman"
+ 		
+ 		#p = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 22, 22)
+ 		#p.fill(0)
+-- 
+1.7.8.6
+
diff --git a/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch b/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch
new file mode 100644
index 000000000000..80cdad0c9a07
--- /dev/null
+++ b/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch
@@ -0,0 +1,30 @@
+diff --git a/blueman/plugins/config/File.py b/blueman/plugins/config/File.py
+index c5414c5..9a9e156 100644
+--- a/blueman/plugins/config/File.py
++++ b/blueman/plugins/config/File.py
+@@ -37,7 +37,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):
+ 	__id__ = 0
+@@ -89,9 +94,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/metadata.xml b/net-wireless/blueman/metadata.xml
index 904025ad57b6..f263c5a895bf 100644
--- a/net-wireless/blueman/metadata.xml
+++ b/net-wireless/blueman/metadata.xml
@@ -6,6 +6,8 @@
 		<email>dev-zero@gentoo.org</email>
 	</maintainer>
 	<use>
+		<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>
 	</use>
 </pkgmetadata>