Include more upstream patches adding PIN quirk for Magic Trackpad, set REQUIRED_USE...

Package-Manager: portage-2.1.10.28/cvs/Linux x86_64

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 1ae20f5cab41476ec343cfb94f5113496a918ea9..29fb09672690c726969a979ae733936aa685c702 100644 (file)
--- 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/Manifest b/net-wireless/gnome-bluetooth/Manifest
index a8a49d9031868b87c75b7d19e41e746de2c272cc..d4da8abe25856fc3ba401dd517d06902a45661f9 100644 (file)
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -2,30 +2,24 @@
 Hash: SHA1
 
 AUX 80-rfkill.rules 117 RMD160 78e948840a4359344d3bd565300e4432fe43bf91 SHA1 6a6b28aaf852aae9e419963ddbdb92092825f4ee SHA256 81b3a8a3a3639b6d6024043364ad4917b32a85fd7f766e4051211d388e165798
+AUX gnome-bluetooth-2.32.0-fix-typo.patch 823 RMD160 0ab12237faed383f69204b66de05e673ba3adb39 SHA1 90029dd1246d488f4b92456d0787bbb6aeb8e92d SHA256 0cd8c2bc6e3a3eb94ba317f9599c86ecea9db4981e3ae27286004a8027b3c421
 AUX gnome-bluetooth-2.32.0-introspection-build.patch 7550 RMD160 a636566db1be7d38a9ef76b6126af0ab96064ce0 SHA1 91e0b0c8adc4fac6d028b0cf82445a8eea868340 SHA256 65d0326ffc06315d14e1d5790230edcae77b2ecb477c86792fed814639f0ad9f
 AUX gnome-bluetooth-2.32.0-libnotify-0.7.patch 622 RMD160 70605606ac85563e8ff820de86bde0fef59c4778 SHA1 50e35bf84b4d0a848d6cc41a99fb8eda3771ad1b SHA256 42b8388156249bd7c8a18db6d6aef18895ce861f2a79cb937e55eda864245838
 AUX gnome-bluetooth-2.32.0-nsd-automagic.patch 989 RMD160 578b3ccaec471fb711f4cf638f7ca282a0c785b1 SHA1 f071b49c66a883973a67053c198f8111b3d4ed1b SHA256 5db8f82ff311c6181cdf7035ad5351cb117f44efeb25332db997c98dccf3932f
+AUX gnome-bluetooth-2.32.0-pin-quirk.patch 812 RMD160 4e48134e079da0aeb1ecaa9da7b7d12d88792dea SHA1 31cd09b5e4686b932c889f4c3e26d40d1ea9134c SHA256 a1d703840e2c81d621225fd4b68e67627e8c09a8d3fcd857bf68f2c2521e21c0
+AUX gnome-bluetooth-2.32.0-update-dtd.patch 800 RMD160 b21e59f61e6a8c421b778650dd9f1d7a8b7ce010 SHA1 47807a4af9b712955eda11626babc80ff4b2f24d SHA256 6bdbe47e15f89d61702a30ad9e5d1b6f569617e2d683833b698dbfb8ff8b0783
 DIST gnome-bluetooth-2.32.0.tar.bz2 1231205 RMD160 2000381411f0e0b409d6131b390632b9fcfdace0 SHA1 24d2c416df92098d96eeaa992bfaf122ee65328d SHA256 57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973
 DIST gnome-bluetooth-3.0.1.tar.bz2 1334640 RMD160 e90548dd9f88fbb996301ab470e0a0eaeaf279c1 SHA1 3620bdebdfb93ef856ed4762a179cc99428a67e4 SHA256 bce843f7cf690c595678fd554b546bd35175f6e7afa70a1463037a0367b3fd38
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
+EBUILD gnome-bluetooth-2.32.0-r1.ebuild 2926 RMD160 2263c7819e7934f5e3a57943499ef14dcae7ab47 SHA1 79af4a99ed7ec8ba2c7b47a232e1b7dbca00beab SHA256 c34edc147bd0eb69500e92f7e10600d71f0f4045bda221a5426fe1a3c7f77d9b
 EBUILD gnome-bluetooth-2.32.0.ebuild 2814 RMD160 140ed84d3d3c2ee5d157e0603d0233f4cc87c1a7 SHA1 e136dacbb664f1b0af0e965354b3583b33a6ca64 SHA256 3af1908a2583227a1680ab4eef731a81c6ffb96466da64bdedda07b0c684d1c7
 EBUILD gnome-bluetooth-3.0.1.ebuild 2583 RMD160 1777612825eb529a34501686f3eb5a7baace7bb4 SHA1 8e0c83f2b4d38dca0d16e0787422dad922bac79b SHA256 21178e9442c85480e1457574e65545a470f7238e838622587cb2b707ee7763ce
