From 51af5f0eb4cddbe6aa7953717873691d77aae9ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jul 2019 23:40:16 +0100 Subject: gentoo resync : 11.07.2019 --- app-misc/geoclue/Manifest | 8 +-- app-misc/geoclue/files/2.5.3-optional-vapi.patch | 52 ++++++++++++++++ .../files/geoclue-2.5.3-optional-vapi.patch | 47 -------------- app-misc/geoclue/geoclue-2.4.13.ebuild | 2 +- app-misc/geoclue/geoclue-2.4.8.ebuild | 60 ------------------ app-misc/geoclue/geoclue-2.5.3-r1.ebuild | 70 --------------------- app-misc/geoclue/geoclue-2.5.3-r2.ebuild | 72 ++++++++++++++++++++++ 7 files changed, 128 insertions(+), 183 deletions(-) create mode 100644 app-misc/geoclue/files/2.5.3-optional-vapi.patch delete mode 100644 app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch delete mode 100644 app-misc/geoclue/geoclue-2.4.8.ebuild delete mode 100644 app-misc/geoclue/geoclue-2.5.3-r1.ebuild create mode 100644 app-misc/geoclue/geoclue-2.5.3-r2.ebuild (limited to 'app-misc/geoclue') diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest index 7d08b66c3403..c7a76b42b3de 100644 --- a/app-misc/geoclue/Manifest +++ b/app-misc/geoclue/Manifest @@ -1,9 +1,7 @@ +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 -AUX geoclue-2.5.3-optional-vapi.patch 1753 BLAKE2B ad8add41e90baa8cfd9bc30b419b5fb4cd85b248d0a08460dbacc53d1047c0b3a90b5d826bb5bb3b3a4aa43eff535ec613be3c3642e274d8822b7d133ed6ca69 SHA512 671434a0c74712c987e39eca7cee628d7304dee5aa1eb05ea1c4a78e7ce20fabdcc3d4c6a6ee1881975d71d5c60730ff83501dcd868476a5f99e37f098c29a51 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78 -DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9 -EBUILD geoclue-2.4.13.ebuild 1677 BLAKE2B 53723734bc0f5a1f1c21f664f8fa9ac7b9b27c9f02c6684d3aaf3a152f831742d028066069ece13a125a88281d6b7f35bba7544b2bf36b221852915376fad585 SHA512 ff0ade63322336de7a4950a56c47cc3e7dde3758270b771526d3fb6f08bf0771ca31d28fa2cb27149fe5563e87bf54c6356f6d359d5df0c4f8960619c48b426d -EBUILD geoclue-2.4.8.ebuild 1592 BLAKE2B 0f3d58e79786d2b0e80905d9bf236e6f6d90e1fb6a98051c319abb89d8723097a4690545468a191bac46bf9317962bee5012dc67d6f5fd00722d084d63ad718f SHA512 ed5f5259c3913294d0b9698b6f7b536c34b546401c7fc004705d1a534cd3fffffe879958274e59152769b082329fce822167652f4640e1b5cf19b5096e0e372d -EBUILD geoclue-2.5.3-r1.ebuild 1884 BLAKE2B 01475ac73c6cb9e09960bf5208da9019f985c6400dfa68713ba78febd181649e613a20e5f300034125fbe63a8a88d6ec59f5d5d4aaa95563ba06ceff4d8d1447 SHA512 282b459e44f3956c7ef5576b0a1fa59f2f82d7cd50e866a9022fe55bc94769386de764d727998b0f8bc5b6bafdc0df8349cba65a44612b706dcfe8e90a65ad74 +EBUILD geoclue-2.4.13.ebuild 1676 BLAKE2B f4cddd032f3d5f3503e9e1e729faca949544f7a094cd9ff2d52b1bfc47a90cc85116b6cd5a590851a7ed31afbb29dccf5733bc58288616d10f69db90a058d1d7 SHA512 902a1922ce0ad6c3e9ebd0bd1d034605de6652c8d9ac40271d6593f5cf9af2db8c41a3901e31d5d56f2857446126fd46fc0fb06fc04d644221d6afce46dd3d97 +EBUILD geoclue-2.5.3-r2.ebuild 1760 BLAKE2B eb321054f2f9bfc0e75a1b9dd6fe62d813883711c5d27e22184a58c54dc2ec14ee74f44f8514e6cae053183a13843f587fd92e3283aa6027d940164b9971028d SHA512 09845c4e258a94a3a4cd28eddd8a95a2c56d38a53001a14453fec3677c81bc624296b1b7c0f688a1538bde292ece070f249a96b0832c38c8c7eb483a3de1c56b MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec diff --git a/app-misc/geoclue/files/2.5.3-optional-vapi.patch b/app-misc/geoclue/files/2.5.3-optional-vapi.patch new file mode 100644 index 000000000000..d451d6ea6d03 --- /dev/null +++ b/app-misc/geoclue/files/2.5.3-optional-vapi.patch @@ -0,0 +1,52 @@ +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/files/geoclue-2.5.3-optional-vapi.patch b/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch deleted file mode 100644 index 874488decace..000000000000 --- a/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 56c7ca99dcadbf3e80ff2a9baf3e174f278b6a71 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour -Date: Wed, 19 Jun 2019 01:16:16 -0400 -Subject: [PATCH] optinal vala - ---- - libgeoclue/meson.build | 5 +++-- - meson_options.txt | 3 +++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build -index e228ec3..e78a3e8 100644 ---- a/libgeoclue/meson.build -+++ b/libgeoclue/meson.build -@@ -58,7 +58,8 @@ 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) -+vapigen_req = get_option('vapigen') -+vapigen = find_program('vapigen-ver', 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 +79,7 @@ if gir.found() and enable_gir - install: true, - header: 'geoclue.h', - extra_args: [ '--quiet' ]) -- if vapigen.found() -+ if vapigen.found() and vapigen_req - 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..8611f6c 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,6 @@ -+option('vapigen', -+ type: 'boolean', value: false, -+ description: 'Enable vala?') - option('libgeoclue', - type: 'boolean', value: true, - description: 'Enable convenience library') --- -2.21.0 - diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild index ead1b7a079ee..edf0b2a0f2b9 100644 --- a/app-misc/geoclue/geoclue-2.4.13.ebuild +++ b/app-misc/geoclue/geoclue-2.4.13.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b LICENSE="LGPL-2" SLOT="2.0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd" IUSE="+introspection modemmanager zeroconf" RDEPEND=" diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild deleted file mode 100644 index da7047d77a4e..000000000000 --- a/app-misc/geoclue/geoclue-2.4.8.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit gnome2 systemd user versionator - -MY_PV=$(get_version_component_range 1-2) -DESCRIPTION="A geoinformation D-Bus service" -HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue" -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz" - -LICENSE="LGPL-2" -SLOT="2.0" -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd" -IUSE="+introspection +modemmanager zeroconf" - -RDEPEND=" - >=dev-libs/glib-2.34: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] ) - !