Include more upstream patches adding PIN quirk for Magic Trackpad, set REQUIRED_USE properly to prevent people from trying to run tests with USE 'doc' as upstream doesn't support it (bug #356075 by Ago and upstream bug #573392), drop .la files.

(Portage version: 2.1.10.28/cvs/Linux x86_64)

5 files changed, 190 insertions, 1 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 1ae20f5cab41..29fb09672690 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.99 2011/08/19 15:19:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.100 2011/10/17 20:14:48 pacho Exp $
+
+*gnome-bluetooth-2.32.0-r1 (17 Oct 2011)
+
+  17 Oct 2011; Pacho Ramos <pacho@gentoo.org>
+  +gnome-bluetooth-2.32.0-r1.ebuild,
+  +files/gnome-bluetooth-2.32.0-fix-typo.patch,
+  +files/gnome-bluetooth-2.32.0-pin-quirk.patch,
+  +files/gnome-bluetooth-2.32.0-update-dtd.patch:
+  Include more upstream patches adding PIN quirk for Magic Trackpad, set
+  REQUIRED_USE properly to prevent people from trying to run tests with USE
+  'doc' as upstream doesn't support it (bug #356075 by Ago and upstream bug
+  #573392), drop .la files.
 
 *gnome-bluetooth-3.0.1 (19 Aug 2011)
 
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch
new file mode 100644
index 000000000000..123e3fc08c93
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch
@@ -0,0 +1,22 @@
+From 76109d033db729252f4d47314ab69b0bf2d63711 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Mar 2011 14:23:26 +0000
+Subject: wizard: Fix typo in PIN quirks
+
+Thanks to Daniele Forsi
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index 3b4479e..e485d03 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -38,7 +38,7 @@
+ <!DOCTYPE devices [
+ 	<!ELEMENT devices (device)+>
+ 	<!ELEMENT device EMPTY>
+-	<!ATTLIST device type (any|mouse|table|keyboard|headset|headphones|audio|printer|network) "any">
++	<!ATTLIST device type (any|mouse|tablet|keyboard|headset|headphones|audio|printer|network) "any">
+ 	<!ATTLIST device oui CDATA #IMPLIED>
+ 	<!ATTLIST device name CDATA #IMPLIED>
+ 	<!ATTLIST device pin CDATA #REQUIRED>
+--
+cgit v0.9.0.2
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch
new file mode 100644
index 000000000000..0602c95a10b3
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch
@@ -0,0 +1,23 @@
+From f03a29b558a834cb26e9abbdc0cb94a14c57cb8f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Mar 2011 13:03:01 +0000
+Subject: wizard: Add PIN quirk for Magic Trackpad
+
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index 8a73d65..b3e9f8d 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -61,6 +61,10 @@
+ 	<device oui="00:0A:95:" type="mouse" pin="0000"/>
+ 	<device oui="00:14:51:" type="mouse" pin="0000"/>
+ 
++	<!-- Apple Magic Trackpad
++	     Note: same as above, tablet needs to be paired -->
++	<device oui="D8:A2:5E:" type="tablet" pin="0000"/>
++
+ 	<!-- Wiimote -->
+ 	<device oui="00:19:1D:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+ 	<device oui="00:1F:C5:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+--
+cgit v0.9.0.2
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch
new file mode 100644
index 000000000000..85f34cf35b72
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch
@@ -0,0 +1,21 @@
+From 479d1535579184f437fe3cf73f24c4e17d933ecc Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Mar 2011 14:16:00 +0000
+Subject: wizard: Update DTD for latest addition
+
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index b3e9f8d..3b4479e 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -38,7 +38,7 @@
+ <!DOCTYPE devices [
+ 	<!ELEMENT devices (device)+>
+ 	<!ELEMENT device EMPTY>
+-	<!ATTLIST device type (any|mouse|keyboard|headset|headphones|audio|printer|network) "any">
++	<!ATTLIST device type (any|mouse|table|keyboard|headset|headphones|audio|printer|network) "any">
+ 	<!ATTLIST device oui CDATA #IMPLIED>
+ 	<!ATTLIST device name CDATA #IMPLIED>
+ 	<!ATTLIST device pin CDATA #REQUIRED>
+--
+cgit v0.9.0.2
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..bf51ce5b22e0
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 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.32.0-r1.ebuild,v 1.1 2011/10/17 20:14:48 pacho Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 multilib autotools
+
+DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
+HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc +introspection nautilus test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.26.1-r1:2
+	>=x11-libs/gtk+-2.19.1:2
+	>=x11-libs/libnotify-0.4.3
+	>=gnome-base/gconf-2.6:2
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libunique:1
+	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )"
+RDEPEND="${COMMON_DEPEND}
+	>=net-wireless/bluez-4.34
+	app-mobilephone/obexd
+	sys-fs/udev
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+DEPEND="${COMMON_DEPEND}
+	!!net-wireless/bluez-gnome
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	app-text/scrollkeeper
+	dev-libs/libxml2
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-proto/xproto
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
+
+# Tests are not ready to pass with docs enabled, upstream bug #573392
+REQUIRED_USE="test? ( !doc )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		$(use_enable nautilus nautilus-sendto)
+		--disable-moblin
+		--disable-desktop-update
+		--disable-icon-update
+		--disable-schemas-compile"
+	DOCS="AUTHORS README NEWS ChangeLog"
+
+	enewgroup plugdev
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
+	# Fix build with gobject-introspection 0.9, bug #344227
+	epatch "${FILESDIR}"/${P}-introspection-build.patch
+
+	# Fix nautilus-sendto automagic support, upstream bug #639130
+	epatch "${FILESDIR}"/${P}-nsd-automagic.patch
+
+	# Add PIN quirk for Magic Trackpad
+	epatch "${FILESDIR}"/${P}-pin-quirk.patch
+
+	# wizard: Update DTD for latest addition
+	epatch "${FILESDIR}"/${P}-update-dtd.patch
+
+	# wizard: Fix typo in PIN quirks
+	epatch "${FILESDIR}"/${P}-fix-typo.patch
+
+	cp "${WORKDIR}"/introspection.m4 . || die
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	AT_M4DIR="." eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /$(get_libdir)/udev/rules.d
+	doins "${FILESDIR}"/80-rfkill.rules
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgnome-bluetooth.so.7
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-bluetooth.so.7
+
+	elog "Don't forget to add yourself to the plugdev group "
+	elog "if you want to be able to control bluetooth transmitter."
+}