gentoo resync : 23.03.2018

20 files changed, 145 insertions, 96 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 5507b31121ed..5fde616a6cb8 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 9dce197e044b..d8bcadc2b0d9 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -4,6 +4,6 @@ DIST cifs-utils-6.4.tar.bz2 392809 BLAKE2B 90d59cbc49e6d3cf427a43fd9deedc8ea8150
 DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e
 DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13
 EBUILD cifs-utils-6.4.ebuild 2974 BLAKE2B f469c0c94f3cba69c8847ffe956e23ed0525ac01360e4e966e73a83680d732251f0fb418df3f5b853bfa13ee1935e77eb6ea92220beca8939edf1437cff0d5c1 SHA512 c5c12c57c322a2a87f03426a2d08f1fe1e69213efbc4463b04b5d2b60ca1b06578a018336666b5a2f4213c3681d1d1ee3c35df4b0bdf802e4a1e564d423ee4e1
-EBUILD cifs-utils-6.7.ebuild 3246 BLAKE2B 16a9f84df376f6b9f427e0212abf15ac34abf1020507e6c8a92de0a2673f1012f43c05d2dde23bb4f5d0f811d5de1e58fdbcecfd8b3277731f5f00ddaf8fe040 SHA512 dc2153bb30d70e7626d511130fba8aadafc54c5b8dbca6c258763e65779e3a0cc1d6e684d4c0c531fabb4ee824b0f33a771af8b0b03e203c7ecf614e12d2b6e9
+EBUILD cifs-utils-6.7.ebuild 3242 BLAKE2B d050d2987e11c0e625b4cdca10da1af8c9547d85b29adb54d8d0bce29e78da4694bba3c5c5f277edc66b9126d7ca851444fce5a720e4908917be11082922ff89 SHA512 f07c4840992fb5f4498d1cba5e9345029965dbe07b4c5ba674a87fdde83b6aebeb511c39d9e553adbdf1de83765d06216728348986f46b3bcd84a8ef384844a6
 EBUILD cifs-utils-6.8.ebuild 3230 BLAKE2B 73e27d0cd239fc82c440d299a3a3ef07e4a4ad244e2980f0526e2ee8aa12b46e70fd46f66eaa587674a1c9bc2d0b02ba98f9943d38fbcb5a2db5a57bf1d82852 SHA512 311e7213a58ddc8df71ecf9ced69af3014de41465f57b8b46dc6bbe334b1a78199afbf142a74869087fd5bcb78d98feb55704f004dec65b61da2f04eac15f26c
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
index 8572921b389b..f4dfbb774f79 100644
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.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
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="+acl +ads +caps +caps-ng creds pam"
 
 RDEPEND="
