Adding metadata

4 files changed, 26 insertions, 81 deletions

diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 5892004d8695..045eab9f230a 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,2 +1 @@
-DIST geoclue-2.6.0.tar.bz2 94890 BLAKE2B d579752482e77e6ec6df3cb34f6b1c7ca61ea425f1c29195f1bcd031afe22644aed2f5b3f75e82c20e0e3cf0d415ca858b30351b2ee3835fff0ca25e63fc6395 SHA512 13205ab88cbd9748c155081318ae1909fddedce4250e3ece39a9f379b8cfea91dfe571961e278406ba54f8efd3a1070967479feb8256f50170112b28246b3103
 DIST geoclue-2.7.0.tar.bz2 105353 BLAKE2B b9bcf29bcdb5302d3df29f48ec235265582ec60badc4f71469faa0d100f860f943529c6a74aadec4b03cbc1474f5eab837b1b9b19ba5c7e0ab0fb6c868db727a SHA512 2314242f529b9011ee5da6e8cfc657568853769e4d38b8e7c604097a747dd5705d9f84dcd2763cdacb9f014e15b63fbb8356d6cb488ba91334cda87c11e4ee7d
diff --git a/app-misc/geoclue/geoclue-2.7.0-r1.ebuild b/app-misc/geoclue/geoclue-2.7.0-r1.ebuild
deleted file mode 100644
index aabd73f6601d..000000000000
--- a/app-misc/geoclue/geoclue-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2022-2023 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-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:3.0
-	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
-	)
-
-	meson_src_configure
-}
diff --git a/app-misc/geoclue/geoclue-2.6.0.ebuild b/app-misc/geoclue/geoclue-2.7.0.ebuild
index 15ade7e0dc96..a627a67b30b7 100644
--- a/app-misc/geoclue/geoclue-2.6.0.ebuild
+++ b/app-misc/geoclue/geoclue-2.7.0.ebuild
@@ -1,26 +1,26 @@
-# Copyright 2022 Liguros Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=8
 
+EAPI=8
 PYTHON_COMPAT=( python3_{8,9,10,11} )
 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"
+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"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~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
+	>=net-libs/libsoup-3.0.0:3.0
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 	modemmanager? ( >=net-misc/modemmanager-1.6 )
 	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
@@ -63,7 +63,19 @@ src_configure() {
 		-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
 }
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index a64fde1a8ccf..ce9de8a338f6 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -2,17 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- <maintainer type="project">
   <email>gnome@gentoo.org</email>
   <name>Gentoo GNOME Desktop</name>
  </maintainer>
- 
+ <longdescription>
+    Geoclue is a D-Bus geoinformation service. The goal of the Geoclue project is to make creating location-aware
+    applications as simple as possible.
+  </longdescription>
+ <upstream>
+  <changelog>https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/master/NEWS</changelog>
+  <bugs-to>https://gitlab.freedesktop.org/geoclue/geoclue/-/issues</bugs-to>
+ </upstream>
  <use>
   <flag name="modemmanager">Enable geolocation through 3G or GPS enabled hardware through <pkg>net-misc/modemmanager</pkg>.</flag>
   <flag name="zeroconf">Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare</flag>
  </use>
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file