gentoo resync : 20.03.2022

29 files changed, 243 insertions, 1103 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 2e537914d4d9..d8e40d27ed04 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 f04ea890536e..446d685e7efb 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -2,5 +2,5 @@ AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
 DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f815ee4fbb750bf8b7d7110a69a808682c239a7c9196468ecc4d55a26eed3b63f8d8539569e16131060f57de389ef92e1063283eb2f41e65be00ed21bb1 SHA512 13d1fb8ff7c31100bfa481e647e9d3b90d61633173b3a71683246d7bb4b68c7e147d21697a17b7ad60e1ac8da2d48d6f4b51762370536a32d14da6c9a6db7e5e
 DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de
-EBUILD cifs-utils-6.13-r1.ebuild 3537 BLAKE2B f002d002f51f55474a767eee0d31e5e4a8085604d5306419b99185958bdf031b37c9cb73c0c8fd8948ad1e58ec700708770226246d4c34489a9a61e9efb766fa SHA512 6f1da4f1ef4c7900d8822d391afbdae0db830206c5e2b6b3c1dfb6c0892445cd6dba1c84589b776d3025ce4b12be881e33b24b862cc3d19f782252a4cc883269
-MISC metadata.xml 887 BLAKE2B 7e9253e13e67ac1873418ef86e7a0fbac46ee3a44472b3afa4a341b175d2972f6cfe02fd56356cfa7c5f19be0a611dce89ee4e059334a41595e9998eea56ebac SHA512 280e721ad2818ccb68f1bcd307ea4be8f52d0d6318e372a502ade301f1b6b5f20322b77a6befe9a34d97b8b6bfefe4e7e4a0f7821eb3785bf7e11dd2a04c2a6a
+EBUILD cifs-utils-6.13-r1.ebuild 3604 BLAKE2B e83232a5e38bf3d1ed479cc8faf87799abf32bcdcd409e7d55b82d35d27bee56ee66662f723458d7876c34db9f2fcf1d3980d290c69b96504328810497760c49 SHA512 1061bf17447c8b1680532f026062a943d39c846a1ef6e7874545765799b94485e3cf1d389632623a1797c96f7949a8f93c24e2dcff26b164bd45a4bc3529808b
+MISC metadata.xml 967 BLAKE2B dc6654b412c77f2e95cad9cfa2d4e4465d3292b546d55ddc04ad1b3d5b8220bbe4ef0b0d1409fb2f5da99851d45567667935057f5d5c15dad4e2cf26e3ce0e00 SHA512 c6b0fbdd9d776695032cd4a3e109717dfa7cd07b1456da8264dc0688fcfa158d1f4a73758ee24ba318f14e7a321811bd24f688ca3c39156b304028566315b650
diff --git a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
index 89c9623e16ce..dd617aa95bdf 100644
--- a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
@@ -16,10 +16,9 @@ SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-kerberos_mount_regression_f
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
-IUSE="+acl +ads +caps creds pam systemd"
+IUSE="+acl +ads +caps creds pam +python systemd"
 
 RDEPEND="
-	${PYTHON_DEPS}
 	!net-fs/mount-cifs
 	sys-apps/keyutils:=
 	ads? (
@@ -28,6 +27,7 @@ RDEPEND="
 	)
 	caps? ( sys-libs/libcap-ng )
 	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="dev-python/docutils"
@@ -37,7 +37,7 @@ PDEPEND="
 
 REQUIRED_USE="
 	acl? ( ads )
