gentoo auto-resync : 06:06:2023 - 15:39:49

5 files changed, 543 insertions, 111 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 016c1d9db5bf..762b9b270a61 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0bb432d14a23..035d5354ab9a 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -8,16 +8,18 @@ AUX samba-4.16.1-netdb-defines.patch 690 BLAKE2B de70f08c6098cd9c309ee6ec144872e
 AUX samba-4.16.2-fix-musl-without-innetgr.patch 866 BLAKE2B 01ed3e083c6765019b0faca257c312870225b47b5e067c7e6c8d2fc26490e0dc384834d776278f5b85f03ea74f24ec740f5d81461078ce0a643c417b23aa648c SHA512 25727dfd65c21415809c7557f72b6e8d472e39ff048de9f985aba996b9e8541d4a7150b33c1c95a14e9f0195e79087366f56836adbb5bcbebc4acbe61573f69f
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba.conf 146 BLAKE2B d86e630dba5fcb3a0bb22ac6daf8b0f63d30903c31911353116bc7a63e3ba434f69fd2cbe7a854ab3dc994b95e630932dcbe556fdd6372d27cea5a15618aa816 SHA512 da9ae57a6740135745453e776040b1e54bb492b351a1aa700b8868ef2d1716c0d54b55400cd9b1b1877e065d896ca1569b5a617863c698676250d8ea29939a52
-DIST samba-4.15.12.tar.gz 19339629 BLAKE2B b394767944e57dc907641c3635ccf290f48bd8a5880e5514066cf410c81eca6f1432a69b67b666ef7c052e2d90541579927456820e58e872a28b7946951f585d SHA512 6cb46bdd7eaebbcd76fb520d959cca22da924049c632338d954f9c8b16015288eebc982e20dcf9f1ed6deabd77e002dfaa920e3b2457f16a6768a1b1bea9dc3e
-DIST samba-4.15.13.tar.gz 19370777 BLAKE2B 8e681aac4a9f40992b212f8d4d5534405eeecae72def2ad8402ad0558912d0f3da6f3ac9302047b5e6813fdb72dfc829f84fe0d56be05903590d3a8c3d1a1407 SHA512 58477c50705f72846a591896bf4ef048e93b5a7488d5731da9d29b0064728baadc94115f22141e2ca4f6ab3114c83f3bfff5a0d589f10f8239f2b0b77e0f7dd3
+DIST samba-4.16.10.tar.gz 30695200 BLAKE2B 4cff5f6ab97e2b1d4e958f6348cf2a61d48441295c8ef4518ecd0a893aa2be2bdae9389297532965439cd9887b905186145a0cf30082e2456274994f277d3cfd SHA512 133bcaec853240041dc6e0d8dd086b3798a6aa81008e29e4e6f875f58bd47bb6e23516d572b763d7f2ed547cfe94a3f8f8f5dc978cc171401fe5ed228b85d000
 DIST samba-4.16.8.tar.gz 30682100 BLAKE2B bbb9a89a39cc0bae88ba350df38aae35df0bd18c27dd37b093eb023cf71274c12f14c44037e9704404ee3ba27ab930e866b3b951bcc7a5f4499cbc544f231e6b SHA512 55fa977e046de4470a9f1cb4c7956ca1368a21fc88e6bb6ae93d3cadb5400caaebd5b7d51a5ff1aaea884ec58d8abe6c90f448168aaa175d0f6c018f1a913c70
 DIST samba-4.16.9.tar.gz 30690610 BLAKE2B ce0bf19bff70cc1e174ea67a14c1acd2290d52bbad21ed491bb4a414286f8810ca342a5d9c14f69de0329f846d422e596572028a0c5a4e908a50c2384d9f1491 SHA512 209f3ae33a218279323a6b34f848e8b2c755d6826e7683753f2d8f63456216782786b8e01e3c5dee74a88c34094c6c8b5148a939ebf6caa0d632001dc2242126
 DIST samba-4.17.5.tar.gz 30846334 BLAKE2B f8d6cf3c0f5333c5a6b1ac16793d8fd443c517068211829f40ca2fbc08d80921de65a4f3e2c08775a5551a4f834f406208c0941a4eb496720cc45ecaeb6c173f SHA512 352ae8bc161fb07ac6c7330c6ebd02c27eb453ffc1c32c8437edc441ba3044cb2e9b31c8cf181664a2b47098c75a55f06c105f5397c57ce75826ef2af331afa9
+DIST samba-4.17.8.tar.gz 30874388 BLAKE2B c1a76071a5d823433cde4e357477d433ca3054f6bb2e75124579bd75d0d93d22dc96e169bb2a4ac0f8fb1be96b54add3a0cdb1c854fdc34450ffd589b89cd074 SHA512 60cd72cd40ef4a958d26926d51d9741d4d6c6a7fc8d275c6ba76d2c3ffc4c71aa7554943125c47575135df1271bc421dd57a0d1206708dfa8e25d1b6dc2661ba
 DIST samba-4.18.0.tar.gz 41268802 BLAKE2B 9684990834f1593d66cc01e6f58d297a113e1b185aa16ce2f48887da041c745565b0ddbd953232019de0589a4afb954e87ce9fc76a4c5d7d4c95db1a3372d8fa SHA512 bc0eb8bc62fd2c4aa94b452a79e0a31fb3ad52bd46535b5f4c5eff4de8781419c3eb066a8394e704e7d4097c9651932a8de76d5b37cc05547d9a3ed48bf157ae
-EBUILD samba-4.15.12-r4.ebuild 9965 BLAKE2B 0ac9dba30b84527feb4ef21d2c6eaa959ffaf9136c998e69e830195c0efbe0244375f7e97d2208b50947b341270941e942b40b4f292863e1b8d08a913bf7af94 SHA512 00e510b19cbb28f1fcc07c6ef5251b693bb079eb68783652e5787d489ec8b769968bb03b04bfe832775405a0b0fb9a17aa80b8329cbc475ff575e629c536feb5
-EBUILD samba-4.15.13.ebuild 9973 BLAKE2B 9ec8b752825b673e6530952d0288a01b184902f7aa51bdaba915caa66e3985c0c2257599d7cd4d1dacde118bfbebb53383a0ef1654603f63bb59e031f05e0822 SHA512 74345f048a2bc6ea06894b8181e3cf99d4813932082fa581f9ee5b763b8c7124bc22cbdb6207dd43412d2ce1c8cf0eca038a7490f2098f45fae5422aa37d04e2
+DIST samba-4.18.3.tar.gz 41294739 BLAKE2B 0e132591d97316a091b1503714fb3085d8bd055f7e286a96aecdc43f8b15e38068e5aaba3fcea68158a37151c5ea8ef13f5b1e245c54f40fc6c3a167497cf70c SHA512 b0980291ca124641bd03ba51d4b4e2e492facb3939f8edf491133be83a82beed66f68f00442cb02c211a9e76eb6ba08387136e30eb7df756c3c90c76034689c4
+EBUILD samba-4.16.10.ebuild 11232 BLAKE2B 3ecb50a443d701e568ed5021a86186158428d05df413ed210283ba75f1edfddcb786d28d7e53aba889871363cb7c1499338f873f25b6c34930cb13a910eec150 SHA512 d6f7118bf7ed78c7239a281de98bbc9390558505e2d8eb9a5ce335218df1c1876977e4d94d45fc2fdbda2e6f2ce8c09cb03f660420b3ba303210bed9ca420e8d
 EBUILD samba-4.16.8.ebuild 11225 BLAKE2B f8a53790c47caf69c97e5782ba8fe16842c05fa78a5a227a3bce81cac96ceebc7a68829132886e3577a7f395ca2d8734ea16a83283011008dbd02de3201a9f93 SHA512 2f0d641dba7a6c7d535b58aad771578f6a7898b7f602dd589a19c371f25584750329c1c30691e45415abc5fa070f894ee85ae4a2bf9dabd88c460d824ebe43c9
 EBUILD samba-4.16.9.ebuild 11229 BLAKE2B f19c076b661648fc3d902c7c79c3e68f2376e829383e631f3c4359aab54bfe6be99176157e17e0d29090e60f72242c74851d9c4d35af6e252890311a64c0af06 SHA512 078c3420b68e144b6e04496593c356085dd994045183354bee077e1053effce2f277a0022604223fb8e8ac71232e9d58ad618ee98745c351e9f0a008ea66762c
 EBUILD samba-4.17.5.ebuild 11066 BLAKE2B 461d5ab07be6a3568119cd51f7b8e8c5872ed91352343b1cc59873fbf56a68d98a566511a5c8583d11d1d707e34c9e9d639ab8d12e668ba8738ff8b83c43e97f SHA512 fac445e30c94285b2b2c5b7ec9d81b51685b2822405931cb6ec3c84e610b0f60b0ceeedbf4000961c33d3836ca5f4f0f72353741cf9a5473f46add8b2cb40e2f
+EBUILD samba-4.17.8.ebuild 11066 BLAKE2B 0868f74e28fe3fc28785fc387f0f65cb9f046378058e40f9c9a65b7483c57745c98b3f8ce4d6c9a29eefd7294d4d25a3386eed52225dc1e1ec6e576e697fa0b8 SHA512 0037d32901a1843e7a32c62d1bb3df38d8d43ad71620509a6c5c4be98e06ad3c897b8c7a7c453bd556925be5e21db7e7451b0553fa022e2242d96a637472ab46
 EBUILD samba-4.18.0.ebuild 11066 BLAKE2B 562c3c8023a401193e6f22a02d726349503e174e489fff3662524211fe1f7f359eed88a06a3e7eff70160ec7ea95f619df806cefef378fdd078a21d00df00fb4 SHA512 44f21c71914976bb43f97085ea0e201846fdf2dad6a2713bc6f9c2999103ff71d7153dc35d71a771fd5b43c2ed2dfc561562f84191084620443cbf82868a3eb5
+EBUILD samba-4.18.3.ebuild 11066 BLAKE2B 3197ed911f94028f5c03461ae3e455cda4bf1bfbd0beb6c79ba820ba4fa6ba0c4c62fc3a641aa3533b73ea3feccd5f881c4b03d25447f2ca0a1e56be74733a34 SHA512 88fae06c506e41bac8d41eda229a904ae77e8e8b1f606644fd4dbf1f6694952e2e9d80cd66c63afcda13f2680787ad721d793535b41922658a66d35253057a57
 MISC metadata.xml 2066 BLAKE2B 1d3a5757c3226cede70b5fabb63b27bf0a5b86bf27643a30ebfe743d0758e57ce1e69b14ba6795de4c656b3d5da5b3f9d90d11074520c24d6459220f62723b04 SHA512 0a7963f9abddd4cc3b303c93dcd4b7dc30ca5660e64750d77bcd3bce0a95291c46208d9a1143303c168febb2d65cdad0018c475130dc04c16d79df2019d8e9aa
