commit:     79adf57aac2b7c54d2a461b40b9beedac06fdb14
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 02:37:27 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 02:37:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79adf57a

net-fs/samba: drop 4.15.10, 4.15.11, 4.16.5-r1, 4.16.6

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-fs/samba/Manifest               |   4 -
 net-fs/samba/samba-4.15.10.ebuild   | 333 --------------------------------
 net-fs/samba/samba-4.15.11.ebuild   | 333 --------------------------------
 net-fs/samba/samba-4.16.5-r1.ebuild | 368 ------------------------------------
 net-fs/samba/samba-4.16.6.ebuild    | 368 ------------------------------------
 5 files changed, 1406 deletions(-)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index fa48e6a8773b..8e4fd2269104 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,8 +1,4 @@
-DIST samba-4.15.10.tar.gz 19333317 BLAKE2B 
20b414d51f915cfdcd50a10dd9d315d3be23a43d35051aa6ff8cdc3c07f430d96d933765a96882db0350792e740a4a4a18963cb7e8baa198c606180b9da273c3
 SHA512 
68e0096df9e348fdf389a11433391cd85606f075e9402ce64f2228daf126d794caf0050463eb2245933551b299735b25d5d5036c4ac78aba3e23c2fc2dce9ef6
-DIST samba-4.15.11.tar.gz 19337500 BLAKE2B 
d374088ac957ac8b7d3d172229efa86878a1d539d790091b70402b615d1772b38e239b8721190c8d3ed873651e7c99912f5a603db1cbfd7dac1972a1fc50aac1
 SHA512 
a5081bee60d375af9eb529990f7d73ede1d3cb41c5fef8b8d794861ae6b0f64464b1bf3b3789d4538d7c36e76fac4062c09e9dfebb6ca97b06268e2a0758635c
 DIST samba-4.15.12.tar.gz 19339629 BLAKE2B 
b394767944e57dc907641c3635ccf290f48bd8a5880e5514066cf410c81eca6f1432a69b67b666ef7c052e2d90541579927456820e58e872a28b7946951f585d
 SHA512 
6cb46bdd7eaebbcd76fb520d959cca22da924049c632338d954f9c8b16015288eebc982e20dcf9f1ed6deabd77e002dfaa920e3b2457f16a6768a1b1bea9dc3e
 DIST samba-4.15.7.tar.gz 19290930 BLAKE2B 
4a295f79d38212d4c6917ed61a22e4204b5ea3d5e26f30b65d1e7e81842e92405870dd40fd4d05ec1126a532bdb1ddea300848387a4c64370ba5c2c1354ee8e5
 SHA512 
beffb09b5bcd62991398d39c7a8aec5fed0c51d550e2f0fb42b2e0a09094f4c6a8f29adf708c4969db12329f5c7343d2debd04315107b79bef59e99a4a7e4ce4
 DIST samba-4.15.9.tar.gz 19324742 BLAKE2B 
36cca5ac1b449339f2ce420d4f29f25151bcd536556bfc571db6422a95e9c5daed98b9a71387babbfc61d43e5ff183a1b69255dbec966f80a1cb8fe0ad40f636
 SHA512 
2ee5d66f5a7c1ff5b27c959be6310335eb6484476c1eadb3b8ca1bc84fb2260487136c1318539e1dc459b81bca66f268fd979f6a816ff5f905bd605a99685004
-DIST samba-4.16.5.tar.gz 30613439 BLAKE2B 
7f6eabb8817d0101d7f95b668ea352fe3a2a9291814b42a303ea89dd19b1bd192e719930485d721b90dcedb180e86e42a87083ae42166bf5b07e8383c85436c6
 SHA512 
9c4cd2ccbb6a4910d0da220e24bf3bf2cf25acaaebb5aa7358d8910016fac29b8ed1889f8ee0b4953d695583ff04d8de7bfffc2d97ae30aa7730e157aa7acfcf
-DIST samba-4.16.6.tar.gz 30619049 BLAKE2B 
c9871be98d29d16fad3666f11ce0fcb9889599307a40cab15be73d03626ea345318ec84dd6e8627d03d370b0292108d9d47abf4404baed52eab810979b67c552
 SHA512 
