commit:     b19b23a1b56923117ec88c958966368012ef0102
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 11:08:08 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 11:08:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19b23a1

net-fs/samba: Removed old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-fs/samba/Manifest               |   6 -
 net-fs/samba/samba-4.5.10-r1.ebuild | 283 --------------------------------
 net-fs/samba/samba-4.6.12.ebuild    | 308 -----------------------------------
 net-fs/samba/samba-4.6.13.ebuild    | 308 -----------------------------------
 net-fs/samba/samba-4.7.4.ebuild     | 312 ------------------------------------
 net-fs/samba/samba-4.7.5.ebuild     | 311 -----------------------------------
 6 files changed, 1528 deletions(-)

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0e600d50690..cc997fb7676 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,15 +1,9 @@
 DIST samba-4.2.14.tar.gz 20883281 BLAKE2B 
90bff4ef0752b952e2e31b6e86223ae7e785248ef01b15d6a26f0912452cbfdb1e828b88c81c8b6d36e1e2ca7d79a00ffd196625eb6ee96b587483a25044fd47
 SHA512 
269dd74ba788657434f51ac70953a293c94bcf98280eaa6f44634c5da54169a5ea7865d543a7c23860c4750a40cdee7caeaf5c7fc3dbc137f444e90f31a09890
-DIST samba-4.5.10.tar.gz 20989431 BLAKE2B 
564d7c98dad101e74be1d54790abd3907b502ad1bdb7322be4853370dd6877a8f5604fec967555cf048978cbcb5a4ad111810657dcc8a58d0cea2843dfcd29ff
 SHA512 
046bae9c66083a4fe656d6a7b02b64343c66e0ea4925193a898dbda107b5b158d1897f16c36f4c393a30457a49215fa6ef91720367f4946760ec48ce02a4a68a
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B 
c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae
 SHA512 
f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.15.tar.gz 21020181 BLAKE2B 
0d113c4d3147102e2cc192a14d145c46930b8f772683bc27e90b264e43c5660298e468c494de41e80fb2dcd80a0dbef0b9ce1f74dc9e89eca52865ceba605382
 SHA512 
e77d746767d55ff933cddbb4d6e0f97f0b12e630c564852bee02f5f9764633167f1c098df7606af2a1930a9bdd4665fb79d7748ff07532db4e9a581fb639450c
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B 
e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9
 SHA512 
de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
-DIST samba-4.6.12.tar.gz 21160637 BLAKE2B 
b12046423f103883fd2d9b5ce12af2bea25c2b26bf8c039619359b789e675f963aec044e11443a8f6a865ea8564d58fe12d5268f00d71c9544e1abd27e9647f7
 SHA512 
e45a6ee43bcb2fba224bf38771d30daace46ad92b05f580a261aaacf7de9eca3d71cb4f4b2f956d83d84df489cb6f015b3b7abb42702ed2936bf92faa945340c
-DIST samba-4.6.13.tar.gz 21160952 BLAKE2B 
6d7927f00c8d013f8ce702168f5810fb112b0e89f3e298178d6e7bf98f0cb8182e54eb9efe2b74c41d16af751ced0a536e08c93b0527c5c88502b7e1f908042b
 SHA512 
bc6ef2558cbdd3d093f5d29e5a79b069b6a4dabdad4becaf0010514c5d67646f5e6ec8d8dbefa1e6ba7891b3e0eb728bcb91522ba910947f90841437b9fe7dda
 DIST samba-4.6.14.tar.gz 21161954 BLAKE2B 
e514c23f46679ba0415b91ada99e0263f123df6b1b76e5e1ead67ab248bb38cdc2e20107a71630b7c31305b3b2b72526b2b16758f048e7c1a0810af7f4fa09f7
 SHA512 
a235f5932d7ec2cad22c841ae5138c5bc5a8bce0fe2327146a7f34d9abb46656b323d66c490d0058bbf0831a5b5fa328722e0566155d430e3a180440be1c70d3
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 
99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222
 SHA512 
c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
-DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 
3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b
 SHA512 
50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
-DIST samba-4.7.5.tar.gz 16862398 BLAKE2B 
dd5fc044e70483dc04e423ee8221afaeb90b1bfaf4ace434000b89d28248b4d9c73a11c15acca31e4b81d27b89f789b59de3da4e27faa4fa5eb025cde112e824
 SHA512 
