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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

7 files changed, 17 insertions, 112 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/Manifest b/app-misc/geoclue/Manifest
index 570275815450..8e584cb7dd02 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -5,21 +5,17 @@ AUX geoclue-0.12.0_p20110307-use-fallback-mac.patch 511 SHA256 21fa236ae8d18e708
 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.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
-DIST geoclue-2.0.0.tar.xz 284592 SHA256 4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1 SHA512 35f25e4491dccb94029ebdf15b9b7864ac8fe79287f091b4b94c65767af2dc4b464e075728eb4db76cecffba330772e31e25c442285bf29a8dea0836aca586a6 WHIRLPOOL 3501bf39e38f0cb09ae3bc193b636ec223ca1874e6458414f02945933f3a7a83e0bdee960c7b33ec65e8863f4b88677023a22bf06af8ec41fc6cc2aaa5d35aac
 DIST geoclue-2.1.10.tar.xz 334916 SHA256 f1d7e7a9c60633d3d747f55fee848299114b3222a4d65e955c2cbcd297d01c68 SHA512 c0efc76dd368a29033591486de419079b72089edea2de52336e6618a01feedf211cdcb1eb804a80ff43e8495951d1bba9a10b43c8bbec310706c5fb8d3ca30ac WHIRLPOOL f9d53465dd0bc74b95402ab39c7eace4c5820cffd6890e17ad9a082dbd18694ac6f1d61ca5ca4a55c2f6cc3b2b4154dded37efc05806c9cf73d91bbb51cf9cd8
-DIST geoclue-2.1.8.tar.xz 321012 SHA256 d5ccc0898f46fb15efcae5615d56cefcca46cf775a53baebee5d3f1082000116 SHA512 b32439d30d2616fde9b60592fb2be172341cfdd6ccd6604813b8975d4f2e41f9984a08f548207f1ec32d877297a39e02187b2a332d8a4048873b7aef852e3b0b WHIRLPOOL 9f4e9105f8cafe93c7d8f401b81b3e18d9807eb04894b5b637aef7c861ed78b72ac6bc831078b887c2c2931c632cb8bc0c00e594cc33b0ed16ac74a6d22d2307
 DIST geoclue-2.1.9.tar.xz 331532 SHA256 b416eea6042d774359f7a141e4e57704c3220363ab8e0bf5c212b1bd2976092b SHA512 6c787b2ba3994bc720a96a1075b4c5ecfae734bbda9f5ae86464f1c83eea7e259130a2e8cd2e2f389f10293037841271556ba810ddcd4800f668625f47f9ecf1 WHIRLPOOL 69532951fda41c1e69de0c74e080a3a16b2406134585c1f6951c66caa2b5bd19893d02348ae21e2f46a48e1120797b7f999eda90303fcc5c659ad0d8f9a7c4d2
 EBUILD geoclue-0.12.99.ebuild 2081 SHA256 46c10d05c9ba985bf2aa8c768842a9e96c56a04d0c73d02212b32dc175b60dba SHA512 cc9223399ba01fdf45308ff58a5ede3a9718880d16b6ad554ae442ce72a24bf6b81b66f1a39d224cd0d378a617e1b6859515232a7b4757c68af578540caab24d WHIRLPOOL 23d62c95ad6925f82c5f2c6435310b09ec9a99d62472efe6b3a9e0bdb0259852dcc176da1de83382cd2896bf9e8a401566c638bcc5f56d3ba8db1de45cc97277