c5f5614b20d612bbc56fb2a4af60572e0b439c979c282cf0a3289b1f3a0891aefce56d1540638de88afaf0c6ecb3f5c7ccb27ed21af1d333761547c0c33d6cf8
 DIST samba-4.16.7.tar.gz 30622700 BLAKE2B 
be35253fd8ced22533716c7190ca02e57d4b9c73ac0d54b1e987c87da9e2fcc686335b9d470902cde47b841f3b57c09f9aab16f17c760b5eb7e45e328b3b2d1c
 SHA512 
3966ef870b24e4282ce971bdc5906fb6f64a5bb99d448d9aade3ad013551b21b3cf42f792853be7e118483ba5b6f9d4b835ada642661a90051b6c04886e10c1e

diff --git a/net-fs/samba/samba-4.15.10.ebuild 
b/net-fs/samba/samba-4.15.10.ebuild
deleted file mode 100644
index 6042a3515c40..000000000000
--- a/net-fs/samba/samba-4.15.10.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam 
tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/";
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-       SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-       SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota 
+regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind 
winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       addc? ( python json winbind )
-       ads? ( acl ldap python winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       spotlight? ( json )
-       test? ( python )
-       !ads? ( !addc )
-       ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/samba-4.0/policy.h
-       /usr/include/samba-4.0/dcerpc_server.h
-       /usr/include/samba-4.0/ctdb.h
-       /usr/include/samba-4.0/ctdb_client.h
-       /usr/include/samba-4.0/ctdb_protocol.h
-       /usr/include/samba-4.0/ctdb_private.h
-       /usr/include/samba-4.0/ctdb_typesafe_cb.h
-       /usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/icu:=[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/libtasn1[${MULTILIB_USEDEP}]
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-perl/Parse-Yapp
-       >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-       >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.4.4[ldap(+)?,${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
-       sys-libs/libcap[${MULTILIB_USEDEP}]
-       sys-libs/liburing:=[${MULTILIB_USEDEP}]
-       sys-libs/ncurses:0=
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       $(python_gen_cond_dep "
-               addc? (
-                       dev-python/dnspython:=[\${PYTHON_USEDEP}]
-                       dev-python/markdown[\${PYTHON_USEDEP}]
-               )
-               ads? (
-                       dev-python/dnspython:=[\${PYTHON_USEDEP}]
-                       net-dns/bind-tools[gssapi]
-               )
-       ")
-       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:0= )
-       unwind? (
-               llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-               !llvm-libunwind? ( sys-libs/libunwind:= )
-       )
-       zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-       >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       spotlight? ( dev-libs/glib )
-       test? (
-               $(python_gen_cond_dep 
"dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-               !system-mitkrb5? (
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${COMMON_DEPEND}
-       client? ( net-fs/cifs-utils[ads?] )
-       python? ( ${PYTHON_DEPS} )
-       selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
-       "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       # Package fails to build with distcc
-       export DISTCC_DISABLE=1
-
-       python-single-r1_pkg_setup
-
-       SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-       if use cluster ; then
-               SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS+=",idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       if ! use test ; then
-               sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-       fi
-
-       ## ugly hackaround for bug #592502
-       #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-       sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-               -i source4/dsdb/samdb/ldb_modules/password_hash.c \
-               || die
-
-       # Friggin' WAF shit
-       multilib_copy_sources
-}
-
-multilib_src_configure() {
-       # when specifying libs for samba build you must append NONE to the end 
to
-       # stop it automatically including things
-       local bundled_libs="NONE"
-       if ! use system-heimdal && ! use system-mitkrb5 ; then
-               
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-       fi
-
-       local myconf=(
-               --enable-fhs
-               --sysconfdir="${EPREFIX}/etc"
-               --localstatedir="${EPREFIX}/var"
-               --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-               --with-piddir="${EPREFIX}/run/${PN}"
-               --bundled-libraries="${bundled_libs}"
-               --builtin-libraries=NONE
-               --disable-rpath
-               --disable-rpath-install
-               --nopyc
-               --nopyo
-               --without-winexe
-               --accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               --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' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 
$(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-               # bug #683148
-               --jobs 1
-       )
-
-       if multilib_is_native_abi ; then
-               myconf+=( --with-shared-modules=${SHAREDMODS} )
-       else
-               myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-       fi
-
-       PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       PYTHONHASHSEED=1 waf-utils_src_compile
-}
-
-multilib_src_install() {
-       PYTHONHASHSEED=1 waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-       if multilib_is_native_abi ; then
-               # install ldap schema for server (bug #491002)
-               if use ldap ; then
-                       insinto /etc/openldap/schema
-                       doins examples/LDAP/samba.schema
-               fi
-
-               # create symlink for cups (bug #552310)
-               if use cups ; then
-                       dosym ../../../bin/smbspool \
-                               /usr/libexec/cups/backend/smb
-               fi
-
-               # install example config file
-               insinto /etc/samba
-               doins examples/smb.conf.default
-
-               # Fix paths in example file (#603964)
-               sed \
-                       -e '/log file 
=/s@/usr/local/samba/var/@/var/log/samba/@' \
-                       -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-                       -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-                       -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-                       -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-                       -i "${ED}"/etc/samba/smb.conf.default || die
-
-               # Install init script and conf.d file
-               newinitd "${CONFDIR}/samba4.initd-r1" samba
-               newconfd "${CONFDIR}/samba4.confd" samba
-
-               dotmpfiles "${FILESDIR}"/samba.conf
-               if ! use addc ; then
-                       rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
-                               || die
-               fi
-
-               # Preserve functionality for old gentoo-specific unit names
-               dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-               dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-               dosym winbind.service 
"$(systemd_get_systemunitdir)/winbindd.service"
-       fi
-
-       if use pam && use winbind ; then
-               newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-               # bugs #376853 and #590374
-               insinto /etc/security
-               doins examples/pam_winbind/pam_winbind.conf
-       fi
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process samba.conf
-}

diff --git a/net-fs/samba/samba-4.15.11.ebuild 
b/net-fs/samba/samba-4.15.11.ebuild
deleted file mode 100644
index 6042a3515c40..000000000000
--- a/net-fs/samba/samba-4.15.11.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam 
tmpfiles
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://samba.org/";
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *_rc* ]]; then
-       SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-else
-       SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~sparc ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam
-glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota 
+regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind 
winbind
-zeroconf"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-       addc? ( python json winbind )
-       ads? ( acl ldap python winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       spotlight? ( json )
-       test? ( python )
-       !ads? ( !addc )
-       ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/samba-4.0/policy.h
-       /usr/include/samba-4.0/dcerpc_server.h
-       /usr/include/samba-4.0/ctdb.h
-       /usr/include/samba-4.0/ctdb_client.h
-       /usr/include/samba-4.0/ctdb_protocol.h
-       /usr/include/samba-4.0/ctdb_private.h
-       /usr/include/samba-4.0/ctdb_typesafe_cb.h
-       /usr/include/samba-4.0/ctdb_version.h
-)
-
-COMMON_DEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/icu:=[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/libtasn1[${MULTILIB_USEDEP}]
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-perl/Parse-Yapp
-       >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-       >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-2.4.4[ldap(+)?,${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
-       sys-libs/libcap[${MULTILIB_USEDEP}]
-       sys-libs/liburing:=[${MULTILIB_USEDEP}]
-       sys-libs/ncurses:0=
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libcrypt:=[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       $(python_gen_cond_dep "
-               addc? (
-                       dev-python/dnspython:=[\${PYTHON_USEDEP}]
-                       dev-python/markdown[\${PYTHON_USEDEP}]
-               )
-               ads? (
-                       dev-python/dnspython:=[\${PYTHON_USEDEP}]
-                       net-dns/bind-tools[gssapi]
-               )
-       ")
-       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:0= )
-       unwind? (
-               llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-               !llvm-libunwind? ( sys-libs/libunwind:= )
-       )
-       zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-       >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       spotlight? ( dev-libs/glib )
-       test? (
-               $(python_gen_cond_dep 
"dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" )
-               !system-mitkrb5? (
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.9
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${COMMON_DEPEND}
-       client? ( net-fs/cifs-utils[ads?] )
-       python? ( ${PYTHON_DEPS} )
-       selinux? ( sec-policy/selinux-samba )
-"
-BDEPEND="${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
-       "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       # Package fails to build with distcc
-       export DISTCC_DISABLE=1
-
-       python-single-r1_pkg_setup
-
-       SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
-       if use cluster ; then
-               SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
-       elif use ads ; then
-               SHAREDMODS+=",idmap_ad"
-       fi
-}
-
-src_prepare() {
-       default
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       if ! use test ; then
-               sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-       fi
-
-       ## ugly hackaround for bug #592502
-       #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-       sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-               -i source4/dsdb/samdb/ldb_modules/password_hash.c \
-               || die
-
-       # Friggin' WAF shit
-       multilib_copy_sources
-}
-
-multilib_src_configure() {
-       # when specifying libs for samba build you must append NONE to the end 
to
-       # stop it automatically including things
-       local bundled_libs="NONE"
-       if ! use system-heimdal && ! use system-mitkrb5 ; then
-               
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-       fi
-
-       local myconf=(
-               --enable-fhs
-               --sysconfdir="${EPREFIX}/etc"
-               --localstatedir="${EPREFIX}/var"
-               --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-               --with-piddir="${EPREFIX}/run/${PN}"
-               --bundled-libraries="${bundled_libs}"
-               --builtin-libraries=NONE
-               --disable-rpath
-               --disable-rpath-install
-               --nopyc
-               --nopyo
-               --without-winexe
-               --accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
-               $(multilib_native_use_with acl acl-support)
-               $(multilib_native_usex addc '' '--without-ad-dc')
-               $(multilib_native_use_with ads)
-               $(multilib_native_use_enable ceph cephfs)
-               $(multilib_native_use_with cluster cluster-support)
-               $(multilib_native_use_enable cups)
-               --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' '')
-               $(usex system-mitkrb5 "--with-system-mitkrb5 
$(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-               $(use_with debug lttng)
-               $(use_with ldap)
-               $(use_with profiling-data)
-               # bug #683148
-               --jobs 1
-       )
-
-       if multilib_is_native_abi ; then
-               myconf+=( --with-shared-modules=${SHAREDMODS} )
-       else
-               myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
-       fi
-
-       PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
-               waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-       PYTHONHASHSEED=1 waf-utils_src_compile
-}
-
-multilib_src_install() {
-       PYTHONHASHSEED=1 waf-utils_src_install
-
-       # Make all .so files executable
-       find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-       if multilib_is_native_abi ; then
-               # install ldap schema for server (bug #491002)
-               if use ldap ; then
-                       insinto /etc/openldap/schema
-                       doins examples/LDAP/samba.schema
-               fi
-
-               # create symlink for cups (bug #552310)
-               if use cups ; then
-                       dosym ../../../bin/smbspool \
-                               /usr/libexec/cups/backend/smb
-               fi
-
-               # install example config file
-               insinto /etc/samba
-               doins examples/smb.conf.default
-
-               # Fix paths in example file (#603964)
-               sed \
-                       -e '/log file 
=/s@/usr/local/samba/var/@/var/log/samba/@' \
-                       -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-                       -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-                       -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-                       -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-                       -i "${ED}"/etc/samba/smb.conf.default || die
-
-               # Install init script and conf.d file
-               newinitd "${CONFDIR}/samba4.initd-r1" samba
-               newconfd "${CONFDIR}/samba4.confd" samba
-
-               dotmpfiles "${FILESDIR}"/samba.conf
-               if ! use addc ; then
-                       rm "${D}/$(systemd_get_systemunitdir)/samba.service" \
-                               || die
-               fi
-
-               # Preserve functionality for old gentoo-specific unit names
-               dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
-               dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
-               dosym winbind.service 
"$(systemd_get_systemunitdir)/winbindd.service"
-       fi
-
-       if use pam && use winbind ; then
-               newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-               # bugs #376853 and #590374
-               insinto /etc/security
-               doins examples/pam_winbind/pam_winbind.conf
-       fi
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process samba.conf
-}

diff --git a/net-fs/samba/samba-4.16.5-r1.ebuild 
b/net-fs/samba/samba-4.16.5-r1.ebuild
deleted file mode 100644
index 4ece5b887999..000000000000
--- a/net-fs/samba/samba-4.16.5-r1.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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="mirror://samba/rc/${MY_P}.tar.gz"
-else
-       SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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? ( python json winbind )
-       ads? ( acl ldap python winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       spotlight? ( json )
-       test? ( python )
-       !ads? ( !addc )
-       ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/samba-4.0/policy.h
-       /usr/include/samba-4.0/dcerpc_server.h
-       /usr/include/samba-4.0/ctdb.h
-       /usr/include/samba-4.0/ctdb_client.h
-       /usr/include/samba-4.0/ctdb_protocol.h
-       /usr/include/samba-4.0/ctdb_private.h
-       /usr/include/samba-4.0/ctdb_typesafe_cb.h
-       /usr/include/samba-4.0/ctdb_version.h
-)
-
-TALLOC_VERSION="2.3.3"
-TDB_VERSION="1.4.6"
-TEVENT_VERSION="0.11.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.5.2[ldap(+)?,${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.6.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.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
-       "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
-       "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
-       "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.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
-
-       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
-
-       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"
-       fi
-
-       if use pam && use winbind ; then
-               newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-               # bugs #376853 and #590374
-               insinto /etc/security
-               doins examples/pam_winbind/pam_winbind.conf
-       fi
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-}
-
-pkg_postinst() {
-       tmpfiles_process samba.conf
-}

diff --git a/net-fs/samba/samba-4.16.6.ebuild b/net-fs/samba/samba-4.16.6.ebuild
deleted file mode 100644
index 4ece5b887999..000000000000
--- a/net-fs/samba/samba-4.16.6.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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="mirror://samba/rc/${MY_P}.tar.gz"
-else
-       SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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? ( python json winbind )
-       ads? ( acl ldap python winbind )
-       cluster? ( ads )
-       gpg? ( addc )
-       spotlight? ( json )
-       test? ( python )
-       !ads? ( !addc )
-       ?? ( system-heimdal system-mitkrb5 )
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/samba-4.0/policy.h
-       /usr/include/samba-4.0/dcerpc_server.h
-       /usr/include/samba-4.0/ctdb.h
-       /usr/include/samba-4.0/ctdb_client.h
-       /usr/include/samba-4.0/ctdb_protocol.h
-       /usr/include/samba-4.0/ctdb_private.h
-       /usr/include/samba-4.0/ctdb_typesafe_cb.h
-       /usr/include/samba-4.0/ctdb_version.h
-)
-
-TALLOC_VERSION="2.3.3"
-TDB_VERSION="1.4.6"
-TEVENT_VERSION="0.11.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.5.2[ldap(+)?,${MULTILIB_USEDEP}]
-       <sys-libs/ldb-2.6.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.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
-       "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
-       "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
-       "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.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
-
-       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
-
-       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"
-       fi
-
-       if use pam && use winbind ; then
-               newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-               # bugs #376853 and #590374
-               insinto /etc/security
-               doins examples/pam_winbind/pam_winbind.conf
-       fi
-
-       keepdir /var/cache/samba
-       keepdir /var/lib/ctdb
-       keepdir /var/lib/samba/{bind-dns,private}
-       keepdir /var/lock/samba
-       keepdir /var/log/samba
-}
-
-pkg_postinst() {
-       tmpfiles_process samba.conf
-}


Reply via email to