-	${PYTHON_REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 DOCS="doc/linux-cifs-client-guide.odt"
@@ -85,6 +85,7 @@ src_configure() {
 		$(use_enable creds cifscreds)
 		$(use_enable pam)
 		$(use_with pam pamdir $(getpam_mod_dir))
+		$(use_enable python pythontools)
 		# mount.cifs can get passwords from systemd
 		$(use_enable systemd)
 	)
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index ee0a0863fcf7..1f04d52ef8c9 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@@ -17,5 +17,6 @@
 		<flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag>
 		<flag name="caps">Enable <pkg>sys-libs/libcap-ng</pkg> support</flag>
 		<flag name="creds">cifs credentials support</flag>
+		<flag name="python">Enable support for python and install python tools</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index b60e126aca95..145aa14993d4 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,10 +1,10 @@
 AUX cvmfs-2.7.2-builtins.patch 3672 BLAKE2B 80c5851c45150384a2c40b962f1e58b2bde5e1111c3b8c9f18aef126569ffd13461408abacd29d6990db3c5633e987440da34a09ecfb0193ec8e3e1d6c3c2328 SHA512 f064cf7d9c8cbbfec68fc67bac4c91c7266b8eabc0be28b30ce8402d39a1a95d15ef9c929a7ef5f887e3058914717c1906e2f0b749fec89475a7a68b1a7f1d54
 AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370db94d715e2ce97ddad22fbc16e85c8c602a2c561ae859e2eccb973144bd803d279029a14f9f591f641265ac9e89e89aa1 SHA512 3a525c50165c83a7079f7d1b51441e7a1e6c230ac76d742b7833506c98f13685339dcf86d1c8697086b195ff33775996e2f9d6e0d825cbdedc190aaa3ea427d0
 AUX cvmfs-2.7.2-xattr.patch 717 BLAKE2B 48d595b0219b62a3ac45e46d51e3910d6124edc89669ae8996a49e95331bf9d32b4f1eec8c6df76f6906594c3da4a89665b6457d3aef9dea96d2af3959c5780e SHA512 9be285da46f52d59ef28f666bee2b0b372d76cbb786f225a533239ac7683fdef6092aaa7d62458a89bc647598e12611f025060c37c0539071feac71b262e57a0
-DIST cvmfs-2.8.1.tar.gz 44117247 BLAKE2B 3505747833779463df79e40c03359c8458d51d2e4635ce6bc7ac080112ca4e81ca914dc6866afc28094e656acf8e3051749ec278e00b8357a50dd530fc2b65be SHA512 3ca4a45e24e06e4ea46a708b3e47fafc4c6eae172c296b091c8d0fb6b2d21c64d4b8975baf7f055101a9d68ada1e3082e7ec808da3fdaf68b5a3a3b5c4ed7731
 DIST cvmfs-2.8.2.tar.gz 44130007 BLAKE2B 3c15c3549971deb418ee142bbec0db8ae272d0fe5371e618460e31bd2c083ff1d1c00e5bc3520b199fdf3297cad278185617f51a217f75120dd71ea792a7a8a8 SHA512 a3a1a6d4eb36248744145393d6ebe5015f8f1d4506bb9adca13b19f68a2e57cdf77fc0e7202ff4e8a927bff3a6e1808f9c740755145b860f2915a31ec9dd5fa3
 DIST cvmfs-2.9.0.tar.gz 48042721 BLAKE2B 614fcacbcc142c22f871e511db951c826245651ce29760f05c132dffc7920c1232c96a51a70d65cae6f48d8e6564d4ed3a30b4c460dce0b37ad24994571b32f1 SHA512 9ff5ba0ff2fe917403e9f7a5139c28c861e95a93d96bf8ff5a7fb7f36dca3b8ddf0d8b2763396a70950f98b032d34d6c0f1ea093e53bf950c5370c933abc22b5
-EBUILD cvmfs-2.8.1-r1.ebuild 2355 BLAKE2B 97f4b6d8265206ed2be8e658e9bb4dd5ac50ae40e096ccfa854b03b14f7d9611b8a9b43d5df23d2c78925af2f5354e282cca4d9ace88baeab1f71149fc79980c SHA512 3f8e1ebd203471bfefa93da5b49bb19a55a617b995b33b0129d538af07c4c994084d74a9e4e55e712fc20358b11e9e11825fdedd3fec87353cc16d008f950db4
-EBUILD cvmfs-2.8.2.ebuild 2357 BLAKE2B 05c4bcb0d895ba56e436140149d8f1ffca43c20cf76acdc4303fa6cb99d39aac6a074d3600ec000d5a77ae7a21b89d268bf665cac5388aa10bbc254aee243672 SHA512 742fe39ba2c859924c79e57b0fc6c26301bc8f3e106902e09d0b07608d51c1ab7badb7ee4142394b8c5a3c6c15f63682bec09dca93827073ada63649167d0e03
-EBUILD cvmfs-2.9.0.ebuild 2317 BLAKE2B 848767b9f3a214573b7ecb0819432a35d141b843bb8a237a0ca08c3201bce738031a090b3040783d6aa5c504d293dc6bbc2d2ec73fdb517d99db7b162ecbbe3a SHA512 ab981c5da6007686d38254cf65fc732232620615ecf6f206b9297812fe886467664190a2ccf6c8be30a7c21080a1f9426203e68eefa943d49cec7ba6d853821d
+DIST cvmfs-2.9.1.tar.gz 48202925 BLAKE2B 75e60537c8fbbc12687980dba6d9dc25f8255c67a1228730a07a684f01d4e3f644f93c34dabf7bd0bccc247fc89f3f322e510181ce38ca3d75025d717fb11d3c SHA512 ca429bcc4fd6b919d171f38c8757a3b48012bf09aa46569dc41326a6037d563b19df3def9ca37201d0beaa3a0e6953ac303f6f4fdded9351ddb5fbcec71c8706
+EBUILD cvmfs-2.8.2.ebuild 2355 BLAKE2B 60906c1308e5bb14cd9c1b627aec0cc415ced4cc6ea9dcd13a1d99524b12cb8f9a43f15a7d9447ba33b4b61a1acdea4dfbfbe11b98fe611e986f546eac973ba2 SHA512 970dad2341d351890962ca2403051492fa394d068dc79dc1f5231a0a8cfdc6b1fff25e51f129ffaf0003680e4ff940332ec1c1994588dc73a3bf78bba3121c1d
+EBUILD cvmfs-2.9.0.ebuild 2315 BLAKE2B 790216ab6dad279138b99f4d84e1cb571ceb6c7978629119fc63255ff80243cf3f468fc168eaa87de0b0124cf096928265b747236aa9872865335aca709a0813 SHA512 6d73e90f73a4d9888711e08f81c597f923ccad59a57aaa57be68aae9a6e2d08c432e671be84f1500f138360a9edfb21176ab5bf02b78417582de7ceed898f0c5
+EBUILD cvmfs-2.9.1.ebuild 2317 BLAKE2B cc896037da2d6ef56ffe1f98ae5554c10a05f7ece066b44be7e36d2e15dab0bd8259990f99890af15b2659236ee8916152e458b6a96ae3e331c875e8d8957846 SHA512 05ac21b52ecb45aa2cb5eea602966e180eb226724de1462910c0fc9c3b25f5c4a893fbcbab0d2e0512005303ac767e5cfa944ef924212060a54e77c25de9ec40
 MISC metadata.xml 1446 BLAKE2B 17b4b0170f3aa7e4ebbdc7d2bbd1b851a6e11b08338ecd9e441dc98a37b9dc5b9b952ef57b367b7e5991a7008f893fda2289c2e391fe8b3ceca112203b02ad00 SHA512 3e759f757e392a13efec745e56a1edabe32ca1c64372ba41b3919f312a81f2e1cb486009baec38704325d466731782d44edd447dfee28607eee9ac75924ac97e
diff --git a/net-fs/cvmfs/cvmfs-2.8.2.ebuild b/net-fs/cvmfs/cvmfs-2.8.2.ebuild
index 294027c7e2b8..4e8078c1e5d7 100644
--- a/net-fs/cvmfs/cvmfs-2.8.2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="server"
 
 CDEPEND="
diff --git a/net-fs/cvmfs/cvmfs-2.9.0.ebuild b/net-fs/cvmfs/cvmfs-2.9.0.ebuild
index 05bf7f553636..882990fbe998 100644
--- a/net-fs/cvmfs/cvmfs-2.9.0.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="server"
 
 CDEPEND="
diff --git a/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild b/net-fs/cvmfs/cvmfs-2.9.1.ebuild
index a80ba78c2a1e..ef6cde5e9e1b 100644
--- a/net-fs/cvmfs/cvmfs-2.8.1-r1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="server"
 
 CDEPEND="
@@ -47,7 +47,6 @@ DEPEND="${CDEPEND}
 PATCHES=(
 		"${FILESDIR}"/${PN}-2.7.2-builtins.patch
 		"${FILESDIR}"/${PN}-2.7.2-find-package.patch
-		"${FILESDIR}"/${PN}-2.7.2-xattr.patch
 )
 
 pkg_setup() {
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 1c88f14a1531..aa792eb46d81 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,4 +1,6 @@
 AUX davfs2-1.6.0-neon-0.32-support.patch 336 BLAKE2B 6f21c679eb1cdc305e6648be4d3114b9e34adc1eb4cd285ed0731ee7576f20d73d6349085af04807f07cd5acf4cf2624ccb093b679bc8d0611a9105b1317f3c8 SHA512 e50e2a5ccc415b43e8942d7d240603dc376195b5945a02ea1c57ce9d41356ce724f6de47e7d34369c2170e683f02ed340e0844dbda07860dc6dafd5ba854f302
 DIST davfs2-1.6.0.tar.gz 472511 BLAKE2B aed1ec060d5639fb90a58257038a75c25c2f77a7d6393130ffa3b4d36b92433654b8396dfe4615e4f2ea06d5c6d961d5de27b0347e62d730a22eddd003db71e1 SHA512 e016eb847152b7d0c20abfdafd36f43fcff29339362be6765202a45692a186c70b1c33d3566ed8ca695c399a7f0ca1aef7b05d378cdda33d892cb684da34de33
+DIST davfs2-1.6.1.tar.gz 472426 BLAKE2B b24a3f17604838e763cbcf86f62719ee41b5569e58732441a621d210dd0c2e619d4f363d90e9b13d1616e84a3da940da941a15ad6eadfa2b339d14a6e26c75a2 SHA512 12f9eadd2049741b7cb61c5583be6c6982559e702e5cbd4767c655110187524d7afad0a6ff8ad00d457e194ad75b3ce391f5fe566fb4a0bbaed0a705caa3f163
 EBUILD davfs2-1.6.0.ebuild 1312 BLAKE2B 473edf342d36c14c816a881e9dfd324833f9146c3e5713b8a795fcf0a101526c0cae31e6189bd6b78567869d3ca578dd90307997c28815823be4c26ed2ad0c92 SHA512 cdb8bc88535a1cbdd56f4c16e07aa5df05fedd4e0ed1ce1d5bf1c24fc051cecd5e135a69f04bf600a4af9b4767741ffa0fe6138844ffec130f41ca97ffe770e1
+EBUILD davfs2-1.6.1.ebuild 1222 BLAKE2B f6c8e425c877c471b4ca5bcec1d1eed1d0493c9aae39a2aeb6fc632dc281ec0e35e331f5346cc230a9780a73483d3f9f6c3e7f30856249d572deba07076e90fd SHA512 0724bcfc45668e2d8b02f25d51cf0160ce849b1379302b6cb825bd49ed6e66c63238b0c5d08cd8f21ab3647ef40fba6072b33efeeb9f4f34b64d52005b20b9f3
 MISC metadata.xml 252 BLAKE2B 121cab92b026aabfa5b7c05a2df912ac7d860e2462ab2ffa30387fed601b61ee54326d63e2b15d813ae73f01c8a054b9a443f27eecd76c4316412463c33ccda2 SHA512 787d4eba8abc2fc701095db317f299837dac0e794cd4a5b2cab58005e01d3759049e39ff479ba818dd440a5fba46b033ef1ac358d027ae5105cced05b484c20e
diff --git a/net-fs/davfs2/davfs2-1.6.1.ebuild b/net-fs/davfs2/davfs2-1.6.1.ebuild
new file mode 100644
index 000000000000..a00ae2819d90
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource"
+HOMEPAGE="https://savannah.nongnu.org/projects/davfs2"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="nls"
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+	acct-group/davfs2
+	acct-user/davfs2
+	net-libs/neon:=
+	sys-libs/zlib
+	nls? ( virtual/libintl virtual/libiconv )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	local f
+
+	# Let the package manager handle man page compression
+	while IFS="" read -d $'\0' -r f ; do
+		sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die
+	done < <(find "${S}"/man -type f -name 'Makefile.am' -print0)
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-largefile $(use_enable nls)
+}
+
+pkg_postinst() {
+	elog
+	elog "Quick setup:"
+	elog "   (as root)"
+	elog "   # gpasswd -a \${your_user} davfs2"
+	elog "   # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto  0  0' >> /etc/fstab"
+	elog "   (as user)"
+	elog "   \$ mkdir -p ~/dav"
+	elog "   \$ mount ~/dav"
+	elog
+}
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index af2374be5820..9313a4917935 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -5,5 +5,5 @@ AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
 EBUILD netatalk-3.1.12-r4.ebuild 4728 BLAKE2B 4209a89f0ef674779ff8106499f2bc465113ddfa26c8abe55d1c200af79a4d9f0f1d7aad1b7e4815c4f5b60daa6713abee2efd8a74c256d50934a6394782f2be SHA512 aaa05b3ffad00f933ad9687edf80f135c82ee6ec428896e5570a429089d77a757d784b2342daca8b838d1486c4dc076c2f21e619d24a0a5f44fc52d8b76d0b1e
-EBUILD netatalk-3.1.12-r5.ebuild 4825 BLAKE2B 444f2d5ee7c9b46916867b334e5308c22ce59ff4da7e328a8e4b5cc7ca418c801ce46052c538dc166f19a1b4f4082c2d008fd65448ca3af0eaa563ff31a3274c SHA512 5b18517bb7a7861d76f3d9c3ff84f40bf9a4e253ba7560de3089430e1c87d57783ce84eb146fee2151c7e854a147964969a86163678d78c6f3e707ab655e9b2f
+EBUILD netatalk-3.1.12-r5.ebuild 4824 BLAKE2B 3704a4a88e95179f0c688e246ac8938da1d24c6a0afc77304dc88d6a64a982fdfef1ba127dd0ffe5c25be2a2ea9209d32c5625511bc1706524bbdaf17c4057e2 SHA512 792ac4bb94493e0885be50d4eb32e972eee4a85643a74bdde59eddb382e49914aa828f2afe2c109a05dd8f2cdae0d5c8ed828837ab3f69e04ebd9c2e819cb9bc
 MISC metadata.xml 720 BLAKE2B fa966860b8fe4f5d18748b8f6a4e4fa78b8b98a6dc12d73d6f7a5b15804c24a4559d9b0be1e73ee294ae5a8ca6521281e6ae948c5f433a22c338760781ef5793 SHA512 77a1fe546ffcaa1e4c9afc2f22d1a27c883ed743dc68c5b259d5a3a59d5ed941e24e7826b35c383d43039c11d92b1fecb3a6f96fd6029252923f1ecfef9efa93
diff --git a/net-fs/netatalk/netatalk-3.1.12-r5.ebuild b/net-fs/netatalk/netatalk-3.1.12-r5.ebuild
index 9961be891b55..00b7df8d04ca 100644
--- a/net-fs/netatalk/netatalk-3.1.12-r5.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
 
 LICENSE="GPL-2 BSD"
 SLOT="0/18.0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd zeroconf"
 
 CDEPEND="
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 56059ec90be2..930e2f7f27fd 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -12,5 +12,5 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
-EBUILD nfs-utils-2.5.4-r3.ebuild 6126 BLAKE2B 804fe2ad8dbf94b61b7a68be5fd6ecc944dafbe827060d5c1f638afd1c672545104c7f0f54976d307a0ed11e0d3694888a7097f0554ce33e3cac3ea633c3c515 SHA512 c0f58359945d722abad848eaef70c5770588e886b909f547b41563f051fdb7fdf8d8a79fe83a3f570ffe0e696c8978de37759f2110e6087425964dbf3a24ec5e
+EBUILD nfs-utils-2.5.4-r3.ebuild 6127 BLAKE2B 1bb44e6a3e2b38edfaab44c5f34d6b0f1a41f9480038196b481f074d64a4e14f4c624002b690847ca24c8dc29f0dce0fa82b3f79287e4ef4a5ae72e21bd6cdf3 SHA512 f6fbc6910a79d6ba6bb33943bc57e39670ca02f196803ad4075698de48b34c00a3386d18cfe49c1f58e30549ebfe3910f68b25b4df7febcfa61c84b0c6575a37
 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
index 0f2697c12830..a9c4be2fff7d 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,6 @@ RESTRICT="test" #315573
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
 COMMON_DEPEND="
-	dev-db/sqlite:3
 	dev-libs/libxml2
 	net-libs/libtirpc:=
 	>=net-nds/rpcbind-0.2.4
@@ -43,6 +42,7 @@ COMMON_DEPEND="
 	)
 	libmount? ( sys-apps/util-linux )
 	nfsv4? (
+		dev-db/sqlite:3
 		dev-libs/libevent:=
 		>=sys-apps/keyutils-1.5.9:=
 		kerberos? (
diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index 8c447bf4710a..b9f3565274c1 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,5 +1,10 @@
+AUX s3fs-1.90-musl-fix.patch 432 BLAKE2B de9ed5d6950149ac83d8dcb3bd0fa567a81b6dd256f53f3a50b533d133642a93b2e07d06da484e8b9b681c57cb2bcecc48011694674c0de60c6e178635f64b72 SHA512 96402a3894d4b3ec886fb839d527f3f4927cf3b802e50e49bdee580d8eb82c663828ca24464a9f9e6419893aea4801fc6b652684523d0d8c1e49f4a398eebb34
 DIST s3fs-1.86.tar.gz 183636 BLAKE2B 78996960725699fee4c0c2b131c227acc073fca407f1057ae636167a7a2313e460f1e3a89c7d8a3741987d8ba46ab1827f8f7c882261ed78bb5c5148ce935d42 SHA512 a4f79d9ae526427d5d41b5cd1519e4aac605e8bbd97079aec2a67562f0322fa5664d770d565aed4fca83ae254ab3c0454d25f4b86ec4d148a57c7745e07f5e14
 DIST s3fs-1.89.tar.gz 221263 BLAKE2B cf84709acd6820d67b2b84fba1ebb4dcbd491f30df704ff78d8967619d1b7775fc2e4c1b3eec736243f77dc8fb9f01d7d0dcefe5a521dfaeb118b006c8a2e40b SHA512 650a7ea4d9197f310d8c24d76460a47e62e1d467b68dab0c78041c8e7dbb49c3983893680e53fe5f01a578fff96d2723b547fbd62d8f3efbc5188207da9d4e97
+DIST s3fs-1.90.tar.gz 231942 BLAKE2B 3e4de5f2deda82febd7be176657e6e5ad31da90fed07c2ecf719f0f30d048d03bbcde6fe5628346ba0b4adb4a74fb0c78fbd4882a5e7d6f98fa301b32945a93c SHA512 f1b74676b9c83e5b99bdd59666eea8cdcd9a6fcd2f9237aaf33fd6e12d642f26ee11a3c3ffb0248ea7ce24ac31ae45eeb5f2bd7f04b8e91ed8a04004d59a550d
+DIST s3fs-1.91.tar.gz 242590 BLAKE2B b65119f480b35a6325fa6d498e260309f65778abf97fc9f82bf423004e142f998a1c4b5c80c74a2932a6fa714956fd4f6a0b71e102061ff4f08ff0a82bdbb05c SHA512 5b57af18395f34885b4b8a98e93b0e3f9043c9af78e415a0a6c15489611d7e21ae619e69655737de369edee15762d8726b82bc2651b5b7f5c20e26fe866a96bc
 EBUILD s3fs-1.86.ebuild 1024 BLAKE2B 8d887d990ef79f356ba1809a21c2f001f92a80963f0b83f8423ee6e9e5dceb5b1bf6a545efb6e006d19c21b9051090176281f9cde9af82a6911f423c1aefa1b5 SHA512 71d89d945b64bb46ea29ec07ddab19a73c01d89284492f32a11877eb0d41bd314d8b3d441e78897d9fff36d93c52ff7b4cea2bb4d7b52b06ceee61615095f3ad
-EBUILD s3fs-1.89.ebuild 1026 BLAKE2B b7c3a1c12aa97e757161b0e635c87aefb6bcd466139751aa42ec1862722c300f9f361bbe1214b9ff92a51eef9dd81e9d5978547ffed8607a7713c85fdd87e76f SHA512 509dabfdc51dc12145945caa154985590152bd6f4948c5e7bd7f0e7f5913c4025c1ab5dd1973d5c15f955b1348c54e5f0c5b6118e1e33e8c25adf0addf341a31
-MISC metadata.xml 812 BLAKE2B eebdbe425ffbd4c3782b8eaae9743dca971cd3fc8d41a715fc9daca3fe1ac79b2c4554ac9772526870bd5de85030733a53bf7816b0d58bbce2e95b759b284d29 SHA512 81eeb95a4dad3ba3f0cc06ad5a1523105eacd0a614793dcd84a16228c8ac373fbd54ae4a9ca386425f1b6da645933db501bb8dcf3e42a69c2b3648b821367d23
+EBUILD s3fs-1.89.ebuild 1031 BLAKE2B b6a341a0e0bff4535c8a16218acba969dfd7e00efb5f26f98776f81ed3cec3a5dc6d6ac2d82c32bc8480cee0281f5a6892c7e24634d403fad30ebe2fd828859e SHA512 19b8cbcd4f5e39e5a0afa6930b8dc1c6c2d502c1b417139b1149a4a2a0439458a4e6b43528085a6764da6d67465f46cc7825565a3eb2805d636564b5ade63ae9
+EBUILD s3fs-1.90.ebuild 1080 BLAKE2B cbcefa5faac92370056408572729410a5f8c66dc75ab09ee41b67ff63ae1b914dd1da0d099cffe0808d134c6d599bc50e4597964fb7c66d8324c53cc53d2530f SHA512 590ee5a625b59e1d45bb8273d61b5614cd3eb1b344e7369f989b8788e2f56f26653c03e6e48717e9dccc1ac1d8e9e68bf6f85da7fd982171c83a853ceb690a5b
+EBUILD s3fs-1.91.ebuild 1033 BLAKE2B fbe0fae0e9865e96996a259252e0c7c1d1e4d7155e3aa45a417b993e2e8fde0c1c398387a88981390e6450424c8a5cd673dcbdcdf8a91cf880c00a472a3fb49d SHA512 587857a4c10c03691712dcf1629e5bf184cbbf9e9490f941429ecc79fec03280a20ae6b61e63bfb41a405679e23a10801f87920b7bcb65c47e16ee353fe2b275
+MISC metadata.xml 588 BLAKE2B 5786ae816ac924f7c8e8044b7f48fa96648b00d3d177a0edfbbb40baa6f260fd93414184c37a73a49f97f0e139d38835da9e41e413208f11550f9fa287488275 SHA512 318c4d450f9d58836982c90e048c57635e855df10712d77d54ddb8e0d0fff297ba92b7f0469987258ce39aba6e3dbe714d49f881048ddd6a840b5de1f16b7216
diff --git a/net-fs/s3fs/files/s3fs-1.90-musl-fix.patch b/net-fs/s3fs/files/s3fs-1.90-musl-fix.patch
new file mode 100644
index 000000000000..bb746e54aa9a
--- /dev/null
+++ b/net-fs/s3fs/files/s3fs-1.90-musl-fix.patch
@@ -0,0 +1,18 @@
+Upstream-issue: https://github.com/s3fs-fuse/s3fs-fuse/pull/1888
+Upstream-commit: 4dfe2bfdd742 ("Include climits to support musl libc")
+
+diff --git a/src/fdcache.cpp b/src/fdcache.cpp
+index 3ececd3..3ad876d 100644
+--- a/src/fdcache.cpp
++++ b/src/fdcache.cpp
+@@ -21,6 +21,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cerrno>
++#include <climits>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <dirent.h>
+-- 
+2.34.1
+
diff --git a/net-fs/s3fs/metadata.xml b/net-fs/s3fs/metadata.xml
index 6d9323ed63db..7656a3f39fbb 100644
--- a/net-fs/s3fs/metadata.xml
+++ b/net-fs/s3fs/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>rini17@gmail.com</email>
-		<name>Juraj Variny</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> crypto backend</flag>
 		<flag name="nss">Enable <pkg>dev-libs/nss</pkg> crypto backend</flag>
diff --git a/net-fs/s3fs/s3fs-1.89.ebuild b/net-fs/s3fs/s3fs-1.89.ebuild
index 97358dee5fea..1c9d0aa1a8ea 100644
--- a/net-fs/s3fs/s3fs-1.89.ebuild
+++ b/net-fs/s3fs/s3fs-1.89.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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 ~riscv x86"
 IUSE="gnutls nettle nss +openssl test"
 REQUIRED_USE="
 	^^ ( gnutls nss openssl )
diff --git a/net-fs/s3fs/s3fs-1.90.ebuild b/net-fs/s3fs/s3fs-1.90.ebuild
new file mode 100644
index 000000000000..600ab37c4930
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.90.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~riscv ~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}"
+
+PATCHES=( "${FILESDIR}/${P}-musl-fix.patch" )
+
+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/s3fs/s3fs-1.91.ebuild b/net-fs/s3fs/s3fs-1.91.ebuild
new file mode 100644
index 000000000000..9f4f765d87a1
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.91.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~riscv ~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 2d2bf2f44f8c..2b8aa9af258b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,18 +5,12 @@ AUX samba-4.14.10-winbindd_regression_fix.patch 1432 BLAKE2B a093a161f16703635fe
 AUX samba-4.15.2-winbindd_regression_fix.patch 1432 BLAKE2B 8309976e5d7d4dd0a66f0e1e8d2fd792b562342130b544fa1bf6f6493356c63a561d67c56329dd784d732c4bc5e6f5b121795773fc9565c68ceba9fa9a42010a SHA512 10dd7ff13c74b6f56b5772039e8f96050b6e5457d919a06bfb6013df3f6f7359bb199c764380dac1643659e5794bc62be4d55b9276184c4a23db272f6ea62070
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
-DIST samba-4.14.10.tar.gz 19134066 BLAKE2B c6daebc7abbf2ed371ed694e4478d05875d55f7c5a9f83461932eebd7fe9089ff15e0530555d468e64f897d4cadab86e8c0acbfbd20938b3be842cb4324486e2 SHA512 0e1dd386d185cf77a2be4155646e98b3218316b5c290358684ec8eed747ffea67aa7db0937edc971fb791dc47f0f51306db33eb3b8cb65cca8787f18fd4b7f1c
 DIST samba-4.14.12.tar.gz 19145135 BLAKE2B 94ffc6dee4448e302591bf30bc34f75c5cdeab8acaa04b2d1105a0f0155ba13d366e61f2d0b38060fccb841febcc212d8ab7b6dfd860d784ae9299a375cb98c3 SHA512 6a021d61dc2a8894c646a9b6d85e38c9020b3c227f10d1820cbdf2ad6793c0beeacedd5fff5f75718d4083ec9169cb1fb58f65636e1a50e638fcefce355690d9
-DIST samba-4.15.2.tar.gz 19252338 BLAKE2B aded33cbefce69c9b20148de1be224514de5cc825404e8188fb0a96022d0fdc6595256f74a5e295fd2e1062e8520775b6c59c1d6a7bf80a52ed9fa9db412dcdd SHA512 6fdf9db0da90332afe527703066cca4ec5b0ec6bf6a5979443953f9fbc18b870a7e2445a41c9ae3d63f7738c9c0282e7ca82f6066aa68e151eec248615ea7b21
-DIST samba-4.15.3.tar.gz 19272345 BLAKE2B ada18904ee7889209488f022daacc34ce1f41c12f9c8c48515cc24aa158072da499cc6ec484cf2b9108c6b2d4074ad734d1850063a354000aa90091faba6f7a6 SHA512 1c30cfa6cd927f4d822dd7227b89542d05d7ab4e50c2d9717eea4fcf1af5120b55d66ec628acd5c887e9bffc732c1d37ab084db953534a2b3987531b10fef63c
 DIST samba-4.15.4.tar.gz 19280813 BLAKE2B 3106f2f265263e871fe3f82d3eecaac2e5f642925ff5dd2a9d163092fd13e9348a3910e40431d51cb94a1abeb3b9c32c487ce1f8caebe59a8d6d90641b4d9201 SHA512 e55473dd4971816a01880870309ca44f022625cd529511bcf386c865a2e7e79118577ee4866559f607952de47dc0d310d6426bd08dd4293db95ddbbe3982383d
 DIST samba-4.15.5.tar.gz 19279071 BLAKE2B 355970b9918e95f925636cdea919e123b072f8710134fe6310637c29b2b5e1bc55d7b66d9674a68408ce5f14545a2cb9a94f596f90204935addb2f8f6a503873 SHA512 808e0f15931bab18a1e36298528a01a1250efaef9f99508dd620d6936dd4a2fc3ccc64ab9dcc94bd73460697d16d6ca0652ccbcdbe1644ffedce0137d796d3ca
-DIST samba-4.16.0rc2.tar.gz 30500023 BLAKE2B d187a1b26f04b1c2748e076c51b6a6e7520079aa63fc1dec8abae7611384ce963e23399b47852837cfeaf4fa8a57f899e6a6024e94e196ae8c2d67ade59fc9c2 SHA512 481e2ab18c502fa5f983bf905c29b2ac6cf66135913065a2368e574d46aae1f99b0786b816b0df11e1404f0dc8c2ab9702c1973ca43d99c3cb88742836f7723b
-EBUILD samba-4.14.10-r2.ebuild 10228 BLAKE2B e10beded76e18d79d78a280a4099e62c3190e9b56e6a5389042e3105bb4221df30b63846b55b4c46adaa7096bd1317edd41936dd6b0eded1970896ce4560f841 SHA512 271c1fc112653695e78feffdea04539cd6cce4b39be167a6cad53c1ff5010f149b1e7bfc7956b2518322d534d990539250e079350ae77356390b0129fa4d6a3e
-EBUILD samba-4.14.12.ebuild 10150 BLAKE2B 6db526fd89184bde4d903c17c45aa77fbc56aac93533429df31e6a54f48fcd9d211a03e990e2253dac49bb34514450430c3e942114393fd8e699e2f69d4fd120 SHA512 546fb0023b4fdc4bba5c942460c3675592af06014339189ecb94203aad3c2a2d7a29a22fa619a8ee47fefeac51bc79f46be04819615312a76d16ace2749dc0fc
-EBUILD samba-4.15.2-r2.ebuild 10096 BLAKE2B 92edf79f42f67ae7850388e0db4204099c0ec1a01358ee9cbbc7d6d25404212ce97c05f917810068f80a6aec9d74ad8fa53fa504009b1bdd6402510cc63be919 SHA512 c255639951280b1d37cf3a97cb543114874444686246a23b8ff33b52d9d90bb3e4f6f89a0caae85cd7230aad64789df2441ecabec92dd95d6f48b12b6f17f0b7
-EBUILD samba-4.15.3-r1.ebuild 10081 BLAKE2B 0624ba774f3625a1d90251186f10b07fee41ccb492d639ab2d9861034a81e14e92a5335c8eb41dd3c3e59f48393cf442760b22e94e80c3b0b0fcdbcded663caa SHA512 ba1657d4abb77a8cbd5e0f838a3ea9f96cb42ffe4436d20aaf30dbcab1274b35abb22642f29cbd648dc357eafbfc0136626ce984b894f6ec96c80fa1f06d6e84
-EBUILD samba-4.15.4.ebuild 10085 BLAKE2B 894637d02cc8cd9151f49529747e1feb493265dbc68d94684a7828ca07ff0c9b0cb8edc7be6196a4013e3dd9a080cef0cdd3b8b2d4fdac0a47d81cc652e5882b SHA512 3d97e2b7f1ceeed11deb4dcb94bc2bc62fe960719627ad3e3dadccbf05afb29da63cd7627f5d1d872d74a2ec7cf7849e311e9b46f55a3dedc591dba74e9b120c
-EBUILD samba-4.15.5.ebuild 10085 BLAKE2B 894637d02cc8cd9151f49529747e1feb493265dbc68d94684a7828ca07ff0c9b0cb8edc7be6196a4013e3dd9a080cef0cdd3b8b2d4fdac0a47d81cc652e5882b SHA512 3d97e2b7f1ceeed11deb4dcb94bc2bc62fe960719627ad3e3dadccbf05afb29da63cd7627f5d1d872d74a2ec7cf7849e311e9b46f55a3dedc591dba74e9b120c
-EBUILD samba-4.16.0_rc2.ebuild 10085 BLAKE2B d73fba1fa4986b33097d598ce9ba2ea25fe89d6b32f807142bddb12db17864a7dd096c12dc754d59f7f03fe2ae9e2828bd4e1007414740c071188e302ddeb3aa SHA512 2ed82657ca0b10a5c346e9031f5bfc3895395a9fa24c6b4cecac3024e1a4d6858dc0da8b1ef08b8d425957627c30398ffcdba3a0add53c55f8b80415e9659b15
-MISC metadata.xml 2166 BLAKE2B 147e131d456bd90334b48d551e47ce92f0fd7a0708df2f4cce0ffeb3f2e541689090f8edd043411d982574285e06a1b31fb087c18bd02b1296c6e15ccd0b2e92 SHA512 332354a6247d9ef8d50b71e07c66a10fcfbdb34dd876490f8517d0275d87a7d486789c19824c7ccd9066148a92ece3061649bd7ac0b7280cbc695c92ec70ef29
+DIST samba-4.16.0rc5.tar.gz 30573619 BLAKE2B fc8c198f64bb204ef7f5c50a8316525c151c00ed9e3219199a8fbef803d460eb89cebcdc996410b486cdc6aad4c52d3f62e2cc01595ac41813519a119c315d3a SHA512 1239d89b8c02d8a5da65be18e318662f65900fcf34f081ff8b80d11a9c3a2609ee723c090122cd2510957ec2af87e748d6d176557bcba176fc9af1e46e407901
+EBUILD samba-4.14.12-r1.ebuild 10094 BLAKE2B ffe435cfe0c40262a8230365a5f9037d4eb988dbfd28044ca08ffabfd5306d4b39f7e416689614e836de8182fd9773b49289b5347ec71aa07d0599b64287c442 SHA512 b1c7db0c0868a57f1e1e4109f31080bbb0bb5e66509f298495a71af2650cbe8bf06375bfbe36b51e60846b58119453ef2ca84bd1d566106d91cec9924b991ce2
+EBUILD samba-4.15.4-r1.ebuild 10029 BLAKE2B dddcf25dcd8409fc1d34600c203723676d14cc6939d5a50f9f322c69ff6afd6530344a19434e234e00a2ee92efdb0283a2f2ec85a71fcfed061a2068ec51481e SHA512 4b131faa7164105d974df1adc802f907e57fd9f1e06a4036683bc999cf75839877ea197f544ecfbb0b88a02fb439fc489f1dac2ca1df2e921677331555f39e3a
+EBUILD samba-4.15.5-r1.ebuild 10036 BLAKE2B 37848fd597a3a4f11cd047a3d633b75cdeb7f105bf8fc2fac4b18cfc23df82bc43687bdcabd506ec66472e5eca420855c6d8891a9d19ad013376618feb275b83 SHA512 edf3b7aeaf8fd683a80991e79377b28e3b54320deadce7dba73ae9e1c81131b6d15543f969d4b410e9568cfcf9f82feb2dc2c121ef53a7c3e5c4cd7da5584e34
+EBUILD samba-4.16.0_rc5.ebuild 10036 BLAKE2B afebc659fcd4b88c9331bfe5bfd27005de30f66eec2ee07e42281352a9a19bca21df67f25c133f0e11b2256ce620abd0f8ceaad0127a68fe6fe12851ac85f969 SHA512 07fca45d4a3738b2f567b46ce9e29bd39aa2ef765c4f44773450a149cc2c3ff0c99429bf7af991d3d6195c854e97071b03839dcdaef60bfbf88a479cf8b8540e
+MISC metadata.xml 2061 BLAKE2B b6232fb0408426e595b8569a26aba4938e2e0edd61cf4d73650ee4eed48725ca3181c212003515ef573a95bd73659fe482d964e26fef3ff61a66e06f0566b600 SHA512 301d931501a67d7189881fb269c31f75790b99c3c6c74caea963507ca5a60e5ae39bfd97f8d7e2f3096ae71645c8d7abea36d70ae621017c72cb20c9ec51d2d8
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 05441d23eaed..0430625e206a 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag>
 		<flag name="client">Enables the client part</flag>
 		<flag name="cluster">Enable support for clustering</flag>
-		<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
 		<flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag>
 		<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
 		<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
diff --git a/net-fs/samba/samba-4.14.10-r2.ebuild b/net-fs/samba/samba-4.14.10-r2.ebuild
deleted file mode 100644
index a89e3d9692cc..000000000000
--- a/net-fs/samba/samba-4.14.10-r2.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	ntvfs? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/ldb-2.3.2[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		addns? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson:= )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-
-	# https://bugs.gentoo.org/828063
-	"${FILESDIR}/${P}-winbindd_regression_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool \
-				/usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		if ! use addc ; then
-			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
-				|| die
-		fi
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.14.12.ebuild b/net-fs/samba/samba-4.14.12-r1.ebuild
index 7d4245f87268..a4f3a7c48492 100644
--- a/net-fs/samba/samba-4.14.12.ebuild
+++ b/net-fs/samba/samba-4.14.12-r1.ebuild
@@ -16,13 +16,13 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+IUSE="acl addc addns ads ceph client cluster cups debug fam glusterfs
 gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
 snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
 zeroconf"
@@ -99,9 +99,8 @@ COMMON_DEPEND="
 	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
+	gpg? ( app-crypt/gpgme:= )
 	json? ( dev-libs/jansson:= )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
@@ -220,7 +219,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable ceph cephfs)
 		$(multilib_native_use_with cluster cluster-support)
 		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
