Backported patch which fixes bluetooth dependency automagic

(Portage version: 2.1.9.5/cvs/Linux x86_64)

3 files changed, 53 insertions, 2 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index c7180d79a53f..9aa3cfb8af49 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.48 2010/08/20 10:18:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.49 2010/09/14 22:37:56 dagger Exp $
+
+*nm-applet-0.8.1-r2 (14 Sep 2010)
+
+  14 Sep 2010; Robert Piasek <dagger@gentoo.org> -nm-applet-0.8.1-r1.ebuild,
+  +nm-applet-0.8.1-r2.ebuild,
+  +files/nm-applet-0.8.1-fix-bluetooth-dep.patch:
+  Backported patch which fixes bluetooth dependency automagic
 
   20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> nm-applet-0.8.ebuild:
   Stable on amd64 wrt bug #321593
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch b/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch
new file mode 100644
index 000000000000..ead490fc0c22
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.8.1-fix-bluetooth-dep.patch
@@ -0,0 +1,43 @@
+From e523771e0d68c347763a004a3f9ac100db5cfbb2 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 24 Aug 2010 16:05:01 +0000
+Subject: build: allow explicit enabling/disabling of gnome-bluetooth dep (bgo #627663)
+
+---
+diff --git a/configure.ac b/configure.ac
+index 1ab81f4..b2dd2cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,12 +97,24 @@ fi
+ AC_SUBST(DBUS_SYS_DIR)
+ 
+ dnl Check for gnome-bluetooth
+-PKG_CHECK_MODULES(GNOME_BLUETOOTH,
+-		  gconf-2.0
+-		  gnome-bluetooth-1.0 >= 2.27.6
+-		  libnm-util >= 0.8.1
+-		  libnm-glib >= 0.8.1,
+-		  have_gbt=yes, have_gbt=no)
++AC_ARG_WITH([bluetooth],
++	    AS_HELP_STRING([--with-bluetooth|--without-bluetooth], [Enable Bluetooth support]),
++	    with_bluetooth="$withval",with_bluetooth=yes)
++have_gbt=no
++case "${with_bluetooth}" in
++	no)	AC_MSG_NOTICE(Bluetooth support disabled)
++		;;
++	*)
++		AC_MSG_CHECKING(for gnome-bluetooth)
++		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
++				  gconf-2.0
++				  gnome-bluetooth-1.0 >= 2.27.6
++				  libnm-util >= 0.8.1
++				  libnm-glib >= 0.8.1,
++				  have_gbt=yes, have_gbt=no)
++		;;
++esac
++
+ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+ 
+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.1-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
index b9d8ccba96f0..0f9ddbbdfd01 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.1-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.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/gnome-extra/nm-applet/nm-applet-0.8.1-r1.ebuild,v 1.1 2010/08/18 09:18:52 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild,v 1.1 2010/09/14 22:37:56 dagger Exp $
 
 EAPI="2"
 
@@ -47,6 +47,7 @@ DOCS="AUTHORS ChangeLog NEWS README"
 src_prepare() {
 	# Fix compilation with DGSEAL_ENABLE gentoo bug #330363
 	epatch "${FILESDIR}/${P}-fix-compilation-with-DGSEAL_ENABLE.patch"
+	epatch "${FILESDIR}/${P}-fix-bluetooth-dep.patch"
 }
 
 S="${WORKDIR}/${MY_PN}-${PV}"