diff --git a/net-fs/samba-client/Manifest b/net-fs/samba-client/Manifest
deleted file mode 100644
index f59649b4..00000000
--- a/net-fs/samba-client/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX samba-3.4.2-add-zlib-linking.patch 514 RMD160 cf753a11cbc46beb363d060f1326c217de4ea127 SHA1 a541097311deb8ce1ad128ef28198f74f06b667a SHA256 671b675a98afa12aa5e44934891de2d51be55e20595e119e047b11ed3e7038e4
-AUX samba-3.4.2-fix-samba4-automake.patch 1301 RMD160 b72df0fbfff15ce5b9f4f5b89860432ac73442c0 SHA1 7e6bd8a7320472e8b03012f06634c534091cac0a SHA256 8254a2219651afb7884c4dd1297a94ed0f376fe26805058bd7a5d12edf236718
-AUX samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch 731 RMD160 648d6f3b78398490ba5da6716ec7e52b41ee236e SHA1 425aa9fa18c9431df4d57768345c80dabc1be5c2 SHA256 7b5ec60126e84957b410c7b0472cc01115c42f213c88b300d1516c616f39de02
-AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c83611f6ebeb5 SHA1 ab048fb7ba236621d82cc305ce85d129d38d32a8 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153
-AUX samba-3.4.2-missing_includes.patch 293 RMD160 e32b75ddc4a35f20173db731681eaef837acbc06 SHA1 c8a2b17dca84ca94eef39870d4af018d5e75c76a SHA256 75e6913172a06af3776372ddcc46e734eb960597aa84856ff8c0c2f885b5f260
-AUX samba-3.4.2-upgrade-tevent-version.patch 288 RMD160 3eb9bbd781d4a92e844ff36824b75f6345c11a97 SHA1 6eec152408b8c18459a7d9413134bc37a6d52b63 SHA256 9171d875322387e7b4f4905067d9310da8e82e9c17cc7d0f0df7d163cffbf414
-AUX samba-3.4.3-cifs_upcall_c.patch 1630 RMD160 3ae405c1875963e720c7ea6c555877b8d89ee986 SHA1 fb1d0ef094faa7c16b0f4a5fe529f3f3ce0a0018 SHA256 0ce57dc8a766a7d765e1d4124042f72328ad3359931c536c7d348a658e1c8043
-DIST samba-3.4.3.tar.gz 34989194 RMD160 5175848b36df04e52bc9ba17302bc3042d493383 SHA1 cad244c5334e6a2b46172910944a899a82f3ef4a SHA256 20bedee9dc72b3081b36f760cfbbcb47a6c8817cffab7dc46131b109585aceff
-EBUILD samba-client-3.4.3.ebuild 6955 RMD160 a063f8cd565e36484b9c64b8e4c3b1363ec1d8d8 SHA1 2a760d113e2cd37198ddc53e3c16d53f9387dff8 SHA256 afda543f2cd4182c63a2fb6ef395224472dfb3fd0eb217ba378bc9b7b420a171
diff --git a/net-fs/samba-client/files/samba-3.4.2-add-zlib-linking.patch b/net-fs/samba-client/files/samba-3.4.2-add-zlib-linking.patch
deleted file mode 100644
index f75f7f54..00000000
--- a/net-fs/samba-client/files/samba-3.4.2-add-zlib-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source3/Makefile.in.orig	2009-09-30 14:17:40.000000000 +0200
-+++ source3/Makefile.in	2009-10-07 10:11:56.090719799 +0200
-@@ -1470,7 +1470,7 @@
-	@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
-		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
-		$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
--		$(LIBTDB_LIBS) $(NSCD_LIBS)
-+		$(LIBTDB_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS)
-
- bin/testparm@EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
-		@echo Linking $@
diff --git a/net-fs/samba-client/files/samba-3.4.2-fix-samba4-automake.patch b/net-fs/samba-client/files/samba-3.4.2-fix-samba4-automake.patch
deleted file mode 100644
index ade4da98..00000000
--- a/net-fs/samba-client/files/samba-3.4.2-fix-samba4-automake.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- source4/build/m4/public.m4.org	2009-09-30 14:17:40.000000000 +0200
-+++ source4/build/m4/public.m4	2009-10-07 08:42:10.000000000 +0200
-@@ -86,10 +86,10 @@
- 		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
- 			AC_MSG_CHECKING(for $2)
- 
--			if $PKG_CONFIG --exists '$2' ; then
-+			if $PKG_CONFIG --exists "$2" ; then
- 				AC_MSG_RESULT(yes)
- 
--				$1_CFLAGS="`$PKG_CONFIG --cflags '$2'`"
-+				$1_CFLAGS="`$PKG_CONFIG --cflags \"$2\"`"
- 				OLD_CFLAGS="$CFLAGS"
- 				CFLAGS="$CFLAGS $$1_CFLAGS"
- 				AC_MSG_CHECKING([that the C compiler can use the $1_CFLAGS])
-@@ -101,15 +101,15 @@
- 				CFLAGS="$OLD_CFLAGS"
- 
- 				SMB_EXT_LIB($1, 
--					[`$PKG_CONFIG --libs-only-l '$2'`], 
--					[`$PKG_CONFIG --cflags-only-other '$2'`],
--					[`$PKG_CONFIG --cflags-only-I '$2'`],
--					[`$PKG_CONFIG --libs-only-other '$2'` `$PKG_CONFIG --libs-only-L '$2'`])
-+					[`$PKG_CONFIG --libs-only-l "$2"`], 
-+					[`$PKG_CONFIG --cflags-only-other "$2"`],
-+					[`$PKG_CONFIG --cflags-only-I "$2"`],
-+					[`$PKG_CONFIG --libs-only-other "$2"` `$PKG_CONFIG --libs-only-L "$2"`])
- 				ac_cv_$1_found=yes
- 
- 			else
- 				AC_MSG_RESULT(no)
--				$PKG_CONFIG --errors-to-stdout --print-errors '$2'
-+				$PKG_CONFIG --errors-to-stdout --print-errors "$2"
- 				ac_cv_$1_found=no
- 			fi
- 		else
diff --git a/net-fs/samba-client/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch b/net-fs/samba-client/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
deleted file mode 100644
index 8a849214..00000000
--- a/net-fs/samba-client/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- lib/replace/libreplace_ld.m4.orig	2009-09-30 14:17:40.000000000 +0200
-+++ lib/replace/libreplace_ld.m4	2009-10-07 02:07:26.000000000 +0200
-@@ -249,6 +249,22 @@
- 		esac
- ])
- 
-+AC_DEFUN([AC_LD_VERSIONSCRIPT],
-+[
-+       AC_SUBST(VERSIONSCRIPT)
-+       VERSIONSCRIPT=""
-+       case "$host_os" in 
-+               *linux*|*gnu*)
-+                       VERSIONSCRIPT="-Wl,--version-script"
-+                       ;;
-+               *solaris*)
-+                       if test "${GCC}" = "yes"; then
-+                               VERSIONSCRIPT="-Wl,--version-script"
-+                       fi
-+                       ;;
-+               esac
-+])
-+
- AC_DEFUN([AC_LIBREPLACE_MDLD],
- [
- 	AC_REQUIRE([AC_LIBREPLACE_LD_SHLIB_LINKER])
diff --git a/net-fs/samba-client/files/samba-3.4.2-lib.tevent.python.mk b/net-fs/samba-client/files/samba-3.4.2-lib.tevent.python.mk
deleted file mode 100644
index 3a037558..00000000
--- a/net-fs/samba-client/files/samba-3.4.2-lib.tevent.python.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-[PYTHON::pytevent]
-LIBRARY_REALNAME = tevent.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBTEVENT PYTALLOC LIBSAMBA-UTIL LIBREPLACE
-
-pytevent_OBJ_FILES = $(libteventsrcdir)/pytevent.o
-
diff --git a/net-fs/samba-client/files/samba-3.4.2-missing_includes.patch b/net-fs/samba-client/files/samba-3.4.2-missing_includes.patch
deleted file mode 100644
index be26fa06..00000000
--- a/net-fs/samba-client/files/samba-3.4.2-missing_includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- source3/client/mtab.c.orig	2009-03-23 09:33:48.339895132 +0100
-+++ source3/client/mtab.c	2009-03-23 09:33:58.159797512 +0100
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <fcntl.h>
- #include <mntent.h>
diff --git a/net-fs/samba-client/files/samba-3.4.2-upgrade-tevent-version.patch b/net-fs/samba-client/files/samba-3.4.2-upgrade-tevent-version.patch
deleted file mode 100644
index 5a614c63..00000000
--- a/net-fs/samba-client/files/samba-3.4.2-upgrade-tevent-version.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- source4/min_versions.m4.orig	2009-09-30 14:17:40.000000000 +0200
-+++ source4/min_versions.m4	2009-10-07 10:01:14.478984106 +0200
-@@ -3,4 +3,4 @@
- TDB_MIN_VERSION=1.1.3
- TALLOC_MIN_VERSION=1.3.0
- LDB_REQUIRED_VERSION=0.9.3
--TEVENT_REQUIRED_VERSION=0.9.6
-+TEVENT_REQUIRED_VERSION=0.9.8
diff --git a/net-fs/samba-client/files/samba-3.4.3-cifs_upcall_c.patch b/net-fs/samba-client/files/samba-3.4.3-cifs_upcall_c.patch
deleted file mode 100644
index 8fd8744a..00000000
--- a/net-fs/samba-client/files/samba-3.4.3-cifs_upcall_c.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- source3/client/cifs.upcall.c.orig	2009-10-29 08:47:16.000000000 +0100
-+++ source3/client/cifs.upcall.c	2009-11-03 10:52:37.000000000 +0100
-@@ -31,6 +31,9 @@
- 
- #include "cifs_spnego.h"
- 
-+// defined in heimdal appl/dceutils/k5dce.h
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+
- #define	CIFS_DEFAULT_KRB5_DIR		"/tmp"
- #define	CIFS_DEFAULT_KRB5_PREFIX	"krb5cc_"
- 
-@@ -45,14 +48,24 @@
- } sectype_t;
- 
- static inline int
--k5_data_equal(krb5_data d1, krb5_data d2, unsigned int length)
-+k5_realm_equal(Realm d1, Realm d2)
-+{
-+	int len1 = length_Realm(&d1);
-+	int len2 = length_Realm(&d2);
-+
-+	return (len1 == len2 &&
-+		memcmp(d1, d2, len1) == 0);
-+}
-+
-+static inline int
-+k5_name_equal(PrincipalName d1, krb5_data d2, unsigned int length)
- {
- 	if (!length)
--		length = d1.length;
-+		length = d1.name_string.len;
- 
--	return (d1.length == length &&
--		d1.length == d2.length &&
--		memcmp(d1.data, d2.data, length) == 0);
-+	return (d1.name_string.len == length &&
-+		d1.name_string.len == d2.length &&
-+		memcmp(d1.name_string.val, d2.data, length) == 0);
- 
- }
- 
-@@ -94,9 +107,9 @@
- 	}
- 
- 	while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) {
--		if (k5_data_equal(creds.server->realm, principal->realm, 0) &&
--		    k5_data_equal(creds.server->data[0], tgt, tgt.length) &&
--		    k5_data_equal(creds.server->data[1], principal->realm, 0) &&
-+
-+	 	if (k5_realm_equal(creds.server->realm, principal->realm) &&
-+		    k5_name_equal(creds.server->name, tgt, tgt.length) &&
- 		    creds.times.endtime > time(NULL))
- 			credtime = creds.times.endtime;
-                 krb5_free_cred_contents(context, &creds);
diff --git a/net-fs/samba-client/samba-client-3.4.3.ebuild b/net-fs/samba-client/samba-client-3.4.3.ebuild
deleted file mode 100644
index 942a5c67..00000000
--- a/net-fs/samba-client/samba-client-3.4.3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-client/samba-client-3.4.3.ebuild,v 1.2 2009/11/08 03:34:46 josejx Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib eutils toolchain-funcs autotools
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="Client bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="samba4 ads aio avahi caps cluster cups debug ldap minimal syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	!net-fs/mount-cifs
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		net-fs/samba-libs[ads] sys-apps/keyutils )
-	!minimal? (
-		dev-libs/popt
-		dev-libs/iniparser
-		virtual/libiconv
-		zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
-		caps? ( sys-libs/libcap )
-		cups? ( net-print/cups )
-		debug? ( dev-libs/dmalloc )
-		ldap? ( net-nds/openldap )
-		syslog? ( virtual/logger )
-		sys-libs/tdb
-		sys-libs/talloc
-		~net-fs/samba-libs-${PV}[caps?,cups?,ldap?,syslog?,winbind?,ads?,samba4?,netapi] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-BINPROGS="bin/smbclient bin/net bin/smbget bin/smbtree bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas bin/ntlm_auth"
-
-pkg_setup() {
-	confutils_use_depend_all samba4 ads
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	epatch \
-		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
-		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
-		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch" \
-		"${FILESDIR}/samba-3.4.3-cifs_upcall_c.patch"
-#		"${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \
-
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk"
-
-	cd "source3"
-	eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		myconf="${myconf} --enable-merged-build --enable-developer"
-		if has_version app-crypt/heimdal ; then
-			myconf="${myconf} --with-krb5=/usr/"
-		elif has_version app-crypt/mit-krb5 ; then
-			die "MIT Kerberos not supported by samba 4, use heimdal"
-		else
-			die "No supported kerberos provider detected"
-		fi
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	export ac_cv_header_sys_capability_h=no
-	if ! use minimal ; then
-		use caps && export ac_cv_header_sys_capability_h=yes
-	fi
-
-	if ! use minimal || use ads; then
-		# Notes:
-		# - FAM is a plugin for the server
-		# - DNS-SD is only used in client/server code
-		# - AFS is a pw-auth-method and only used in client/server code
-		# - AFSACL is a server module
-		# - automount is only needed in conjunction with NIS and we don't have that
-		# anymore
-		# - quota-support is only needed in server-code
-		# - acl-support is only used in server-code
-		# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-		# - current DNS/SD support in the client is via the mdnsresponder-compat api in avahi
-		econf ${myconf} \
-			--sysconfdir=/etc/samba \
-			--localstatedir=/var \
-			$(use_enable debug developer) \
-			--enable-largefile \
-			--enable-socket-wrapper \
-			--enable-nss-wrapper \
-			--disable-swat \
-			$(use_enable debug dmalloc) \
-			$(use minimal && echo "--disable-cups" || echo "$(use_enable cups)") \
-			--disable-iprint \
-			--disable-fam \
-			--enable-shared-libs \
-			$(use minimal && echo "--disable-dnssd" || echo "$(use_enable avahi dnssd)") \
-			--disable-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 minimal && echo "--without-ldap" || echo "$(use_with ldap)") \
-			$(use minimal && echo "--without-ads" || echo "$(use_with ads)") \
-			$(use minimal && echo "--without-krb5" || echo "$(use_with ads krb5 /usr)") \
-			$(use minimal && echo "--without-dnsupdate" || echo "$(use_with ads dnsupdate)") \
-			--without-automount \
-			--without-cifsmount \
-			--without-cifsupcall \
-			--without-pam \
-			--without-pam_smbpass \
-			$(use minimal && echo "--without-syslog" || echo "$(use_with syslog)") \
-			--without-quotas \
-			--without-sys-quotas \
-			--without-utmp \
-			--without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-			--without-libaddns \
-			$(use minimal && echo "--without-ctdb" || echo "$(use_with cluster ctdb /usr)") \
-			$(use minimal && echo "--without-cluster" || echo "$(use_with cluster cluster-support)") \
-			--without-acl-support \
-			$(use minimal && echo "--without-aio-support" || echo "$(use_with aio aio-support)") \
-			--with-sendfile-support \
-			$(use minimal && echo "--without-winbind" || echo "$(use_with winbind)") \
-			--without-included-popt \
-			--without-included-iniparser
-	fi
-}
-
-src_compile() {
-	mkdir bin
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/mount.cifs client/{mount.cifs,mtab}.c || die "building mount.cifs failed"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bin/umount.cifs client/{umount.cifs,mtab}.c || die "building umount.cifs failed"
-
-	if use ads ; then
-		emake bin/cifs.upcall || die "emake cifs.upcall failed"
-	fi
-
-	if ! use minimal ; then
-		emake ${BINPROGS} || die "emake binprogs failed"
-		if use cups ; then
-			emake bin/smbspool || die "emake smbspool failed"
-		fi
-	fi
-}
-
-src_install() {
-	into /
-	dosbin bin/mount.cifs bin/umount.cifs || die "u/mount.cifs not around"
-	doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	dohtml ../docs/htmldocs/manpages/{u,}mount.cifs.8.html || die "dohtml failed"
-
-	into /usr
-	if use ads ; then
-		dosbin bin/cifs.upcall || die "cifs.upcall not around"
-		doman ../docs/manpages/cifs.upcall.8 || die "doman failed"
-		dohtml ../docs/htmldocs/manpages/cifs.upcall.8.html || die "doman failed"
-	fi
-
-	if ! use minimal ; then
-		dobin ${BINPROGS} || die "not all bins around"
-		for prog in ${BINPROGS} ; do
-			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed"
-		done
-
-		if use cups ; then
-			dobin bin/smbspool || die "smbspool not around"
-			doman ../docs/manpages/smbspool.8 || die "doman failed"
-			dohtml ../docs/htmldocs/manpages/smbspool.8.html || die "dohtml failed"
-			dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-		fi
-	fi
-}