gentoo resync : 20.03.2021

8 files changed, 8 insertions, 121 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index bac99f5360f7..f35b09e34e64 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/metadata.xml b/net-fs/metadata.xml
index e419bebd83ba..9d926e6b22a0 100644
--- a/net-fs/metadata.xml
+++ b/net-fs/metadata.xml
@@ -31,4 +31,3 @@
 		plików.
 	</longdescription>
 </catmetadata>
-
diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 594814f7a0b6..f8ff1d7b2ce2 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,9 +1,5 @@
 DIST s3fs-1.80.tar.gz 135891 BLAKE2B a2e38154e1721a88042e49db22bbd607ce0776758a351f5a54e76cb1654518a4d3e30cf9faf3d6d04f6d45d3224491f6e55cbae83ee5b88c27211044255d51d0 SHA512 c98c61198a6c2132f98ef5a8c8f600787cf359c6f79010366f786a3758281257cbf79b4bb47892fd1e9e50d8e46a389125ea67f3828c1c8131cbee5462c74141
-DIST s3fs-1.83.tar.gz 150816 BLAKE2B 1b567708ea6264a619b664c5be3186374dcd3f50f01ac7d9aa093a82520f4685b7adc49a2d9c5a30e64334439c4c2676ae6cc74079251b4e47fe4ff7ad1f5945 SHA512 a925fb09c5786f2ff7fcb458e3cc37cce0eb2bd431b24e582cf02e7656716bfd9b7ffa3647f6f3c56ccfa313d2238cd263f28c2321850c1de082c48ebd9af5cb
-DIST s3fs-1.85.tar.gz 170209 BLAKE2B 1f879948d243d36c99186a4b6a52cd1200472c7f792583e56cd82e4f00e79374e82ee033152dac2642e626acbf9e0523a45fa41aed0bcd9b1743df418387d610 SHA512 c99920bf1f1dc04a0ff89a71ad027a5b65d22d75a77f5c6dd4559eaa299af36c71d29b4bcf9fe7e473478e7da1d328c7cfcb1fb77d414b65a289f38456ce5d7a
 DIST s3fs-1.86.tar.gz 183636 BLAKE2B 78996960725699fee4c0c2b131c227acc073fca407f1057ae636167a7a2313e460f1e3a89c7d8a3741987d8ba46ab1827f8f7c882261ed78bb5c5148ce935d42 SHA512 a4f79d9ae526427d5d41b5cd1519e4aac605e8bbd97079aec2a67562f0322fa5664d770d565aed4fca83ae254ab3c0454d25f4b86ec4d148a57c7745e07f5e14
 EBUILD s3fs-1.80.ebuild 974 BLAKE2B 942fd8691a0e75841bc860a52a9555dcedbd177176f516205fca4e9936a2d31a961f51d0fc04e35d45057a327b8171d7ca757f38e3fd86f39eb7b2546db9a992 SHA512 c8a2454148d00aba788098ac41792c3f157d30dfbece90c20d815153bccebbe5387543900e055053c8f38c5f1627b5577fd333af393ff677f6347ad70253ac55
-EBUILD s3fs-1.83.ebuild 984 BLAKE2B a8d7b72e5ddc921813fed8dcde49fe24a9653ab58e785735bd0e00cbe10531dbdd5348300b0d44e760cb8c1ecdaba7c5d61553994cd47eafd1f36e2aa690cd8c SHA512 ea0b563bc9437d4ccdf44c58d4ba46ed740e234d0dcdc1de0b9caa603efd174bb893a3537f33fcccda5f2eafb54f017eede28492db5d13d20671788beef82821
-EBUILD s3fs-1.85.ebuild 1026 BLAKE2B 74e6710c0cee83a61b5038a8532183abfc76a5df879026f4a69a6474fc0eaf5dca6f6c053f022d61d481ecd27b213fa5d813f93323c0d7d57afb148be153e7fd SHA512 7028aa303c49074e12b8a7705bdf9e6c10a1f8f30e1ab10ebefff8a33433079a3070161475c1bf89d235d366ae05edee9c8169a15b05500f541c126d3273c589
 EBUILD s3fs-1.86.ebuild 1026 BLAKE2B cfcd85d74dfdd1aa138a090c3c4f6aa41bf5beadf1a6a5ad85ebed2ebccab7a92906bb549c3f7c26719ae618b6a260f883478ae5cf2270680ea2a0c75d3c47da SHA512 8a195d893fb8ec335bbb9a7bb25b3e6b5f052ec54e10c5c2bb23c1422ad00603782e3e1e3c36757e2279235267c1eb7a197a1b53655b65be1a1ae8a57a119b10