diff --git a/net-fs/s3backer/Manifest b/net-fs/s3backer/Manifest
index 956145969910..5c2f807f63b5 100644
--- a/net-fs/s3backer/Manifest
+++ b/net-fs/s3backer/Manifest
@@ -1,3 +1,3 @@
-DIST s3backer-1.3.7.tar.gz 179068 BLAKE2B b72fe6207b935e10c31568888d8fd167013f92fd3fca2d06432bb12e9a60ca8064b664a64824eb72a55713c1d768ae1f025f0239027b55cefb4f319843d25681 SHA512 c3fae911e6b39cb211ac5d85c3d75cb6fd823243879d98d2a2b18644d22fe5a70a293d06c4e3c6559452d39cec80bbac9cea76965ead451bb0a145a61df8bc83
-EBUILD s3backer-1.3.7.ebuild 651 BLAKE2B 97e42052179fbe57e0b0e8e00f166c6230c56997e062869c46c76db12bfaa752d242d37c36ef64cccd788cc4513e6e1289f0ec422e73b60e78c362b83d1fed87 SHA512 ea1cf13c4b181c7b9fc69ca787ac482736af9bf10effa7061b04f16bcdaa5efd7027f593dd4a8b4dcfcd25a79abf45703c86ca8f183b0de802b1a1d28d663bf3
+DIST s3backer-1.4.5.tar.gz 103318 BLAKE2B 0fb93418ddf0fe295002fe0335f8ea626b8d0cb584f0fab6bcd60964b8dc14b883b35c2e2a973d542715732efe3afb3f7e214b96208a6f33aa991915a4a9ccdc SHA512 9feb42266639981e6f7da5618ec356a5c87fdc3c26fe17b27773509d161df62dcf4e42efbc4bb5d55e2f1cd9ea4cef563274ed5fd4119cf1fb3924e91180f589
+EBUILD s3backer-1.4.5.ebuild 683 BLAKE2B 7b2656e63aaacbdc4be854eec0bc586597c076f6ddcdfc6c0437e3ff6a4f0df2d6b9528b7572edfd99e5cfb3d99226615a161c0d1a18776b884b6a61aedda46c SHA512 3c62b2e4ed5c076b9ef8ad3ad0bc0c6b72b5e17e14706ae7703c0140ad3162599d36fee073501b632cf84508a56076837d5ddd96a6b417d78be6b9d10ccb4ef3
 MISC metadata.xml 305 BLAKE2B c1b22134224641d2d08a9d9eaf5a5ee3b394a9923c3d441cbf6e232882c6d3663af2900b3beef6f9920f9098f3fec94dcb87bff2118600708e1c879ec45c469b SHA512 016508df31db9ca31cdd2921e5569a450388c321724c41feb868162fcac11af35de1eb174f996df1f9e0ba945f0f313389caa4a6a0164e803f1c9413f052c62d
diff --git a/net-fs/s3backer/s3backer-1.3.7.ebuild b/net-fs/s3backer/s3backer-1.4.5.ebuild
index 0d2d6cb324a3..8a6fa70538ec 100644
--- a/net-fs/s3backer/s3backer-1.3.7.ebuild
+++ b/net-fs/s3backer/s3backer-1.4.5.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools
 
 DESCRIPTION="FUSE-based single file backing store via Amazon S3"
 HOMEPAGE="https://github.com/archiecobbs/s3backer"
-SRC_URI="https://s3backer.googlecode.com/files/s3backer-${PV}.tar.gz"
+SRC_URI="https://github.com/archiecobbs/s3backer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="net-misc/curl
-	sys-fs/fuse
+	sys-fs/fuse:0
 	sys-libs/zlib
 	dev-libs/expat
-	dev-libs/openssl"
+	dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	sed -e "/docdir=/s:packages/\$(PACKAGE):${PF}:" \
 		-e "/doc_DATA=/d" \
 		-i Makefile.am || die
diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 2a043dc6be5d..bf892be8eff8 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,7 +1,5 @@
-DIST s3fs-1.74.tar.gz 199120 BLAKE2B 4b2d3be59c443fe015ce2198218a6b87b258524edb6b290f333f20998eef58907c62abf904a7d8f007c5b0da8176a645972d51e864c56b877346ffc48f92fb72 SHA512 c9f6e2a113d2cfb9d6ac485d58ae8ebf317b9fc29b2fab34de427f206902eda22de056cbcdbc0e8cdebeff7900793e96a87f4ad8a3b1add85433a617ba53889d
-DIST s3fs-1.78.tar.gz 99538 BLAKE2B 635369651f8a695390fb96efbb25076f8fb9eeb575e1dfa5324de59c3de08972a0602456fb255dcb072d5ccd4436c19415ed50db7a23e6270de8aebae863a5a4 SHA512 ba0ad1ee5fc3c31d5b98dc7511abc8e74e91649af27aaaf5ecdca76cc7503bf66118638f983199bcdcaa51897f1bfa802310db9e2b72538d9f345f6942a3a8d0
 DIST s3fs-1.80.tar.gz 135891 BLAKE2B a2e38154e1721a88042e49db22bbd607ce0776758a351f5a54e76cb1654518a4d3e30cf9faf3d6d04f6d45d3224491f6e55cbae83ee5b88c27211044255d51d0 SHA512 c98c61198a6c2132f98ef5a8c8f600787cf359c6f79010366f786a3758281257cbf79b4bb47892fd1e9e50d8e46a389125ea67f3828c1c8131cbee5462c74141