diff --git a/net-fs/samba/samba-4.15.13.ebuild b/net-fs/samba/samba-4.16.10.ebuild
index c3fbe5e8b9cb..24d454925e9e 100644
--- a/net-fs/samba/samba-4.15.13.ebuild
+++ b/net-fs/samba/samba-4.16.10.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+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
+if [[ ${PV} == *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
-zeroconf"
+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 !system-mitkrb5 winbind )
+	addc? ( json python !system-mitkrb5 winbind )
 	ads? ( acl ldap python winbind )
 	cluster? ( ads )
 	gpg? ( addc )
@@ -55,6 +55,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/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:=
@@ -65,28 +69,28 @@ COMMON_DEPEND="
 	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/ldb-2.5.3:=[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-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
+	>=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 "
+	$(python_gen_cond_dep '
 		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		)
 		ads? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
-	")
+	')
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
@@ -106,7 +110,7 @@ COMMON_DEPEND="
 	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= )
+	systemd? ( sys-apps/systemd:= )
 	unwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
@@ -114,14 +118,12 @@ COMMON_DEPEND="
 	zeroconf? ( net-dns/avahi[dbus] )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	dev-perl/JSON
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
+	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
@@ -143,26 +145,25 @@ BDEPEND="${PYTHON_DEPS}
 
 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"
-	"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
 	"${FILESDIR}/${PN}-4.15.12-configure-clang16.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
+	export PYTHONHASHSEED=1
 
 	python-single-r1_pkg_setup
 
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
 	if use cluster ; then
 		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
 	elif use ads ; then
@@ -170,36 +171,68 @@ pkg_setup() {
 	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
 
-	# un-bundle dnspython
+	check_samba_dep_versions
+
+	# Unbundle dnspython
 	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
 
-	# unbundle iso8601 unless tests are enabled
+	# 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
+	# 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
+	# WAF
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
+	# 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"
@@ -240,7 +273,7 @@ multilib_src_configure() {
 		$(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 '')" '')
+		$(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)
@@ -254,16 +287,23 @@ multilib_src_configure() {
 		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
 	fi
 
-	PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
 }
 
 multilib_src_compile() {
-	PYTHONHASHSEED=1 waf-utils_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() {
-	PYTHONHASHSEED=1 waf-utils_src_install
+	waf-utils_src_install
 
 	# Make all .so files executable
 	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
@@ -274,23 +314,23 @@ multilib_src_install() {
 	find "${ED}"/{run,var} -type d -empty -delete || die
 
 	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
+		# 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)
+		# Create symlink for cups (bug #552310)
 		if use cups ; then
 			dosym ../../../bin/smbspool \
 				/usr/libexec/cups/backend/smb
 		fi
 
-		# install example config file
+		# Install example config file
 		insinto /etc/samba
 		doins examples/smb.conf.default
 
-		# Fix paths in example file (#603964)
+		# 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/@' \
@@ -323,12 +363,6 @@ multilib_src_install() {
 	fi
 }
 
-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.12-r4.ebuild b/net-fs/samba/samba-4.17.8.ebuild
index aced3716fcad..64dc7ce9bf2c 100644
--- a/net-fs/samba/samba-4.15.12-r4.ebuild
+++ b/net-fs/samba/samba-4.17.8.ebuild
@@ -1,34 +1,34 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+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
+if [[ ${PV} == *_rc* ]]; then
 	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
 else
 	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind
-zeroconf"
+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 !system-mitkrb5 winbind )
+	addc? ( json python !system-mitkrb5 winbind )
 	ads? ( acl ldap python winbind )
 	cluster? ( ads )
 	gpg? ( addc )
@@ -55,38 +55,42 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/ctdb_version.h
 )
 
+TALLOC_VERSION="2.3.4"
+TDB_VERSION="1.4.7"
+TEVENT_VERSION="0.13.0"
+
 COMMON_DEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	>=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/libtasn1:=[${MULTILIB_USEDEP}]
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-perl/Parse-Yapp
-	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	>=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/ldb-2.6.2:=[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.7.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/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 "
+	$(python_gen_cond_dep '
 		addc? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
-			dev-python/markdown[\${PYTHON_USEDEP}]
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
+			dev-python/markdown[${PYTHON_USEDEP}]
 		)
 		ads? (
-			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/dnspython:=[${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
-	")
+	')
 	acl? ( virtual/acl )
 	ceph? ( sys-cluster/ceph )
 	cluster? ( net-libs/rpcsvc-proto )
@@ -106,7 +110,7 @@ COMMON_DEPEND="
 	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= )
+	systemd? ( sys-apps/systemd:= )
 	unwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
 		!llvm-libunwind? ( sys-libs/libunwind:= )
@@ -114,14 +118,12 @@ COMMON_DEPEND="
 	zeroconf? ( net-dns/avahi[dbus] )
 "
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	dev-perl/JSON
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
+	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
@@ -143,26 +145,22 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
 	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
-	"${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch"
-	"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
-	"${FILESDIR}/${PN}-4.15.12-configure-clang16.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
+	export PYTHONHASHSEED=1
 
 	python-single-r1_pkg_setup
 
-	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
+	SHAREDMODS="$(usev !snapper '!')vfs_snapper"
 	if use cluster ; then
 		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
 	elif use ads ; then
@@ -170,36 +168,68 @@ pkg_setup() {
 	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
 
-	# un-bundle dnspython
+	check_samba_dep_versions
+
+	# Unbundle dnspython
 	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
 
-	# unbundle iso8601 unless tests are enabled
+	# 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
+	# 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
+	# WAF
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
+	# 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"
@@ -240,7 +270,7 @@ multilib_src_configure() {
 		$(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 '')" '')
+		$(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)
@@ -254,16 +284,23 @@ multilib_src_configure() {
 		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
 	fi
 
-	PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
+	append-cppflags "-I${ESYSROOT}/usr/include/et"
+
+	waf-utils_src_configure ${myconf[@]}
 }
 
 multilib_src_compile() {
-	PYTHONHASHSEED=1 waf-utils_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() {
-	PYTHONHASHSEED=1 waf-utils_src_install
+	waf-utils_src_install
 
 	# Make all .so files executable
 	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
@@ -274,23 +311,23 @@ multilib_src_install() {
 	find "${ED}"/{run,var} -type d -empty -delete || die
 
 	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
+		# 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)
+		# Create symlink for cups (bug #552310)
 		if use cups ; then
 			dosym ../../../bin/smbspool \
 				/usr/libexec/cups/backend/smb
 		fi
 
-		# install example config file
+		# Install example config file
 		insinto /etc/samba
 		doins examples/smb.conf.default
 
-		# Fix paths in example file (#603964)
+		# 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/@' \
@@ -323,12 +360,6 @@ multilib_src_install() {
 	fi
 }
 
-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.18.3.ebuild b/net-fs/samba/samba-4.18.3.ebuild
new file mode 100644
index 000000000000..dd6ebd54b02e
--- /dev/null
+++ b/net-fs/samba/samba-4.18.3.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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="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? ( 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.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.16.1-netdb-defines.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
+
+	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"
+	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
+}