Version bump for Gnome 3.10, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 54 insertions, 65 deletions

diff --git a/app-misc/geoclue/ChangeLog b/app-misc/geoclue/ChangeLog
index 25c61235914b..b572bb9ffd33 100644
--- a/app-misc/geoclue/ChangeLog
+++ b/app-misc/geoclue/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/geoclue
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.26 2013/07/21 10:42:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.27 2013/12/24 15:35:15 pacho Exp $
+
+*geoclue-2.0.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +geoclue-2.0.0.ebuild,
+  -geoclue-0.12.0_p20110307.ebuild, metadata.xml:
+  Version bump for Gnome 3.10, drop old
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   connman is a global USE flag now
diff --git a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
deleted file mode 100644
index dfdc747a6107..000000000000
--- a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.0_p20110307.ebuild,v 1.13 2012/09/11 14:01:50 armin76 Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="http://dev.gentoo.org/~signals/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes
-	skyhook yahoo-geo"
-
-REQUIRED_USE="skyhook? ( networkmanager )"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	gnome-base/gconf
-	skyhook? ( net-libs/libsoup )
-	sys-apps/dbus
-	gtk? ( x11-libs/gtk+:2 )
-	gps? ( <=sci-geosciences/gpsd-2.95-r1 )
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-use-flag.patch \
-		"${FILESDIR}"/${P}-use-fallback-mac.patch
-	sed -i -e 's/-Werror//' configure.ac || die #363723
-	gtkdocize || 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-conic \
-		--disable-gypsy \
-		$(use_enable geonames) \
-		$(use_enable gps gpsd) \
-		$(use_enable gsmloc) \
-		$(use_enable gtk) \
-		$(use_enable hostip) \
-		$(use_enable manual) \
-		$(use_enable networkmanager) \
-		$(use_enable nominatim) \
-		$(use_enable plazes) \
-		$(use_enable skyhook) \
-		$(use_enable yahoo-geo yahoo)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use gtk && dobin test/.libs/geoclue-test-gui
-}
diff --git a/app-misc/geoclue/geoclue-2.0.0.ebuild b/app-misc/geoclue/geoclue-2.0.0.ebuild
new file mode 100644
index 000000000000..4bbd63ff141e
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 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.1 2013/12/24 15:35:15 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 ~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/metadata.xml b/app-misc/geoclue/metadata.xml
index 2a470a5d21cd..6d7a565886cd 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -1,6 +1,7 @@
 <?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>
@@ -10,6 +11,7 @@
     <flag name="manual">Install manual provider</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>