Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/geocode-glib/, sci-geosciences/geocode-glib/files/
Date: Fri, 11 Jan 2019 21:00:21
Message-Id: 1547240322.5240288de1ae51f86ed6ca31b3584fad3dd7366e.leio@gentoo
commit:     5240288de1ae51f86ed6ca31b3584fad3dd7366e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 12:30:50 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 20:58:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5240288d

sci-geosciences/geocode-glib: bump to 3.26.0

Remove long unnecessary (I think) gvfs[http] dep; old version
did use g_file_new_for_uri on a http:// URI, but it's all
direct libsoup nowadays, with g_file for local cache file only.

Re-enable tests and remove unnecessary dbus machinery, as
current tests seem to make no use of it. Patch the test suite
to not install tests.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 sci-geosciences/geocode-glib/Manifest              |  1 +
 .../files/disable-installed-tests.patch            | 38 +++++++++++++++++++
 .../geocode-glib/geocode-glib-3.26.0.ebuild        | 43 ++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 8960f1594e1..8a1c932fbf8 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1 +1,2 @@
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
+DIST geocode-glib-3.26.0.tar.xz 75984 BLAKE2B 72d7655e1066c276663ce90082d40c353a3c11ca13e51cb1568180d39e6058df5e7729b2206b44539ed70bd7fb8afeb7d4c264f7a541ab9b9c80223bcab0a457 SHA512 d0924673b669a29d04ad5f1d70797e98b67af3bc85edd8870d21d22d18ec8f2b93a13f94226e295ccb3c6e83d1545bdd2361ebacdbb1928c06b8beed36759838

diff --git a/sci-geosciences/geocode-glib/files/disable-installed-tests.patch b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch
new file mode 100644
index 00000000000..9358e489652
--- /dev/null
+++ b/sci-geosciences/geocode-glib/files/disable-installed-tests.patch
@@ -0,0 +1,38 @@
+--- a/geocode-glib/tests/meson.build	2019-01-11 14:10:47.797376871 +0200
++++ b/geocode-glib/tests/meson.build	2019-01-11 14:13:09.409159050 +0200
+@@ -3,7 +3,7 @@
+ e = executable('geo-uri',
+                'geo-uri.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ test('Geo URI', e)
+ 
+@@ -12,7 +12,7 @@
+                'geocode-nominatim-test.c',
+                'geocode-glib.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ env = ['G_TEST_SRCDIR=' + meson.current_source_dir()]
+ test('API test', e, env: env)
+@@ -20,10 +20,11 @@
+ e = executable('mock-backend',
+                'mock-backend.c',
+                dependencies: geocode_glib_dep,
+-               install: true,
++               install: false,
+                install_dir: install_dir)
+ test('Test mock backend', e)
+ 
++if false
+ install_data('locale_format.json',
+              'locale_name.json',
+              'nominatim-area.json',
+@@ -39,3 +40,4 @@
+              'search_lat_long.json',
+              'xep.json',
+              install_dir: install_dir)
++endif

diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
new file mode 100644
index 00000000000..018bb7e4086
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="GLib helper library for geocoding services"
+HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection test"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.99.2[introspection?]
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.13
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/disable-installed-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test enable-installed-tests) # Actual installation to live system is sedded out, but we need this for running them in src_test
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+	meson_src_configure
+}