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

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 17 insertions, 43 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/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 60616318e017..ac3c02deca32 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,13 +1,12 @@
-AUX gnome-bluetooth-2.28.1-fix-smp-build.patch 870 RMD160 63f78c0fdd7174a4a5c1e2bd6d69a22e0aed556b SHA1 d563591625f49db712cb606414261b07b6bef7f3 SHA256 afe7bff781d488d32abbb2facf998543549bb72585084c3990213287dcc68eb2
 DIST gnome-bluetooth-0.11.0.tar.bz2 558059 RMD160 123e64e28ddfbed3e8bda4fab7b9cdab5e5d8549 SHA1 b781207c3953cebf1edc2255c697bb4ad43c8405 SHA256 ae3c75465269609d363105ab7237b11ec41ea39737da862e47fcbff6f1b036fa
 DIST gnome-bluetooth-0.12.0.tar.bz2 549901 RMD160 7d2ac5e371093ad2664c831b9cd230d66cce797d SHA1 8e46f51a7fc92469e24183c1e042a642cfe32de3 SHA256 f9b514189367bdaa91592eb4825259d90dcdaee0aa0a7c9d43252fad3506473a
 DIST gnome-bluetooth-0.9.1.tar.bz2 559765 RMD160 173352716dc84740e41cbafae9fd4db8edef5fab SHA1 c67ae127760cc24e0d2be75e0b518da5565e91c6 SHA256 de8cbc2baf8d145f6e389fe4a101d0b8fc0f66840905204283aec070859a043c
-DIST gnome-bluetooth-2.28.1.tar.bz2 895561 RMD160 a78ff51f34759e65a37f828aa1c598fab6167c81 SHA1 d97efc4e2b2d0ae3a322a4796815014ce9d41bfa SHA256 17516d4004984f43a26c8fcb763d045b045a2d02ebf843536db3af74ff90c569
 DIST gnome-bluetooth-2.28.3.tar.bz2 907126 RMD160 e625ab145cdc34ad8b432e3b07fea801fa0123f0 SHA1 514c0e5331b0603e7b32badca3d54cf90b676dbf SHA256 7a33b673e85dcae11e2e14ed23309759133efb2c426ab9c89dd1658ba7131a78
+DIST gnome-bluetooth-2.28.6.tar.bz2 911443 RMD160 5b435837229c940a2c6a30ff937c05f1f950e1bb SHA1 181f2fe69430e722506f5e6a06bf66a1095a9e72 SHA256 0abfcf93f637c58dc83c5590823452189aecc6d48450f6c98122affc6eb8906b
 EBUILD gnome-bluetooth-0.11.0.ebuild 1521 RMD160 8e3ee8d69175599d4ca3ad842145b3a6458baee9 SHA1 5a9991924161630472deba89c6d09ca1da191b0d SHA256 eddbc9cd81ae7bb4bb3e7ea1ae70bb3da9ff99dcdcb56d797e1daf88921d2984
 EBUILD gnome-bluetooth-0.12.0.ebuild 1001 RMD160 78d84de63503004a4d324a36db5a3e7f63fd450c SHA1 fce670e6c6e8111be2b05afa9dd7b7c3ce283481 SHA256 2266f44c35582c98a9e0a8ab67d881c45e23d7b2bbd6a56bf42faa496c06fa30
 EBUILD gnome-bluetooth-0.9.1.ebuild 1580 RMD160 b26ec9195dd4e21d79409528dd700c269ff09d77 SHA1 e73dc3337445fcfb14e468199eeb75868325e60e SHA256 08b7255a1922c69fd60bb11d1054903202f0109646d64539740413de0c41fb04
-EBUILD gnome-bluetooth-2.28.1.ebuild 1367 RMD160 474923155dd9cca65286c5edc3a6c1b0056cf6ac SHA1 a09f27b2226725c3e4515b6e97162afdd3ed9a77 SHA256 f0975a7c0b232f1ac37fd10f0de64ad7b8e19770055cc69e59563cb903e0898f
 EBUILD gnome-bluetooth-2.28.3.ebuild 1153 RMD160 195b22a46f15b308908e806c3279738073f9f781 SHA1 839b4ff46f0271c3d2d0bd2c04fabc632fb1b9de SHA256 612f4ca35c58ecc0ba61ae5dc0bfd44adc81ba1454f4e858baf2072eab16c0bb
-MISC ChangeLog 11760 RMD160 7eab3be55d1b85150c5acb0e8b0a28a888df2d99 SHA1 9833167fa2f28cd72a37caf5ad1a282e71769c2e SHA256 a19899062322c8b4bd7a136dc239468465df2ce99f9b893682696d1b87a72c18
+EBUILD gnome-bluetooth-2.28.6.ebuild 1093 RMD160 a2168d29e1a53bcdf86e1de6ba3a6a95bd9275d1 SHA1 7c2571f8926a1180f8e2797176e730fcc697c7f3 SHA256 c970cfa61bfb49cacbc4482c093afca47e86e0d322abe46bb370b40d0b391e83
+MISC ChangeLog 12110 RMD160 9f0c93510821f73c66d4caf2d3f815e43fa60bae SHA1 26e7c2d75bfd8cd3001a1a62e12c559a2be9e99f SHA256 4fd9caf73d11e7387647aacec9f4e963dc1dacdd990183ee28727fca65041181
 MISC metadata.xml 195 RMD160 e6211b251685833c4a0eed62d735e0f4ea7d870a SHA1 d635b8b23bd26fcb7ec9fe2cb015c7618fd034ad SHA256 81b6400e7c415f0000de8250b5ddefa56d81f5e374d834a45505795b55f4e205
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
-}