gentoo resync : 12.01.2019

6 files changed, 177 insertions, 2 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8a5ad9468d52..59a11482fbef 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 141bfb2556b9..633d4135ce6f 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -5,4 +5,5 @@ DIST gvfs-1.34.2.1-patchset.tar.xz 2608 BLAKE2B 1041815fa35e052219df561325bab4a9
 DIST gvfs-1.34.2.1.tar.xz 1822700 BLAKE2B 2de1e86bf9dfe6567c59c7d1e2032f9e749daef0a1deb27963c0b5122be5925256c02a90dae5371bed9e037137400cca8e3461f415b3bed36de4310757bced62 SHA512 ff8d2ebff220e8432584d13640747d54c78c7350c0b8b9ed8544eb311fb4211897fb8473375b246cc1271df507f5ae2dd4edc6d5fd5d2061792377f3f37ebdb1
 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
 EBUILD gvfs-1.34.2.1-r1.ebuild 3741 BLAKE2B cdc826af8a3ceffa2e211ae804f31b970c554aace54dcd71ef3eb197ffef40be96c68c0b7624214c6e3007c922d8396f9f8c8d75409b16f7b36081cdd8acfede SHA512 98afd5b53bf08526a43ba561b8bd27e295f4f33247b29a344a0142657a5715d0af29edd55ecccf1912985ab416e34eb837191769de84b3255058e0e1fda22fa7
+EBUILD gvfs-1.34.2.1-r2.ebuild 3767 BLAKE2B 992c78246b386873c9eed365168556a7d04ea4c56e50bc4f720a80d1a700b52e8354c09b678576fae98a202351e9354effb358985814ddb83e025bcf7099e9bc SHA512 b9d67a7275c699605a9745d49b026f0f3d9461fc9ab696e136883d3d342304a07a7a019ff36cc523acb47711ccdcbc4bb293a80f190ed355a0d53db9e82f887c
 MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild b/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild
new file mode 100644
index 000000000000..16bae098ddea
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.34.2.1-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+REQUIRED_USE="
+	cdda? ( udev )
+	elogind? ( !systemd udisks )
+	google? ( gnome-online-accounts )
+	mtp? ( udev )
+	udisks? ( udev )
+	systemd? ( !elogind udisks )
+"
+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="
+	app-crypt/gcr:=
+	>=dev-libs/glib-2.51:2
+	dev-libs/libxml2:2
+	net-misc/openssh
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	archive? ( app-arch/libarchive:= )
+	bluray? ( media-libs/libbluray:= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	fuse? ( >=sys-fs/fuse-2.8.0:0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
+	google? (
+		>=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts]
+		>=net-libs/gnome-online-accounts-3.17.1:= )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	http? ( >=net-libs/libsoup-2.42:2.4 )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:= )
+	mtp? (
+		>=dev-libs/libusb-1.0.21
+		>=media-libs/libmtp-1.1.12 )
+	nfs? ( >=net-fs/libnfs-1.9.8 )
+	policykit? (
+		sys-auth/polkit
+		sys-libs/libcap )
+	samba? ( >=net-fs/samba-4[client] )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	udev? (
+		cdda? (
+			dev-libs/libcdio:0=
+			dev-libs/libcdio-paranoia )
+		>=virtual/libgudev-147:=
+		virtual/libudev:= )
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	zeroconf? ( >=net-dns/avahi-0.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	test? (
+		>=dev-python/twisted-16
+		|| (
+			net-analyzer/netcat
+			net-analyzer/netcat6 ) )
+	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+PATCHES=(
+	"${WORKDIR}"/patches/ # origin/gnome-3-26@20180912 + elogind support (requires eautoreconf)
+)
+
+src_prepare() {
+	if ! use udev; then
+		sed -e 's/gvfsd-burn/ /' \
+			-e 's/burn.mount.in/ /' \
+			-e 's/burn.mount/ /' \
+			-i daemon/Makefile.am || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-documentation installs man pages
+	# --disable-obexftp, upstream bug #729945
+	gnome2_src_configure \
+		--disable-gdu \
+		--enable-documentation \
+		--enable-gcr \
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(use_enable afp) \
+		$(use_enable archive) \
+		$(use_enable bluray) \
+		$(use_enable cdda) \
+		$(use_enable elogind libelogind) \
+		$(use_enable fuse) \
+		$(use_enable gnome-keyring keyring) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable google) \
+		$(use_enable gphoto2) \
+		$(use_enable http) \
+		$(use_enable ios afc) \
+		$(use_enable mtp libmtp) \
+		$(use_enable mtp libusb) \
+		$(use_enable nfs) \
+		$(use_enable policykit admin) \
+		$(use_enable samba) \
+		$(use_enable systemd libsystemd-login) \
+		$(use_enable udev gudev) \
+		$(use_enable udev) \
+		$(use_enable udisks udisks2) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index ba49f20fb16a..1a127b4991cf 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,3 +1,4 @@
+AUX 3.26.0-glib-2.60-compat.patch 1154 BLAKE2B a513831c02906d83f93c6864d18dc176e9453ea417d22423e3823e2f2b692fa472bd5492fe6403dbbbb8e87f7010a555ba29090614b6cad2b9bd1090e72ddeda SHA512 54ba7e58820eadcfcb9e3568be09ac389274a1088d7113548c6abc534136261fa30455e701f047a547ee310234cc4fcc26c6051902f0988ea4c09c69b4b8ccd7
 DIST libgnomekbd-3.26.0.tar.xz 449204 BLAKE2B 360f6da6ea7ad2850ecba062e0825cadcbc62ab9fdd432ad1fd4f38d32230e9eb6da1b7eb50116302b39be76565da7554df2c96e3a348e5130c428158bfa7792 SHA512 dc3ee91468e570d038bc91c4458ddb49dc097639c671815eecc4308efea85e29c1121cfd959e62f970a2e8112f818296802be804e99b96ee89fd5de8136645d9
-EBUILD libgnomekbd-3.26.0.ebuild 787 BLAKE2B 367e2a745e6a8127738df87127a08b9cadf19ddcacf691ebff875d3c1f7ae9fbaa0583158abfc94649d516aaca567350a7094672825b945f5395ab0f293ecd23 SHA512 90b8bd48ecd21b71f88adff154383601cf6a14fdcfafee9a35bcc1e785f733c81b456db6951051be4a07688ef66585642d0df2a3e39e8a25c2aacc2d90f7f0c8
+EBUILD libgnomekbd-3.26.0.ebuild 844 BLAKE2B b3da8f610a5c4f5c554abc10f6f3342fdee60f4b88ee09e20867f70af501bb9792bee031109f3eedfc9cd5d2e9360185526407147bfc407a2d46e52d39009032 SHA512 09e7286cfa12e556f595f3f118a69325fdc9900bede6bc6f68165f5b40bfbd8c317c3369ec47911cce4e5ebb808758de5b1c44d6bd01c345ba9dcbb1911a1edc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch
new file mode 100644
index 000000000000..c6bcf66160f9
--- /dev/null
+++ b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch
@@ -0,0 +1,35 @@
+From 7e0b6f0a96477c5d12434231ea413d3a16658ed0 Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <akitouni@gnome.org>
+Date: Tue, 18 Dec 2018 10:54:06 +0100
+Subject: [PATCH] rename g_strv_equal to gkbd_strv_equal
+
+it conflicts with the newly added g_strv_equal in glib
+---
+ libgnomekbd/gkbd-keyboard-config.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
+index bbe6904..00dc429 100644
+--- a/libgnomekbd/gkbd-keyboard-config.c
++++ b/libgnomekbd/gkbd-keyboard-config.c
+@@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = {
+  */
+ 
+ static gboolean
+-g_strv_equal (gchar ** l1, gchar ** l2)
++gkbd_strv_equal (gchar ** l1, gchar ** l2)
+ {
+ 	if (l1 == l2)
+ 		return TRUE;
+@@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1,
+ 	    (kbd_config2->model != NULL) &&
+ 	    g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model))
+ 		return False;
+-	if (!g_strv_equal (kbd_config1->layouts_variants,
++	if (!gkbd_strv_equal (kbd_config1->layouts_variants,
+ 			   kbd_config2->layouts_variants))
+ 		return False;
+ 
+-- 
+2.17.0
+
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
index 9bc10e4ce687..d07c943fef68 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \