gentoo resync : 18.05.2019

3 files changed, 2 insertions, 48 deletions

diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index b8a857ba65f5..1e47ae563304 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -1,6 +1,4 @@
 AUX disable-installed-tests.patch 1245 BLAKE2B e66fe773ad51475247306ea3b2459bf062e5b26cf8e85c52ce99dd05bfdcd32dd40c5d3d591737f6c3ce7c2688f31526b39af852a92a40c06657fc3e9149035c SHA512 7ab8113b1468c9291838def18b57e4dc3cc1a5bcbc22208ac2920b1199121a2055dcd31346551cbcafc1101945f242afdbabd8738d32fdc254a5b7474aeaa038
-DIST geocode-glib-3.24.0.tar.xz 413536 BLAKE2B 37eebd39bb64d614af338e323b7c37c9bcf554d82b761c135326a9b2c0ab405901739ffe89f50c35932d162e4d2743a21caf4f446924c5d9f47bcf50eb11f4e8 SHA512 0e3910e99d164fdf5afd6befbcb7139a56779834fb1f2a318951c03e5196a31c4dafd7f88c37c7014377f15cd4d4b81e7080a440881e2c50aadaadf621abe3b6
 DIST geocode-glib-3.26.1.tar.xz 75296 BLAKE2B 68e42868edfd73db94d16dcc754eea1ee736ad910c5180616ba351cc50b682cd3b7ea4a64c9e1296af315298f68ea850a1773c4a05955c1159a6038773aad184 SHA512 0eb8e8a668c3950d06e77a379d375e2297cf7d95435aa8212715ddc36c3a57a53192e75dd0c82a2f2e7e558ea0e903a477c9dfa54f8cd2805d048fe46265d621
-EBUILD geocode-glib-3.24.0.ebuild 1102 BLAKE2B 57374e9c55d69bf88a15daba5a16288141d601fb63db5aef322bc6ae0e9293a36cccd32a45fa4e8b582e904239d091dd85159a52d3c0d71f405faf9a20eb092d SHA512 1f22d917ed56b2cc8e0707586131fb0c5c94a7322d444b06a3a31a06e445b0bd35eab970b747538b889066700600a03e4acd909f723f2682d888d6bd8d715b31
-EBUILD geocode-glib-3.26.1.ebuild 1108 BLAKE2B b98945fed4ce215f78ac578bd82722478c9abf0943429798fcb47327f0845eb9f88d3cad669a6e5827879f87ab353eb63654ac1b420fd321a0a7cf9eb8b8fcc4 SHA512 edebca99a3efbea33218ac027cf5a80e3dbab5f7fa27d2825d4b31924a021743f02b43fe58bb2badd0c517d08f5af9e69487db23c86306e879b8fc1308c5c209
+EBUILD geocode-glib-3.26.1.ebuild 1106 BLAKE2B 82e4c8e16549e78d973423a02f29787df6af42dcad996e4d4ccbb1f837c25bba5fb1e7555d2d5c912835af0c9e6043772906846b56963eb335584418a3cd3cb7 SHA512 a5c249357dad6a1d719defe06f2b05d6de07c1b69f7ba86acee24792459b02eb68f1b82f63c7fb5cfcea29a8f1f0e6358fb6dc5aa7268e822d976b967d39444e
 MISC metadata.xml 416 BLAKE2B dfe7b0b1aa8cd6c4664d3cbc0d9bda64b4452e8bf606f105a24829f19a9151b36406c676ffd66e81150e0cfd813d1f7b33ada08b71be9e93ac3547815ba9721c SHA512 d3c5f22341ffa6a9a63d788f9cdb801b496142336bed66318d780ad7cb16d75cbc964d11b472e0cb268d431542b4d2b2a2ccc87fff20fd77777bae0418009cb8
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
deleted file mode 100644
index 73ffc54fc348..000000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.24.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-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="+introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.99.2[introspection?]
-	gnome-base/gvfs[http]
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-
-# FIXME: need network #424719, recheck
-# need various locales to be present
-RESTRICT="test"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
-
-src_test() {
-	export GVFS_DISABLE_FUSE=1
-	export GIO_USE_VFS=gvfs
-	ewarn "Tests require network access to http://where.yahooapis.com"
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.1.ebuild
index 018bb7e4086a..ab7bb6a37ef6 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.1.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection test"
 
 RDEPEND="