1cd70ebbe59e467701e6607147d19492c3fdad99371aa182ded9e4e2f37a53c76c04e796725bd747e5e1fb882bfb73d82a0d26f25de5ef135266d33be9f7fb61
 DIST samba-4.7.6.tar.gz 16864824 BLAKE2B 
0c519f83e95f9ef9ff13c6a4998d0c98e67765253e855386febe20f836873b10e94161d1539d24af835f464d56edd7f5595abd30b8d6b039cd8ba887563394b1
 SHA512 
8190b06f543cc3d4a9a98f93ad5e4e16e4e87ea462435723044a780942cea7efc77c66cd3e61941bf449a2ac0f4346ced378f032d5fb1776280a3c4bcb951b46
 DIST samba-4.8.0rc4.tar.gz 17662979 BLAKE2B 
bcafc3e26062ad31ae8cd946fabf1fbfa0d2f83c497ffa49e40e943314f98dca9920d3ccf6cdcd29e5cd4bcdd66b01791cc1dc233f655f88b1590477d45940b6
 SHA512 
dddcce6933bd7126e2bda0554f5702974d094dcff70487189f497824a2f6ca567bc3c8637dce6c60d444b040ce3fd144a6ec045cf5ddc2d13dfe3470e0de251b
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 
0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0
 SHA512 
c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
-DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B 
b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e
 SHA512 
920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927

diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild 
b/net-fs/samba/samba-4.5.10-r1.ebuild
deleted file mode 100644
index fe9661d17a0..00000000000
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-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
-       
https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz";
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 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 client cluster cups dmapi fam gnutls gpg iprint ldap 
pam
-quota selinux 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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( virtual/pam )
-       acl? ( virtual/acl )
-       addns? ( net-dns/bind-tools[gssapi] )
-       cluster? ( !dev-db/ctdb )
-       cups? ( net-print/cups )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.7
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
-       ads? ( acl gnutls ldap )
-       gpg? ( addc )
-       ?? ( system-heimdal system-mitkrb5 )
-       ${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-4.4.0-pam.patch"
-       "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       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
-
-       # install the patches from tarball(s)
-       eapply "${WORKDIR}/patches"
-
-       # 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=()
-       myconf=(
-               --enable-fhs
-               --sysconfdir="${EPREFIX}/etc"
-               --localstatedir="${EPREFIX}/var"
-               --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-               --with-piddir="${EPREFIX}/run/${PN}"
-               --without-lttng
-               --bundled-libraries="${bundled_libs}"
-               --builtin-libraries=NONE
-               --disable-rpath
-               --disable-rpath-install
-               --nopyc
-               --nopyo
-               --disable-cephfs
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       $(use_with acl acl-support)
-                       $(usex addc '' '--without-ad-dc')
-                       $(use_with addns dnsupdate)
-                       $(use_with ads)
-                       $(use_with cluster cluster-support)
-                       $(use_enable cups)
-                       $(use_with dmapi)
-                       $(use_with fam)
-                       $(use_enable gnutls)
-                       $(use_with gpg gpgme)
-                       $(use_enable iprint)
-                       $(use_with ldap)
-                       $(use_with pam)
-                       $(usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-                       $(use_with quota quotas)
-                       $(use_with syslog)
-                       $(use_with systemd)
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       $(use_with winbind)
-                       $(usex test '--enable-selftest' '')
-                       $(use_enable zeroconf avahi)
-                       --with-shared-modules=${SHAREDMODS}
-               )
-       else
-               myconf+=(
-                       --without-acl-support
-                       --without-ad-dc
-                       --without-dnsupdate
-                       --without-ads
-                       --disable-avahi
-                       --without-cluster-support
-                       --disable-cups
-                       --without-dmapi
-                       --without-fam
-                       --disable-gnutls
-                       --without-gpgme
-                       --disable-iprint
-                       $(use_with ldap)
-                       --without-pam
-                       --without-quotas
-                       --without-syslog
-                       --without-systemd
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       --without-winbind
-                       --disable-python
-               )
-       fi
-
-       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 "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-       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 /usr/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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware the 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://www.samba.org/samba/history/${P}.html "
-       elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and"
-       elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}

diff --git a/net-fs/samba/samba-4.6.12.ebuild b/net-fs/samba/samba-4.6.12.ebuild
deleted file mode 100644
index 89f52e0eaf4..00000000000
--- a/net-fs/samba/samba-4.6.12.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-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
-       https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz";
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/";
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg 
iprint ldap pam python
-quota selinux 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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       
~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( virtual/pam )
-       acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
-       ceph? ( sys-cluster/ceph )
-       cluster? ( !dev-db/ctdb )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.7
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
-       test? ( python )
-       addns? ( python )
-       ads? ( acl gnutls ldap )
-       gpg? ( addc )
-       ?? ( 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.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       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
-
-       # install the patches from tarball(s)
-       eapply "${WORKDIR}/patches"
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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=()
-       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
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       $(use_with acl acl-support)
-                       $(usex addc '' '--without-ad-dc')
-                       $(use_with addns dnsupdate)
-                       $(use_with ads)
-                       $(use_enable ceph cephfs)
-                       $(use_with cluster cluster-support)
-                       $(use_enable cups)
-                       $(use_with debug lttng)
-                       $(use_with dmapi)
-                       $(use_with fam)
-                       $(use_enable gnutls)
-                       $(use_with gpg gpgme)
-                       $(use_enable iprint)
-                       $(use_with ldap)
-                       $(use_with pam)
-                       $(usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-                       $(use_with quota quotas)
-                       $(use_with syslog)
-                       $(use_with systemd)
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       $(use_with winbind)
-                       $(usex python '' '--disable-python')
-                       $(usex test '--enable-selftest' '')
-                       $(use_enable zeroconf avahi)
-                       --with-shared-modules=${SHAREDMODS}
-               )
-       else
-               myconf+=(
-                       --without-acl-support
-                       --without-ad-dc
-                       --without-dnsupdate
-                       --without-ads
-                       --disable-avahi
-                       --disable-cephfs
-                       --without-cluster-support
-                       --disable-cups
-                       --without-dmapi
-                       --without-fam
-                       --disable-gnutls
-                       --without-gpgme
-                       --disable-iprint
-                       $(use_with ldap)
-                       $(use_with debug lttng)
-                       --without-pam
-                       --without-quotas
-                       --without-syslog
-                       --without-systemd
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       --without-winbind
-                       --disable-python
-               )
-       fi
-
-       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 "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-       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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware the 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 "http://samba.org/samba/history/${P}.html "
-       elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-       elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}

diff --git a/net-fs/samba/samba-4.6.13.ebuild b/net-fs/samba/samba-4.6.13.ebuild
deleted file mode 100644
index ff66041de15..00000000000
--- a/net-fs/samba/samba-4.6.13.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-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
-       https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz";
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/";
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg 
iprint ldap pam python
-quota selinux 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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       
~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.12[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( virtual/pam )
-       acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
-       ceph? ( sys-cluster/ceph )
-       cluster? ( !dev-db/ctdb )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-       system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.7
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
-       test? ( python )
-       addns? ( python )
-       ads? ( acl gnutls ldap )
-       gpg? ( addc )
-       ?? ( 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.5.1-compile_et_fix.patch"
-       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       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
-
-       # install the patches from tarball(s)
-       eapply "${WORKDIR}/patches"
-
-       # un-bundle dnspython
-       sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-       # unbundle iso8601 unless tests are enabled
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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=()
-       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
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       $(use_with acl acl-support)
-                       $(usex addc '' '--without-ad-dc')
-                       $(use_with addns dnsupdate)
-                       $(use_with ads)
-                       $(use_enable ceph cephfs)
-                       $(use_with cluster cluster-support)
-                       $(use_enable cups)
-                       $(use_with debug lttng)
-                       $(use_with dmapi)
-                       $(use_with fam)
-                       $(use_enable gnutls)
-                       $(use_with gpg gpgme)
-                       $(use_enable iprint)
-                       $(use_with ldap)
-                       $(use_with pam)
-                       $(usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-                       $(use_with quota quotas)
-                       $(use_with syslog)
-                       $(use_with systemd)
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       $(use_with winbind)
-                       $(usex python '' '--disable-python')
-                       $(usex test '--enable-selftest' '')
-                       $(use_enable zeroconf avahi)
-                       --with-shared-modules=${SHAREDMODS}
-               )
-       else
-               myconf+=(
-                       --without-acl-support
-                       --without-ad-dc
-                       --without-dnsupdate
-                       --without-ads
-                       --disable-avahi
-                       --disable-cephfs
-                       --without-cluster-support
-                       --disable-cups
-                       --without-dmapi
-                       --without-fam
-                       --disable-gnutls
-                       --without-gpgme
-                       --disable-iprint
-                       $(use_with ldap)
-                       $(use_with debug lttng)
-                       --without-pam
-                       --without-quotas
-                       --without-syslog
-                       --without-systemd
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       --without-winbind
-                       --disable-python
-               )
-       fi
-
-       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 "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-       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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware the 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 "http://samba.org/samba/history/${P}.html "
-       elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-       elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}

diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
deleted file mode 100644
index 791413f4a91..00000000000
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-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="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/";
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg 
iprint ldap pam python
-quota selinux 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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( virtual/pam )
-       acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
-       ceph? ( sys-cluster/ceph )
-       cluster? ( !dev-db/ctdb )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       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= )"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.7
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls )
-       test? ( python )
-       addns? ( python )
-       ads? ( acl gnutls ldap )
-       gpg? ( addc )
-       ?? ( 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.5.1-compile_et_fix.patch"
-       "${FILESDIR}"/talloc-disable-python.patch
-       "${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-       "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
-       "${FILESDIR}/${P}-no_ads.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       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
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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=()
-       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
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       $(use_with acl acl-support)
-                       $(usex addc '' '--without-ad-dc')
-                       $(use_with addns dnsupdate)
-                       $(use_with ads)
-                       $(use_enable ceph cephfs)
-                       $(use_with cluster cluster-support)
-                       $(use_enable cups)
-                       $(use_with debug lttng)
-                       $(use_with dmapi)
-                       $(use_with fam)
-                       $(use_enable gnutls)
-                       $(use_with gpg gpgme)
-                       $(use_enable iprint)
-                       $(use_with ldap)
-                       $(use_with pam)
-                       $(usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-                       $(use_with quota quotas)
-                       $(use_with syslog)
-                       $(use_with systemd)
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       $(use_with winbind)
-                       $(usex python '' '--disable-python')
-                       $(usex test '--enable-selftest' '')
-                       $(use_enable zeroconf avahi)
-                       --with-shared-modules=${SHAREDMODS}
-               )
-       else
-               myconf+=(
-                       --without-acl-support
-                       --without-ad-dc
-                       --without-dnsupdate
-                       --without-ads
-                       --disable-avahi
-                       --disable-cephfs
-                       --without-cluster-support
-                       --disable-cups
-                       --without-dmapi
-                       --without-fam
-                       --disable-gnutls
-                       --without-gpgme
-                       --disable-iprint
-                       $(use_with ldap)
-                       $(use_with debug lttng)
-                       --without-pam
-                       --without-quotas
-                       --without-syslog
-                       --without-systemd
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       --without-winbind
-                       --disable-python
-               )
-       fi
-
-       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 "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-       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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware the 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 "http://samba.org/samba/history/${P}.html "
-       elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-       elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}