-EBUILD geoclue-2.0.0.ebuild 1123 SHA256 76f24d8bad85da7ab0471ff54c3463c73b5c3891ce43de4a1d4f385fcd16ebe8 SHA512 ec18a00dacb56ce9d82fbfb07aa583273563d97997cacfa4d34fff1a9b3e35b4e348f836833ec974141445fa65b83d7651f00b65817a43816bd811aab54ee049 WHIRLPOOL 7111ba1487d089896de3a2f60480a609a83ab34ab9f49cdd90888a605ace637b045574e3fae24d031ebf7aeb66d9ab257fd2f422065fbcce8cfe04d1ff448298
-EBUILD geoclue-2.1.10.ebuild 1294 SHA256 2586df03d5e3b3bec7594d3983718a5750c6a2d334f45fdd902908e29b3c7f29 SHA512 47a07b310fcc14c1d71458745364bd0e0675676c4f6a2eb1f798fa62dca31d996b2df132b9ac0801c798d11742d53023d6d7c8ab5c17b47b5eeb707a467f5414 WHIRLPOOL 607d6f9626cf51319953b82a4a306ab6017985d72fb9d26b199f86a1ee7536847fd1a5e1455e0e88a1057d69b5f5679172d2a24d9f50560db80f9cdec8109148
-EBUILD geoclue-2.1.8.ebuild 1394 SHA256 19549f77970a21dc1769391f76c393957b1ea401746d697999f31855354a8335 SHA512 fabd46daaa02b4a08327185aa66a1c219d6af0a53fcc932d4771a2b98b8a95f59042a8682dcb8c38d8f9f5ef28d0ec92f7c281d25f1c470b636adb8b08abfc58 WHIRLPOOL b2c917ba5ca25049419fae528ebc5568ea509279fdf00ae0aba5a7fc4b250165189b458c21c8c86216e004e399a0c4e955c6f24226e4f6ca6ca3d65bd75a9f19
-EBUILD geoclue-2.1.9.ebuild 1250 SHA256 2305f72eefd789aec464ec975131fbceafb026aa7630faf90ecf45deb5f6ce4c SHA512 084290ec91160c6cce702c44239301be8431f8cfc53a923f7856af19d472ba87e5c63d539af2d69b289bf72cc0d3d5c2cf1253590418ce6f65f287f9fa2e1325 WHIRLPOOL f5f4fd6fb50a804b81d4d14542f8b43e6aa1c48e7d5a526c2def2b159991948b10123c737320c1068d4c51be96ba7e4668de167e82120012c5fe9e20506051d1
-MISC ChangeLog 4996 SHA256 dead90da6dd00d25ae0584dce7ad7507b46096b11930794f9ab360eb405c3f8e SHA512 07219f0060c497fbeddf3acf6e2560f7ad87fc471b0418064220e3ade2095348ea22c226bfefbafcfdf432240533ef4079583e74bab0b50628b2951a62318188 WHIRLPOOL 5f4e80205c5ff32a9b61cbf51e88b12441ed82bb00b003fd5fc3adf0b9b5da0d85f737f21275f7c0f088a7de3486fa46237806e9e822647e6918867c3196616e
-MISC metadata.xml 957 SHA256 dac1a99d88c85a561bb8ce61539a554d08e7463e63e190945eba39bc1f58b282 SHA512 aa71a2117c8ebf87b3076244d9475859cf94d7129e79ce3d2ecc1035a109192f8aee8d066830c79fa1e815f7c44933538c8e04d49a00740a82198708bbbf2865 WHIRLPOOL 1bd4ff01eca5a358c0a415d267b23ac024e48e8cb2ce5229300554bc8aa7ab00b7b5ce22b6d87a8264c67e450a389933be3d8c2c63eea1c8e412e406f52d361f
+EBUILD geoclue-2.1.10.ebuild 1301 SHA256 06a16f6c6574f30a15ab39d2699b6ed7d7d2e65dfb643e100945741229fc6b2e SHA512 ae24b1b35b1fb458c2086895b5c8daadff00940d9074f8d0f798031d2dd4c46812ed18ee8a199760134f36a48e39ef979d91904afc2a5dad3b884c36c93166b7 WHIRLPOOL 9a5cd64689f7b1f3ef2052a663985d6e0ec8a3d0aec38ef8a218ced4f7a58c7d75f6bd5004bf2a8877b0ad9a584f31a681489026c511d83f38cf899f6803c676
+EBUILD geoclue-2.1.9.ebuild 1254 SHA256 0c4d2676ab6d0121190b84fa693398df5fd64842a8fba943c67e2c9e119f7e6d SHA512 c66ee72be73a04783df495e5fdbf42a02e4a24f7dd79a88004535c81d137df8c130a2ae046654cf3e60ab3fee1e4cc6f7fa0a2f3142ea4f8ea4555b2599e6dde WHIRLPOOL 423eaeaec59773fc6e2476d2bb6f2b68810b8e569bd9a1f7d280db080b453c852d618e3002f360ed6d62688afa31b4871d60c04207d1e9b79f5443b35605c132
+MISC ChangeLog 5220 SHA256 0767fb6934172749263945829e4885b7c21e3ecfb3407b8d350360be282fc3fc SHA512 530e42648c66d99bc5abe73c6e2aef58665e30975b1b74aee27ddb11beec74f5446e2a8d3da98a0384bf826751d4536651c3d42bf0360de0cb239bd5b265f5ef WHIRLPOOL 279f511c37ae1c1bc32f75e12d96618ea14cb20a9b4bd39adc519d2b44ccdc32f854740851d3c69fb5126079c79dfce921727b3aae47a166b5bd91d56bef887c
+MISC metadata.xml 905 SHA256 9b0082954fd53d856c6902bdc7ad6e9c245327affcfbea616449b7fa62e260ae SHA512 8df79f40e2bb91cac037b497a376baa1fdfed8128d0d6409b27b44411efedb361f9f20bd9e62c367a005afdeacb0ac2ad27e62a4d02edd9a160babb7e899b5c6 WHIRLPOOL e36b6141d185a37bbea5ee22ae8d7f64cc981bb64e63a5b2ba6afca41f74cef91ceb9db927b9ebdd77ce35e1a292273fb4a461f907659f5a06ae0e43409108d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5NNYACgkQkKaRLQcq0GKS7ACgpW/Uv9nWB8EilbcnyrbykjtJ
-Q9wAoKilfD+QJH5hm10wU4KVhGSvkXQn
-=B1iY
+iEYEAREIAAYFAlRZUd8ACgkQ1fmVwcYIWAbG+wCgkuTIWt7cE0UTS6GZh9ZW574u
+6IoAoJsJ8ugv/P2nkr54oniRR+8Z5A1F
+=nYba
 -----END PGP SIGNATURE-----
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>