gentoo resync : 12.03.2021

7 files changed, 347 insertions, 17 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4fc023b70e83..9f48c50355a2 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -7,13 +7,15 @@ AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8f
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
 DIST samba-4.12.11.tar.gz 18249361 BLAKE2B 74208769d42f3cb534855c77933b3e820cf1cbb02ea8748e4d208281427640b0b3071099ca51fde43454c2d24733a9ba81ef489fd17597e7cf8bdb2e450c7864 SHA512 8147f36bc56dd1b7b6603e1e51b83cef59273a591bac77ba8cbefe9df85b0f85886f983979cbfc8fd11eb4e7552944ab4e8ac2400acb3e2b89ec584363961df5
+DIST samba-4.12.12.tar.gz 18252232 BLAKE2B 4e5fabdbbcbf1df5e4a8966fbd55923c7fe97c4449574f0c17864dd9376197539ea29f59e00fc4fbb58ce18d4c7fcd8ab24e8f892edc9b32c646215287fc4bb7 SHA512 45ebed4cc73990993e800605391715afa2aa044e92bf89a62eb3ccbff97be2c9c4bf4a1f840a5d5d1d0c02704435c074e4ae386ca1729066b706c236c898c08f
 DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
-DIST samba-4.13.3.tar.gz 18422056 BLAKE2B f2b8528047e47e65ce8e0a089092c5e68ee7555248e163c0ed969ae1bf19919ed55bb614f2adae75e26725bf2079b5be3efba9af3a18ff8cbf5a98e1f39dc1bd SHA512 e7d29a89ba31ac6ca6c2dfd2629b8e07e47f4b1f265907847b43845dcf19a2200bcb1ca9f6845dd39c1ffca5dbf89f998bcc4defe33f5e3c4d8006ec9c6e88ab
 DIST samba-4.13.4.tar.gz 18429050 BLAKE2B b2141f5b39e849dce4607430fdde217535c6d9aa236807de2e8072415c0e408b2690ea7b335915d87f9a4b574615f282c6724886210d62ad1a059eed447a3e34 SHA512 fb7b0e2ad122a72ef534de6446e5a44b842553963fc331c68454e8ff761f16e921a0dcdd653fe6b5e90d4ccf28869bd13df53d615d86cccd85a5ec3589268cf6
-DIST samba-4.14.0rc4.tar.gz 18635886 BLAKE2B 70f6f7f8e34ea5e0eb07c7532c4e3be854bf867fc4e7a2f2bd9cea3b9d81cad15e89d7410722560d5d8c3e49e8dfb0aedeb8c73d7d68acd958d51172658c21f2 SHA512 cbe182b0bc849e5477aafa07afb5c7a365239e612bbc53dfabadcb09b7157a2c6b6cc7de9030cec6d026cc03a2864a044749bf186acab421f26e5525e67d783b
-EBUILD samba-4.12.11.ebuild 9732 BLAKE2B 8a98c1b956bbc4e236458328b2517f4ee99ab449a0b6d65e02fd9b10d14afea32ad4b131b081407e7d9fb46e1b68faa44677eb227081e2e7f7b25b4234721a40 SHA512 80017ff4c4867f24634ac537d5f87703b00c7b35b0c3c0c61f10776a652e9303c2c1e186a64b39cce45f9016d380e2a1424fc2ffef1a7a8ece44f5771eb8ca64
-EBUILD samba-4.12.9-r1.ebuild 9771 BLAKE2B 2a3362d9753a1164e1d72d83bce5b729d4ff832dae1e15a9066fc296d1e268efc1dc6c01e4edd278ae0caa3c2137b145a4aed55d8bae34f9740be9e70fbb45f4 SHA512 f7c94d5ed0271c0585c278e3195130b57ffc0feae99e67d161a1fcec41e6226968708ae4d20f0b272221a225c1eab8752e11d3fe1933d910cdd375a7b170d1a2
-EBUILD samba-4.13.3-r1.ebuild 9819 BLAKE2B be43da7fb32e2c86dc43ec59624deedd0f4dba15f4c3839ff7541aa0617b885a0fba6c2cd297e13ea76321eb06ddc02a36b530d9beccc94eb8b04905f4a90539 SHA512 94c327ee3e07a4fad4378d88f0d04c6705f52d0a87c114e8433b4a90a13d52d20f0d5faa5de8a19a722f5d9ef1f885c3a6bf31d9a721c3a0494a7baeb657a6b4
-EBUILD samba-4.13.4.ebuild 9819 BLAKE2B be43da7fb32e2c86dc43ec59624deedd0f4dba15f4c3839ff7541aa0617b885a0fba6c2cd297e13ea76321eb06ddc02a36b530d9beccc94eb8b04905f4a90539 SHA512 94c327ee3e07a4fad4378d88f0d04c6705f52d0a87c114e8433b4a90a13d52d20f0d5faa5de8a19a722f5d9ef1f885c3a6bf31d9a721c3a0494a7baeb657a6b4
-EBUILD samba-4.14.0_rc4.ebuild 9819 BLAKE2B 4fb7f13b41d7a2266c26b20b0260fe82c86eff2365e2584b20e02f44609b6d957f6cd07e9d9ceb604ffac6b4c01611ce2ad896c9fe35076caf577f6d28180bc0 SHA512 37f00c249d403870248970631b529fa1accfcf9692f155169bc9d4190a471005c00da87b5779f2229ce46536b7857e9521f561e8159e24cf7f1d2f87fed57b70
+DIST samba-4.13.5.tar.gz 18426722 BLAKE2B d84b71cd8a925270670b7d302b527ee116cecf9d603baf1fc69c8527c657d5e2430e1b51e951476525fd95dc3392e5642a829a646c0eb254ccd7530bd393f1a4 SHA512 4187337fecf60fa133c6e81e894634f36028d34ccc521e5e856a5736a4f58fc2ad2cd136a206d141f17f7bc519a6168a27e83705fb2d38559667a60b24ad1c1f
+DIST samba-4.14.0.tar.gz 18635518 BLAKE2B ad1d091886b5da536a73bdbd4075f7ddc247e13a514e26c9bf993e8da5a3d737662ddd859c60d47a9a597e1326b96d7e8d083d5b15074f5875495cf68db58a24 SHA512 cf5767fc49b8c5832dd9711765e0b395a07964c3a618de10ae491123de7141eb4f083194b6120f302f5c4a196837a14070b8a8324412e8957af3706a5bbc6f11
+EBUILD samba-4.12.11.ebuild 9732 BLAKE2B 2841627a44fcb86b3e4421b8777bc5adeaa8cdb287325aad54e3fdf9ad4d91b3b5d37f6d4e85060928402e6a6fa9170c4ccfd0e0338035ef752cad75a7d572a1 SHA512 23c5b5fa258914686f69cb7724ffc165539143fe5d85537937fafa64058c6ae63d09d3eed56f1dd7f87c895f76d632e89b250d61dc44834dea77de100b2fd829
+EBUILD samba-4.12.12.ebuild 9732 BLAKE2B 2841627a44fcb86b3e4421b8777bc5adeaa8cdb287325aad54e3fdf9ad4d91b3b5d37f6d4e85060928402e6a6fa9170c4ccfd0e0338035ef752cad75a7d572a1 SHA512 23c5b5fa258914686f69cb7724ffc165539143fe5d85537937fafa64058c6ae63d09d3eed56f1dd7f87c895f76d632e89b250d61dc44834dea77de100b2fd829
+EBUILD samba-4.12.9-r1.ebuild 9771 BLAKE2B 7f5c318b381a854525bc7f92b781d4832b701c04334b0890fcde2230cf0a639e1b7e5956c247fb27856c3d65b3ec94a884bdd1b6621f83a550344b231ed265d4 SHA512 ad740fd5e49ebc3ee7ec48d70c559e3c82d54fecc944566322ce45bdf257450b76bc8d691748ad3d2e2a80820a4f3e4da2abcc35ca78279769d2ebb35ea58cc9
+EBUILD samba-4.13.4.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
+EBUILD samba-4.13.5.ebuild 9819 BLAKE2B 49e7a8ab04e5b3db52f5de2e28def31406693c44ea2337a556e9dbc35aef4ca0f1e2a4ce2b38345158723554a8272e4b3c47f5d343e1fcee29b632515dd7e049 SHA512 0061ee5719e8dd0c8323e75f8813db78ceba047dd32e2249011d2f24f95b5c9aa5afb917b425f871ee927ed61296ced20ea134026088aac689f9f39d0a2612d7
+EBUILD samba-4.14.0.ebuild 9819 BLAKE2B 924b52ca1f1b1c0f04f08e32e547eb52df3d8442399dcf8189ce66b6905067946bc9e74bedf2af0df23e60dbaca41cee88bb86919d8695365e5baa026aee13a4 SHA512 a266f58e19c1df342b90a3f9889fa21621fae4a5fc05078608e98347695cf09edcad09134cbcbeb1df474eb43c0b47465d90841371208e7c48df507a68800454
 MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/samba-4.12.11.ebuild b/net-fs/samba/samba-4.12.11.ebuild
