gentoo resync : 12.05.2022

3 files changed, 86 insertions, 3 deletions

diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 5dbd55aad074..8d64240fda80 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,4 +1,6 @@
 AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338
 DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f
-EBUILD geoclue-2.5.7.ebuild 1763 BLAKE2B 9feac54965408b9df68943bfa6ef003088d199ca9f64a1a57b35a02d9e0c269d70f48b8f09afad6dbc3465edd53ec40acfda4241aaa8a4ff59309e0991824ddd SHA512 0018a41975f19ca23ebb0fae024f60578277d11e9bab12decc3f0ac0b8666817da7517101c645beb38c6f7b54323b6463b8699c43193be776d90cd63be2351e3
+DIST geoclue-2.6.0.tar.bz2 94890 BLAKE2B d579752482e77e6ec6df3cb34f6b1c7ca61ea425f1c29195f1bcd031afe22644aed2f5b3f75e82c20e0e3cf0d415ca858b30351b2ee3835fff0ca25e63fc6395 SHA512 13205ab88cbd9748c155081318ae1909fddedce4250e3ece39a9f379b8cfea91dfe571961e278406ba54f8efd3a1070967479feb8256f50170112b28246b3103
+EBUILD geoclue-2.5.7.ebuild 1764 BLAKE2B 9bd08a6d0823b978f256c66bfcc073b586cbcae665882f60e7a3c76be146ade4834f94b32bc1c9d5a38321b2851506484b3f1e9069c62652f93240ac74c04fcb SHA512 2999116ab064f7b50a14e1e1c460ce895f292fc34a2c28014ab33e91558322ea46a1301160294113eb50e2d88a7fe20a6dd59d5387de7f3c0a0415f0a16f3ccc
+EBUILD geoclue-2.6.0.ebuild 2330 BLAKE2B f25e38f1200e011b9d0b1e2402d0c6dd31b5532fbb84565e3f409fced902279c9f15d47a366751ad95f2e57e98cc08a9fe722ee2d36870a884572f80aefa1fc0 SHA512 d9fc71abdb965b907a2f32af9531560e907f70d2c77f01ee471417de873b4d94bf985326d7c2267ef918ed7a4ff165c95a0d0d384b2d1e70fd4f42e2501f5a91
 MISC metadata.xml 523 BLAKE2B 42629fc7fb9ed88748d53c9f521666436eb8b65d33d004410c577c32235dacc8618def18da640986b8e64ecfb8b0b9c4085797a40b9aebc3d8f9471ca4e163b2 SHA512 33aa5cf04b48ab8c9b805aff3ee9d33193314bff55e4ec47ee2cadd0f5b7cb2c9d6ee86a27a4a2bb9286ee4637c9d04b5eedea41467b6a8da605f8b0eaf71a5c
diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild
index 4ebabf0ba6f2..fb5eef3a6052 100644
--- a/app-misc/geoclue/geoclue-2.5.7.ebuild
+++ b/app-misc/geoclue/geoclue-2.5.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="xml(+)"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/app-misc/geoclue/geoclue-2.6.0.ebuild b/app-misc/geoclue/geoclue-2.6.0.ebuild
new file mode 100644
index 000000000000..d792a58f3b94
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.6.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-any-r1 systemd vala 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 ~riscv ~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}
+	acct-user/geoclue
+	sys-apps/dbus
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	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) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+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)
+		-Dcompass=true
+		-Denable-backend=true
+		-Ddemo-agent=true
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Ddbus-srv-user=geoclue
+
+		-Dmozilla-api-key=f57afde7-113f-4e8f-96d1-62be64a0273c
+	)
+
+	DISTRO="$(awk -F= '/^NAME/ {print $2}' /etc/os-release | tr -d \" )"
+	if [[ $DISTRO != Gentoo ]]; then
+		eerror "The following API key has been allocated for Gentoo only."
+		eerror "If you are a derivative, please request your own key as discussed here:"
+		eerror "https://gitlab.freedesktop.org/geoclue/geoclue/-/issues/136"
+		eerror "See also: https://location.services.mozilla.com/api and"
+		eerror "https://blog.mozilla.org/services/2019/09/03/a-new-policy-for-mozilla-location-service/"
+		die "Please request an API key for your distribution."
+	fi
+
+	meson_src_configure
+}