-MISC ChangeLog 17034 RMD160 e63ff93c335633e29776ca58a9648418aa8956dd SHA1 0b16aab086ce8be6a60f8064bfc9d16f9e74e662 SHA256 2147c7a1c652f270669581df20bec1318c013985d4263ee040a8ca7fa58c4937
+MISC ChangeLog 17558 RMD160 81bb523f62feb5aa0ed1182b5ca2e65981ade1f3 SHA1 6c7811af97b7e805f978b8eca5bf4e656d5a9e5e SHA256 b696d690ff410c0d9abb144bcefd1c57ad3634ea056fe5c9e523a15379186dc5
 MISC metadata.xml 483 RMD160 ee7120d4f3611209f313938c0893977a4e02da43 SHA1 c15d0583f1b71c5be432114cb0de144777bbb91d SHA256 32facf84ef6faf2d4818fa36a090d88bf4db5efdd6d75611125ae9000712d718
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTn72AAoJEO/kOhxWD91kgXwQAK3tTwoA1WVz97dbcFqYBvGM
-mZpG0cRKt1cj3p7HeDy/DR9dCfMTSCysnOpUk9C/hzHPl7IZNamnT3E3vYlsrCCd
-BkSVDOQDpN/IqnzEatuMubg615ewZr7SDR30ytYlAaikbWl5uIadlBASU3LV3qmG
-SnBvqD13pTzuoZJwYT9Z34lXxmeMKjJFou0HUadntEflshY/3X9gkJqt6+mIgnKs
-OViQl4eEB+W2C3gnvRv5mOm+kGlEfmDlRhxNkoRywRf/cUsQ0Vavfznu5uOsDS9z
-cRKsxsKt1rBSDqcQcH9U5l1hc73CYNj2OlXlz1aTNcQ8EXZg/AFTVutFsmYvDC8T
-zeIFvSzcOfZl33rMRyrB6uka2DNoElybr2aaPxIPOi4Mwn4bl1ckUNzkSyFwuL4J
-VG/9EXKluBolSNR5kwgyqN/PlRtg89HmTAB0rmeuBQpOCLlCxIe3gB+PHOkGyFdL
-2VI2y/FIv2aL6XnfToXB035Dmcgkb3wz/M0t6+wXsHhNd/da09PqJMGswgLx00Lh
-KR94G1iCE+oW96itxlrcEnuZonZHgCtHMKwxEbcwfi9ep6hOekfWwP4VORq2k/Gn
-NVGAMSKgvNwhF4Db1jBsq7bfkvc1CIQU1zPlh9e3cJ79sBJZyjER6b+Tni1OZxLY
-kexL6K80z5GiP4NYh0X+
-=oEnJ
+iEYEARECAAYFAk6cjL4ACgkQCaWpQKGI+9RlbgCePvcpu1iiQOonKYLGTIJJGSHl
+ZaAAn3+oc/TPU9mc0QA7mrU9Mpg4xWu7
+=komI
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..123e3fc
--- /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 (file)
index 0000000..0602c95
--- /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 (file)
index 0000000..85f34cf
--- /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 (file)
index 0000000..bf51ce5
--- /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."
+}