gentoo auto-resync : 09:10:2024 - 04:26:32

8 files changed, 2 insertions, 1939 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index e413fffcc622..13b543b8a0b7 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 5b0f24bd2ee1..b48e4dab36e8 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,24 +5,14 @@ AUX cmocka-config_h.patch 763 BLAKE2B 9f84366da43a9d353b0116361cf44302c2c9c1c222
 AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
 AUX samba-4.18.4-pam.patch 900 BLAKE2B c2e07609d619a50086ac7727d714ae5bd9508b548f070b9c8193fa5ff4c2051b8f9ee8c3d636693746ae4b4a422add093a95bf3e713e7a4c9325fe6a8a2a2f4c SHA512 5cb997276a35ad6a188801deac7ccaad0e1b8c92f2070fcac62513ea371afc1d9d3414550d3c65726a4a813a4a619ada25063a6d7f145243873c1d9ed6d9690f
 AUX samba.conf 146 BLAKE2B d86e630dba5fcb3a0bb22ac6daf8b0f63d30903c31911353116bc7a63e3ba434f69fd2cbe7a854ab3dc994b95e630932dcbe556fdd6372d27cea5a15618aa816 SHA512 da9ae57a6740135745453e776040b1e54bb492b351a1aa700b8868ef2d1716c0d54b55400cd9b1b1877e065d896ca1569b5a617863c698676250d8ea29939a52
-DIST samba-4.18.10.tar.gz 41352009 BLAKE2B 191928a3b0b2ff203de83a208dd61ac047bc666b744b0ba16a8f9a7e2e072438e2980bf0096ac95cc44003526b2098e763a29b4317083a1e3192f7e3cae2ab85 SHA512 19fed2644b1cb5a5bddca6c7eb2da11b4faf224b060b52ac9131f321d194dc650ea3082051960253e2ce627cdc06ef396778fa0f95e3e9b79f74cd1422577d80
 DIST samba-4.18.11.tar.gz 41352059 BLAKE2B b2a39079286c5c0ca7beec99597ef6004c37eb81e7772b010c78b95b468b48d0370941717b8b919f0308e5313be4fc6a09374460eb2a0d2d7b26e3a8cea996d0 SHA512 7ae0f739070133c803fff3daf27ae2b0adff7336affb4898b07e5ca13bd6658228e8796565374e5a2c14e0b16ae84f404d3a62454096cacccc120520d379199f
-DIST samba-4.18.8.tar.gz 41335959 BLAKE2B d25711f1e781ed16fc224476979a07a5362f92ac943dd0bccfdf445434d0e6838281d5ceae27963267f914720ad6db647078520dc0e78c6ae652faec7d773e73 SHA512 2924c360f6299129527457547b13c1b282e2907a0ecde1036dbca894c752935d693914b4846a9eab436b33798c53c9974692e51fd071301b1174598be944a246
 DIST samba-4.18.9.tar.gz 41332779 BLAKE2B 8a0769c73d42b941b6f69d62243dd2b93d66748231465b853320cf1bf4b3dd8a912ac7bddfaa9c8b1941788951c2ccd630dabb23cf94965bc1d1e4cb5d74d123 SHA512 93a6c878bca583f59208df2a7865bbd453f7a65dc2f39a863797ef807bdeced4d632c5edd4579e341f8cf3b0b2fbe41e68a815a1510518bdd43e9a25a973c94c
-DIST samba-4.19.4.tar.gz 41839810 BLAKE2B b5916478d9385eff93d852b61eaa835e04eef7d813175b7011dfab518d3115707895a67f34fc4bb6afc2a1e3b2f60af8d30cd5a32b59d8ec48977c7eefd1b906 SHA512 9a66f685cb1b5b89c59c75ccb67292b3f792b40b30ca76dfc483e805f5bb680bac027117a28a117f42713452fca41c439bed1724ba7d436fe0b0cb30a34f5b45
 DIST samba-4.19.6.tar.gz 41847853 BLAKE2B 42a1756f3cb1cd48da5abe043357e15b294148b88fdcb2502394372628a17a729ffb5ea070a967face2dfb76e319cdf6fa56d611c369baddf54e998164d782ca SHA512 23172f4393deb9c520182ffb1acb3cf3e53391d4276fffe98527f2f514f969c0952e6e59bcd90f11385dc51367a7bb9cd0534fa9fc3814f16bfb88f41609d0f5
 DIST samba-4.19.7.tar.gz 41851647 BLAKE2B 9bd58363d4cd30f900b286be7c7e172ed0308c4527308d15309a5f3881ba9b1d4c3dd2a37f19d63fdf80a36bd89c9b6001ab2a5aefb724f10721e3a0dc09fa94 SHA512 a837a6255be6268a48c9f41ccad5db040c69b596936a37b011a4c8e3ec68f27ebd1947b86d26b544a7b546ed426dadc450353dff9553698ca4e6e0a3af162ad3
-DIST samba-4.20.0.tar.gz 42433302 BLAKE2B 97cdfdaf118fcd9b44aef0134d211e243a6e2468d90449b9c5ac55c9a8c4dc1e63bf9eb2be9878dc70609c830f90b08b4d1dbf80d7e947c10219043def970d24 SHA512 e820739706992ef3b4e3a7a771ad5d8efc6b87d5ccdcee7ebd41483d90fa3cc0420ba9680d059e71d7083c9c12b0d36deafcdce0224560f49bbfc3a277e7e77c
-DIST samba-4.20.1.tar.gz 42441898 BLAKE2B 5516b3d74705ee829971119d9931ccd339aaa857647dc46e40fda96f65ec5ba695db107f91075a46e1a7135cfdcc0a56ee67aa3475649b314260be03e4e44657 SHA512 bea2bacae5b3272045399057ddf88d8f38203dde04c718b0088fd45792cccd68047b413e66bca7418b19db8580879358b86531a8d6f2d76fbcd902c331050a84
 DIST samba-4.20.2.tar.gz 42458953 BLAKE2B dffa86c8f3abca45e0b9dd29e723fbc13c0dac6c2b50d6240151ec0ae261fa5d9f43cc57403fa0b35624fd05f8cb50e2945d26b5f5205be48ccb60db0e64c1f7 SHA512 ff2c24314c6a35cc42db36a9021241b1323e810bf746e3975bc103f26daf395cd3c32da72e7172e322dee480587bbb1daac939e9851ff65be493be6fb4fc3eda
-EBUILD samba-4.18.10.ebuild 11594 BLAKE2B 6d2edef52584eaba1d39b581e9793ffc3a828540b6030eba3355a4a7b750aacac1456706605f5cc5e658c090ecad80195def81720f8e60a31f592dd14192da87 SHA512 881282e5ae98b830342e950220b7edc43c33e0cc29148c1cb3a41fee928c5d33acba3185488ef6efbd1c97c1396efea387c63abee92b30cb8b2ba7384602a6a0
 EBUILD samba-4.18.11.ebuild 11638 BLAKE2B 36fff90c4916bc65d54c49322edd390e27d012330113cdb3cdaa4ec634e81520e5a6dca4002b58c1b73b8982ce1c7041327ba283492d4c48c1aeca289debece5 SHA512 a077a3248815d083307dc464558e7911ed64d9f025da988646dcf5f12dfdc5e1a0c8fb4ac04cdbd5865a3a5cf852f723e889409abc9b6d5979f36697b7cc9d8b
-EBUILD samba-4.18.8.ebuild 11587 BLAKE2B 5da6cd77a04232a9861c5f556079ba6449dd5969641c277f0dac287eb5aa75fbbf1acb11fd3bae31caa9cd1f3f43bb8184da1409e9edd6be18a25231d68a5073 SHA512 e6bbf877b6ea31a2db0bbfb937b17d6e12bab5d4aeffdb9004d0f587f0fe84c5b241cff42e7147f65109c66e14e2f491e6d3ee541619fe4861059766cb687942
 EBUILD samba-4.18.9.ebuild 11587 BLAKE2B 1c69b21134e526d21397ea5d05eb1954df818289eaf8c46c3baaef4c6255da5381da32b838253c6c1df433882a9d2c3bb71f324cc4b52a292a577192cbf8eb63 SHA512 dd32313fbe60dafbaf668c97245a51adfa9135bb1a31fa7335ecdf0a60681a368b049e0e4cb72c37c3fac850e764bac3de44ebdb721569717c0593fd70c395f1
-EBUILD samba-4.19.4.ebuild 11520 BLAKE2B c2be4823e690e2aa2927329715c65e59e56cb61e5b5c8e3d74c7392177e45a96c9d3c7187707de740855fa9f9e7873ef677aee7b702d03023c7ad610e32245af SHA512 09a1cfa1533cf8b7e5a4f881cb0e95e5b248ec00b781995d53c803f3f7ca90d431711459e540e05227c3d40c34747651e3500f20120319b6a0ff1daaa28e8e61
 EBUILD samba-4.19.6.ebuild 11558 BLAKE2B 46c2cc2d4412d1631ea9480d3664e75163a713119e7d570373a194f4f7814d23dc6c4abe0d23194eb3cb213f6e17e009e2a8c03f39d83cbf1fa27d19c4f7b665 SHA512 96eeceb673c2e448d6f27e53b30115511f15eb5c2c16c9b597d8d08a32485404b00fc3ff4d070e4fb4386aab7c7f83ea0460067c609bdd61539496469d2121e7
-EBUILD samba-4.19.7.ebuild 11564 BLAKE2B 6e2eebc67174b5fc26d5ba90837808194f6062f85ab6bbbf860cd83120f6733dbf4988e777082341b5ccd9f891455e51816a436e85caea8f556c1712579447cb SHA512 00340aad873d29e7593d9bcdd444589754f60e914e09dda75649a183021b6c50b328400b83029efefd1a749a3d283ac303e482e8860e0df57074dcddc0c3f672
-EBUILD samba-4.20.0.ebuild 11566 BLAKE2B ddc1eba1295c8490eff336bc233511a6bcf33a52b84a67a062f0888ced378fa85ba8f37f8537f3fde0ac27389cd689643bbe35598badf95fcd4dc47b7f385a76 SHA512 a30a6533c26a244fba3d18a66e42c928507e62d762d7c8e16597335c126297e043fbea377536f186b0943951e858cbea81a01cc90601156c157f766bad25dce3
-EBUILD samba-4.20.1.ebuild 11566 BLAKE2B ddc1eba1295c8490eff336bc233511a6bcf33a52b84a67a062f0888ced378fa85ba8f37f8537f3fde0ac27389cd689643bbe35598badf95fcd4dc47b7f385a76 SHA512 a30a6533c26a244fba3d18a66e42c928507e62d762d7c8e16597335c126297e043fbea377536f186b0943951e858cbea81a01cc90601156c157f766bad25dce3
+EBUILD samba-4.19.7.ebuild 11561 BLAKE2B 18393da26139df595a072335d9f1a31324554c514dbf6c3f6b884013ea7e7c54f3ca6d93993e96790973555396891820c01f5d9446949f9e05ab8313b857663b SHA512 c333d90dd4a18aa01da15297462158ed3a74bcff3e2cdeb31a92599631a78ad49c157edcdfaede4cd369acd1abca6afee6cc14df3d17a2c73be135803b04aee6
 EBUILD samba-4.20.2.ebuild 11588 BLAKE2B f7bad7222dfe70434090f34edee90eb4069102deb864d75b8828bf85c0ceaf2e3b6b8ccf7620ef80c6a47d9a93827bc9640b9cad82f81e3735ef06e459501a08 SHA512 04bf31c57957efe4da843aa2859a8e5930beea870915f13a72aaef5230b989f3c2c008730ef3abe7ac64f89adcd0e3a61fa3f58ca13147b512c9f4badffae061
 MISC metadata.xml 2066 BLAKE2B 1d3a5757c3226cede70b5fabb63b27bf0a5b86bf27643a30ebfe743d0758e57ce1e69b14ba6795de4c656b3d5da5b3f9d90d11074520c24d6459220f62723b04 SHA512 0a7963f9abddd4cc3b303c93dcd4b7dc30ca5660e64750d77bcd3bce0a95291c46208d9a1143303c168febb2d65cdad0018c475130dc04c16d79df2019d8e9aa
diff --git a/net-fs/samba/samba-4.18.10.ebuild b/net-fs/samba/samba-4.18.10.ebuild
deleted file mode 100644
index df4f64da3816..000000000000
--- a/net-fs/samba/samba-4.18.10.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 flag-o-matic 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="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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 fam glusterfs gpg"
-IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
-IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
-IUSE+=" zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( json python !system-mitkrb5 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
-)
-
-TALLOC_VERSION="2.4.0"
-TDB_VERSION="1.4.8"
-TEVENT_VERSION="0.14.1"
-
-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/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-${TEVENT_VERSION}[${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]
-		)
-	')
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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.19[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/JSON
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	net-libs/rpcsvc-proto
-	spotlight? ( dev-libs/glib )
-	test? (
-		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-		$(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.18.4-pam.patch
-	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
-	"${FILESDIR}"/cmocka-config_h.patch
-)
-
-CONFDIR="${FILESDIR}/4.4"
-WAF_BINARY="${S}/buildtools/bin/waf"
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-	export PYTHONHASHSEED=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-check_samba_dep_versions() {
-	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
-	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
-		eerror "Source talloc version: ${TALLOC_VERSION}"
-		eerror "Ebuild talloc version: ${actual_talloc_version}"
-		die "Ebuild needs to fix TALLOC_VERSION!"
-	fi
-
-	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
-	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
-		eerror "Source tdb version: ${TDB_VERSION}"
-		eerror "Ebuild tdb version: ${actual_tdb_version}"
-		die "Ebuild needs to fix TDB_VERSION!"
-	fi
-
-	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
-	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
-		eerror "Source tevent version: ${TEVENT_VERSION}"
-		eerror "Ebuild tevent version: ${actual_tevent_version}"
-		die "Ebuild needs to fix TEVENT_VERSION!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	check_samba_dep_versions
-
-	# Unbundle 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
-
-	# WAF
-	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
-
-	# We "use" bundled cmocka when we're not running tests as we're
-	# not using it anyway. Means we avoid making users install it for
-	# no reason. bug #802531
-	if ! use test ; then
-		bundled_libs="cmocka,${bundled_libs}"
-	fi
-
-	# bug #874633
-	if use llvm-libunwind ; then
-		mkdir -p "${T}"/${ABI}/pkgconfig || die
-
-		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
-
-		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
-		exec_prefix=\${prefix}
-		libdir=/usr/$(get_libdir)
-		includedir=\${prefix}/include
-
-		Name: libunwind-generic
-		Description: libunwind generic library
-		Version: 1.70
-		Libs: -L\${libdir} -lunwind
-		Cflags: -I\${includedir}
-		EOF
-	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)
-		--without-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 unwind libunwind)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usev 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
-
-	append-cppflags "-I${ESYSROOT}/usr/include/et"
-
-	waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "Test failed"
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
-	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
-
-	# Remove empty runtime dirs created by build system (bug #892341)
-	find "${ED}"/{run,var} -type d -empty -delete || 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 (bug #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"
-
-		use python && python_optimize
-	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
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-}
diff --git a/net-fs/samba/samba-4.18.8.ebuild b/net-fs/samba/samba-4.18.8.ebuild
deleted file mode 100644
index 701794a974a6..000000000000
--- a/net-fs/samba/samba-4.18.8.ebuild
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 flag-o-matic 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="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong 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 fam glusterfs gpg"
-IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
-IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
-IUSE+=" zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( json python !system-mitkrb5 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
-)
-
-TALLOC_VERSION="2.4.0"
-TDB_VERSION="1.4.8"
-TEVENT_VERSION="0.14.1"
-
-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/ldb-2.7.2:=[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-${TEVENT_VERSION}[${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]
-		)
-	')
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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.19[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/JSON
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	net-libs/rpcsvc-proto
-	spotlight? ( dev-libs/glib )
-	test? (
-		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-		$(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.18.4-pam.patch
-	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
-	"${FILESDIR}"/cmocka-config_h.patch
-)
-
-CONFDIR="${FILESDIR}/4.4"
-WAF_BINARY="${S}/buildtools/bin/waf"
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-	export PYTHONHASHSEED=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-check_samba_dep_versions() {
-	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
-	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
-		eerror "Source talloc version: ${TALLOC_VERSION}"
-		eerror "Ebuild talloc version: ${actual_talloc_version}"
-		die "Ebuild needs to fix TALLOC_VERSION!"
-	fi
-
-	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
-	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
-		eerror "Source tdb version: ${TDB_VERSION}"
-		eerror "Ebuild tdb version: ${actual_tdb_version}"
-		die "Ebuild needs to fix TDB_VERSION!"
-	fi
-
-	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
-	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
-		eerror "Source tevent version: ${TEVENT_VERSION}"
-		eerror "Ebuild tevent version: ${actual_tevent_version}"
-		die "Ebuild needs to fix TEVENT_VERSION!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	check_samba_dep_versions
-
-	# Unbundle 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
-
-	# WAF
-	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
-
-	# We "use" bundled cmocka when we're not running tests as we're
-	# not using it anyway. Means we avoid making users install it for
-	# no reason. bug #802531
-	if ! use test ; then
-		bundled_libs="cmocka,${bundled_libs}"
-	fi
-
-	# bug #874633
-	if use llvm-libunwind ; then
-		mkdir -p "${T}"/${ABI}/pkgconfig || die
-
-		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
-
-		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
-		exec_prefix=\${prefix}
-		libdir=/usr/$(get_libdir)
-		includedir=\${prefix}/include
-
-		Name: libunwind-generic
-		Description: libunwind generic library
-		Version: 1.70
-		Libs: -L\${libdir} -lunwind
-		Cflags: -I\${includedir}
-		EOF
-	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)
-		--without-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 unwind libunwind)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usev 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
-
-	append-cppflags "-I${ESYSROOT}/usr/include/et"
-
-	waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "Test failed"
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
-	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
-
-	# Remove empty runtime dirs created by build system (bug #892341)
-	find "${ED}"/{run,var} -type d -empty -delete || 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 (bug #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"
-
-		use python && python_optimize
-	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
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-}
diff --git a/net-fs/samba/samba-4.19.4.ebuild b/net-fs/samba/samba-4.19.4.ebuild
deleted file mode 100644
index 8f5ad70e64dc..000000000000
--- a/net-fs/samba/samba-4.19.4.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 flag-o-matic 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="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
-IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
-IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
-IUSE+=" zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( json python !system-mitkrb5 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
-)
-
-TALLOC_VERSION="2.4.1"
-TDB_VERSION="1.4.9"
-TEVENT_VERSION="0.15.0"
-
-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/ldb-2.8.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-${TEVENT_VERSION}[${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]
-		)
-	')
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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.19[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:= )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/JSON
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	net-libs/rpcsvc-proto
-	spotlight? ( dev-libs/glib )
-	test? (
-		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-		$(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.18.4-pam.patch
-	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
-	"${FILESDIR}"/cmocka-config_h.patch
-)
-
-CONFDIR="${FILESDIR}/4.4"
-WAF_BINARY="${S}/buildtools/bin/waf"
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-	export PYTHONHASHSEED=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-check_samba_dep_versions() {
-	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
-	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
-		eerror "Source talloc version: ${TALLOC_VERSION}"
-		eerror "Ebuild talloc version: ${actual_talloc_version}"
-		die "Ebuild needs to fix TALLOC_VERSION!"
-	fi
-
-	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
-	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
-		eerror "Source tdb version: ${TDB_VERSION}"
-		eerror "Ebuild tdb version: ${actual_tdb_version}"
-		die "Ebuild needs to fix TDB_VERSION!"
-	fi
-
-	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
-	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
-		eerror "Source tevent version: ${TEVENT_VERSION}"
-		eerror "Ebuild tevent version: ${actual_tevent_version}"
-		die "Ebuild needs to fix TEVENT_VERSION!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	check_samba_dep_versions
-
-	# Unbundle 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
-
-	# WAF
-	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
-
-	# We "use" bundled cmocka when we're not running tests as we're
-	# not using it anyway. Means we avoid making users install it for
-	# no reason. bug #802531
-	if ! use test ; then
-		bundled_libs="cmocka,${bundled_libs}"
-	fi
-
-	# bug #874633
-	if use llvm-libunwind ; then
-		mkdir -p "${T}"/${ABI}/pkgconfig || die
-
-		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
-
-		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
-		exec_prefix=\${prefix}
-		libdir=/usr/$(get_libdir)
-		includedir=\${prefix}/include
-
-		Name: libunwind-generic
-		Description: libunwind generic library
-		Version: 1.70
-		Libs: -L\${libdir} -lunwind
-		Cflags: -I\${includedir}
-		EOF
-	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)
-		--without-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 unwind libunwind)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usev 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
-
-	append-cppflags "-I${ESYSROOT}/usr/include/et"
-
-	waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "Test failed"
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
-	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
-
-	# Remove empty runtime dirs created by build system (bug #892341)
-	find "${ED}"/{run,var} -type d -empty -delete || 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 (bug #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"
-
-		use python && python_optimize
-	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
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-}
diff --git a/net-fs/samba/samba-4.19.7.ebuild b/net-fs/samba/samba-4.19.7.ebuild
index 5035cef13434..c05eb37103d7 100644
--- a/net-fs/samba/samba-4.19.7.ebuild
+++ b/net-fs/samba/samba-4.19.7.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *_rc* ]]; then
 	SRC_URI="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-fs/samba/samba-4.20.0.ebuild b/net-fs/samba/samba-4.20.0.ebuild
deleted file mode 100644
index bd2e10c3c1ee..000000000000
--- a/net-fs/samba/samba-4.20.0.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 flag-o-matic 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="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
-IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
-IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
-IUSE+=" zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( json python !system-mitkrb5 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
-)
-
-TALLOC_VERSION="2.4.2"
-TDB_VERSION="1.4.10"
-TEVENT_VERSION="0.16.1"
-
-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/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-${TEVENT_VERSION}[${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]
-		)
-	')
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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.19[${MULTILIB_USEDEP}] )
-	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
-	systemd? ( sys-apps/systemd:= )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/JSON
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	net-libs/rpcsvc-proto
-	spotlight? ( dev-libs/glib )
-	test? (
-		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-		$(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.18.4-pam.patch
-	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
-)
-
-CONFDIR="${FILESDIR}/4.4"
-WAF_BINARY="${S}/buildtools/bin/waf"
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-	export PYTHONHASHSEED=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-check_samba_dep_versions() {
-	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
-	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
-		eerror "Source talloc version: ${TALLOC_VERSION}"
-		eerror "Ebuild talloc version: ${actual_talloc_version}"
-		die "Ebuild needs to fix TALLOC_VERSION!"
-	fi
-
-	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
-	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
-		eerror "Source tdb version: ${TDB_VERSION}"
-		eerror "Ebuild tdb version: ${actual_tdb_version}"
-		die "Ebuild needs to fix TDB_VERSION!"
-	fi
-
-	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
-	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
-		eerror "Source tevent version: ${TEVENT_VERSION}"
-		eerror "Ebuild tevent version: ${actual_tevent_version}"
-		die "Ebuild needs to fix TEVENT_VERSION!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	check_samba_dep_versions
-
-	# Unbundle 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
-
-	# WAF
-	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
-
-	# We "use" bundled cmocka when we're not running tests as we're
-	# not using it anyway. Means we avoid making users install it for
-	# no reason. bug #802531
-	if ! use test ; then
-		bundled_libs="cmocka,${bundled_libs}"
-	fi
-
-	# bug #874633
-	if use llvm-libunwind ; then
-		mkdir -p "${T}"/${ABI}/pkgconfig || die
-
-		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
-
-		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
-		exec_prefix=\${prefix}
-		libdir=/usr/$(get_libdir)
-		includedir=\${prefix}/include
-
-		Name: libunwind-generic
-		Description: libunwind generic library
-		Version: 1.70
-		Libs: -L\${libdir} -lunwind
-		Cflags: -I\${includedir}
-		EOF
-	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)
-		--without-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 unwind libunwind)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usev 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
-
-	append-cppflags "-I${ESYSROOT}/usr/include/et"
-
-	waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "Test failed"
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
-	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
-
-	# Remove empty runtime dirs created by build system (bug #892341)
-	find "${ED}"/{run,var} -type d -empty -delete || 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 (bug #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"
-
-		use python && python_optimize
-	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
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-}
diff --git a/net-fs/samba/samba-4.20.1.ebuild b/net-fs/samba/samba-4.20.1.ebuild
deleted file mode 100644
index bd2e10c3c1ee..000000000000
--- a/net-fs/samba/samba-4.20.1.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 flag-o-matic 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="https://download.samba.org/pub/samba/rc/${MY_P}.tar.gz"
-else
-	SRC_URI="https://download.samba.org/pub/samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg"
-IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux"
-IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind"
-IUSE+=" zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	addc? ( json python !system-mitkrb5 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
-)
-
-TALLOC_VERSION="2.4.2"
-TDB_VERSION="1.4.10"
-TEVENT_VERSION="0.16.1"
-
-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/ldb-2.9.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.10.0:=[ldap(+)?,${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	sys-libs/liburing:=[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-${TEVENT_VERSION}[${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]
-		)
-	')
-	acl? ( virtual/acl )
-	ceph? ( sys-cluster/ceph )
-	cluster? ( net-libs/rpcsvc-proto )
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	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.19[${MULTILIB_USEDEP}] )
-	!system-heimdal? ( !system-mitkrb5? ( sys-apps/keyutils[${MULTILIB_USEDEP}] ) )
-	systemd? ( sys-apps/systemd:= )
-	unwind? (
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/JSON
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	net-libs/rpcsvc-proto
-	spotlight? ( dev-libs/glib )
-	test? (
-		>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-		$(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.18.4-pam.patch
-	"${FILESDIR}"/ldb-2.5.2-skip-wav-tevent-check.patch
-)
-
-CONFDIR="${FILESDIR}/4.4"
-WAF_BINARY="${S}/buildtools/bin/waf"
-SHAREDMODS=""
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-	export PYTHONHASHSEED=1
-
-	python-single-r1_pkg_setup
-
-	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
-	if use cluster ; then
-		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS+=",idmap_ad"
-	fi
-}
-
-check_samba_dep_versions() {
-	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
-	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
-		eerror "Source talloc version: ${TALLOC_VERSION}"
-		eerror "Ebuild talloc version: ${actual_talloc_version}"
-		die "Ebuild needs to fix TALLOC_VERSION!"
-	fi
-
-	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
-	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
-		eerror "Source tdb version: ${TDB_VERSION}"
-		eerror "Ebuild tdb version: ${actual_tdb_version}"
-		die "Ebuild needs to fix TDB_VERSION!"
-	fi
-
-	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
-	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
-		eerror "Source tevent version: ${TEVENT_VERSION}"
-		eerror "Ebuild tevent version: ${actual_tevent_version}"
-		die "Ebuild needs to fix TEVENT_VERSION!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	check_samba_dep_versions
-
-	# Unbundle 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
-
-	# WAF
-	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
-
-	# We "use" bundled cmocka when we're not running tests as we're
-	# not using it anyway. Means we avoid making users install it for
-	# no reason. bug #802531
-	if ! use test ; then
-		bundled_libs="cmocka,${bundled_libs}"
-	fi
-
-	# bug #874633
-	if use llvm-libunwind ; then
-		mkdir -p "${T}"/${ABI}/pkgconfig || die
-
-		local -x PKG_CONFIG_PATH="${T}/${ABI}/pkgconfig:${PKG_CONFIG_PATH}"
-
-		cat <<-EOF > "${T}"/${ABI}/pkgconfig/libunwind-generic.pc || die
-		exec_prefix=\${prefix}
-		libdir=/usr/$(get_libdir)
-		includedir=\${prefix}/include
-
-		Name: libunwind-generic
-		Description: libunwind generic library
-		Version: 1.70
-		Libs: -L\${libdir} -lunwind
-		Cflags: -I\${includedir}
-		EOF
-	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)
-		--without-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 unwind libunwind)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usev 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
-
-	append-cppflags "-I${ESYSROOT}/usr/include/et"
-
-	waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "Test failed"
-	fi
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-	# smbspool_krb5_wrapper must only be accessible to root, bug #880739
-	find "${ED}" -type f -name "smbspool_krb5_wrapper" -exec chmod go-rwx {} + || die
-
-	# Remove empty runtime dirs created by build system (bug #892341)
-	find "${ED}"/{run,var} -type d -empty -delete || 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 (bug #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"
-
-		use python && python_optimize
-	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
-}
-
-pkg_postinst() {
-	tmpfiles_process samba.conf
-}