Fix libsoup dependency, bug #511408. Clean up old revisions.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C6085806)

6 files changed, 10 insertions, 101 deletions

diff --git a/app-misc/geoclue/ChangeLog b/app-misc/geoclue/ChangeLog
index 2dab86173200..8220ea069281 100644
--- a/app-misc/geoclue/ChangeLog
+++ b/app-misc/geoclue/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/geoclue
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.38 2014/10/11 13:47:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.39 2014/11/04 22:23:28 eva Exp $
+
+  04 Nov 2014; Gilles Dartiguelongue <eva@gentoo.org> -geoclue-2.0.0.ebuild,
+  -geoclue-2.1.8.ebuild, geoclue-2.1.9.ebuild, geoclue-2.1.10.ebuild,
+  metadata.xml:
+  Fix libsoup dependency, bug #511408. Clean up old revisions.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> geoclue-2.1.9.ebuild:
   arm stable, bug #512012
diff --git a/app-misc/geoclue/geoclue-2.0.0.ebuild b/app-misc/geoclue/geoclue-2.0.0.ebuild
deleted file mode 100644
index a6bc437105d6..000000000000
--- a/app-misc/geoclue/geoclue-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.0.0.ebuild,v 1.4 2014/03/09 11:53:58 pacho Exp $
-
-EAPI="5"
-
-inherit gnome2 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="server"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.14
-	net-libs/libsoup:2.4
-	sys-apps/dbus
-	server? ( >=dev-libs/geoip-1.5.1 )
-	!<sci-geosciences/geocode-glib-3.10.0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-RESTRICT="test"
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--with-dbus-service-user=geoclue \
-		$(use_enable server geoip-server)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-}
diff --git a/app-misc/geoclue/geoclue-2.1.10.ebuild b/app-misc/geoclue/geoclue-2.1.10.ebuild
index 3379ca012a60..879ea15ddb34 100644
--- a/app-misc/geoclue/geoclue-2.1.10.ebuild
+++ b/app-misc/geoclue/geoclue-2.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.1.10.ebuild,v 1.1 2014/10/09 09:19:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.1.10.ebuild,v 1.2 2014/11/04 22:23:28 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ IUSE="+modemmanager"
 RDEPEND="
 	>=dev-libs/glib-2.34:2
 	>=dev-libs/json-glib-0.14
-	net-libs/libsoup:2.4
+	>=net-libs/libsoup-2.42:2.4
 	sys-apps/dbus
 	modemmanager? ( >=net-misc/modemmanager-1 )
 	!<sci-geosciences/geocode-glib-3.10.0
diff --git a/app-misc/geoclue/geoclue-2.1.8.ebuild b/app-misc/geoclue/geoclue-2.1.8.ebuild
deleted file mode 100644
index 091e06014232..000000000000
--- a/app-misc/geoclue/geoclue-2.1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.1.8.ebuild,v 1.1 2014/04/27 15:42:09 eva Exp $
-
-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 +networkmanager"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.14
-	>=dev-libs/libxml2-2.7:2
-	net-libs/libsoup:2.4
-	sys-apps/dbus
-	modemmanager? ( >=net-misc/modemmanager-1 )
-	networkmanager? ( >=net-misc/networkmanager-0.9.8 )
-	!<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) \
-		$(use_enable networkmanager network-manager) \
-		$(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
index fa141ffcb315..d982fa4a1c36 100644
--- a/app-misc/geoclue/geoclue-2.1.9.ebuild
+++ b/app-misc/geoclue/geoclue-2.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.1.9.ebuild,v 1.4 2014/10/11 13:47:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.1.9.ebuild,v 1.5 2014/11/04 22:23:28 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ IUSE="+modemmanager"
 RDEPEND="
 	>=dev-libs/glib-2.34:2
 	>=dev-libs/json-glib-0.14
-	net-libs/libsoup:2.4
+	>=net-libs/libsoup-2.42:2.4
 	sys-apps/dbus
 	modemmanager? ( >=net-misc/modemmanager-1 )
 	!<sci-geosciences/geocode-glib-3.10.0
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 604a304c83da..280739e0eae7 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -12,7 +12,6 @@
     <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="server">Install geoip server</flag>
     <flag name="skyhook">Install skyhookwireless.com provider</flag>
     <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
   </use>