net-fs/samba: Remove <3.6, bonsaikitten approved

16 files changed, 0 insertions, 1527 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d7e2439c286d..ef297d5458bb 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,3 @@
-DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
-DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
 DIST samba-4.2.11.tar.gz 20875348 SHA256 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8 SHA512 293365f2718e756b66ccaec4b0dbce7044ade615b332f58968cf42dd1ec6b6445576590eaf5bd35fa00ba9aa4ba3be7720afc33763652e97731eebc3149f4820 WHIRLPOOL 1e04fd527e55c8d438c96a43d9a25a9b3e09a3edc504a2a5fe44bc8f9101c833c90e3ba3188b8872b046370916f3798e4fce0ffa7848b65f452b5c51ec7107f1
 DIST samba-4.2.12.tar.gz 20878216 SHA256 b334a86a92a1c2759c0b3dce20965e7fe820f0abafee38e6fd82eb9c5cd80514 SHA512 0edf606e03fbfbf8efda6e918f5ab0fd4284d38ae1b0c829f30ea01646eca73dd61b1239363960371a8dc64eaeaffbc4b1c216872ae431f7dfef2139b620e0be WHIRLPOOL f1de51eedd5172cc7c8fb3d0093be5aa1678de1f0b7a686be2c9eb962abb3219ed9232e79d03065c58a14f0b6482cb8bf5c8b3e166fec95911ace2b5dced0782
@@ -12,4 +10,3 @@ DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cb
 DIST samba-disable-python-patches-4.2.9.tar.xz 6016 SHA256 222d0153f03dddde28a0b906ee2b27076223ac88b84a998aaa285f658861edfa SHA512 02fc666a36f8e733e522663d80775d130fabee9d5fb4e1c261d28815e07be425ae8977213f9216c7af62dd8b2619e7e13d71f9a25780b058c8119901c2115a18 WHIRLPOOL ebba3a6d41a41844621759672aa8c984d26f44d12007c8e929405470c381bc262523ec68d3972e86cf675c45f092fa287496167e42940e70d704790753e47b03
 DIST samba-disable-python-patches-4.3.9.tar.xz 6116 SHA256 83206112e04c375e170e86ea6b29d6dc2c172b55ba9fb89130be14708d758cf5 SHA512 ca8b62337afd1cc6059b9aefc0a3972d18ba90fba3f043d9730f6967e1b80c40bc918b0445b8ae8a1f3df74d3551f90c721df3c0514edccb881ed0b4fc54e1b5 WHIRLPOOL 3aebd6758e5e7dc2920b1e8f8825d2b7b7efac7c5f2d91d5ed6fed75597bfdced1b27d9e2a00385af5df19e5462a4e014df6a7274c0b25a660702268235ef746
 DIST samba-disable-python-patches-4.4.2.tar.xz 6244 SHA256 774994cc6b1fcb7099667769159fe2f49eccbdadfc579793f733fe93e7e19874 SHA512 c79fa89b49d558e64e3e4406e2794651d300b8cf678a6714e03aa85352e3aeb21f8012f37fc6e488a39e7a13e86b92a82ee9fb3aabc2dfc86e5928f805a1a989 WHIRLPOOL 66fd03d0edb9b58c36c7e1beb7db6ddf60b194fe6d83f7c3b046a02cab565175e3332c92822f4ba0245f69d1d9f32f2ede2b5b5fe42d51ba17acbdca797ce3c8
-DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/files/3.5/lmhosts b/net-fs/samba/files/3.5/lmhosts
deleted file mode 100644
index fe7b466eb16a..000000000000
--- a/net-fs/samba/files/3.5/lmhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-127.0.0.1 localhost
diff --git a/net-fs/samba/files/3.5/nsswitch.conf-winbind b/net-fs/samba/files/3.5/nsswitch.conf-winbind
deleted file mode 100644
index 32d9b98b8505..000000000000
--- a/net-fs/samba/files/3.5/nsswitch.conf-winbind
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-passwd:      files winbind
-group:       files winbind
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
diff --git a/net-fs/samba/files/3.5/nsswitch.conf-wins b/net-fs/samba/files/3.5/nsswitch.conf-wins
deleted file mode 100644
index 44c01aed9557..000000000000
--- a/net-fs/samba/files/3.5/nsswitch.conf-wins
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id$
-passwd:      files
-group:       files
-
-hosts:       files dns wins
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
diff --git a/net-fs/samba/files/3.5/samba-3.5.6-kerberos-dummy.patch b/net-fs/samba/files/3.5/samba-3.5.6-kerberos-dummy.patch
deleted file mode 100644
index ef76afff7ef6..000000000000
--- a/net-fs/samba/files/3.5/samba-3.5.6-kerberos-dummy.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -NrU5 samba-3.5.6.original/source3/include/krb5_protos.h samba-3.5.6/source3/include/krb5_protos.h
---- samba-3.5.6.original/source3/include/krb5_protos.h	2010-10-07 10:41:16.000000000 -0600
-+++ samba-3.5.6/source3/include/krb5_protos.h	2010-12-23 11:01:09.000000000 -0600
-@@ -86,15 +86,10 @@
- 					    const char *name,
- 					    krb5_principal *principal);
- bool smb_krb5_principal_compare_any_realm(krb5_context context,
- 					  krb5_const_principal princ1,
- 					  krb5_const_principal princ2);
--int cli_krb5_get_ticket(const char *principal, time_t time_offset,
--			DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
--			uint32 extra_ap_opts, const char *ccname,
--			time_t *tgs_expire,
--			const char *impersonate_princ_s);
- krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
- krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
- krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
- krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
- NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
-@@ -144,5 +139,10 @@
- 				   krb5_creds **creds_p);
- char *smb_krb5_principal_get_realm(krb5_context context,
- 				   krb5_principal principal);
- #endif /* HAVE_KRB5 */
- 
-+int cli_krb5_get_ticket(const char *principal, time_t time_offset,
-+                        DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-+                        uint32 extra_ap_opts, const char *ccname,
-+                        time_t *tgs_expire,
-+                        const char *impersonate_princ_s);
diff --git a/net-fs/samba/files/3.5/samba-3.5.8-uclib-build.patch b/net-fs/samba/files/3.5/samba-3.5.8-uclib-build.patch
deleted file mode 100644
index 905b06a5db16..000000000000
--- a/net-fs/samba/files/3.5/samba-3.5.8-uclib-build.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a5bfd634ecd0e81eb92b065da311ee4cf6f08757 Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlayton@samba.org>
-Date: Mon, 5 Jul 2010 08:39:45 -0400
-Subject: [PATCH] mount.cifs: switch to using _PATH_MNTTAB and paths.h
-
-The code currently uses fstab.h and _PATH_FSTAB, but uClibc apparently
-doesn't have that header. It does have paths.h and _PATH_MNTTAB however
-and so does glibc, so use that instead.
-
-Reported-by: Armin Kuster <linux@kama-aina.net>
-Signed-off-by: Jeff Layton <jlayton@samba.org>
----
-diff -NrU5 samba-3.5.8.original/client/mount.cifs.c samba-3.5.8/client/mount.cifs.c
---- samba-3.5.8.original/client/mount.cifs.c	2011-03-06 12:48:05.000000000 -0600
-+++ samba-3.5.8/client/mount.cifs.c	2011-05-04 08:51:42.000000000 -0600
-@@ -37,11 +37,11 @@
- #include <netdb.h>
- #include <string.h>
- #include <mntent.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <fstab.h>
-+#include <paths.h>
- #include "mount.h"
- 
- #define MOUNT_CIFS_VERSION_MAJOR "1"
- #define MOUNT_CIFS_VERSION_MINOR "14"
- 
-@@ -261,14 +261,14 @@
- {
- 	FILE *fstab;
- 	struct mntent *mnt;
- 
- 	/* make sure this mount is listed in /etc/fstab */
--	fstab = setmntent(_PATH_FSTAB, "r");
-+	fstab = setmntent(_PATH_MNTTAB, "r");
- 	if (!fstab) {
- 		fprintf(stderr, "Couldn't open %s for reading!\n",
--				_PATH_FSTAB);
-+				_PATH_MNTTAB);
- 		return EX_FILEIO;
- 	}
- 
- 	while((mnt = getmntent(fstab))) {
- 		if (!strcmp(mountpoint, mnt->mnt_dir))
-@@ -277,11 +277,11 @@
- 	endmntent(fstab);
- 
- 	if (mnt == NULL || strcmp(mnt->mnt_fsname, devname)) {
- 		fprintf(stderr, "%s: permission denied: no match for "
- 				"%s found in %s\n", progname, mountpoint,
--				_PATH_FSTAB);
-+				_PATH_MNTTAB);
- 		return EX_USAGE;
- 	}
- 
- 	/*
- 	 * 'mount' munges the options from fstab before passing them
diff --git a/net-fs/samba/files/3.5/samba.confd b/net-fs/samba/files/3.5/samba.confd
deleted file mode 100644
index 1b329dae6b18..000000000000
--- a/net-fs/samba/files/3.5/samba.confd
+++ /dev/null
@@ -1,28 +0,0 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-my_service_name="samba"
-my_service_PRE="unset TMP TMPDIR"
-my_service_POST=""
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-smbd_start_options="-D"
-smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
-nmbd_reload="killall -HUP nmbd"
-
-winbind_start_options=""
-winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba/files/3.5/samba.initd b/net-fs/samba/files/3.5/samba.initd
deleted file mode 100644
index 18804daa3421..000000000000
--- a/net-fs/samba/files/3.5/samba.initd
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-extra_started_commands="reload"
-
-depend() {
-	after slapd
-	need net
-	use cupsd
-}
-
-DAEMONNAME="${SVCNAME##samba.}"
-[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
-
-signal_do() {
-	local signal="$1"
-	[ -z "${signal}" ] && return 0
-
-	local result=0 last_result=0 daemon= cmd_exec=
-	for daemon in ${daemon_list} ; do
-		eval cmd_exec=\$${daemon}_${signal}
-		if [ -n "${cmd_exec}" ]; then
-			ebegin "${my_service_name} -> ${signal}: ${daemon}"
-			#echo ${cmd} '->' ${!cmd}
-			${cmd_exec} > /dev/null
-			last_result=$?
-			eend ${last_result}
-		fi
-		result=$(( ${result} + ${last_result} ))
-	done
-	return ${result}
-}
-
-mkdir_sambadirs() {
-	[ -d /var/run/samba ] || mkdir -p /var/run/samba
-}
-
-start() {
-	${my_service_PRE}
-	mkdir_sambadirs
-	signal_do start && return 0
-	
-	eerror "Error: starting services (see system logs)"
-	signal_do stop
-	return 1
-}
-stop() {
-	${my_service_PRE}
-	if signal_do stop ; then
-	    ${my_service_POST}
-	    return 0
-	fi
-}
-reload() {
-	${my_service_PRE}
-	signal_do reload
-}
diff --git a/net-fs/samba/files/3.5/samba.pam b/net-fs/samba/files/3.5/samba.pam
deleted file mode 100644
index 91beadd478a4..000000000000
--- a/net-fs/samba/files/3.5/samba.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# * pam_smbpass.so authenticates against the smbpasswd file
-# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
-#    (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only
-auth       required     pam_smbpass.so nodelay
-account    include      system-auth
-session    include      system-auth
-password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/net-fs/samba/files/3.5/smb.conf.default b/net-fs/samba/files/3.5/smb.conf.default
deleted file mode 100644
index 4c9a4a6d529f..000000000000
--- a/net-fs/samba/files/3.5/smb.conf.default
+++ /dev/null
@@ -1,271 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba, 
-# read the Samba-HOWTO-Collection. This may be obtained from:
-#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the 
-# Samba-Guide which is generated daily and can be downloaded from: 
-#  http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = /etc/samba/smb.conf.%m
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
-   dns proxy = no 
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /var/lib/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /var/lib/samba/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = /var/spool/samba
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/net-fs/samba/files/3.5/smb.conf.default.patch b/net-fs/samba/files/3.5/smb.conf.default.patch
deleted file mode 100644
index e9d62db164f4..000000000000
--- a/net-fs/samba/files/3.5/smb.conf.default.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- samba-3.5.9/examples/smb.conf.default	2011-06-14 05:17:28.000000000 -0600
-+++ /etc/samba/smb.conf.default	2011-06-29 10:12:13.000000000 -0600
-@@ -61,11 +61,11 @@
- # otherwise the user "nobody" is used
- ;  guest account = pcguest
- 
- # this tells Samba to use a separate log file for each machine
- # that connects
--   log file = /usr/local/samba/var/log.%m
-+   log file = /var/log/samba/log.%m
- 
- # Put a capping on the size of the log files (in Kb).
-    max log size = 50
- 
- # Use password server option only with security = server
-@@ -79,19 +79,22 @@
- # Specifies the Active Directory realm the host is part of
- ;   realm = MY_REALM
- 
- # Backend to store user information in. New installations should 
- # use either tdbsam or ldapsam. smbpasswd is available for backwards 
--# compatibility. tdbsam requires no further configuration.
-+# compatibility. tdbsam requires no further configuration. If you're 
-+# migrating from < samba 3.4, you'll have to convert your old user 
-+# passwords to the new backend with the command:
-+# pdbedit -i smbpasswd:/var/lib/samba/private/smbpasswd -e
- ;   passdb backend = tdbsam
- 
- # Using the following line enables you to customise your configuration
- # on a per machine basis. The %m gets replaced with the netbios name
- # of the machine that is connecting.
- # Note: Consider carefully the location in the configuration file of
- #       this line.  The included file is read at that point.
--;   include = /usr/local/samba/lib/smb.conf.%m
-+;   include = /etc/samba/smb.conf.%m
- 
- # Configure Samba to use multiple interfaces
- # If you have multiple network interfaces then you must list them
- # here. See the man page for details.
- ;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-@@ -164,29 +167,29 @@
-    writable = yes
- 
- # Un-comment the following and create the netlogon directory for Domain Logons
- ; [netlogon]
- ;   comment = Network Logon Service
--;   path = /usr/local/samba/lib/netlogon
-+;   path = /var/lib/samba/netlogon
- ;   guest ok = yes
- ;   writable = no
- ;   share modes = no
- 
- 
- # Un-comment the following to provide a specific roving profile share
- # the default is to use the user's home directory
- ;[Profiles]
--;    path = /usr/local/samba/profiles
-+;    path = /var/lib/samba/profiles
- ;    browseable = no
- ;    guest ok = yes
- 
- 
- # NOTE: If you have a BSD-style print system there is no need to 
- # specifically define each individual printer
- [printers]
-    comment = All Printers
--   path = /usr/spool/samba
-+   path = /var/spool/samba
-    browseable = no
- # Set public = yes to allow user 'guest account' to print
-    guest ok = no
-    writable = no
-    printable = yes
-@@ -202,11 +205,11 @@
- # the "staff" group
- ;[public]
- ;   comment = Public Stuff
- ;   path = /home/samba
- ;   public = yes
--;   writable = no
-+;   writable = yes
- ;   printable = no
- ;   write list = @staff
- 
- # Other examples. 
- #
diff --git a/net-fs/samba/files/3.5/smbusers b/net-fs/samba/files/3.5/smbusers
deleted file mode 100644
index 7acb6dc817af..000000000000
--- a/net-fs/samba/files/3.5/smbusers
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id$
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
diff --git a/net-fs/samba/files/3.5/swat.xinetd b/net-fs/samba/files/3.5/swat.xinetd
deleted file mode 100644
index 45e977df11aa..000000000000
--- a/net-fs/samba/files/3.5/swat.xinetd
+++ /dev/null
@@ -1,17 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-# $Id$
-
-service swat
-{
-	port            = 901
-	socket_type     = stream
-	wait            = no
-	only_from       = localhost
-	user            = root
-	server          = /usr/sbin/swat
-	log_on_failure += USERID
-	disable         = yes
-}
diff --git a/net-fs/samba/files/3.5/system-auth-winbind.pam b/net-fs/samba/files/3.5/system-auth-winbind.pam
deleted file mode 100644
index 8d6746b7aeb6..000000000000
--- a/net-fs/samba/files/3.5/system-auth-winbind.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-# $Id$
-
-auth        required      pam_env.so
-auth        sufficient    pam_winbind.so
-auth        sufficient    pam_unix.so likeauth nullok use_first_pass
-auth        required      pam_deny.so
-
-account     sufficient    pam_winbind.so
-account     required      pam_unix.so
-
-password    required      pam_cracklib.so retry=3
-password    sufficient    pam_unix.so nullok use_authtok md5 shadow
-password    required      pam_deny.so
-
-session     required      pam_mkhomedir.so skel=/etc/skel/ umask=0022 
-session     required      pam_limits.so
-session     required      pam_unix.so
diff --git a/net-fs/samba/samba-3.5.21.ebuild b/net-fs/samba/samba-3.5.21.ebuild
deleted file mode 100644
index fc876a5c51e6..000000000000
--- a/net-fs/samba/samba-3.5.21.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit pam versionator multilib eutils flag-o-matic
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/stable/${P}.tar.gz
-	https://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="acl addns ads +aio avahi caps +client cluster debug doc examples fam
-	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
-	swat syslog winbind"
-
-DEPEND="dev-libs/popt
-	!net-fs/samba-client
-	!net-fs/samba-libs
-	!net-fs/samba-server
-	!net-fs/cifs-utils
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser:0 )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser:0 )
-	)
-	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-KRBPLUGIN=""
-PLUGINEXT=".so"
-SHAREDMODS=""
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-REQUIRED_USE="
-	ads? ( ldap )
-	swat? ( server )
-"
-
-pkg_setup() {
-	if use server ; then
-		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-			bin/profiles bin/sharesec bin/eventlogadm"
-
-		use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util"
-		use swat && SBINPROGS="${SBINPROGS} bin/swat"
-		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
-	fi
-
-	if use client ; then
-		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-			bin/ntlm_auth"
-
-		use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
-	fi
-
-	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-	if use winbind ; then
-		BINPROGS="${BINPROGS} bin/wbinfo"
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
-		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
-		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
-	fi
-
-	if use winbind &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-	then
-		eerror "It is a known issue that ${P} will not build with "
-		eerror "winbind use flag enabled when using gcc < 4.3 ."
-		eerror "Please use at least the latest stable gcc version."
-		die "Using sys-devel/gcc < 4.3 with winbind use flag."
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-
-	epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch
-	use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff
-	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch
-	epatch "${CONFDIR}"/smb.conf.default.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
-
-	#Allowing alpha/s390/sh to build
-	if use alpha || use s390 || use sh; then
-		replace-flags -O? -O1
-	fi
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# use_with doesn't accept 2 USE-flags
-	if use client && use ads ; then
-		myconf+=" --with-cifsupcall"
-	else
-		myconf+=" --without-cifsupcall"
-	fi
-
-	if use client && use kernel_linux ; then
-		myconf+=" --with-cifsmount --with-cifsumount"
-	else
-		myconf+=" --without-cifsmount --without-cifsumount"
-	fi
-
-	#bug #399141 wrap newer iniparser version
-	has_version ">=dev-libs/iniparser-3.0.0:0" && \
-		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
-
-	# Notes:
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore => LDAP?
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		--disable-cups \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb} \
-		$(use_with netapi libnetapi) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--with-shared-modules=${SHAREDMODS} \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes
-	fi
-
-	# compile modules
-	emake modules
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS}
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS}
-	fi
-
-	if [ -n "${KRBPLUGIN}" ] ; then
-		einfo "make krbplugin"
-		emake ${KRBPLUGIN}${PLUGINEXT}
-	fi
-
-	if use client && use kernel_linux; then
-		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs
-	fi
-}
-
-src_install() {
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}"
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			# bug #376853
-			insinto /etc/security
-			doins ../examples/pam_winbind/pam_winbind.conf || die
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-		einfo "install libwbclient related manpages"
-		doman ../docs/manpages/idmap_rid.8
-		doman ../docs/manpages/idmap_hash.8
-		if use ldap ; then
-			doman ../docs/manpages/idmap_adex.8
-			doman ../docs/manpages/idmap_ldap.8
-		fi
-		if use ads ; then
-			doman ../docs/manpages/idmap_ad.8
-		fi
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	# install krbplugin
-	if [ -n "${KRBPLUGIN}" ] ; then
-		if has_version app-crypt/mit-krb5 ; then
-			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		elif has_version app-crypt/heimdal ; then
-			insinto /usr/$(get_libdir)/plugin/krb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		fi
-		insinto /usr
-		for prog in ${KRBPLUGIN} ; do
-			doman ../docs/manpages/${prog/bin\/}*
-		done
-	fi
-
-	# install server components
-	if use server ; then
-		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
-
-		diropts -m0700
-		keepdir /var/lib/samba/private
-
-		diropts -m1777
-		keepdir /var/spool/samba
-
-		diropts -m0755
-		keepdir /var/{cache,log}/samba
-		keepdir /var/lib/samba/{netlogon,profiles}
-		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-		newconfd "${CONFDIR}/samba.confd" samba
-		newinitd "${CONFDIR}/samba.initd" samba
-
-		insinto /etc/samba
-		doins "${CONFDIR}"/{smbusers,lmhosts}
-
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins ../examples/LDAP/samba.schema
-		fi
-
-		if use swat ; then
-			insinto /etc/xinetd.d
-			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}"
-		fi
-
-		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install client files ({u,}mount.cifs into /)
-	if use client && use kernel_linux ; then
-		into /
-		dosbin bin/{u,}mount.cifs
-		doman ../docs/manpages/{u,}mount.cifs.8
-	fi
-
-	# install misc files
-	insinto /etc/samba
-	doins ../examples/smb.conf.default
-	doman  ../docs/manpages/smb.conf.5
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	# install docs
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	# install examples
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-
-		if use smbclient ; then
-			doins -r ../examples/libsmbclient
-		fi
-
-		if use winbind ; then
-			doins -r ../examples/pam_winbind ../examples/nss
-		fi
-
-		if use server ; then
-			cd ../examples
-			doins -r auth autofs dce-dfs LDAP logon misc pdb \
-			perfcounter printer-accounting printing scripts tridge \
-			validchars VFS
-		fi
-	fi
-
-	# Remove empty installation directories
-	rmdir --ignore-fail-on-non-empty \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-}
-
-pkg_postinst() {
-	elog "The default value of 'wide links' has been changed to 'no' in samba 3.5"
-	elog "to avoid an insecure default configuration"
-	elog "('wide links = yes' and 'unix extensions = yes'). For more details,"
-	elog "please see http://www.samba.org/samba/news/symlink_attack.html ."
-	elog ""
-	elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added."
-	elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new "
-	elog "implementation of the SMB protocol used by Windows Vista and higher"
-	elog ""
-	elog "For further information make sure to read the release notes at"
-	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.5.0.html"
-}
diff --git a/net-fs/samba/samba-3.5.22.ebuild b/net-fs/samba/samba-3.5.22.ebuild
deleted file mode 100644
index e68cb33006ad..000000000000
--- a/net-fs/samba/samba-3.5.22.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit pam versionator multilib eutils flag-o-matic
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/stable/${P}.tar.gz
-	https://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="acl addns ads +aio avahi caps +client cluster debug doc examples fam
-	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
-	swat syslog winbind"
-
-DEPEND="dev-libs/popt
-	!net-fs/samba-client
-	!net-fs/samba-libs
-	!net-fs/samba-server
-	!net-fs/cifs-utils
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser:0 )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser:0 )
-	)
-	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-KRBPLUGIN=""
-PLUGINEXT=".so"
-SHAREDMODS=""
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-REQUIRED_USE="
-	ads? ( ldap )
-	swat? ( server )
-"
-
-pkg_setup() {
-	if use server ; then
-		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-			bin/profiles bin/sharesec bin/eventlogadm"
-
-		use smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util"
-		use swat && SBINPROGS="${SBINPROGS} bin/swat"
-		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
-	fi
-
-	if use client ; then
-		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-			bin/ntlm_auth"
-
-		use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
-	fi
-
-	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-	if use winbind ; then
-		BINPROGS="${BINPROGS} bin/wbinfo"
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
-		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
-		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
-	fi
-
-	if use winbind &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-	then
-		eerror "It is a known issue that ${P} will not build with "
-		eerror "winbind use flag enabled when using gcc < 4.3 ."
-		eerror "Please use at least the latest stable gcc version."
-		die "Using sys-devel/gcc < 4.3 with winbind use flag."
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-
-	epatch "${CONFDIR}"/${PN}-3.5.6-kerberos-dummy.patch
-	use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff
-	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch
-	epatch "${CONFDIR}"/smb.conf.default.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
-
-	#Allowing alpha/s390/sh to build
-	if use alpha || use s390 || use sh; then
-		replace-flags -O? -O1
-	fi
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# use_with doesn't accept 2 USE-flags
-	if use client && use ads ; then
-		myconf+=" --with-cifsupcall"
-	else
-		myconf+=" --without-cifsupcall"
-	fi
-
-	if use client && use kernel_linux ; then
-		myconf+=" --with-cifsmount --with-cifsumount"
-	else
-		myconf+=" --without-cifsmount --without-cifsumount"
-	fi
-
-	#bug #399141 wrap newer iniparser version
-	has_version ">=dev-libs/iniparser-3.0.0:0" && \
-		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
-
-	# Notes:
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore => LDAP?
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		--disable-cups \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb} \
-		$(use_with netapi libnetapi) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--with-shared-modules=${SHAREDMODS} \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes
-	fi
-
-	# compile modules
-	emake modules
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS}
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS}
-	fi
-
-	if [ -n "${KRBPLUGIN}" ] ; then
-		einfo "make krbplugin"
-		emake ${KRBPLUGIN}${PLUGINEXT}
-	fi
-
-	if use client && use kernel_linux; then
-		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs
-	fi
-}
-
-src_install() {
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}"
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			# bug #376853
-			insinto /etc/security
-			doins ../examples/pam_winbind/pam_winbind.conf || die
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-		einfo "install libwbclient related manpages"
-		doman ../docs/manpages/idmap_rid.8
-		doman ../docs/manpages/idmap_hash.8
-		if use ldap ; then
-			doman ../docs/manpages/idmap_adex.8
-			doman ../docs/manpages/idmap_ldap.8
-		fi
-		if use ads ; then
-			doman ../docs/manpages/idmap_ad.8
-		fi
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	# install krbplugin
-	if [ -n "${KRBPLUGIN}" ] ; then
-		if has_version app-crypt/mit-krb5 ; then
-			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		elif has_version app-crypt/heimdal ; then
-			insinto /usr/$(get_libdir)/plugin/krb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		fi
-		insinto /usr
-		for prog in ${KRBPLUGIN} ; do
-			doman ../docs/manpages/${prog/bin\/}*
-		done
-	fi
-
-	# install server components
-	if use server ; then
-		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
-
-		diropts -m0700
-		keepdir /var/lib/samba/private
-
-		diropts -m1777
-		keepdir /var/spool/samba
-
-		diropts -m0755
-		keepdir /var/{cache,log}/samba
-		keepdir /var/lib/samba/{netlogon,profiles}
-		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-		newconfd "${CONFDIR}/samba.confd" samba
-		newinitd "${CONFDIR}/samba.initd" samba
-
-		insinto /etc/samba
-		doins "${CONFDIR}"/{smbusers,lmhosts}
-
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins ../examples/LDAP/samba.schema
-		fi
-
-		if use swat ; then
-			insinto /etc/xinetd.d
-			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}"
-		fi
-
-		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install client files ({u,}mount.cifs into /)
-	if use client && use kernel_linux ; then
-		into /
-		dosbin bin/{u,}mount.cifs
-		doman ../docs/manpages/{u,}mount.cifs.8
-	fi
-
-	# install misc files
-	insinto /etc/samba
-	doins ../examples/smb.conf.default
-	doman  ../docs/manpages/smb.conf.5
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	# install docs
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	# install examples
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-
-		if use smbclient ; then
-			doins -r ../examples/libsmbclient
-		fi
-
-		if use winbind ; then
-			doins -r ../examples/pam_winbind ../examples/nss
-		fi
-
-		if use server ; then
-			cd ../examples
-			doins -r auth autofs dce-dfs LDAP logon misc pdb \
-			perfcounter printer-accounting printing scripts tridge \
-			validchars VFS
-		fi
-	fi
-
-	# Remove empty installation directories
-	rmdir --ignore-fail-on-non-empty \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-}
-
-pkg_postinst() {
-	elog "The default value of 'wide links' has been changed to 'no' in samba 3.5"
-	elog "to avoid an insecure default configuration"
-	elog "('wide links = yes' and 'unix extensions = yes'). For more details,"
-	elog "please see http://www.samba.org/samba/news/symlink_attack.html ."
-	elog ""
-	elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added."
-	elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new "
-	elog "implementation of the SMB protocol used by Windows Vista and higher"
-	elog ""
-	elog "For further information make sure to read the release notes at"
-	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.5.0.html"
-}