Convert shebangs to make sure python2.7 is used and set dependency to python-2.7 since it does not work with python-2.6 (bug #421631).

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

4 files changed, 115 insertions, 8 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index aef1ae0e7b31..cf9d38b4a10f 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2012/06/19 06:10:22 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.15 2012/06/20 06:12:44 dev-zero Exp $
+
+*blueman-1.23-r2 (20 Jun 2012)
+
+  20 Jun 2012; Tiziano Müller <dev-zero@gentoo.org> +blueman-1.23-r2.ebuild,
+  blueman-1.23-r1.ebuild:
+  Convert shebangs to make sure python2.7 is used and set dependency to
+  python-2.7 since it does not work with python-2.6 (bug #421631).
 
 *blueman-1.23-r1 (19 Jun 2012)
 
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 530aea0d7380..ad72bdd127aa 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -7,14 +7,15 @@ AUX blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch 9343 RMD160 9a31a
 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
-EBUILD blueman-1.23-r1.ebuild 2371 RMD160 3bd6a6fbe5cc25f9323bbcc46478b1c7e24f5bc1 SHA1 b1cc1850dc6fa8750e9fdd0cd925ce8894e7069e SHA256 46f2b35a650a44dba1327312dcc0e8f9c8b1954b72e83684423c2768f1e55f77
+EBUILD blueman-1.23-r1.ebuild 2375 RMD160 5ae83a5272d21264baa249ccb4a7dde8e8dd7c5f SHA1 e101403b5b5ca4fad9cb917aab08c56252c46e24 SHA256 161a46dbf73b3bb21cb756b21ea2f39f99a9258563692abcaf6da960a60bc3e0
+EBUILD blueman-1.23-r2.ebuild 2469 RMD160 df83a266dbb349a724f744e09c539d668c270ff6 SHA1 009d5f37ee07cb5851113ec5da41967eaf4b301d SHA256 09fd911b22cec761e9b98189598d0ba3a18a6ff43fa17708ccecbfd0a30c1dbb
 EBUILD blueman-1.23.ebuild 2299 RMD160 447fa3bba1c839cc4e3563d933f658bdfb748878 SHA1 c5bad9f5e8f0fcffc7f34815727b0c252508b570 SHA256 0c657a9c249d8dde3f4ff4c36678607e5e12580cd5007a3aba343ab77e0b60cc
-MISC ChangeLog 3044 RMD160 1519294fe432e3d5395a64174b6bfb12a28dff2f SHA1 94868c79c73de6ddc35a77ed50d943465a359dfd SHA256 5c7fd217a6cab807f91dc418ede5b5b5ca23b46fe99bc218da8add21dd2fae93
+MISC ChangeLog 3320 RMD160 a93c2d12963ccd651d7b04898c791c20a3cc6b5b SHA1 ef05c735d82672424e3ffeb2c58f579bbb34802a SHA256 68ebb8c195f51f689e93f3dde35593e4f7d2aac1af3a189bfce5676b03a703de
 MISC metadata.xml 546 RMD160 a34c912242b54be23d9386e3fa532388c8b2c7dd SHA1 c018ca31d0ae013d41b39b5f1b68c5a10fcf3913 SHA256 4008067dce9d94b43ef71f0f39b1d41113ac96a30305fd6b9bfb6970cee99029
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/gF9cACgkQGwVqY66cHjAIqgCfRDI5KMkFgwzh283XVKMcorbm
-epoAnieKGpnuyLyrvI12bkIRiUBETVHR
-=mOif
+iEYEARECAAYFAk/haeEACgkQGwVqY66cHjAETACffC3ae6KkUu9tYdxcqyV+3r4o
+rQ4AmwZHmM3mXKTTlJid28nk0W+26TGP
+=zg7K
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/blueman/blueman-1.23-r1.ebuild b/net-wireless/blueman/blueman-1.23-r1.ebuild
index 2a869272a475..80843743470d 100644
--- a/net-wireless/blueman/blueman-1.23-r1.ebuild
+++ b/net-wireless/blueman/blueman-1.23-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-r1.ebuild,v 1.1 2012/06/19 06:10:22 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild,v 1.2 2012/06/20 06:12:44 dev-zero Exp $
 
 EAPI="4"
 
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.7"
 
 inherit eutils python gnome2-utils
 
diff --git a/net-wireless/blueman/blueman-1.23-r2.ebuild b/net-wireless/blueman/blueman-1.23-r2.ebuild
new file mode 100644
index 000000000000..1064e585cabd
--- /dev/null
+++ b/net-wireless/blueman/blueman-1.23-r2.ebuild
@@ -0,0 +1,99 @@
+# 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-r2.ebuild,v 1.1 2012/06/20 06:12:44 dev-zero Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2:2.7"
+
+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.7
+	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" \
+		"${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable policykit polkit) \
+		$(use_enable sendto) \
+		--disable-hal \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+
+	python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism"
+
+	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
+}