-EBUILD s3fs-1.74.ebuild 598 BLAKE2B 13bbac8bd1336197c8d2cbd20ef3189f1ff73227fd68f3b372f7305c6e510c5ac420b9a8aa99dbbe154477346e1d8e399fdce0ba5dd78e2ee3e0132a219018b8 SHA512 3e9598678724a7729795d935fbbbcc5422f7974897e6757baa6cb2d5664aeb4d4e6ead00e3a28517afd2ce65b5577262bc4a141126f33b51ca71d9373f14051a
-EBUILD s3fs-1.78.ebuild 648 BLAKE2B 0362fe3dcf4996d793759b7eddb67b900d42b64110c27274198e61c424f4f4cddba285edcff9b9600ef4b4de9dba1f1c672a43190ef37a6092760f05d7056fb9 SHA512 8c839df2fb5a0687ee0ff0892f7accdc9ad5cdbe7ce9407df6b973419ad2c8c79a87141c8cfb5e2326e00c7fb541c4f8e6b3d2687be14bf142bdc6d9698d6a77
+DIST s3fs-1.83.tar.gz 150816 BLAKE2B 1b567708ea6264a619b664c5be3186374dcd3f50f01ac7d9aa093a82520f4685b7adc49a2d9c5a30e64334439c4c2676ae6cc74079251b4e47fe4ff7ad1f5945 SHA512 a925fb09c5786f2ff7fcb458e3cc37cce0eb2bd431b24e582cf02e7656716bfd9b7ffa3647f6f3c56ccfa313d2238cd263f28c2321850c1de082c48ebd9af5cb
 EBUILD s3fs-1.80.ebuild 975 BLAKE2B f255a02ec6a4fa97aed20007878c474f1196b78f3148b7e7f77356a2051ace6910c63ffddab2682e32c6f03e611095e71b3db1b55bbb66ef4124be76118eb8be SHA512 78e40951c4766934f3a5da327889e9795f06fa37c1f6609991dda2b0f95971ec4fe3119845517fc11885965e4b85dbab1015c63850d5d8fd71c9e0315571469f
+EBUILD s3fs-1.83.ebuild 984 BLAKE2B a8d7b72e5ddc921813fed8dcde49fe24a9653ab58e785735bd0e00cbe10531dbdd5348300b0d44e760cb8c1ecdaba7c5d61553994cd47eafd1f36e2aa690cd8c SHA512 ea0b563bc9437d4ccdf44c58d4ba46ed740e234d0dcdc1de0b9caa603efd174bb893a3537f33fcccda5f2eafb54f017eede28492db5d13d20671788beef82821
 MISC metadata.xml 781 BLAKE2B 97bacc52164bcc8f16df993523ae64d3d848b27649e99479b4910c4927a9bcf866dec9373ebc6293d55078b7d704c8182cdcc5d0c25dfbd9912adc8ec82daaad SHA512 c85a9298324825ece93ccb670708647d53234430aba6722af4e5eb8485d30a1c007a7d652c8cd455587204bff439cd455ad90a106eb46cf0645d16020a883e5d
