From 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 08:43:51 +0100 Subject: gentoo auto-resync : 21:07:2022 - 08:43:51 --- app-misc/geoclue/Manifest | 3 - app-misc/geoclue/files/2.5.3-optional-vapi.patch | 52 ----------------- app-misc/geoclue/geoclue-2.5.7.ebuild | 71 ------------------------ 3 files changed, 126 deletions(-) delete mode 100644 app-misc/geoclue/files/2.5.3-optional-vapi.patch delete mode 100644 app-misc/geoclue/geoclue-2.5.7.ebuild (limited to 'app-misc/geoclue') diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest index f4fe94e7094c..ab2fea53de2a 100644 --- a/app-misc/geoclue/Manifest +++ b/app-misc/geoclue/Manifest @@ -1,6 +1,3 @@ -AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338 -DIST geoclue-2.5.7.tar.bz2 85764 BLAKE2B bf0a6e312b7a303ed2cfc33f02cfad0e68e44f60899a327c9eba12f4967d2a3a5922a475f8fefb6f47da328c92dc75706504b41bc2dcd21db3fc5da7c2a50180 SHA512 16ec15afa41910b7d993a9918dd3c068dea3f6c5be922b7ac772493cd6aabb0cad3fe2206b82c1a008781c3f1ddd8f4afd8f70b5d497920bea8ed5e473f0fd1f 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 2324 BLAKE2B 536a60815b6a0501ddac9073c72e6c85d63bb0a82cf7f623780b671e945a4a0b069a4e99d4fde96726fb9bb21ff593dff76692bbb1dcf23ca194517d5a49c0b6 SHA512 c88d9e09e3751cf9f9c3ad84835432056f0177f1f30f5d181c84e11d10ac117ccb9fecdec0646a24c5f0a249d9f386ee0cbd57efd40d4ac85b41bb6a2bfd4f46 MISC metadata.xml 523 BLAKE2B 42629fc7fb9ed88748d53c9f521666436eb8b65d33d004410c577c32235dacc8618def18da640986b8e64ecfb8b0b9c4085797a40b9aebc3d8f9471ca4e163b2 SHA512 33aa5cf04b48ab8c9b805aff3ee9d33193314bff55e4ec47ee2cadd0f5b7cb2c9d6ee86a27a4a2bb9286ee4637c9d04b5eedea41467b6a8da605f8b0eaf71a5c diff --git a/app-misc/geoclue/files/2.5.3-optional-vapi.patch b/app-misc/geoclue/files/2.5.3-optional-vapi.patch deleted file mode 100644 index d451d6ea6d03..000000000000 --- a/app-misc/geoclue/files/2.5.3-optional-vapi.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 3598b8b9c1a6ef4a31e2c179a6be3e3a69cce357 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 7 Jul 2019 15:57:03 +0300 -Subject: [PATCH] meson: Make vapi generation optional and remove explicit - vapigen check - -meson gnome.generate_vapi properly handles VAPIGEN and other vala -environment variables. It is counter-productive to check for an -unversioned vapigen, as that breaks versioned VAPIGEN usages. ---- - libgeoclue/meson.build | 3 +-- - meson_options.txt | 3 +++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build -index e228ec3..d053bc1 100644 ---- a/libgeoclue/meson.build -+++ b/libgeoclue/meson.build -@@ -58,7 +58,6 @@ libgeoclue_dep = declare_dependency(link_with: libgeoclue, - sources: [ libgeoclue_sources, libgeoclue_headers ]) - - gir = find_program('g-ir-scanner', required: false) --vapigen = find_program('vapigen', required: false) - enable_gir = get_option('introspection') - pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0'] - gir_sources = [ libgeoclue_sources, -@@ -78,7 +77,7 @@ if gir.found() and enable_gir - install: true, - header: 'geoclue.h', - extra_args: [ '--quiet' ]) -- if vapigen.found() -+ if get_option('vapi') - gnome.generate_vapi('libgeoclue-' + gclue_api_version, - sources: geo_gir[0], - packages: pkg_requirements, -diff --git a/meson_options.txt b/meson_options.txt -index 83bc60e..3a832d5 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,9 @@ option('libgeoclue', - option('introspection', - type: 'boolean', value: true, - description: 'Enable convenience library introspection generation') -+option('vapi', -+ type: 'boolean', value: true, -+ description: 'Generate vapi data for convenience library (requires vapigen and introspection)') - option('gtk-doc', - type: 'boolean', value: true, - description: 'Whether to generate the API reference for Geocode-GLib') --- -2.20.1 - diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild deleted file mode 100644 index fb5eef3a6052..000000000000 --- a/app-misc/geoclue/geoclue-2.5.7.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) -PYTHON_REQ_USE="xml(+)" -VALA_USE_DEPEND="vapigen" - -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) ) -" - -PATCHES=( - "${FILESDIR}"/2.5.3-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 -} -- cgit v1.2.3