diff --git a/net-fs/samba/samba-4.7.5.ebuild b/net-fs/samba/samba-4.7.5.ebuild
deleted file mode 100644
index ae147981edc..00000000000
--- a/net-fs/samba/samba-4.7.5.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-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="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/";
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg 
iprint ldap pam python
-quota selinux 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
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-       >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-       dev-lang/perl:=
-       dev-libs/libaio[${MULTILIB_USEDEP}]
-       dev-libs/libbsd[${MULTILIB_USEDEP}]
-       dev-libs/iniparser:0
-       dev-libs/popt[${MULTILIB_USEDEP}]
-       dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-       sys-apps/attr[${MULTILIB_USEDEP}]
-       
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/libcap
-       sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-       sys-libs/readline:0=
-       >=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       >=sys-libs/tevent-0.9.34[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       virtual/libiconv
-       pam? ( virtual/pam )
-       acl? ( virtual/acl )
-       addns? (
-               net-dns/bind-tools[gssapi]
-               dev-python/dnspython:=[${PYTHON_USEDEP}]
-       )
-       ceph? ( sys-cluster/ceph )
-       cluster? ( !dev-db/ctdb )
-       cups? ( net-print/cups )
-       debug? ( dev-util/lttng-ust )
-       dmapi? ( sys-apps/dmapi )
-       fam? ( virtual/fam )
-       gnutls? (
-               dev-libs/libgcrypt:0
-               >=net-libs/gnutls-1.4.0
-       )
-       gpg? ( app-crypt/gpgme )
-       ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-       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= )"
-DEPEND="${CDEPEND}
-       ${PYTHON_DEPS}
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt
-       virtual/pkgconfig
-       net-libs/libtirpc[${MULTILIB_USEDEP}]
-       || (
-               net-libs/rpcsvc-proto
-               <sys-libs/glibc-2.26[rpc(+)]
-       )
-       test? (
-               !system-mitkrb5? (
-                       >=sys-libs/nss_wrapper-1.1.3
-                       >=net-dns/resolv_wrapper-1.1.4
-                       >=net-libs/socket_wrapper-1.1.7
-                       >=sys-libs/uid_wrapper-1.2.1
-               )
-       )"
-RDEPEND="${CDEPEND}
-       python? ( ${PYTHON_DEPS} )
-       client? ( net-fs/cifs-utils[ads?] )
-       selinux? ( sec-policy/selinux-samba )
-       !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="addc? ( python gnutls )
-       test? ( python )
-       addns? ( python )
-       ads? ( acl gnutls ldap )
-       gpg? ( addc )
-       ?? ( 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.5.1-compile_et_fix.patch"
-       "${FILESDIR}"/talloc-disable-python.patch
-       "${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
-       "${FILESDIR}/${PN}-4.7.4-no_ads.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-       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
-       use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-       # 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=()
-       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
-       )
-       if multilib_is_native_abi ; then
-               myconf+=(
-                       $(use_with acl acl-support)
-                       $(usex addc '' '--without-ad-dc')
-                       $(use_with addns dnsupdate)
-                       $(use_with ads)
-                       $(use_enable ceph cephfs)
-                       $(use_with cluster cluster-support)
-                       $(use_enable cups)
-                       $(use_with debug lttng)
-                       $(use_with dmapi)
-                       $(use_with fam)
-                       $(use_enable gnutls)
-                       $(use_with gpg gpgme)
-                       $(use_enable iprint)
-                       $(use_with ldap)
-                       $(use_with pam)
-                       $(usex pam 
"--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-                       $(use_with quota quotas)
-                       $(use_with syslog)
-                       $(use_with systemd)
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       $(use_with winbind)
-                       $(usex python '' '--disable-python')
-                       $(usex test '--enable-selftest' '')
-                       $(use_enable zeroconf avahi)
-                       --with-shared-modules=${SHAREDMODS}
-               )
-       else
-               myconf+=(
-                       --without-acl-support
-                       --without-ad-dc
-                       --without-dnsupdate
-                       --without-ads
-                       --disable-avahi
-                       --disable-cephfs
-                       --without-cluster-support
-                       --disable-cups
-                       --without-dmapi
-                       --without-fam
-                       --disable-gnutls
-                       --without-gpgme
-                       --disable-iprint
-                       $(use_with ldap)
-                       $(use_with debug lttng)
-                       --without-pam
-                       --without-quotas
-                       --without-syslog
-                       --without-systemd
-                       $(usex system-mitkrb5 '--with-system-mitkrb5' '')
-                       --without-winbind
-                       --disable-python
-               )
-       fi
-
-       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 "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-       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
-
-               systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-               systemd_dounit "${FILESDIR}"/nmbd.service
-               systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-               systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-               systemd_dounit "${FILESDIR}"/winbindd.service
-               systemd_dounit "${FILESDIR}"/samba.service
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi ; then
-               "${WAF_BINARY}" test || die "test failed"
-       fi
-}
-
-pkg_postinst() {
-       ewarn "Be aware the 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 "http://samba.org/samba/history/${P}.html "
-       elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-       elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}

Reply via email to