gentoo resync : 28.04.2021

3 files changed, 31 insertions, 29 deletions

diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index f8ff1d7b2ce2..efb0eb4318c5 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,5 +1,5 @@
-DIST s3fs-1.80.tar.gz 135891 BLAKE2B a2e38154e1721a88042e49db22bbd607ce0776758a351f5a54e76cb1654518a4d3e30cf9faf3d6d04f6d45d3224491f6e55cbae83ee5b88c27211044255d51d0 SHA512 c98c61198a6c2132f98ef5a8c8f600787cf359c6f79010366f786a3758281257cbf79b4bb47892fd1e9e50d8e46a389125ea67f3828c1c8131cbee5462c74141
 DIST s3fs-1.86.tar.gz 183636 BLAKE2B 78996960725699fee4c0c2b131c227acc073fca407f1057ae636167a7a2313e460f1e3a89c7d8a3741987d8ba46ab1827f8f7c882261ed78bb5c5148ce935d42 SHA512 a4f79d9ae526427d5d41b5cd1519e4aac605e8bbd97079aec2a67562f0322fa5664d770d565aed4fca83ae254ab3c0454d25f4b86ec4d148a57c7745e07f5e14
-EBUILD s3fs-1.80.ebuild 974 BLAKE2B 942fd8691a0e75841bc860a52a9555dcedbd177176f516205fca4e9936a2d31a961f51d0fc04e35d45057a327b8171d7ca757f38e3fd86f39eb7b2546db9a992 SHA512 c8a2454148d00aba788098ac41792c3f157d30dfbece90c20d815153bccebbe5387543900e055053c8f38c5f1627b5577fd333af393ff677f6347ad70253ac55
-EBUILD s3fs-1.86.ebuild 1026 BLAKE2B cfcd85d74dfdd1aa138a090c3c4f6aa41bf5beadf1a6a5ad85ebed2ebccab7a92906bb549c3f7c26719ae618b6a260f883478ae5cf2270680ea2a0c75d3c47da SHA512 8a195d893fb8ec335bbb9a7bb25b3e6b5f052ec54e10c5c2bb23c1422ad00603782e3e1e3c36757e2279235267c1eb7a197a1b53655b65be1a1ae8a57a119b10
+DIST s3fs-1.89.tar.gz 221263 BLAKE2B cf84709acd6820d67b2b84fba1ebb4dcbd491f30df704ff78d8967619d1b7775fc2e4c1b3eec736243f77dc8fb9f01d7d0dcefe5a521dfaeb118b006c8a2e40b SHA512 650a7ea4d9197f310d8c24d76460a47e62e1d467b68dab0c78041c8e7dbb49c3983893680e53fe5f01a578fff96d2723b547fbd62d8f3efbc5188207da9d4e97
+EBUILD s3fs-1.86.ebuild 1024 BLAKE2B 8d887d990ef79f356ba1809a21c2f001f92a80963f0b83f8423ee6e9e5dceb5b1bf6a545efb6e006d19c21b9051090176281f9cde9af82a6911f423c1aefa1b5 SHA512 71d89d945b64bb46ea29ec07ddab19a73c01d89284492f32a11877eb0d41bd314d8b3d441e78897d9fff36d93c52ff7b4cea2bb4d7b52b06ceee61615095f3ad
+EBUILD s3fs-1.89.ebuild 1026 BLAKE2B b7c3a1c12aa97e757161b0e635c87aefb6bcd466139751aa42ec1862722c300f9f361bbe1214b9ff92a51eef9dd81e9d5978547ffed8607a7713c85fdd87e76f SHA512 509dabfdc51dc12145945caa154985590152bd6f4948c5e7bd7f0e7f5913c4025c1ab5dd1973d5c15f955b1348c54e5f0c5b6118e1e33e8c25adf0addf341a31
 MISC metadata.xml 811 BLAKE2B 8549eecc95f92bc830e57f269b24aee60dff8c37f5ac84d79f01240a797ccae4c4edc8afb558ed15f491066bb8742e9f3efa7cfb7644a684a00c7e09d1a907f1 SHA512 399fe84e728980f233f9f6080e4092ea4319c5a9386a34edd09f0530f6f9dbcb06baa5043ec79714d7a1493b22259dc0f41ced76440cddacbf72f73ee0ca99fa
diff --git a/net-fs/s3fs/s3fs-1.86.ebuild b/net-fs/s3fs/s3fs-1.86.ebuild
index 15c85dedfe1f..29e2862df293 100644
--- a/net-fs/s3fs/s3fs-1.86.ebuild
+++ b/net-fs/s3fs/s3fs-1.86.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls nettle nss +openssl test"
 REQUIRED_USE="
 	^^ ( gnutls nss openssl )
diff --git a/net-fs/s3fs/s3fs-1.80.ebuild b/net-fs/s3fs/s3fs-1.89.ebuild
index a196cef2a3e1..97358dee5fea 100644
--- a/net-fs/s3fs/s3fs-1.80.ebuild
+++ b/net-fs/s3fs/s3fs-1.89.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,30 +14,30 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="openssl nss gnutls nettle"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls nettle nss +openssl test"
 REQUIRED_USE="
-	^^ ( openssl nss gnutls )
+	^^ ( gnutls nss openssl )
 	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"
+# Requires active internet connection
+RESTRICT="test"
 
 DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
+	dev-libs/libxml2:2
+	net-misc/curl
+	sys-fs/fuse:0
+	gnutls? ( net-libs/gnutls:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	openssl? ( dev-libs/openssl:0= )
+"
 
-RESTRICT="test"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -47,9 +47,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_with nss) \
-		$(use_with nettle) \
-		$(use_with gnutls) \
+	local myeconfargs=(
+		$(use_with gnutls)
+		$(use_with nettle)
+		$(use_with nss)
 		$(use_with openssl)
+	)
+	econf "${myeconfargs[@]}"
 }