5 files changed, 6 insertions, 185 deletions
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index f1f44dea8a94..283603b2f688 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,9 +1,4 @@
 AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338
-AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
-DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
-DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9
 DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f
-EBUILD geoclue-2.4.13.ebuild 1664 BLAKE2B 6c03fdb2d889caadf3d0ea7d32ee4f9497479316591a6c3ff796b8dcc84b8c22b9d4096c7c063d743f40c4001a6f697d31056785a29465d78d87a1d7defd59b3 SHA512 7f8afcff6944b800515b4d2e5bf1140050bb88372043b5945b9fa3ecaa5e0a7cb6c20ae1fcb2e85450f413e921a7180c2b3ebdc4061de5138779f527e96735e7
-EBUILD geoclue-2.5.3-r2.ebuild 1742 BLAKE2B c134c15fb5fde6e0fd4a3ada5a9f5471bc7cee1c2ded9d2fd608d4469c765e3f5751dd790127856c4c478fe28069ca5aeb637159dda610d697f1f576662f18ab SHA512 8df4106658cb34b423a3366d7ef425b6045eb76ef233ebdd6b9358e0d7dbf21e85153a67c826e031ee73ef835bd86abfb25d42f6ce11ab15e11d7f0fde4bab52
-EBUILD geoclue-2.5.7.ebuild 1674 BLAKE2B 50d5f3c66afd38a30f16fabeb465e88d62afcb92968753c2d1106fcb9652c5c79a7248b402160c94f54e21339e3f4ddff718396e8a8111c1d71f7a4f500e25f9 SHA512 b5bbaf187aa21dd31628e5601901b0aaced98c953d8f8fa3578140a95c41207047f61d7ae4fcaf6471a1fd7de48d06a7465c8fba4e8cf4bf03384bd921bd4070
+EBUILD geoclue-2.5.7.ebuild 1756 BLAKE2B 3ef91e37fe3ec67328819233bd6e88d969053dfddb3f6b88d2b938ec49d13c6d4db43f00f15e5b9aa1afd1c7ee3d4e7078326baae607832efcdc3227151e3e45 SHA512 a8a5031d8b675114e7c6f6f053aa4149e7c12aead12a5dc013dfd647778031c5fc340fee2194db34e500dc09858e00d17f8403a291d9c2728bb7cfbbc19d991b
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch b/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
deleted file mode 100644
index b27bf5d44c01..000000000000
--- a/app-misc/geoclue/files/geoclue-2.4.1-fix-GLIBC-features.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This has been edited to fit geoclue that import the code from geocode-glib.
---Anthony G. Basile
-
-From 3ce317a218c255b8a8025f8f2a6010ce500dc0ee Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Tue, 22 Mar 2016 09:48:00 +0000
-Subject: [PATCH] Use __UCLIBC__ when checking for GLIBC features
-
-Commit f0f85d8d introduces __GLIBC__ to check for glibc only features.
-However this is not sufficient for uClibc because it shares code with
-glibc.  To select for features in glibc but not uClibc, we need
-defined(__GLIBC__) && !defined(__UCLIBC__).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764021
----
- geocode-glib/geocode-glib.c | 4 ++--
- geocode-glib/test-gcglib.c  | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/geocode-glib/geocode-glib.c b/src/geocode-glib/geocode-glib.c
-index 4e3b3fd..6215fd1 100644
---- a/src/geocode-glib/geocode-glib.c
-+++ b/src/geocode-glib/geocode-glib.c
-@@ -213,7 +213,7 @@ _geocode_object_get_lang (void)
- 	return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES, NULL));
- }
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- static gpointer
- is_number_after_street (gpointer data)
- {
-@@ -246,7 +246,7 @@ is_number_after_street (gpointer data)
- gboolean
- _geocode_object_is_number_after_street (void)
- {
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- 	return FALSE;
- #else
- 	static GOnce once = G_ONCE_INIT;
--- 
-2.7.3
-
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
deleted file mode 100644
index 6dec1598db5a..000000000000
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_EAUTORECONF="yes" # 2.4.13 isn't properly disted, as released concurrently with 2.5.x, which is meson
-
-inherit gnome2 systemd user
-
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
-SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+introspection modemmanager zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	modemmanager? ( >=net-misc/modemmanager-1.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	!<sci-geosciences/geocode-glib-3.10.0
-	x11-libs/libnotify
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--enable-backend \
-		--with-dbus-service-user=geoclue \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable introspection) \
-		$(use_enable modemmanager 3g-source) \
-		$(use_enable modemmanager cdma-source) \
-		$(use_enable modemmanager modem-gps-source) \
-		$(use_enable zeroconf nmea-source)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-	gnome2_pkg_preinst
-}
diff --git a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
deleted file mode 100644
index 4f5b490e4dc4..000000000000
--- a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit meson systemd vala user xdg
-
-DESCRIPTION="A location information D-Bus service"
-HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
-SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="+introspection gtk-doc modemmanager vala zeroconf"
-REQUIRED_USE="vala? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.14.0
-	>=net-libs/libsoup-2.42.0:2.4
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	modemmanager? ( >=net-misc/modemmanager-1.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-optional-vapi.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibgeoclue=true
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc)
-		$(meson_use modemmanager 3g-source)
-		$(meson_use modemmanager cdma-source)
-		$(meson_use modemmanager modem-gps-source)
-		$(meson_use zeroconf nmea-source)
-		-Denable-backend=true
-		-Ddemo-agent=true
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Ddbus-srv-user=geoclue
-	)
-	meson_src_configure
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-}
diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild
index c2a62fecfdde..b039c33965dd 100644
--- a/app-misc/geoclue/geoclue-2.5.7.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.7.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
 VALA_USE_DEPEND="vapigen"
 
-inherit meson systemd vala xdg
+inherit meson python-any-r1 systemd vala xdg
 
 DESCRIPTION="A location information D-Bus service"
 HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
@@ -12,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="+introspection gtk-doc modemmanager vala zeroconf"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -30,6 +32,7 @@ RDEPEND="${DEPEND}
 	sys-apps/dbus
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	gtk-doc? (