gentoo resync : 23.03.2018

4 files changed, 57 insertions, 66 deletions

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)
+}