index 4c218a5d0893..849733e5d9a0 100644
--- a/net-fs/samba/samba-4.12.11.ebuild
+++ b/net-fs/samba/samba-4.12.11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -287,7 +287,7 @@ multilib_src_install() {
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
 		newconfd "${CONFDIR}/samba4.confd" samba
 
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		dotmpfiles "${FILESDIR}"/samba.conf
 		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
 
 		# Preserve functionality for old gentoo-specific unit names
diff --git a/net-fs/samba/samba-4.12.12.ebuild b/net-fs/samba/samba-4.12.12.ebuild
new file mode 100644
index 000000000000..849733e5d9a0
--- /dev/null
+++ b/net-fs/samba/samba-4.12.12.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
+
+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
+)
+
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.1.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${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.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	snapper? ( sys-apps/dbus )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	spotlight? ( dev-libs/glib )
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+
+REQUIRED_USE="
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# 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"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.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
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	## ugly hackaround for bug #592502
+	#cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--without-winexe
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable snapper)
+		$(multilib_native_use_enable spotlight)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		dotmpfiles "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# 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() {
+	ewarn "Be aware that this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild
index 84df21f0f498..76829ea314e5 100644
--- a/net-fs/samba/samba-4.12.9-r1.ebuild
+++ b/net-fs/samba/samba-4.12.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_{7,8} )
 PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -288,7 +288,7 @@ multilib_src_install() {
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
 		newconfd "${CONFDIR}/samba4.confd" samba
 
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		dotmpfiles "${FILESDIR}"/samba.conf
 		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
 
 		# Preserve functionality for old gentoo-specific unit names
diff --git a/net-fs/samba/samba-4.13.4.ebuild b/net-fs/samba/samba-4.13.4.ebuild
index 315792bf5681..77f12371c1a5 100644
--- a/net-fs/samba/samba-4.13.4.ebuild
+++ b/net-fs/samba/samba-4.13.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://samba.org/"
@@ -288,7 +288,7 @@ multilib_src_install() {
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
 		newconfd "${CONFDIR}/samba4.confd" samba
 
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		dotmpfiles "${FILESDIR}"/samba.conf
 		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
 
 		# Preserve functionality for old gentoo-specific unit names
diff --git a/net-fs/samba/samba-4.13.3-r1.ebuild b/net-fs/samba/samba-4.13.5.ebuild
index 315792bf5681..77f12371c1a5 100644
--- a/net-fs/samba/samba-4.13.3-r1.ebuild
+++ b/net-fs/samba/samba-4.13.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://samba.org/"
@@ -288,7 +288,7 @@ multilib_src_install() {
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
 		newconfd "${CONFDIR}/samba4.confd" samba
 
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		dotmpfiles "${FILESDIR}"/samba.conf
 		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
 
 		# Preserve functionality for old gentoo-specific unit names
diff --git a/net-fs/samba/samba-4.14.0_rc4.ebuild b/net-fs/samba/samba-4.14.0.ebuild
index 197b80e67973..0fa1731cdd3b 100644
--- a/net-fs/samba/samba-4.14.0_rc4.ebuild
+++ b/net-fs/samba/samba-4.14.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+),xml(+)"
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://samba.org/"
@@ -288,7 +288,7 @@ multilib_src_install() {
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
 		newconfd "${CONFDIR}/samba4.confd" samba
 
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		dotmpfiles "${FILESDIR}"/samba.conf
 		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
 
 		# Preserve functionality for old gentoo-specific unit names