+		--without-dmapi
 		$(multilib_native_use_with fam)
 		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
diff --git a/net-fs/samba/samba-4.15.2-r2.ebuild b/net-fs/samba/samba-4.15.2-r2.ebuild
deleted file mode 100644
index 20decb463cde..000000000000
--- a/net-fs/samba/samba-4.15.2-r2.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	ads? ( acl ldap python winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		ads? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson:= )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-
-	# https://bugs.gentoo.org/828063
-	"${FILESDIR}/${P}-winbindd_regression_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool \
-				/usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		if ! use addc ; then
-			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
-				|| die
-		fi
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	if [[ "${PV}" != *_rc* ]] ; then
-		elog "For further information and migration steps make sure to read "
-		elog "https://samba.org/samba/history/${P}.html "
-		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-	fi
-}
diff --git a/net-fs/samba/samba-4.15.3-r1.ebuild b/net-fs/samba/samba-4.15.4-r1.ebuild
index de5a94c7c655..138a2bc526df 100644
--- a/net-fs/samba/samba-4.15.3-r1.ebuild
+++ b/net-fs/samba/samba-4.15.4-r1.ebuild
@@ -16,13 +16,13 @@ if [[ ${PV} = *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
 glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
 snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
 zeroconf"
@@ -96,9 +96,8 @@ COMMON_DEPEND="
 	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
+	gpg? ( app-crypt/gpgme:= )
 	json? ( dev-libs/jansson:= )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
@@ -217,7 +216,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable ceph cephfs)
 		$(multilib_native_use_with cluster cluster-support)
 		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
+		--without-dmapi
 		$(multilib_native_use_with fam)
 		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
diff --git a/net-fs/samba/samba-4.15.4.ebuild b/net-fs/samba/samba-4.15.5-r1.ebuild
index 189af1340a9c..63161f7a96ce 100644
--- a/net-fs/samba/samba-4.15.4.ebuild
+++ b/net-fs/samba/samba-4.15.5-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
 glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
 snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
 zeroconf"
@@ -96,9 +96,8 @@ COMMON_DEPEND="
 	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
+	gpg? ( app-crypt/gpgme:= )
 	json? ( dev-libs/jansson:= )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
@@ -217,7 +216,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable ceph cephfs)
 		$(multilib_native_use_with cluster cluster-support)
 		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
+		--without-dmapi
 		$(multilib_native_use_with fam)
 		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
diff --git a/net-fs/samba/samba-4.15.5.ebuild b/net-fs/samba/samba-4.15.5.ebuild
deleted file mode 100644
index 189af1340a9c..000000000000
--- a/net-fs/samba/samba-4.15.5.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/"
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam
-glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( python json winbind )
-	ads? ( acl ldap python winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	spotlight? ( json )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/icu:=[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/libtasn1[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	$(python_gen_cond_dep "
-		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
-		)
-		ads? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			net-dns/bind-tools[gssapi]
-		)
-	")
-	!alpha? ( !sparc? ( sys-libs/libunwind:= ) )
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson:= )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? (
-		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
-		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
-	)
-	snapper? ( sys-apps/dbus )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	spotlight? ( dev-libs/glib )
-	test? (
-		$(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-		!system-mitkrb5? (
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/nss_wrapper-1.1.3
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	## ugly hackaround for bug #592502
-	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--without-winexe
-		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_enable glusterfs)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with regedit)
-		$(multilib_native_use_enable spotlight)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		--systemd-install-services
-		--with-systemddir="$(systemd_get_systemunitdir)"
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-		# bug #683148
-		--jobs 1
-	)
-
-	if multilib_is_native_abi ; then
-		myconf+=( --with-shared-modules=${SHAREDMODS} )
-	else
-		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool \
-				/usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		dotmpfiles "${FILESDIR}"/samba.conf
-		if ! use addc ; then
-			rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
-				|| die
-		fi
-
-		# Preserve functionality for old gentoo-specific unit names
-		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Be aware that this release contains the best of all of Samba's"
-		elog "technology parts, both a file server (that you can reasonably expect"
-		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
-		elog "controller work previously known as 'samba4'."
-		elog
-	fi
-	if [[ "${PV}" != *_rc* ]] ; then
-		elog "For further information and migration steps make sure to read "
-		elog "https://samba.org/samba/history/${P}.html "
-		elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-	fi
-}
diff --git a/net-fs/samba/samba-4.16.0_rc2.ebuild b/net-fs/samba/samba-4.16.0_rc5.ebuild
index e5dff16aef51..edebd88b5c02 100644
--- a/net-fs/samba/samba-4.16.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.16.0_rc5.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
 glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux
 snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
 zeroconf"
@@ -96,9 +96,8 @@ COMMON_DEPEND="
 	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
-	gpg? ( app-crypt/gpgme )
+	gpg? ( app-crypt/gpgme:= )
 	json? ( dev-libs/jansson:= )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
@@ -217,7 +216,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable ceph cephfs)
 		$(multilib_native_use_with cluster cluster-support)
 		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
+		--without-dmapi
 		$(multilib_native_use_with fam)
 		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)