-MISC metadata.xml 781 BLAKE2B 97bacc52164bcc8f16df993523ae64d3d848b27649e99479b4910c4927a9bcf866dec9373ebc6293d55078b7d704c8182cdcc5d0c25dfbd9912adc8ec82daaad SHA512 c85a9298324825ece93ccb670708647d53234430aba6722af4e5eb8485d30a1c007a7d652c8cd455587204bff439cd455ad90a106eb46cf0645d16020a883e5d
+MISC metadata.xml 811 BLAKE2B 8549eecc95f92bc830e57f269b24aee60dff8c37f5ac84d79f01240a797ccae4c4edc8afb558ed15f491066bb8742e9f3efa7cfb7644a684a00c7e09d1a907f1 SHA512 399fe84e728980f233f9f6080e4092ea4319c5a9386a34edd09f0530f6f9dbcb06baa5043ec79714d7a1493b22259dc0f41ced76440cddacbf72f73ee0ca99fa
diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml
index ea9d9e2e2caf..07d6f4894ded 100644
--- a/net-fs/s3fs/metadata.xml
+++ b/net-fs/s3fs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>rini17@gmail.com</email>
 		<name>Juraj Variny</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-fs/s3fs/s3fs-1.83.ebuild b/net-fs/s3fs/s3fs-1.83.ebuild
deleted file mode 100644
index 434d6f6bf7a7..000000000000
--- a/net-fs/s3fs/s3fs-1.83.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/s3fs/s3fs-1.85.ebuild b/net-fs/s3fs/s3fs-1.85.ebuild
deleted file mode 100644
index f372318bb91b..000000000000
--- a/net-fs/s3fs/s3fs-1.85.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="gnutls nettle nss +openssl test"
-REQUIRED_USE="
-	^^ ( gnutls nss openssl )
-	nettle? ( gnutls )"
-
-# Requires active internet connection
-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= )
-"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with gnutls)
-		$(use_with nettle)
-		$(use_with nss)
-		$(use_with openssl)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9f48c50355a2..2263a5bec794 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -17,5 +17,5 @@ EBUILD samba-4.12.12.ebuild 9732 BLAKE2B 2841627a44fcb86b3e4421b8777bc5adeaa8cdb
 EBUILD samba-4.12.9-r1.ebuild 9771 BLAKE2B 7f5c318b381a854525bc7f92b781d4832b701c04334b0890fcde2230cf0a639e1b7e5956c247fb27856c3d65b3ec94a884bdd1b6621f83a550344b231ed265d4 SHA512 ad740fd5e49ebc3ee7ec48d70c559e3c82d54fecc944566322ce45bdf257450b76bc8d691748ad3d2e2a80820a4f3e4da2abcc35ca78279769d2ebb35ea58cc9
 EBUILD samba-4.13.4.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
 EBUILD samba-4.13.5.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
-EBUILD samba-4.14.0.ebuild 9819 BLAKE2B 924b52ca1f1b1c0f04f08e32e547eb52df3d8442399dcf8189ce66b6905067946bc9e74bedf2af0df23e60dbaca41cee88bb86919d8695365e5baa026aee13a4 SHA512 a266f58e19c1df342b90a3f9889fa21621fae4a5fc05078608e98347695cf09edcad09134cbcbeb1df474eb43c0b47465d90841371208e7c48df507a68800454
+EBUILD samba-4.14.0.ebuild 9932 BLAKE2B 535396c759eeed6e3ad994d9dbc738ce14cc64ebd3ea3d73f2de12c81358b6f12ade18cafbc9c4203c77f9875ddb3e3d415bc11899da98f34e58a3b1168fe1dd SHA512 3288b583cbf0227f70c214091a86e9e52c861834fce398d39c499884b5a3db3d3e65df4d67c6b846cb576c9a0130944e7c588a7d1776a006b2d0f91d207d0047
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.14.0.ebuild b/net-fs/samba/samba-4.14.0.ebuild
index 0fa1731cdd3b..7744a90df298 100644
--- a/net-fs/samba/samba-4.14.0.ebuild
+++ b/net-fs/samba/samba-4.14.0.ebuild
@@ -82,6 +82,10 @@ COMMON_DEPEND="
 	acl? ( virtual/acl )
 	$(python_gen_cond_dep "
 		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[\${PYTHON_MULTI_USEDEP}]
+		)
 		addns? (
 			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
 			net-dns/bind-tools[gssapi]