gentoo auto-resync : 11:08:2023 - 09:34:39

3 files changed, 26 insertions, 17 deletions

diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 3e010672130d..c5e7cab69214 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,5 +1,5 @@
-DIST s3fs-1.91.tar.gz 242590 BLAKE2B b65119f480b35a6325fa6d498e260309f65778abf97fc9f82bf423004e142f998a1c4b5c80c74a2932a6fa714956fd4f6a0b71e102061ff4f08ff0a82bdbb05c SHA512 5b57af18395f34885b4b8a98e93b0e3f9043c9af78e415a0a6c15489611d7e21ae619e69655737de369edee15762d8726b82bc2651b5b7f5c20e26fe866a96bc
 DIST s3fs-1.92.tar.gz 283295 BLAKE2B 7286d3c8a83d87252db1b18b063f6704b128abdd957a9baeb204834b534a16a09d60a46507ae03633ce789e8127c7a480fb1e81b1fc1a3c8c7b69a79541abf11 SHA512 375492d63626f0b71583e735e43985045dd5d4ccad2e66ae5d1c7ea9d8e5e881993bf00e31bae96d55aa441fae555bc71ebcfd47f3d189f6c322ba441853a95f
-EBUILD s3fs-1.91.ebuild 1031 BLAKE2B 57a0bf9bc20707881776c12bbd7d3a3410ff68c82b8110f3eec2347344c9047a0bc080e74557b9f5fc49926a5f4515e78b4f0e89ed1635f105df5e5011e783ce SHA512 3a14d4c17dd60da75e00df2cea5dc60700da2182caf1051d89cde82135c8b90bc2c9c51dfb5ce9ef431a0125f7429f9c00a31f74f0da707add100f9484204f8c
+DIST s3fs-1.93.tar.gz 284353 BLAKE2B bae0d850f69f04b18327790406260721a0a2d981f5b2cbc8e6ebc059f4db83bd0810780b68d334a50cbba4654301a395683a778567ce3f08d4b9f69fef5ed282 SHA512 613ad713ac426236b471aa4b2f8292ee0558017f149bfe51aa7fad1bacd60fccf00c31404ebc14b692787e524704e9cd9111b84540f1309ba99900d42d03dc5d
 EBUILD s3fs-1.92.ebuild 1227 BLAKE2B c2f0aa56733563ca97b7da4a215a3181b1e59c2dd808b9a86cb48ba8a747ee574106082de291c81ff53bf139fc45c34c137612223bf3c5084ea9d0d9b4a795c0 SHA512 a61440f08cac3c98fdc8d0e4d8d687c3ac1e026026dc945ea7db687750e1c0514105771a0a1bc333b7b5c9e674e852d2a9d398a9717913c2218b097b1e679cd3
-MISC metadata.xml 620 BLAKE2B 47b83dba3a0987ba0587471596f422c85a9400a8607a2b13071145aab66c2b05931600bdc885510e308d279b3b27be4d27c2fb30ec70a870f693aec0bf569b28 SHA512 6570f408a2f9367363ad6b2e2463a9fd8f19f7726d5c207475c56772f34a84887e88e97217b2cf6ef87bfe8efecbe13c670267647f578a405dedb8236a63f78a
+EBUILD s3fs-1.93.ebuild 1230 BLAKE2B c31bc72f1aa4655979c6d5052219f67859068f572b56116462d79f7e01739df5ec5632204fe551eae720294180123298720fb7f8ef731e7ef13dce6eb35ecf05 SHA512 b7833e040ca5aef2cdea376dd14fe7dce0c394fcb2777aeaf14d5246dfc0bac117b1af9a0fae81c1b487de43d991b43e07f21ce92232028faa79c130f4cee285
+MISC metadata.xml 508 BLAKE2B 728c88e638fbb795a328d61e9089b3f4fbf08ceb09f3d1b8b24ab33b19c59b7fb95ca57682f03fef4621b4890fcafd0f4fd329769c05aa6c290279e477034f62 SHA512 4e8cc10540c264f3c676f604ebcb147aab5b06f333410b5ee0bd7211711dd80b43d39ee1b85bd2193500c9ce59ec2830c0f415819350495d3f8898d48477713c
diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml
index eb7977bc87e6..b9a262d42a8d 100644
--- a/net-fs/s3fs/metadata.xml
+++ b/net-fs/s3fs/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="openssl" restrict="&lt;net-fs/s3fs-1.92">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag>
 		<flag name="nss">Enable <pkg>dev-libs/nss</pkg> crypto backend</flag>
 		<flag name="gnutls">Enable <pkg>net-libs/gnutls</pkg> crypto backend</flag>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> network functions with GnuTLS.</flag>
diff --git a/net-fs/s3fs/s3fs-1.91.ebuild b/net-fs/s3fs/s3fs-1.93.ebuild
index fded3ccf1ec6..f946efb66bc7 100644
--- a/net-fs/s3fs/s3fs-1.91.ebuild
+++ b/net-fs/s3fs/s3fs-1.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,23 +14,25 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="gnutls nettle nss +openssl test"
-REQUIRED_USE="
-	^^ ( gnutls nss openssl )
-	nettle? ( gnutls )"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gnutls nettle nss"
+REQUIRED_USE="nettle? ( gnutls !nss )"
 
-# Requires active internet connection
+# Requires active internet connection and it tries to download some binaries for later execution
 RESTRICT="test"
 
 DEPEND="
 	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= )
+	!nss? (
+		gnutls? (
+			net-libs/gnutls:=
+			nettle? ( dev-libs/nettle:= )
+		)
+		!gnutls? ( dev-libs/openssl:0= )
+	)
 "
 
 RDEPEND="${DEPEND}
@@ -43,15 +45,23 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
+
+	sed -i 's/ -D_FORTIFY_SOURCE=3//' configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		$(use_with gnutls)
 		$(use_with nettle)
-		$(use_with nss)
-		$(use_with openssl)
 	)
+	if use nss; then
+		myeconfargs+=( $(use_with nss) )
+	elif use gnutls; then
+		myeconfargs+=( $(use_with gnutls) )
+	else
+		myeconfargs+=( --with-openssl )
+	fi
+
 	econf "${myeconfargs[@]}"
 }