diff --git a/net-fs/s3fs/s3fs-1.74.ebuild b/net-fs/s3fs/s3fs-1.74.ebuild
deleted file mode 100644
index 88bea69d2004..000000000000
--- a/net-fs/s3fs/s3fs-1.74.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-MY_PN=${PN}-fuse
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Amazon mounting S3 via fuse"
-HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND=">=dev-libs/libxml2-2.6:2
-	dev-libs/openssl
-	>=net-misc/curl-7.0
-	>=sys-fs/fuse-2.8.4"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
diff --git a/net-fs/s3fs/s3fs-1.78.ebuild b/net-fs/s3fs/s3fs-1.78.ebuild
deleted file mode 100644
index a60f9c0f267f..000000000000
--- a/net-fs/s3fs/s3fs-1.78.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-MY_PN=${PN}-fuse
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Amazon mounting S3 via fuse"
-HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND=">=dev-libs/libxml2-2.6:2
-	dev-libs/openssl
-	>=net-misc/curl-7.0
-	>=sys-fs/fuse-2.8.4"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/net-fs/s3fs/s3fs-1.83.ebuild b/net-fs/s3fs/s3fs-1.83.ebuild
new file mode 100644
index 000000000000..434d6f6bf7a7
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.83.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN=${PN}-fuse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Amazon S3 mounting via fuse"
+HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openssl nss gnutls nettle"
+REQUIRED_USE="
+	^^ ( openssl nss gnutls )
+	nettle? ( gnutls )"
+
+CDEPEND="
+	>=dev-libs/libxml2-2.6:2
+	openssl? ( dev-libs/openssl:0= )
+	nss? ( dev-libs/nss )
+	gnutls? ( net-libs/gnutls:= )
+	nettle? ( dev-libs/nettle:= )
+	>=net-misc/curl-7.0
+	>=sys-fs/fuse-2.8.4:0"
+
+RDEPEND="
+	${CDEPEND}
+	app-misc/mime-types"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with nss) \
+		$(use_with nettle) \
+		$(use_with gnutls) \
+		$(use_with openssl)
+}
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index 324ae1b3e46d..df64a8212cef 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -1,5 +1,7 @@
 DIST s3ql-2.24.tar.bz2 773766 BLAKE2B e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f SHA512 20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc
 DIST s3ql-2.25.tar.bz2 770189 BLAKE2B d0d3c7656f93b7bdac97ab7b9afdb6b53c6e909a5fd4e5a1cf9e5c153d81349dfb809409f79ec45768297e7c7eb89a590338cb9726b2eda51b3ca02734fa1001 SHA512 e2aa9f5d68a00b36ae33a7d36bf4aa42f761fb7e2cfb8370c914a78d0ed54edab85dd224fa7ef08e9e240161f5c66e46c0cbe99b6c5451cab3a50f33c78bde36
+DIST s3ql-2.26.tar.bz2 775435 BLAKE2B e30d0108522e3bca2e3e16138c418af553d4a0cb502671b70dee689be2795c02bc4fb47a2aa5d225a1ad748c7fadc099ff28443c9dedba737d89e8efabb455a0 SHA512 5bdf89fba0a0d354dbdb84bdc3f31a2cefaf3bc701989b9f413c428cb2de9e7449255c3f7ed775fccd2f2fbe3bdb3156ecfb43de5a958dedb83ba63399427569
 EBUILD s3ql-2.24.ebuild 1259 BLAKE2B 70fcff067f9dd5ecb42d8ee4487017ad17151407dbf88c78c0e18233955e9efefe1b414f94a2fdb256d7064a3f1ae11d8c64c0ae494c8cdfbb9411988f6b82d3 SHA512 56629a8387e72e4b345f57174f1ad722c012b86655f0e4a6fead7dfc800430859f84799dd6de28e2035d280abd18d6fd58fe41887ca83af9eaf20bfb907d89cb
 EBUILD s3ql-2.25.ebuild 1259 BLAKE2B 8c56bd4dbfc07a7bac09d0a73bfe9fb8cf33cae5660b0c0b796d420e2c19587553e21d86f69e65eba98471f590d9761aa285537d45d16a7b65d8275b142c3c0f SHA512 0043faf3590e5a771c7506f246b6d7b715904e922ab14a349351524b101d4ab4c62b68b16becbe813c6dfadebf8e0feeafb691e7b38d00847900c9ccb9dafabb
