summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-misc/geoclue
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-misc/geoclue')
-rw-r--r--app-misc/geoclue/Manifest4
-rw-r--r--app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch16
-rw-r--r--app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch79
-rw-r--r--app-misc/geoclue/files/geoclue-0.12.99-gpsd.patch73
-rw-r--r--app-misc/geoclue/geoclue-0.12.99.ebuild72
-rw-r--r--app-misc/geoclue/geoclue-2.1.10.ebuild48
-rw-r--r--app-misc/geoclue/geoclue-2.1.9.ebuild47
-rw-r--r--app-misc/geoclue/geoclue-2.2.0.ebuild48
-rw-r--r--app-misc/geoclue/metadata.xml18
9 files changed, 405 insertions, 0 deletions
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
new file mode 100644
index 000000000000..6e2600cf6dc3
--- /dev/null
+++ b/app-misc/geoclue/Manifest
@@ -0,0 +1,4 @@
+DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
+DIST geoclue-2.1.10.tar.xz 334916 SHA256 f1d7e7a9c60633d3d747f55fee848299114b3222a4d65e955c2cbcd297d01c68 SHA512 c0efc76dd368a29033591486de419079b72089edea2de52336e6618a01feedf211cdcb1eb804a80ff43e8495951d1bba9a10b43c8bbec310706c5fb8d3ca30ac WHIRLPOOL f9d53465dd0bc74b95402ab39c7eace4c5820cffd6890e17ad9a082dbd18694ac6f1d61ca5ca4a55c2f6cc3b2b4154dded37efc05806c9cf73d91bbb51cf9cd8
+DIST geoclue-2.1.9.tar.xz 331532 SHA256 b416eea6042d774359f7a141e4e57704c3220363ab8e0bf5c212b1bd2976092b SHA512 6c787b2ba3994bc720a96a1075b4c5ecfae734bbda9f5ae86464f1c83eea7e259130a2e8cd2e2f389f10293037841271556ba810ddcd4800f668625f47f9ecf1 WHIRLPOOL 69532951fda41c1e69de0c74e080a3a16b2406134585c1f6951c66caa2b5bd19893d02348ae21e2f46a48e1120797b7f999eda90303fcc5c659ad0d8f9a7c4d2
+DIST geoclue-2.2.0.tar.xz 338912 SHA256 a490de0d4f97cb65f81e9fd0f687c7e84ef2c41509c214a1438964f541c7d446 SHA512 78ddd7a6df8066d97fb00758106f0fe307b9db9dd3d6a90b922bf31a031a53ac1c2c450a7a91c45ddae3f8c98fec54e7fe653f1f1f45935833860e5a24647c01 WHIRLPOOL fb76dde50855a0c533c1100571eae3e06c42827133f30928280ef1ca869f8d9f48a60e4959cdefacd7771408bfe608697e0a04c2ec461035b685fc18dffc9066
diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch
new file mode 100644
index 000000000000..9c9115a284ef
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-fallback-mac.patch
@@ -0,0 +1,16 @@
+Force geoclue to use the "fallback" mac address fetching code.
+The NM-based code does not seem to work.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- src/connectivity.c
++++ src/connectivity.c
+@@ -218,7 +218,7 @@
+ geoclue_connectivity_get_router_mac (GeoclueConnectivity *self)
+ {
+ if (self == NULL ||
+- GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL) {
++ GEOCLUE_CONNECTIVITY_GET_INTERFACE (self)->get_router_mac == NULL || 1) {
+ char *mac = NULL;
+ guint i;
+ int ret_val;
diff --git a/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch
new file mode 100644
index 000000000000..236c98928ba7
--- /dev/null
+++ b/app-misc/geoclue/files/geoclue-0.12.0_p20110307-use-flag.patch
@@ -0,0 +1,79 @@
+Add configure options for all providers except localnet.
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -158,7 +158,71 @@
+ AC_SUBST(CONNECTIVITY_LIBS)
+ AC_SUBST(CONNECTIVITY_CFLAGS)
+
+-PROVIDER_SUBDIRS="example hostip geonames nominatim manual plazes localnet yahoo gsmloc"
++PROVIDER_SUBDIRS="localnet"
++
++AC_ARG_ENABLE(hostip,
++ AS_HELP_STRING([--enable-hostip=@<:@no/yes/auto@:>@],
++ [build with hostip support]), ,
++ enable_hostip=auto)
++
++if test "x$enable_hostip" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS hostip"
++fi
++
++AC_ARG_ENABLE(geonames,
++ AS_HELP_STRING([--enable-geonames=@<:@no/yes/auto@:>@],
++ [build with geonames support]), ,
++ enable_geonames=auto)
++
++if test "x$enable_geonames" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS geonames"
++fi
++
++AC_ARG_ENABLE(nominatim,
++ AS_HELP_STRING([--enable-nominatim=@<:@no/yes/auto@:>@],
++ [build with nominatim support]), ,
++ enable_nominatim=auto)
++
++if test "x$enable_nominatim" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS nominatim"
++fi
++
++AC_ARG_ENABLE(manual,
++ AS_HELP_STRING([--enable-manual=@<:@no/yes/auto@:>@],
++ [build with manual support]), ,
++ enable_manual=auto)
++
++if test "x$enable_manual" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS manual"
++fi
++
++AC_ARG_ENABLE(plazes,
++ AS_HELP_STRING([--enable-plazes=@<:@no/yes/auto@:>@],
++ [build with plazes support]), ,
++ enable_plazes=auto)
++
++if test "x$enable_plazes" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS plazes"
++fi
++
++AC_ARG_ENABLE(yahoo,
++ AS_HELP_STRING([--enable-yahoo=@<:@no/yes/auto@:>@],
++ [build with yahoo support]), ,
++ enable_yahoo=auto)
++
++if test "x$enable_yahoo" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS yahoo"
++fi
++
++AC_ARG_ENABLE(gsmloc,
++ AS_HELP_STRING([--enable-gsmloc=@<:@no/yes/auto@:>@],
++ [build with gsmloc support]), ,
++ enable_gsmloc=auto)
++
++if test "x$enable_gsmloc" != "xno"; then
++ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gsmloc"
++fi
++
+
+ # -----------------------------------------------------------
+ # gypsy / gpsd / skyhook
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..b29db17fd7ec
--- /dev/null
+++ b/app-misc/geoclue/geoclue-0.12.99.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="alpha amd64 arm ia64 ~mips ppc ppc64 sparc 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
+ 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-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
+
+ sed -i -e '/CFLAGS/s:-g ::' configure.ac || die #399177
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ 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 \
+ --disable-silent-rules \
+ $(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/geoclue-2.1.10.ebuild b/app-misc/geoclue/geoclue-2.1.10.ebuild
new file mode 100644
index 000000000000..463fdcfb6aa2
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.1.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+IUSE="+modemmanager"
+
+RDEPEND="
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/json-glib-0.14
+ >=net-libs/libsoup-2.42:2.4
+ sys-apps/dbus
+ modemmanager? ( >=net-misc/modemmanager-1 )
+ !<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # debug only affects CFLAGS
+ gnome2_src_configure \
+ --with-dbus-service-user=geoclue \
+ $(use_enable modemmanager 3g-source) \
+ $(use_enable modemmanager cdma-source) \
+ $(use_enable modemmanager modem-gps-source) \
+ $(systemd_with_unitdir)
+}
+
+pkg_preinst() {
+ enewgroup geoclue
+ enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}
diff --git a/app-misc/geoclue/geoclue-2.1.9.ebuild b/app-misc/geoclue/geoclue-2.1.9.ebuild
new file mode 100644
index 000000000000..470726e2e997
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.1.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+IUSE="+modemmanager"
+
+RDEPEND="
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/json-glib-0.14
+ >=net-libs/libsoup-2.42:2.4
+ sys-apps/dbus
+ modemmanager? ( >=net-misc/modemmanager-1 )
+ !<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # debug only affects CFLAGS
+ gnome2_src_configure \
+ --with-dbus-service-user=geoclue \
+ $(use_enable modemmanager 3g-source) \
+ $(use_enable modemmanager modem-gps-source) \
+ $(systemd_with_unitdir)
+}
+
+pkg_preinst() {
+ enewgroup geoclue
+ enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}
diff --git a/app-misc/geoclue/geoclue-2.2.0.ebuild b/app-misc/geoclue/geoclue-2.2.0.ebuild
new file mode 100644
index 000000000000..a695fc1c7745
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+IUSE="+modemmanager"
+
+RDEPEND="
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/json-glib-0.14
+ >=net-libs/libsoup-2.42:2.4
+ sys-apps/dbus
+ modemmanager? ( >=net-misc/modemmanager-1 )
+ !<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # debug only affects CFLAGS
+ gnome2_src_configure \
+ --with-dbus-service-user=geoclue \
+ $(use_enable modemmanager 3g-source) \
+ $(use_enable modemmanager cdma-source) \
+ $(use_enable modemmanager modem-gps-source) \
+ $(systemd_with_unitdir)
+}
+
+pkg_preinst() {
+ enewgroup geoclue
+ enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
new file mode 100644
index 000000000000..280739e0eae7
--- /dev/null
+++ b/app-misc/geoclue/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <herd>desktop-misc</herd>
+ <use>
+ <flag name="geonames">Install geonames.org provider</flag>
+ <flag name="gsmloc">Install GSM location provider</flag>
+ <flag name="gtk">Install gtk-based geoclue-test-gui</flag>
+ <flag name="hostip">Install hostip.info provder</flag>
+ <flag name="manual">Install manual provider</flag>
+ <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
+ <flag name="nominatim">Install openstreetmap.org provider</flag>
+ <flag name="plazes">Install plazes.com provider</flag>
+ <flag name="skyhook">Install skyhookwireless.com provider</flag>
+ <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
+ </use>
+</pkgmetadata>