gentoo resync : 08.01.2018

6 files changed, 143 insertions, 6 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 90298f527295..6c1fc8198c40 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 1b44abe5d262..bc1b4d4b5dda 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -5,5 +5,5 @@ DIST gnome-control-center-3.24.2.tar.xz 7269112 BLAKE2B 41049a7176eb3de146d8ac80
 DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb
 EBUILD gnome-control-center-3.22.2-r1.ebuild 5245 BLAKE2B 141297b816965b48778e6bf62ef84e395fd3c3075bfbd5d11c97e4e98840792f4e6841dc577a34c14cb43c788993d8389d662aa7fe4102e450c6f1e37fd32c5b SHA512 44612716ac751b1e73f9fc7526c93e154843bfe78f5a302bcc9ef7f881c94535f02e39b38dbd0d4bc9f970554f51bbc76a61fcf42f4278e90671fcae11a0c39b
 EBUILD gnome-control-center-3.24.2.ebuild 5309 BLAKE2B cd087cde303cf9255f6086831cae71725954b3836ae3e910ff844f3ade9c42c4953299d2b4fb2b5e199cb65dc2c33e29e2d97f1ddb0a07aaa355d5b67ecf4c41 SHA512 cdff94b284057745e2abee9c8ff1756fbfe138c6a377d7137f929c34ab25deef145cbe2ac52a7a4a209cb543f3aef206216f01ab789d9c845b3516125264c2c3
-EBUILD gnome-control-center-3.24.3.ebuild 5371 BLAKE2B 7981e62e19e241a4f250b8a233768b9ba0a413844c5ab64c5906610e8e568e02a8355267490c6ebbbf3d7e614e8d47aeab5e4c4295068aa3d4774428bb939c2e SHA512 49986939d878f9b559fd29cbdcae2c85f44396ca4fedf4200f74c22bdad71835353cf17630eb5027776c874e339bf4e922266f279aa316544de43e63d196170d
+EBUILD gnome-control-center-3.24.3.ebuild 5404 BLAKE2B 8390c1072f780a6127e0a25598ebe4a5ad1bff9a3bd903b3a079f961f4fac5f8b5043a654af00abd32ef52363417b24175e6530a72df89bb177b0346a79051b1 SHA512 c0821dce654bdd3f47a9165c158b33754891a3e909119d4338a1ba503e88b6adbfe0ceb3f1aa67c3b0ad476fc533ffb3d950196481b44378921cae24a813a3ae
 MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
index b7fe8aa31c0b..4f53c91e0924 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ QA_CONFIGURE_OPTIONS=".*"
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # udev could be made optional, only conditions gsd-device-panel
 # (mouse, keyboards, touchscreen, etc)
-# display panel requires colord
+# display panel requires colord and gnome-settings-daemon[colord]
 # printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2[dbus]
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
 	>=gnome-base/gsettings-desktop-schemas-3.21.4
 	>=gnome-base/gnome-desktop-3.21.2:3=
-	>=gnome-base/gnome-settings-daemon-3.23.90[colord?,policykit]
+	>=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit]
 	>=x11-misc/colord-0.1.34:0=
 
 	>=dev-libs/libpwquality-1.2.2
@@ -59,7 +59,7 @@ COMMON_DEPEND="
 		>=x11-misc/colord-0.1.34:0=
 		>=x11-libs/colord-gtk-0.1.24 )
 	cups? (
-		>=net-print/cups-1.4[dbus]
+		>=net-print/cups-1.7[dbus]
 		>=net-fs/samba-4.0.0[client]
 	)
 	gnome-online-accounts? (
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 8cdfefdfbcd2..0085a45ca17c 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,6 +1,8 @@
 AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2
 DIST gvfs-1.30.4.tar.xz 1895304 BLAKE2B 7e7dbcde464ac3afc982d6d04916ecbee4b0cfae9481d2f75e2195b4816e8f92a5fe3d434f630dbea684b4020721825133205f303d4bf527d8826033355b547e SHA512 305b2abc8cfcb4bdea1fb84f5a7df4aac9697494f5d63d40ce1eb234b547aed497deb4d88a2cb17f9ab4fc188d49ff56033993a17cbfebae6d65a33dc84a633a
+DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823ebffca2e7e73245b3597e085f2fff5c98999e6eccd052fa3564339b75d764f2124592c0977fddd2eb4afeca819b965 SHA512 c3e9de02e013aaf707878f8ffab96c42ac558412020f8462f928d2c7bd8b9756aa980e6b8db50e6f0ff0ad91f250ef1a26358d80b5d1cdaa9234475ec3a3db4f
 DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
 EBUILD gvfs-1.30.4.ebuild 3682 BLAKE2B 2d3d1ef263069a971b730ca70ca5719a67279b393381e14ea385fc677be382d7e81d68a81e89a1a8cfd288e56fb2cf52577cc55568a666aba89b64e247cc47d1 SHA512 e5698ae16fad71377b69a981ab420754be4303f36b8b18bd1687b2377469a215ae2a6eb75df5682c80dca4b682a7e9f48840247616d431b1b11a2b56048110ad
+EBUILD gvfs-1.32.1-r1.ebuild 3834 BLAKE2B 92f7208e137f9c6dc7001d07abefad4cd679111c0326c9a00e83e59b1dde72aa09c9fa14d705c1bd124476374c747d8a7db7b058738d2a82cf7fd41cb411bd0a SHA512 3c63db912c414c0a910ae4cbb4c60f26f10fe53384f9048b59c69d7f5cb70c9096ebc0088a956ca121d13501472246802f360d831d12e05e46accc2665c9ed01
 EBUILD gvfs-1.32.1.ebuild 3621 BLAKE2B 2364de0783d0a1a5d3a4de00f9528ebed53a40aea3056211ad5349c726921304682314bf3c6b040edd41f4fc726415a25cf05a49074885c1dfff28d289a1b52a SHA512 00057451a01ede2cc50c271bc14bfd53c50f3d56a2d386c0106b3550c0d577e7aca11e39568d02a3821e6695602b74e6c094d5798a809f3b1aa60005c46c989e
-MISC metadata.xml 1542 BLAKE2B 7d9cea575247a3f9bfcba36d207b9a20777a73a8d0b6af194e0b63f84c8209caf326f7380c36430d03e76607e1d75544ac6355e8811b25ff11496dbf9aae2ebc SHA512 f6576dfac41a515f2bf1918979e9f7927aea32f7cbd552c6f4f550e573556315eeda16f52262994ffe0ee305545f51845f101e7538e7a5e0f5745f3cc75201b9
+MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
new file mode 100644
index 000000000000..cef628d1332b
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patches.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +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 ~arm-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.7:=[crypt,gnome-online-accounts]
+		>=net-libs/gnome-online-accounts-3.17.1:= )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	gtk? ( >=x11-libs/gtk+-3.0:3 )
+	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-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/gtk-doc-am
+	test? (
+		>=dev-python/twisted-core-12.3.0
+		|| (
+			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}"/${P}-patches/ #599482, 641522, gnome-3-24 backports
+	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
+)
+
+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 gtk) \
+		$(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/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 346074ac28ce..d26195bc7e44 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -16,6 +16,7 @@ applications not using gio to access the gvfs filesystems.
 	<flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
 	<flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
+	<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
 	<flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
 	<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 	<flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>