add patch to fix detection with hal-0.5.11, bug #231678.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64

4 files changed, 123 insertions, 2 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index 2e83560fc8e1..45a399cac41e 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/gnome-pilot
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.46 2008/08/01 19:16:04 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.47 2008/08/06 22:28:25 eva Exp $
+
+*gnome-pilot-2.0.16-r1 (06 Aug 2008)
+
+  06 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-pilot-2.0.16-hal-0.5.11.patch, +gnome-pilot-2.0.16-r1.ebuild:
+  add patch to fix detection with hal-0.5.11, bug #231678.
 
   01 Aug 2008; nixnut <nixnut@gentoo.org> gnome-pilot-2.0.16.ebuild:
   Stable on ppc wrt bug 230067
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index 271a67ee20b1..183923d7b21c 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-pilot-2.0.15-as-needed.patch 615 RMD160 fbe474f52251eba860153a17e94db2d39c78f0f0 SHA1 f8047494624457716886dd2463a8a9a6810dae30 SHA256 2772c7d38cffa91473612671b2f859b2c922c2952690e06ba3cf6df2cceb9dd3
+AUX gnome-pilot-2.0.16-hal-0.5.11.patch 1253 RMD160 2bf5f22787d3abec7db8dccce2cf4b953bcd8fb2 SHA1 5fdefcb86f24b27159f1a08f81cda1885e395b60 SHA256 8edab795c9bc9536f66d4fc69026ba8429d92cbee285913ec51ed489994b15ec
 DIST gnome-pilot-2.0.15.tar.bz2 804209 RMD160 6e066d8bf14352f654cac72c566aef5107ad4e35 SHA1 417a190bd3eeac2db6c86c03a2aed95c3c140137 SHA256 38e6f5522a4a56824cbf6765e4ea368068f82ecf74cf8b2b260420876c56c6ec
 DIST gnome-pilot-2.0.16.tar.bz2 829677 RMD160 13c0fec7ab9ed987e5c80d8ceaf68e0eea47ea42 SHA1 2a80852b09f41b55df16c7f1130e6d437bfe4dee SHA256 3ae8da427269a122e72aca025b01fc5f5c5a402efadd0e98e107d8a9453f6a56
 EBUILD gnome-pilot-2.0.15.ebuild 1163 RMD160 58f95116a954c533171155a325bcf00d502612ef SHA1 98da574eb53e9ff34739d6de3cb63815f34a8ced SHA256 8a8662afcb29581760331e15dd78721ed42222d3fc0fd26c8032ec441a60803c
+EBUILD gnome-pilot-2.0.16-r1.ebuild 1563 RMD160 4f1015ec9e1ebe6f7128279cb1ad4cd70c8f08af SHA1 9fe5be8e256a97d979c328281971d08cfd2df3b8 SHA256 81ec4ca56237ae8a5c529e461fe548fac37e6c56f1c3a5089e13d3b13351b471
 EBUILD gnome-pilot-2.0.16.ebuild 1468 RMD160 3c25e7fa45e724bc7f69bddcf13ea0c25e897301 SHA1 b4d8bd347353581415d19c94e6b7d8aea0d56f68 SHA256 1ffb0e3bab777e005ebed2e2de9a1a13bdb01050799bb9b815ad284e1da5949c
-MISC ChangeLog 11847 RMD160 f90cd2af32d7b1d00191a6982b2111ab3b919a95 SHA1 6dbf5ba4de55cb9c80a7c2b6a6908a3ca1fef5cb SHA256 e41ebfbc3a3a5380a156e51fb878069666e76d4cbb54e084bd61842d90a2502f
+MISC ChangeLog 12073 RMD160 a3679e7957e855a35a6ad82f0ce072ad7c305bf1 SHA1 74f00fc414e27168a963e30b8484e3bd3e2dfe39 SHA256 a954805c9c364c2e43f6a2bc49825658e254b51159fc6b8590465c3a772a589a
 MISC metadata.xml 175 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 SHA1 5f39f2aee5dc458e1f1184425ff00a600cfbeb93 SHA256 ad69c13297c0e440519a25f99fdcefd579e75f58d652bb174055ae0c827b8543
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiaJZMACgkQ1fmVwcYIWAZFjQCg54kZDKwk/4OxlQOw3+2cVITE
+KXwAn3Pzzjr6uacwxWxLDfyF+9JP701j
+=hziM
+-----END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.16-hal-0.5.11.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.16-hal-0.5.11.patch
new file mode 100644
index 000000000000..df0042899780
--- /dev/null
+++ b/app-pda/gnome-pilot/files/gnome-pilot-2.0.16-hal-0.5.11.patch
@@ -0,0 +1,38 @@
+--- gpilotd/gpilotd.c-old	2008-07-13 21:52:04.000000000 +1000
++++ gpilotd/gpilotd.c	2008-07-13 21:53:30.000000000 +1000
+@@ -1079,7 +1079,7 @@
+ hal_device_added (LibHalContext *ctx, const char *udi)
+ {
+ 	gboolean visor_net = FALSE;
+-	char *bus, *match_str;
++	char *bus, *platform, *match_str;
+ 	int vendor_id, product_id, i;
+ 	GPilotDevice *device;
+ 	DBusError error;
+@@ -1090,15 +1090,23 @@
+ 
+ 	load_devices_xml ();
+ 
+-	/* HAL match rule: we look for info.bus == 'usb_device'
++	/* HAL match rule: we look for pda.platform == 'palm'
++	 * (or the legacy info.bus == 'usb_device')
+ 	 * and then try to match the usb_device.product_id and usb_device.vendor_id
+ 	 * against the list in devices.xml.
+ 	 */
+-	if (!(bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)))
++	if (platform = libhal_device_get_property_string (hal_ctx, udi, "pda.platform", NULL)) {
++	    if (strcmp (platform, "palm") != 0) {
++		libhal_free_string (platform);
+ 		return;
+-	if (strcmp (bus, "usb_device") != 0) {
++	    }
++	} else if (bus = libhal_device_get_property_string (hal_ctx, udi, "info.bus", NULL)) {
++	    if (strcmp (bus, "usb_device") != 0) {
+ 		libhal_free_string (bus);
+ 		return;
++	    }
++	} else {
++	    return;
+ 	}
+ 
+ 	dbus_error_init (&error);
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..995805169307
--- /dev/null
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.16-r1.ebuild,v 1.1 2008/08/06 22:28:25 eva Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="Gnome Palm Pilot and Palm OS Device Syncing Library"
+HOMEPAGE="http://live.gnome.org/GnomePilot"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="hal"
+
+RDEPEND=">=gnome-base/libgnome-2.0.0
+	>=gnome-base/libgnomeui-2.0.0
+	>=gnome-base/libglade-2.0.0
+	>=gnome-base/orbit-2.6.0
+	>=gnome-base/libbonobo-2.0.0
+	>=gnome-base/gnome-panel-2.0
+	>=gnome-base/gconf-2.0
+	dev-libs/libxml2
+	>=app-pda/pilot-link-0.11.7
+	hal? (
+		dev-libs/dbus-glib
+		>=sys-apps/hal-0.5.4
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/gob-2.0.5
+	>=dev-lang/perl-5.6.0
+	dev-util/intltool"
+
+DOCS="AUTHORS COPYING* ChangeLog README NEWS"
+SCROLLKEEPER_UPDATE="0"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-usb
+		--enable-network
+		--enable-pilotlinktest
+		$(use_with hal)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	echo "libgpilotdCM/gnome-pilot-conduit-management.c" >> po/POTFILES.in
+
+	# Fix --as-needed
+	epatch "${FILESDIR}/${PN}-2.0.15-as-needed.patch"
+
+	# Fix use with hal-0.5.11
+	epatch "${FILESDIR}/${P}-hal-0.5.11.patch"
+
+	eautoreconf
+	intltoolize --force || die
+}
+
+pkg_postinst() {
+	if ! built_with_use app-pda/pilot-link bluetooth; then
+		elog "if you want bluetooth support, please rebuild app-pda/pilot-link"
+		elog "echo 'app-pda/pilot-link bluetooth >> /etc/portage/package.use"
+	fi
+}