Version bump with patch for new gpsd API wrt #424587 by "jannis". USE="static-libs" and prune_libtool_files wrt #399173 by Maurizio Camisaschi.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 172 insertions, 4 deletions

diff --git a/app-misc/geoclue/ChangeLog b/app-misc/geoclue/ChangeLog
index e7985cae86b4..47a842d2218f 100644
--- a/app-misc/geoclue/ChangeLog
+++ b/app-misc/geoclue/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/geoclue
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.12 2012/08/08 19:42:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.13 2012/08/11 17:41:36 ssuominen Exp $
+
+*geoclue-0.12.99 (11 Aug 2012)
+
+  11 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +geoclue-0.12.99.ebuild,
+  +files/geoclue-0.12.99-gpsd.patch, metadata.xml:
+  Version bump with patch for new gpsd API wrt #424587 by "jannis".
+  USE="static-libs" and prune_libtool_files wrt #399173 by Maurizio Camisaschi.
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> geoclue-0.12.0_p20110307.ebuild:
   Marking geoclue-0.12.0_p20110307 ppc for bug 427556
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 82e966b22926..f02b4e541bac 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,6 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX geoclue-0.12.0_p20110307-use-fallback-mac.patch 511 SHA256 21fa236ae8d18e708e19198336d25180902055196987ca15048be707729febe8 SHA512 e2845272cca268c4658c3e836efd7b49bc53e7690125bc48a7d1d9d0b82b46ea88fff427ee73fa2045c74c2dfe21d45497341032363713a6401a735110bcd1e0 WHIRLPOOL 3672f61433b53bfca07496fd679785f4362ab4f57065ec40619c10c1c006a5fd82ac8a114d8d53cc1e903ac59b8a909aadb3598ee716a047d29922fc5f65ee94
 AUX geoclue-0.12.0_p20110307-use-flag.patch 2571 SHA256 30771a233355c31eeae0694e275454875feac47797eb1990714946875323e5b5 SHA512 9558635f1c520f26c30edcd2512934a6f3238c0fabf88e2e5b345aa8521575faad2e734d84e99071b827cc81724fab27299f2b838a48993e3110d2fa6ba82eef WHIRLPOOL bbae6a830b1886d967dbe746e96bec0dce787458500acb2ccc2f1af881fab201c2bdcd53d3a7f7ab96c7ae1a25d363d022804561d9c90f1208101d3d77bf8d21
+AUX geoclue-0.12.99-gpsd.patch 2073 SHA256 0abf0404525bc69da2365562eecb6e828547086de455fb2d9b0ac41a41fbe216 SHA512 9a5280af319cea99567fbbaf8174f11de71f9dbbeb146c4ad42a19df1d84f7573c9cd72560b7185065e5b8507770f77fa3cc06b3e45e0a56fdf3d3e5b717f0bc WHIRLPOOL e8e3072ae9acba711a550cab6d05e73c1d047e039a3707686bfea0a832158a5dc60ebc3f1c8860312afcfdebd9a484dabe45798aa721868b81086bea1fab9ab2
 DIST geoclue-0.12.0_p20110307.tar.bz2 1019929 SHA256 f6980afaaadf47b89b2dee639c322947f8097000f72509d5f8af993de78d7d99 SHA512 0aa4bea17a3bd63fb53515a4791d589efcc7b9cbf6dc7e4d424efc9ab6f920929c324b1bb248563ab9a65f3100f088cb69360c2b2d49847b6172a7acfd630fcb WHIRLPOOL 37522f63ec8633295a32d9e52f8be74a9a2afecc77f3a60685bdca5e42aa75fc39093087a91445171f46a60a376ca184672576fbbb2b3118975e742c42e5c6e4
+DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
 EBUILD geoclue-0.12.0_p20110307.ebuild 1721 SHA256 e9ea86175bb065cbace8512b42945bdf6139ef973441cae4543fba41657be332 SHA512 2f23726f2e2733647c62337aa6ef046accd20b22fa622c87e08f3cacbf648d71588bd97f0e171430c9510aaccd356bb438cea7710aa9c9a02c33f8f67121185c WHIRLPOOL f7ebbdeb6b26dc0b376a2dd718fd19c623e3b80811b61c7609e3aa12fe3bfa98e44660a26461dbbfbc1483cf601cc00e302f1e6ee315200b8fc5b98d30867471
