Bump to 2.28.6, fixes lots of bugs. Fix deps to only depend on obexd, fixes bug 285043 -- bug will be opened for dropped keywords

(Portage version: 2.1.7.16/cvs/Linux i686)

3 files changed, 14 insertions, 39 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 482366826063..786e3447b9bb 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.67 2009/11/21 15:13:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.68 2009/12/27 02:57:33 nirbheek Exp $
+
+*gnome-bluetooth-2.28.6 (27 Dec 2009)
+
+  27 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gnome-bluetooth-2.28.1.ebuild,
+  -files/gnome-bluetooth-2.28.1-fix-smp-build.patch,
+  +gnome-bluetooth-2.28.6.ebuild:
+  Bump to 2.28.6, fixes lots of bugs. Fix deps to only depend on obexd,
+  fixes bug 285043 -- bug will be opened for dropped keywords
 
   21 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-bluetooth-0.9.1.ebuild, gnome-bluetooth-0.11.0.ebuild,
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.28.1-fix-smp-build.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.28.1-fix-smp-build.patch
deleted file mode 100644
index 02990bebe380..000000000000
--- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.28.1-fix-smp-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Parallel build issue http://bugs.gentoo.org/show_bug.cgi?id=287043
-
----
-From 0622ea93f4e42d1599f2467e6bef5dca49cd99fd Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 29 Sep 2009 10:36:58 +0000
-Subject: Fix SMP build
-
----
-diff --git a/wizard/Makefile.am b/wizard/Makefile.am
-index fc92c5e..074f55f 100644
---- a/wizard/Makefile.am
-+++ b/wizard/Makefile.am
-@@ -9,7 +9,7 @@ bin_PROGRAMS = bluetooth-wizard
- 
- bluetooth_wizard_SOURCES = main.c
- 
--bluetooth_wizard_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la $(top_builddir)/wizard/libwizard.la $(WIZARD_LIBS)
-+bluetooth_wizard_LDADD = $(top_builddir)/lib/libgnome-bluetooth.la $(top_builddir)/lib/libcommon.la libwizard.la $(WIZARD_LIBS)
- 
- AM_CFLAGS = $(WIZARD_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
- 
---
-cgit v0.8.2
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild
index 44f8d3c3f1b8..771306f6c8c7 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.1.ebuild,v 1.8 2009/11/21 15:13:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.28.6.ebuild,v 1.1 2009/12/27 02:57:33 nirbheek Exp $
 
 EAPI="2"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="2"
 IUSE="doc"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND=">=dev-libs/glib-2.16
 	>=x11-libs/gtk+-2.15
@@ -21,9 +21,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16
 	dev-libs/libunique"
 RDEPEND="${COMMON_DEPEND}
 	>=net-wireless/bluez-4.34
-	|| (
-		app-mobilephone/obexd
-		>=app-mobilephone/obex-data-server-0.4 )"
+	app-mobilephone/obexd"
 DEPEND="${COMMON_DEPEND}
 	!!net-wireless/bluez-gnome
 	app-text/gnome-doc-utils
@@ -42,11 +40,3 @@ G2CONF="${G2CONF}
 --disable-desktop-update
 --disable-icon-update
 --disable-introspection"
-
-src_prepare() {
-	# Patch is from upstream 2.28 branch, bug 287043
-	epatch "${FILESDIR}/${P}-fix-smp-build.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}