Enable sys-auth/polkit support wrt #340084.

Package-Manager: portage-2.2.0_alpha1/cvs/Linux x86_64

3 files changed, 11 insertions, 10 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index 1c0c8a3b4fd3..45215c1a7c86 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/blueman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.8 2010/06/08 12:53:50 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.9 2010/10/31 22:36:01 ssuominen Exp $
+
+  31 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  blueman-1.21-r1.ebuild:
+  Enable sys-auth/polkit support wrt #340084.
 
   08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> blueman-1.21.ebuild,
   blueman-1.21-r1.ebuild:
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index beea2ca0a64d..39418e4efd9f 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 DIST blueman-1.21.tar.gz 1086099 RMD160 d13479615d11a4848d5629ca541b2f8f995befec SHA1 ec513e1a1c7bc99dd695baf7b934e38e7ea86cd6 SHA256 86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af
-EBUILD blueman-1.21-r1.ebuild 2077 RMD160 4b599cb6ac7c716f98447ea962e8f7453e5a4c0b SHA1 8a1fa1ac0c8e0a0cb2f6266195f5fdc65410f947 SHA256 4c7070725551304911181f75a45908fb7a6b58581d15d7e4efb487c5011ec4be
+EBUILD blueman-1.21-r1.ebuild 2017 RMD160 4020477aff50bd7a67b30a206cfafa2df0011672 SHA1 09c32dc9e967e9bbcf38ac97aceaae35d016ccc2 SHA256 3f7de05af1caf50f269dc2304306cbf00815834add020d73bfa11d14bf8bf942
 EBUILD blueman-1.21.ebuild 2009 RMD160 3bd330ae1502787a7cb9d6f3a70e37ce3023df8f SHA1 ccd46339f03336f73a9c137ddeef374affc09fd7 SHA256 409be9b31475ccc0d77f0499b2832dbcc049d905a0eb9238c6b132625ffc6084
-MISC ChangeLog 1806 RMD160 490dd3de346085b6f25955e7b3c4219887100759 SHA1 12a714293ca22453b1c569614cc69744a8f4d02d SHA256 23725fc6c0e8ca4f279fc6ffd6c1c7e188cc535c7e0034924b2d5a078246cd93
+MISC ChangeLog 1934 RMD160 791935853b2a20e3b47aadff76b937b8ae8c11d8 SHA1 335a6570e01e187f0e805f92564eac4f48e0fa90 SHA256 6f218cf3685a7bf3b54149907dc387b091552dcaaa9283b9a128070b4e98f761
 MISC metadata.xml 389 RMD160 927c639a1d47d4ce89bfa7f141efbcd4630a72e5 SHA1 de4e94bb8c1958a3cee35a79e24641fd49405f95 SHA256 5da178f7b84f7858ca7bee032dcff7c963c46d42800c2929e3e0a4daecd413eb
diff --git a/net-wireless/blueman/blueman-1.21-r1.ebuild b/net-wireless/blueman/blueman-1.21-r1.ebuild
index 5444d801b9e6..679e6a9876a8 100644
--- a/net-wireless/blueman/blueman-1.21-r1.ebuild
+++ b/net-wireless/blueman/blueman-1.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.21-r1.ebuild,v 1.2 2010/06/08 12:53:50 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.21-r1.ebuild,v 1.3 2010/10/31 22:36:01 ssuominen Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnome hal network nls pulseaudio"
+IUSE="gnome hal network nls policykit pulseaudio"
 
 CDEPEND="dev-libs/glib:2
 	>=x11-libs/gtk+-2.12:2
@@ -35,11 +35,9 @@ RDEPEND="${CDEPEND}
 	network? ( || ( net-dns/dnsmasq
 		=net-misc/dhcp-3*
 		>=net-misc/networkmanager-0.8 ) )
+	policykit? ( sys-auth/polkit )
 	pulseaudio? ( media-sound/pulseaudio )"
 
-# TODO:
-# - add policykit-support as soon as policykit-1 is available in the tree
-
 pkg_setup() {
 	python_set_active_version 2
 }
@@ -56,7 +54,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-static \
-		--disable-polkit \
+		$(use_enable policykit polkit) \
 		$(use_enable hal) \
 		$(use_enable nls)
 }
@@ -66,7 +64,6 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README
 
 	rm "${D}"/$(python_get_sitedir)/*.la
-	rm -rf "${D}/usr/share/polkit-1"
 
 	use gnome || rm "${D}/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py"
 	use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}