gentoo resync : 18.08.2019

4 files changed, 52 insertions, 9 deletions

diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 2b1c59b3883d..4f905c0fc81b 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,10 +1,11 @@
 AUX 1.38.3-gvfsdaemon-rpath.patch 1075 BLAKE2B ccb99b16418e8d08bbbb4fe211b69b388d3995c0d28d8d33f1ceffaf5ef4384cefd19e7337dfbd95c31a7406f873448c9ea3343d5afa787b2df9050d204cb61f SHA512 18794d7081a6d4e6cbd7994a5ff683ecab4df677d5b37419144cdb39d800569d620b76fc931b849a7d05421effc66bf76b193a28f9ca8d653867784ad666b13a
+AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013
 AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2
 DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45
 DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
-DIST gvfs-1.38.2.tar.xz 1202808 BLAKE2B 31150c10e042b262a55f4a072496138f47532ec55c2cae564d7c1a7a06b043bf131a91a633757fc02a0a31fc052a6ae64bd25d357cf60efa10b9490c6d1a9d84 SHA512 b6982f2c23cae057aebd00dab52b4f21f8bcef79fc5e97c098d54a9ebf997913f53146bd1760065454198c94a66f1bc1fc5325b08fea10e63a755fad87321488
 DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175
+DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
-EBUILD gvfs-1.38.2.ebuild 3654 BLAKE2B 49c92afd0473913cd972ef26f228bfc192b347167fab0fcbb38c9f5ab0882b5085c27ff75464ea2d13616fbe77919ec097fb3bc066efcf22e87bbf78fc52bd1c SHA512 e6a31e04a3c38d98c6ba2101dd4522e0c8022627658db291b5c7d01e193fcb1101fb7874ea94f6c3b39265b9e230c6355504e73e441e762e83af802b37b86b09
-EBUILD gvfs-1.38.3.ebuild 3770 BLAKE2B 551347cd47fe30f72fac1515b036dc05768cefa1afd62daf8c5381189cb3e1ff6e2749724f4423d48d7a1d9bf60bd140c08dcd254bc69e8bb6b5c83e59b7a806 SHA512 a8ee9a144551b56403b4ce2b5d5c8531bc8a22338dd9c7ae030df131c1c489826d6308b32683ece2ec12908c331e6896975fba0f10a44e09374992ca1e5feccc
+EBUILD gvfs-1.38.3.ebuild 3769 BLAKE2B b8d9a194313ffcf85e4e4364bcc658f5c8e8874fa0c24338f0214685a7d3f4f3930220bc9764bdd06fcf5de70b1babd7e12a2d2c86247288074db30b46af41e8 SHA512 352e5b0800c192ab6e629318c2b975d2d1149e5d9613bee39812d6a7ae3213a0cf1b92397bc46c1a7b59643cc8eff197773306c8ed4ebd7c7293db37e2dff77c
+EBUILD gvfs-1.40.2.ebuild 3811 BLAKE2B 79fb1bbf68b45ecc1f12522f9a5e626529b397aef69f34a1e15715de265cc43e3d2d64637fb38bf644bedd240e2aa506f63c6fedab96d3bc90f131320e3d20f7 SHA512 6756c476d138b0bb561e16bb418c5b8bd18c8c0d5bea60ee2db58340a2ecbc7264493249b80f643d171f1c4597cf169a44d2828e23fef5aedcd8515565f8d64b
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
new file mode 100644
index 000000000000..e5d579418932
--- /dev/null
+++ b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch
@@ -0,0 +1,35 @@
+From 4fd68eb29aaf010468e154c737a03e04465aabb5 Mon Sep 17 00:00:00 2001
+From: Robby Workman <rworkman@slackware.com>
+Date: Thu, 18 Jul 2019 03:38:41 -0500
+Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so
+
+On Slackware development branch with gvfs-1.40.2, I just noticed this:
+  # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found"
+	libgvfscommon.so => not found
+
+After some backtracking, it seems that this first occurred in the
+switchover from autotools to meson in the 1.36.x --> 1.38.x bump.
+
+Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and
+assistance with troubleshooting this.
+
+Signed-off-by: Robby Workman <rworkman@slackware.com>
+---
+ daemon/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/meson.build b/daemon/meson.build
+index 0ce0c204..f3ed404a 100644
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library(
+   dependencies: deps,
+   c_args: cflags,
+   install: true,
++  install_rpath: gvfs_rpath,
+   install_dir: gvfs_pkglibdir,
+ )
+ 
+-- 
+2.20.1
+
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild
index 3af7859cf3d8..268370f19184 100644
--- a/gnome-base/gvfs/gvfs-1.38.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.38.3.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/gvfs/gvfs-1.38.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index 03f0d89a9e17..fab749fb5a6d 100644
--- a/gnome-base/gvfs/gvfs-1.38.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome.org gnome2-utils meson systemd xdg
 
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
@@ -33,7 +33,7 @@ RDEPEND="
 		sys-libs/libcap )
 	http? (
 		dev-libs/libxml2:2
-		>=net-libs/libsoup-2.42.0:2.4 )
+		>=net-libs/libsoup-2.58.0:2.4 )
 	zeroconf? ( >=net-dns/avahi-0.6 )
 	udev? ( >=virtual/libgudev-147:= )
 	fuse? ( >=sys-fs/fuse-2.8.0:0 )
@@ -59,16 +59,23 @@ RDEPEND="
 	nfs? ( >=net-fs/libnfs-1.9.8 )
 	net-misc/openssh
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.49
 	dev-util/glib-utils
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	dev-util/gdbus-codegen
 "
 
+PATCHES=(
+	# from gnome-3-32 branch, fixes RPATH of libgvfsdaemon.so
+	"${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch
+)
+
 src_configure() {
 	local enable_logind="false"
 	if use systemd || use elogind; then