+EBUILD s3ql-2.26.ebuild 1259 BLAKE2B 8c56bd4dbfc07a7bac09d0a73bfe9fb8cf33cae5660b0c0b796d420e2c19587553e21d86f69e65eba98471f590d9761aa285537d45d16a7b65d8275b142c3c0f SHA512 0043faf3590e5a771c7506f246b6d7b715904e922ab14a349351524b101d4ab4c62b68b16becbe813c6dfadebf8e0feeafb691e7b38d00847900c9ccb9dafabb
 MISC metadata.xml 463 BLAKE2B e1b6d823fd6696f0c18592981f399b884e4aa2987cfebbf4c3f071d815d3d3260fbf4b1e68a8de80ce8135a8f593ed3fd40bbcbf8387cbf9658c2f0a9334e073 SHA512 7021866874fac865898c724916b0b455f3416351aba40ce8eeef55436e93c8616786be656101bcc693ec0762626e60b44814f9dba788ff5e17b2b22f3daf5f88
diff --git a/net-fs/s3ql/s3ql-2.26.ebuild b/net-fs/s3ql/s3ql-2.26.ebuild
new file mode 100644
index 000000000000..ef6ddc58a267
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.26.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured file system for online data storage"
+HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
+SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib doc test"
+
+RDEPEND=">=dev-db/sqlite-3.7.0:3
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
+	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		net-misc/rsync[xattr]
+	)"
+
+RESTRICT="test"
+
+python_test() {
+	addwrite /dev/fuse
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use contrib ; then
+		exeinto /usr/share/doc/${PF}/contrib
+		docompress -x /usr/share/doc/${PF}/contrib
+		doexe contrib/*.{py,sh}
+		doman contrib/*.1
+	fi
+
+	if use doc ; then
+		dodoc doc/manual.pdf
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index ae9deb31e55f..9c68a5ad6c8a 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -27,9 +27,9 @@ DIST samba-4.7.6.tar.gz 16864824 BLAKE2B 0c519f83e95f9ef9ff13c6a4998d0c98e677652
 DIST samba-4.8.0.tar.gz 17659751 BLAKE2B 389d7b6039a00734b514eb017bb201f119b8b894b98af4387ac3186a082b2de295e78b58e96539b93433d3d850e9be19f6ef9a63f66fa9a330f3a88d25b28a03 SHA512 64ffbddb6cf9eee00e5d67a471387b81759c3b4bf67793083aa021e232c8321182182eb9c642b9c25fb1a488f135dec34f7e092d286f94836c488022f8a15c01
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 EBUILD samba-4.2.14.ebuild 7066 BLAKE2B 7c88d976faf5e47b17678c2523a9cce59a93f4e401cc8a9d7e293051b9430fc6dada6c0eb0e06308e20ca6e10993c10d5a0c65ce55d26b4443d0b682efc4fd60 SHA512 b86f624ea3caaa517a8baf7e98edfdc470a294f2e0df3ccd5c3b979215386b762d166c81c187988ae151068149f722429e4b33e32092f842cb697aedacc8d6a5
-EBUILD samba-4.5.15.ebuild 8094 BLAKE2B eaca0d6a27865349f9c7c34ffa78dec632974021818dfbb5869f819aadf21b6585c27bddf7b85fb97a7ccb4dbd8e7ffaa329805e0b251a51914101767d80862f SHA512 3126a561de57cbf355e542aeb3de21e74be05ac839b851af8ded40a3625548671eb2ea874f315a592b06cdcb9c62d6db3116e9f96eaf1d39d1c8abc269fc8bcc
-EBUILD samba-4.5.16.ebuild 8094 BLAKE2B 2f9db841105c0699acd2e1700fa9bb38fb027761ccd0397a03819ac0c31c593a74b02ea68f2b93cbb3809af0611ba9227bed826a12320eb0392a05972fd0d403 SHA512 5c3538fcdfef8b014ba2d42765143b85a9dda23ba9e64f8ab0be14ab2e16653d976107e640317d50ed1a8e565456e2af417a68c38e5f35ea42a6592045334911
-EBUILD samba-4.6.14.ebuild 8619 BLAKE2B c331dbada58fb5ae792cfad8a97008b1453d13f101fc09ec40d85d5140b89c834576632da6c1b91c8ed0cdc79c18f1c75f2e046118b235a30926339dfd966afb SHA512 3abf8368b3f582879b9311f966594d20addae977c983516a7f9db401d45642cc213b8facd29612f8c9a2a033b860f9608cc3e6626451de88d37f461bb4f479fe
-EBUILD samba-4.7.6.ebuild 8654 BLAKE2B c2dfec298a58a11dddec7a8b0b41fc7b71e8109c750815d5fcd581cbf569254fd013e3a3b0884f37ff90f24ccbe39542b9545035ef871cad13c2b5f6206a7329 SHA512 3cca1a7037fc82cbbd9db490e86c8078a0a3587acda588619dd081e83bc132a400cd1a503a04f646c9eda37b18fe452f5dbf66094d388a5a0775a6a98cbd84f1
-EBUILD samba-4.8.0.ebuild 8298 BLAKE2B 11e30b67f4c8ef188fbbedb4d4c5ade57da52f66e81168c79c9f92bf57f933d29ba4b4fdeb360b5a5ce4b5c28dd2075517a13ba9f7980dc1818fbde11f5ef61e SHA512 63b19c10f2df496ac57b3575a94aea46795dae5416d44674b684eaaa1c4a6243a465b9e3d1d99fc1049eed0df64945ef3fe9025cf0df239b605e5370ab05e507
+EBUILD samba-4.5.15.ebuild 8100 BLAKE2B 996d16a48c8448b442dff2f5552d8c302629d9f8f726e0c4f87e2c056c219846aa798ca2c0971b42196c190cead961ed58608064599019372401d13c232891f5 SHA512 362a8430090e9d5df7767daf45d35cfd374b4a6107d5bfe45df0c10dcb1275376f4ec9547c0a75bcb580e114c933004829dd283febedf51340f8ce83b16c74ab
+EBUILD samba-4.5.16.ebuild 8099 BLAKE2B d47cfce6faaa618d8b0705798d581f50da1241f9ffceb3cb78855025d35a3491956f1be90603a217b9e309690c9e414f5a739c14e98c0260d724f51772fc5b67 SHA512 fd00c6fd607e7c979b6f666075d085dbc2f186c179321e07be4f909160c3fb9018404d31b2c9e1bdbfb3771cab4583ffa91242df452c01edb80190cdc03920a1
+EBUILD samba-4.6.14.ebuild 8625 BLAKE2B 8ea87d6c465a2c1e10fd120baba6058470a0c18c1c7e0b5c8120d8cf6cf6d756d3dc80d7ef733822d55245be05fcc2e52dae6928fcbc646aa9529311bc4f976e SHA512 3f58b695aaa5641e43feb4a7cb3109ff07a3a083a0c8a2badeab630ef89affd73b00787e2a71cc3d02d82163ddcd6c007e314b8652684cb02f57865bf5ed28ce
+EBUILD samba-4.7.6.ebuild 8660 BLAKE2B 065a8de49ddd51e8c1b8abcfbdd59a80128c08440c4fe081ce667c70639e30bad0db2673fdbcedbbbce0432f7af10c07ec4bba361c484b07859edb0960e31941 SHA512 6689829b484ae3857d21b0995954550415e3bdc74f2c788e33bc6b2ba1899b6d8caaab8ffd8ae6c93cb3ea716d6953df53c9444abd888eda0bee024db34b3384
+EBUILD samba-4.8.0.ebuild 8304 BLAKE2B cd59b69b7c0c256cba9546b94c195a09fbfc3910143f913f664db1d1a44f9a560951fc0f235c1ad47cd7e0f9f1fe37bc564edf24edb22673f6ac702233e582ee SHA512 f3156e1d8ac58b2230fc1c0c88346c8b975ccdea689ad1d39815cce1a45fd025b851afe386b579b4df28471c5482883535d0d93a44b0fdc37042ad854f127203
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index 4d0ebd052baa..5ead0fdc00b4 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
index 5ca400685354..373028cee2c5 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild
index 4768bc39a8ba..8f75ac18b7bf 100644
--- a/net-fs/samba/samba-4.6.14.ebuild
+++ b/net-fs/samba/samba-4.6.14.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild
index da9d5260b043..32f91596d86f 100644
--- a/net-fs/samba/samba-4.7.6.ebuild
+++ b/net-fs/samba/samba-4.7.6.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild
index 946396955361..c976502d1273 100644
--- a/net-fs/samba/samba-4.8.0.ebuild
+++ b/net-fs/samba/samba-4.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index 93dff5976910..c9d74c1406b8 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -1,7 +1,7 @@
 DIST sshfs-2.10.tar.gz 163076 BLAKE2B e443b3bb65c432d8d8e3d6d198e3e41363ff506dbc19a215b8606317fb02ef3ea370d0f3fbbe01e6f5c49581c74faefbceb9f50ab44bb3791c82e0a633d86655 SHA512 8887eb634edc4c64cf7a0c1a1be4d9ef72d5080eec687d187898dc31bb841ed730850bae8467247a05e56c2b4ef7e9d02fdc0812d48876e145c9826a7406d9ff
 DIST sshfs-2.8.tar.gz 153230 BLAKE2B c2d7116d72145dee1a31093ce3225e92681a8bc5c5cd8472ffb0f6e46c9dd8e6b99089b91466311d2cf437ceb0cab9eeead5cccb890763c8f0302fbc0f16bceb SHA512 a3c6a75137a4410a0c4e049ffdb6e219319add9673de32cf32a74c12ff4bb80f92a6e75088417a180a4dd01957deec39bd780a02140e8b0348f5868c92d67cfd
-DIST sshfs-2.9.tar.gz 154423 BLAKE2B 8597bb26f2c1400d85715113bbde68bc2df3650e3ee49537efa025db8c89a8351385bcda798a7b37c3de550a349ce7761d823dd10ce0ad70f06a73e222fb5c37 SHA512 e7ddd4ed116287d5b6e67caaf87f7dedaec8c370c9641749c6b0adf493ff4e9b1e79a68c0abe8f081a4bd68d6706a770c384a1abfbe22aba494af3e6fb792a42
-EBUILD sshfs-2.10.ebuild 555 BLAKE2B 80badea97bdd085190130887a6ab7867136957f58fac7f055614f0c1a7101e9bc40a474685451221ad7cbbdc9e2d26f0f2c118421424d18b6d77b371596dcbfd SHA512 44c98dd1515155c7c307c60c0e127f0d9ce80bb6f1f7ec40e2d7be507025f6646a437c306f5012b0dadf7d20ae120dc412367811d936dc48db3ae2ff202932c4
+DIST sshfs-3.3.1.tar.xz 46076 BLAKE2B 719c04e383b35ed5ce380db1a5a77858444768f27ac45a09205f4854a03aaad04ce418582dc79e5a9d23ccf9e225838bbdc20b0538bb867cca9af919fb294e34 SHA512 d0b623859a5b98db48c0ac6703e148603b2240114e22216e314f798ce645b39bbe7119a4e3f2d32d7bb41e07b2015761313e8249097a21bef9ad83287df9b80a
+EBUILD sshfs-2.10-r1.ebuild 557 BLAKE2B 4adc5dd50559add2d4b35d899b7fb91a23819d31fb74ae12e7f6d3238da47c991b775e3619606cf13e662af6b5bffbe3469dae5bace04c92e2a071f38f7b516a SHA512 acb4c6dc98b655404a373417bc1b6990f0ae427069f3c44daf03322471abf0518671e2c8ffe8027d3847c55f4b85886c0ae7a2d0b05f3d1e360ee65a643b99b8
 EBUILD sshfs-2.8.ebuild 586 BLAKE2B 47a92fe81d0b2c341fc1368f7c13c8ce97876fc9d9c12c3799672161c311c0f7ff9305169b2a8c2dbf32051f31dc7c56ff33ba3aa62bac7d3a871dc87e901744 SHA512 236e68382702733eb3fa109f12a4d2626065340a3ae9bf7d0fb954dd4f76d08a77772101e9807118061c5311c8b8b41db194dff7c55a7dda5293b5cf76b624f6
-EBUILD sshfs-2.9.ebuild 583 BLAKE2B b7131218ad8a23b4a5d56f2a643d4dab84890f3e190acd812a375c30e9a33eafb0b74b96114985930e6f2127db21cd5131f9671978e6d47def030eb1671aedeb SHA512 f21b00034ca56ff57f5d1e3b21eb190ce8b9ad3795cb469ce352b83fd0a781fe119733969476a1d3d648fa5891a7899962f2400c8e5f6d13514ec8a6980542e6
+EBUILD sshfs-3.3.1.ebuild 567 BLAKE2B da738f78cbb73fb7d220e759258e5af2444604540355f8351a19f7962976d6fbbff83c85472b0c2af19baff35d70b394c33b3e510071b43369462e9b1b9266ee SHA512 7a8f2ba4fa1b7253a9969a013e1165e00c1acbb2af6e58f6e58e3bd70c15b2d62bb1d2110314a93c1bc1ff4769ad048bfa2ec1ce6f027f682845902ced81b69c
 MISC metadata.xml 334 BLAKE2B efe6b250e6679987941b578fc0dabd47bad1ab687eb08d99bcedabb5064ea87fad7e2fc36657f0cea0ebd42489c92d85bc9c44d65fc6abc1451622584fb4a766 SHA512 17d120fe909408832fcfcae2cc074316fb1c1952f92b8ad1d395ac2b44f99a38cee499116b976b2326cea3778e01c2cd7b31dd82d05a11d97b95585a32071cec
diff --git a/net-fs/sshfs/sshfs-2.10.ebuild b/net-fs/sshfs/sshfs-2.10-r1.ebuild
index 085c0eecfed8..687a6819045f 100644
--- a/net-fs/sshfs/sshfs-2.10.ebuild
+++ b/net-fs/sshfs/sshfs-2.10-r1.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
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 SLOT="0"
 
-CDEPEND=">=sys-fs/fuse-2.6.0_pre3
+CDEPEND=">=sys-fs/fuse-2.6.0_pre3:0
 	>=dev-libs/glib-2.4.2"
 RDEPEND="${CDEPEND}
 	>=net-misc/openssh-4.4"
diff --git a/net-fs/sshfs/sshfs-2.9.ebuild b/net-fs/sshfs/sshfs-3.3.1.ebuild
index 1b02e48401b4..5de09d00ec8e 100644
--- a/net-fs/sshfs/sshfs-2.9.ebuild
+++ b/net-fs/sshfs/sshfs-3.3.1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit meson
+
 DESCRIPTION="Fuse-filesystem utilizing the sftp service"
 HOMEPAGE="https://github.com/libfuse/sshfs"
-SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 SLOT="0"
 
-CDEPEND=">=sys-fs/fuse-2.6.0_pre3
+CDEPEND=">=sys-fs/fuse-3.1.0:3
 	>=dev-libs/glib-2.4.2"
 RDEPEND="${CDEPEND}
 	>=net-misc/openssh-4.4"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )