commit:     1f19c92579568a69a4f5e57219c24286f60c5e93
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  6 10:05:24 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  8 15:42:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f19c925

net-fs/samba: drop 4.18.8, 4.18.10, 4.19.4, 4.20.0, 4.20.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-fs/samba/Manifest             |   5 -
 net-fs/samba/samba-4.18.10.ebuild | 386 --------------------------------------
 net-fs/samba/samba-4.18.8.ebuild  | 386 --------------------------------------
 net-fs/samba/samba-4.19.4.ebuild  | 385 -------------------------------------
 net-fs/samba/samba-4.20.0.ebuild  | 385 -------------------------------------
 net-fs/samba/samba-4.20.1.ebuild  | 385 -------------------------------------
 6 files changed, 1932 deletions(-)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 37266801f4b3..26fa80c8ffb3 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,10 +1,5 @@
-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

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.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
-}

Reply via email to