gentoo resync : 12.01.2019

5 files changed, 93 insertions, 5 deletions

diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 5804e99badb9..619075954746 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,3 +1,6 @@
+AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
 DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
-EBUILD geocode-glib-3.24.0.ebuild 1126 BLAKE2B a32f466ba0e92ce4f07cb8c4c3de71f45cf9d309e16aecdb3b976cca8644de0feff9d50ec69a5c30104e4b64cdf8ece6a97430d7cc7cb4a328db121ac55c3e63 SHA512 92bc4d7b61f6eb6c38268fa6ac2852a2aeb126bab0953e3280b6750cd9a4c74d024f8205d30bce000ca990ae0cf979773cd726834880f167eb76cda28e2b863e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+DIST geocode-glib-3.26.0.tar.xz 75984 BLAKE2B 72d7655e1066c276663ce90082d40c353a3c11ca13e51cb1568180d39e6058df5e7729b2206b44539ed70bd7fb8afeb7d4c264f7a541ab9b9c80223bcab0a457 SHA512 d0924673b669a29d04ad5f1d70797e98b67af3bc85edd8870d21d22d18ec8f2b93a13f94226e295ccb3c6e83d1545bdd2361ebacdbb1928c06b8beed36759838
+EBUILD geocode-glib-3.24.0.ebuild 1102 BLAKE2B 57374e9c55d69bf88a15daba5a16288141d601fb63db5aef322bc6ae0e9293a36cccd32a45fa4e8b582e904239d091dd85159a52d3c0d71f405faf9a20eb092d SHA512 1f22d917ed56b2cc8e0707586131fb0c5c94a7322d444b06a3a31a06e445b0bd35eab970b747538b889066700600a03e4acd909f723f2682d888d6bd8d715b31
+EBUILD geocode-glib-3.26.0.ebuild 1108 BLAKE2B b98945fed4ce215f78ac578bd82722478c9abf0943429798fcb47327f0845eb9f88d3cad669a6e5827879f87ab353eb63654ac1b420fd321a0a7cf9eb8b8fcc4 SHA512 edebca99a3efbea33218ac027cf5a80e3dbab5f7fa27d2825d4b31924a021743f02b43fe58bb2badd0c517d08f5af9e69487db23c86306e879b8fc1308c5c209
+MISC metadata.xml 416 BLAKE2B dfe7b0b1aa8cd6c4664d3cbc0d9bda64b4452e8bf606f105a24829f19a9151b36406c676ffd66e81150e0cfd813d1f7b33ada08b71be9e93ac3547815ba9721c SHA512 d3c5f22341ffa6a9a63d788f9cdb801b496142336bed66318d780ad7cb16d75cbc964d11b472e0cb268d431542b4d2b2a2ccc87fff20fd77777bae0418009cb8
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 000000000000..9358e4896526
--- /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.24.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
index 792fefb398a0..73ffc54fc348 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit gnome2
 
-DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
+DESCRIPTION="GLib helper library for geocoding services"
 HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection test"
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 000000000000..018bb7e4086a
--- /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
+}
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index 39980802b1da..f4c3acdf586c 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -5,4 +5,8 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<longdescription lang="en">
+	geocode-glib is a helper library for geocoding and reverse-geocoding
+	services offered by OpenStreetMap and Nominatim.
+</longdescription>
 </pkgmetadata>