-MISC ChangeLog 1851 SHA256 83018a67a35d9d94c43ea9285770655afa4a3ef5d62b9fc6851a58ee11bf9dca SHA512 d6c8a3b621432ee6f6d45d4e15bd9481da772365417668e8619ee65f83e39aafff54bb8352fdc704834828f4e8d12639f27b4b85b5ddc92f8cda021f6929b179 WHIRLPOOL 766416c299380d952497a1e18c6201d159fc04ee2e41282bed91e11d663a96c4fe6cee79765be7c616b5b7cb258a6d2c5e31e7be05b2bc673aef1a0253fee916
-MISC metadata.xml 819 SHA256 912c71378feb79d7ee7e5708ba69d7b98b0cb1f65e959f4fc328e8c43a27b065 SHA512 e811bc75d5731129ff75a5b4b73705fe4bca8aade430f10da4b8a526515450a5143cc7992c0cefd0cfc36a446ec50a3a5780803fcaaec9c5291a09c1ee67a77b WHIRLPOOL be94fdf6809c732103536b4ef0224330c4165205c0fddb1fb37f5c42b78e0ae50fe72c199c1aaa098c535bd0bfef99710a18aa3d970ddc5150888b2cbd4e0d34
+EBUILD geoclue-0.12.99.ebuild 1947 SHA256 a6053d83ae770f717d95ce9cf0f382f8762abd7ada7fbe4b587c0e71709cbf4d SHA512 f3ac2075e1faa8e47c3b3409bcbe643e205a79c238c544935fd8dba1512f902c42630830b9e5846f463926c885f1c40c8c56118e95aa61bb82d85df80bddfe1e WHIRLPOOL 4557123f8d8247a3c0b114548b30a3beb4bfe95e1dfe1a1f5d0483350f7b3b5d374130c4d9201a633cc33dadd3d99dc3535dabeec9604f93190d31a902acca10
+MISC ChangeLog 2165 SHA256 5c8c386252a1f295713972d006c36303a2be92e597ec0849bafb3dfc4d5b9957 SHA512 d87836cc940e27e0bae04262c06ef5db907933cccbddf2aee791f3a76cb88709e4190f0b49738a8045f060d3879c02b0848f0d253490109c1fda0ef0158ca4dc WHIRLPOOL c4280ee220e30b577fe7750e7af130f798b49a0e7849fe33751b1b85d0309d6a71a3485d67d83cb78a564ab44fcfe5f3159bd9570791e9a2e8158104bcd83d42
+MISC metadata.xml 883 SHA256 33748ea3ab8ddb398625123ad644991b9be19ad897cc759b0ce7dac1a11475cd SHA512 d388afb0cdeafc1cb618dfeb81fa217ea99004d5dba48129d550fc6636a44272ab602f31351fa3e4f907a4d255d524b4f64e4c701aee66610764ae9d36d58cbd WHIRLPOOL 81aa4affad0a1e0cf33eb59593361865ddde90fdc0f04523492911e9f1fdbd7c90cb6a41125e9c62da287fccd572b68963d5fa311fbb6b481f420688dc5b0998
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQJpkxAAoJEEdUh39IaPFNt5IH/1ggXTbo2K1h3vAQVUvMO++U
+HUtacnNkA3f2UpjyVmCvz7hcdW8jltl7iNNG8FHByY/BS0+wyHZDGHMfHZEXcq+o
+nRAEdGKu+ATXzymT+d6lMax6JBGrzu+TNKaIht5IVrjQxcIoqjvpIeWUHj6q1/Iv
+CwropF3BjpqIM8UNPVPAEMr6gFQ6c3n/l7gXebh8KNsToEXz7tTygPCeHg1hl2io
+nXTfWZqVYmqLCDhSAnb8PrQbI9ofqWCl+MI9lxcZk5vBKiDvmKFaNcEQLIyhsEij
+DasqEBV8RUzc7pPq28OcaZdKtkhpnGeT0FfdvrNIj2IbjtcDpVtW3mB2q57xqJ4=
+=Xcs4
+-----END PGP SIGNATURE-----
diff --git a/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch b/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch
new file mode 100644
index 000000000000..51160d6296e0
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch
@@ -0,0 +1,73 @@
+Description: Refactoring to support new libgps API 
+Author: James Page <james.page@ubuntu.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40996
+Forwarded: no
+
+--- providers/gpsd/geoclue-gpsd.c
++++ providers/gpsd/geoclue-gpsd.c
+@@ -40,7 +40,12 @@
+ #include <geoclue/gc-iface-position.h>
+ #include <geoclue/gc-iface-velocity.h>
+ 
++#if GPSD_API_MAJOR_VERSION >= 5
++/* gps_data conflicts with gps_data function */
++typedef struct gps_data_t gps_data_l;
++#else
+ typedef struct gps_data_t gps_data;
++#endif
+ typedef struct gps_fix_t gps_fix;
+ 
+ /* only listing used tags */
+@@ -59,7 +64,11 @@
+ 	char *host;
+ 	char *port;
+ 	
++#if GPSD_API_MAJOR_VERSION >= 5
++	gps_data_l *gpsdata;
++#else
+ 	gps_data *gpsdata;
++#endif
+ 	
+ 	gps_fix *last_fix;
+ 	
+@@ -394,10 +403,16 @@
+ static gboolean
+ geoclue_gpsd_start_gpsd (GeoclueGpsd *self)
+ {
++#if GPSD_API_MAJOR_VERSION >= 5
++	int status = gps_open (self->host, self->port, self->gpsdata);
++	if (status == 0) {
++		gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA, NULL);
++#else
+ 	self->gpsdata = gps_open (self->host, self->port);
+ 	if (self->gpsdata) {
+ 		gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA | POLL_NONBLOCK, NULL);
+ 		gps_set_raw_hook (self->gpsdata, gpsd_raw_hook);
++#endif
+ 		return TRUE;
+ 	} else {
+ 		g_warning ("gps_open() failed, is gpsd running (host=%s,port=%s)?", self->host, self->port);
+@@ -410,10 +425,23 @@
+ {
+ 	GeoclueGpsd *self = (GeoclueGpsd*)data;
+ 	if (self->gpsdata) {
++#if GPSD_API_MAJOR_VERSION >= 5 
++		/* gps_poll and gps_set_raw_hook no longer present in this API version */
++		if (gps_waiting(self->gpsdata, 500)) {
++			if (gps_read(self->gpsdata) == -1) {
++				geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
++				geoclue_gpsd_stop_gpsd(self);
++				return FALSE;
++			} else {          
++				/* Call existing raw_hook to process the data */
++				gpsd_raw_hook(self->gpsdata, NULL, 0);    
++			}
++#else
+ 		if (gps_poll(self->gpsdata) < 0) {
+ 			geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
+ 			geoclue_gpsd_stop_gpsd(self);
+ 			return FALSE;
++#endif
+ 		}
+ 	}
+ 	return TRUE;
diff --git a/app-misc/geoclue/geoclue-0.12.99.ebuild b/app-misc/geoclue/geoclue-0.12.99.ebuild
new file mode 100644
index 000000000000..78b34e375a44
--- /dev/null
+++ b/app-misc/geoclue/geoclue-0.12.99.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.99.ebuild,v 1.1 2012/08/11 17:41:36 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://freedesktop.org/~hadess/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="connman geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook static-libs yahoo-geo"
+
+REQUIRED_USE="skyhook? ( networkmanager )"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2
+	dev-libs/libxml2
+	gnome-base/gconf
+	sys-apps/dbus
+	gps? ( sci-geosciences/gpsd )
+	gtk? ( x11-libs/gtk+:2 )
+	networkmanager? ( net-misc/networkmanager )
+	skyhook? ( net-libs/libsoup )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.12.0_p20110307-use-flag.patch \
+		"${FILESDIR}"/${PN}-0.12.0_p20110307-use-fallback-mac.patch \
+		"${FILESDIR}"/${P}-gpsd.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# Conic is only for Maemo. Don't enable.
+	# Gypsy has multiple vulnerabilities:
+	# https://bugs.freedesktop.org/show_bug.cgi?id=33431
+	econf \
+		$(use_enable static-libs static) \
+		--disable-schemas-compile \
+		$(use_enable gtk tests) \
+		$(use_enable gtk) \
+		--disable-conic \
+		$(use_enable connman) \
+		$(use_enable networkmanager) \
+		--disable-gypsy \
+		$(use_enable gps gpsd) \
+		$(use_enable skyhook) \
+		$(use_enable geonames) \
+		$(use_enable gsmloc) \
+		$(use_enable hostip) \
+		$(use_enable manual) \
+		$(use_enable nominatim) \
+		$(use_enable plazes) \
+		$(use_enable yahoo-geo yahoo) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use gtk && dobin test/.libs/geoclue-test-gui
+	prune_libtool_files
+}
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 88cc76609747..ca50dd348dfb 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>desktop-misc</herd>
   <use>
+    <flag name="connman">Add support for net-misc/connman</flag>
     <flag name="geonames">Install geonames.org provider</flag>
     <flag name="gpsd">Install sci-geosciences/gpsd provider</flag>
     <flag name="gsmloc">Install GSM location provider</flag>
@@ -15,4 +16,3 @@
     <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
   </use>
 </pkgmetadata>
-