From 3300fb6d6283fde22451729b6811e85613fc9d1a Mon Sep 17 00:00:00 2001
From: Torsten Kurbad <t.kurbad@iwm-tuebingen.de>
Date: Mon, 12 Oct 2009 10:21:41 +0000
Subject: [PATCH] Removed obsolete samba-3.4.2 ebuilds

git-svn-id: svn+ssh://svnintern.kmrc.de/projects/gentoo/iwm-overlay@11162 cbe59ace-07ea-0310-918e-868702b5370d
---
 net-fs/samba-client/Manifest                  |   8 -
 .../files/samba-3.4.2-add-zlib-linking.patch  |  11 -
 .../samba-3.4.2-fix-samba4-automake.patch     |  36 ---
 ...mba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch |  25 --
 .../files/samba-3.4.2-lib.tevent.python.mk    |   6 -
 .../files/samba-3.4.2-missing_includes.patch  |  10 -
 .../samba-3.4.2-upgrade-tevent-version.patch  |   8 -
 net-fs/samba-client/samba-client-3.4.2.ebuild | 228 ---------------
 net-fs/samba-libs/Manifest                    |  12 -
 .../files/3.4/nsswitch.conf-winbind           |  17 --
 .../samba-libs/files/3.4/nsswitch.conf-wins   |  17 --
 net-fs/samba-libs/files/3.4/samba.pam         |   8 -
 .../files/3.4/system-auth-winbind.pam         |  18 --
 .../files/samba-3.4.2-add-zlib-linking.patch  |  11 -
 .../samba-3.4.2-fix-samba4-automake.patch     |  36 ---
 ...mba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch |  25 --
 .../files/samba-3.4.2-lib.tevent.python.mk    |   6 -
 .../files/samba-3.4.2-missing_includes.patch  |  10 -
 .../samba-3.4.2-upgrade-tevent-version.patch  |   8 -
 net-fs/samba-libs/samba-libs-3.4.2.ebuild     | 237 ---------------
 net-fs/samba-server/Manifest                  |  14 -
 net-fs/samba-server/files/3.4/lmhosts         |   2 -
 net-fs/samba-server/files/3.4/samba.confd     |  28 --
 net-fs/samba-server/files/3.4/samba.initd     |  53 ----
 .../samba-server/files/3.4/smb.conf.default   | 271 ------------------
 net-fs/samba-server/files/3.4/smbusers        |   7 -
 net-fs/samba-server/files/3.4/swat.xinetd     |  17 --
 .../files/samba-3.4.2-add-zlib-linking.patch  |  11 -
 .../samba-3.4.2-fix-samba4-automake.patch     |  36 ---
 ...mba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch |  25 --
 .../files/samba-3.4.2-lib.tevent.python.mk    |   6 -
 .../files/samba-3.4.2-missing_includes.patch  |  10 -
 .../samba-3.4.2-upgrade-tevent-version.patch  |   8 -
 net-fs/samba-server/samba-server-3.4.2.ebuild | 248 ----------------
 net-fs/samba/samba-3.4.2.ebuild               |  16 --
 35 files changed, 1489 deletions(-)
 delete mode 100644 net-fs/samba-client/Manifest
 delete mode 100644 net-fs/samba-client/files/samba-3.4.2-add-zlib-linking.patch
 delete mode 100644 net-fs/samba-client/files/samba-3.4.2-fix-samba4-automake.patch
 delete mode 100644 net-fs/samba-client/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
 delete mode 100644 net-fs/samba-client/files/samba-3.4.2-lib.tevent.python.mk
 delete mode 100644 net-fs/samba-client/files/samba-3.4.2-missing_includes.patch
 delete mode 100644 net-fs/samba-client/files/samba-3.4.2-upgrade-tevent-version.patch
 delete mode 100644 net-fs/samba-client/samba-client-3.4.2.ebuild
 delete mode 100644 net-fs/samba-libs/Manifest
 delete mode 100644 net-fs/samba-libs/files/3.4/nsswitch.conf-winbind
 delete mode 100644 net-fs/samba-libs/files/3.4/nsswitch.conf-wins
 delete mode 100644 net-fs/samba-libs/files/3.4/samba.pam
 delete mode 100644 net-fs/samba-libs/files/3.4/system-auth-winbind.pam
 delete mode 100644 net-fs/samba-libs/files/samba-3.4.2-add-zlib-linking.patch
 delete mode 100644 net-fs/samba-libs/files/samba-3.4.2-fix-samba4-automake.patch
 delete mode 100644 net-fs/samba-libs/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
 delete mode 100644 net-fs/samba-libs/files/samba-3.4.2-lib.tevent.python.mk
 delete mode 100644 net-fs/samba-libs/files/samba-3.4.2-missing_includes.patch
 delete mode 100644 net-fs/samba-libs/files/samba-3.4.2-upgrade-tevent-version.patch
 delete mode 100644 net-fs/samba-libs/samba-libs-3.4.2.ebuild
 delete mode 100644 net-fs/samba-server/Manifest
 delete mode 100644 net-fs/samba-server/files/3.4/lmhosts
 delete mode 100644 net-fs/samba-server/files/3.4/samba.confd
 delete mode 100644 net-fs/samba-server/files/3.4/samba.initd
 delete mode 100644 net-fs/samba-server/files/3.4/smb.conf.default
 delete mode 100644 net-fs/samba-server/files/3.4/smbusers
 delete mode 100644 net-fs/samba-server/files/3.4/swat.xinetd
 delete mode 100644 net-fs/samba-server/files/samba-3.4.2-add-zlib-linking.patch
 delete mode 100644 net-fs/samba-server/files/samba-3.4.2-fix-samba4-automake.patch
 delete mode 100644 net-fs/samba-server/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
 delete mode 100644 net-fs/samba-server/files/samba-3.4.2-lib.tevent.python.mk
 delete mode 100644 net-fs/samba-server/files/samba-3.4.2-missing_includes.patch
 delete mode 100644 net-fs/samba-server/files/samba-3.4.2-upgrade-tevent-version.patch
 delete mode 100644 net-fs/samba-server/samba-server-3.4.2.ebuild
 delete mode 100644 net-fs/samba/samba-3.4.2.ebuild

diff --git a/net-fs/samba-client/Manifest b/net-fs/samba-client/Manifest
deleted file mode 100644
index 9a7946e..0000000
--- a/net-fs/samba-client/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX samba-3.4.2-add-zlib-linking.patch 569 RMD160 68b33771eb2f6871a51bf295b4ad10d27bb1e74f SHA1 509f061ef4f382181eb001d060895a9303e2b3dd SHA256 9e01a93c2966c7f55ae80b67f270be4d42a3dc5cbb026d6c34c3f9a6c355c6aa
-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
-DIST samba-3.4.2.tar.gz 34979734 RMD160 741456633afeacccb1942089b9d759ac073d2562 SHA1 4077302ed27b6d9f50bbcfba58ca6a58fe9d0f59 SHA256 8b880e78d175a82df627d61a070461812bba209b21346aa0383cd5c96d364fc4
-EBUILD samba-client-3.4.2.ebuild 7494 RMD160 e6dd0029dab6ec585eb10995f98300dba9dcc891 SHA1 5a5f4538dc5b08a16d34a2e3fdc8e8d0101ea7b0 SHA256 5f5fb3226ea597d5c57838ad6e86829aa59f5a39436f07e1ea00a0188edb4987
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 b04bca2..0000000
--- 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
-@@ -1468,7 +1468,7 @@
- bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
- 	@echo Linking $@
- 	@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
--		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
-+		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils -lz $(KRB5LIBS) \
- 		$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
- 		$(LIBTDB_LIBS) $(NSCD_LIBS)
-
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 ade4da9..0000000
--- 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 8a84921..0000000
--- 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 3a03755..0000000
--- 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 be26fa0..0000000
--- 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 5a614c6..0000000
--- 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/samba-client-3.4.2.ebuild b/net-fs/samba-client/samba-client-3.4.2.ebuild
deleted file mode 100644
index ca5a082..0000000
--- a/net-fs/samba-client/samba-client-3.4.2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit pam confutils versionator multilib eutils toolchain-funcs
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="samba-client"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~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 )
-		virtual/tdb
-		virtual/talloc
-		net-fs/samba-libs[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 ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	epatch \
-		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
-		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
-		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.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"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		if ! use ads; then
-			# samba will not compile if ads use flag is not set
-			die "ads use flag must be enabled to compile franky samba4 hybrid"
-		else
-			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
-	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
-}
diff --git a/net-fs/samba-libs/Manifest b/net-fs/samba-libs/Manifest
deleted file mode 100644
index 149410b..0000000
--- a/net-fs/samba-libs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 3.4/nsswitch.conf-winbind 411 RMD160 0266acf875557b3332550aa0d8e68510deb55ed0 SHA1 35ba35a57f88daa26ef5aa79ccabe81317eb9d06 SHA256 e83deeaeb64e3c7b907ef7a27e280ce1c777b51ca6e93da226424954ea22b83e
-AUX 3.4/nsswitch.conf-wins 397 RMD160 8dad352a86a242c1ad81561d478701f88f1b7a29 SHA1 f72680b3071f5f9f0157af06be947374b5498821 SHA256 70a4253546718aa02ec02b7cbb1470807ff08eeaf36626b040fb999362bfba2a
-AUX 3.4/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
-AUX 3.4/system-auth-winbind.pam 710 RMD160 d0e55b592a51b5354b42176074a8387af767c483 SHA1 5d354dd2b41d7d0d4fe3cd79a4bdaa3a9487069d SHA256 ce50f011fe2c4f4576a9a8f9334fbeefcf1e71407853c917072b25830c293543
-AUX samba-3.4.2-add-zlib-linking.patch 569 RMD160 68b33771eb2f6871a51bf295b4ad10d27bb1e74f SHA1 509f061ef4f382181eb001d060895a9303e2b3dd SHA256 9e01a93c2966c7f55ae80b67f270be4d42a3dc5cbb026d6c34c3f9a6c355c6aa
-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
-DIST samba-3.4.2.tar.gz 34979734 RMD160 741456633afeacccb1942089b9d759ac073d2562 SHA1 4077302ed27b6d9f50bbcfba58ca6a58fe9d0f59 SHA256 8b880e78d175a82df627d61a070461812bba209b21346aa0383cd5c96d364fc4
-EBUILD samba-libs-3.4.2.ebuild 6740 RMD160 6a0af61940132dc8583a3a97bf565ec591377733 SHA1 a52299d6956fca939a689be200dcbddce05261ae SHA256 64da1f6d0d00dd08883ac6df7bcfa8475149d3b89ad94ea5c8b7e73ed720f386
diff --git a/net-fs/samba-libs/files/3.4/nsswitch.conf-winbind b/net-fs/samba-libs/files/3.4/nsswitch.conf-winbind
deleted file mode 100644
index d9d5331..0000000
--- a/net-fs/samba-libs/files/3.4/nsswitch.conf-winbind
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/files/3.3/nsswitch.conf-winbind,v 1.1 2009/06/26 20:22:16 patrick Exp $
-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-libs/files/3.4/nsswitch.conf-wins b/net-fs/samba-libs/files/3.4/nsswitch.conf-wins
deleted file mode 100644
index 01c42c4..0000000
--- a/net-fs/samba-libs/files/3.4/nsswitch.conf-wins
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/files/3.3/nsswitch.conf-wins,v 1.1 2009/06/26 20:22:16 patrick Exp $
-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-libs/files/3.4/samba.pam b/net-fs/samba-libs/files/3.4/samba.pam
deleted file mode 100644
index 91beadd..0000000
--- a/net-fs/samba-libs/files/3.4/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-libs/files/3.4/system-auth-winbind.pam b/net-fs/samba-libs/files/3.4/system-auth-winbind.pam
deleted file mode 100644
index ba39b98..0000000
--- a/net-fs/samba-libs/files/3.4/system-auth-winbind.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/files/3.3/system-auth-winbind.pam,v 1.1 2009/06/26 20:22:16 patrick Exp $
-
-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-libs/files/samba-3.4.2-add-zlib-linking.patch b/net-fs/samba-libs/files/samba-3.4.2-add-zlib-linking.patch
deleted file mode 100644
index b04bca2..0000000
--- a/net-fs/samba-libs/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
-@@ -1468,7 +1468,7 @@
- bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
- 	@echo Linking $@
- 	@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
--		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
-+		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils -lz $(KRB5LIBS) \
- 		$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
- 		$(LIBTDB_LIBS) $(NSCD_LIBS)
-
diff --git a/net-fs/samba-libs/files/samba-3.4.2-fix-samba4-automake.patch b/net-fs/samba-libs/files/samba-3.4.2-fix-samba4-automake.patch
deleted file mode 100644
index ade4da9..0000000
--- a/net-fs/samba-libs/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-libs/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch b/net-fs/samba-libs/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
deleted file mode 100644
index 8a84921..0000000
--- a/net-fs/samba-libs/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-libs/files/samba-3.4.2-lib.tevent.python.mk b/net-fs/samba-libs/files/samba-3.4.2-lib.tevent.python.mk
deleted file mode 100644
index 3a03755..0000000
--- a/net-fs/samba-libs/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-libs/files/samba-3.4.2-missing_includes.patch b/net-fs/samba-libs/files/samba-3.4.2-missing_includes.patch
deleted file mode 100644
index be26fa0..0000000
--- a/net-fs/samba-libs/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-libs/files/samba-3.4.2-upgrade-tevent-version.patch b/net-fs/samba-libs/files/samba-3.4.2-upgrade-tevent-version.patch
deleted file mode 100644
index 5a614c6..0000000
--- a/net-fs/samba-libs/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-libs/samba-libs-3.4.2.ebuild b/net-fs/samba-libs/samba-libs-3.4.2.ebuild
deleted file mode 100644
index a1271ef..0000000
--- a/net-fs/samba-libs/samba-libs-3.4.2.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="samba-libs"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind +talloc +tdb +netapi smbclient smbsharemodes addns"
-
-PROVIDE="talloc? ( virtual/talloc )
-	tdb? ( virtual/tdb )"
-
-DEPEND="dev-libs/popt
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs )
-	caps? ( sys-libs/libcap )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	syslog? ( virtual/logger )
-	!<net-fs/samba-3.3"
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	epatch \
-		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
-		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
-		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.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"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
-
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		if ! use ads; then
-			# samba will not compile if ads use flag is not set
-			die "ads use flag must be enabled to compile franky samba4 hybrid"
-		else
-			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
-	fi
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-	use hppa && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# 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
-	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_enable cups) \
-		--disable-iprint \
-		--disable-fam \
-		--enable-shared-libs \
-		--disable-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_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		--without-cifsmount \
-		--without-cifsupcall \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		--without-quotas \
-		--without-sys-quotas \
-		--without-utmp \
-		$(use_with tdb libtdb) \
-		$(use_with netapi libnetapi) \
-		$(use_with talloc libtalloc) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		--without-acl-support \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	if use talloc || use tdb || use netapi || use smbclient || use smbsharemodes || use addns ; then
-		emake libs || die "emake libs failed";
-	fi
-	if use pam ; then
-		emake pam_modules || die "emake nss_modules failed";
-	fi
-	if use winbind ; then
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" installlibs || die "emake installlibs failed"
-	if use pam ; then
-		emake DESTDIR="${D}" installpammodules || die "emake installpammodules failed"
-	fi
-
-	# Remove empty installation directories
-	rmdir \
-		"${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"
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		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
-	fi
-
-	if use pam ; then
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.7
-			dohtml ../docs/htmldocs/manpages/pam_winbind.7.html
-
-			if use examples ; then
-				insinto /usr/share/doc/${PF}/examples
-				doins -r ../examples/pam_winbind
-			fi
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r ../examples/libsmbclient
-
-		use winbind && doins -r ../examples/nss
-	fi
-
-}
diff --git a/net-fs/samba-server/Manifest b/net-fs/samba-server/Manifest
deleted file mode 100644
index 008ee8f..0000000
--- a/net-fs/samba-server/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 3.4/lmhosts 133 RMD160 5fe8da95213b99a41e60cee6256bcae472168135 SHA1 239819ab0b8b90cb75794394808766d20a9b3f8b SHA256 2d5cdf87577da802caa0a1799fcfa2c0582cfc99e21436c063c73d48184ae333
-AUX 3.4/samba.confd 1243 RMD160 70caeec85d6414745a926c5c497767b23b7b6aa7 SHA1 4096cadfc1ad1b549e2f6fe5f469ab197e3efbaa SHA256 e2d303ae9e1e1df65e87cf873bf0cd53d7883ac8f5b39928944f64e5f15ade3f
-AUX 3.4/samba.initd 1143 RMD160 14d18d740f21b0fedcb4ed188be8d3adb63c7d96 SHA1 ad476b2338622e8a4681870b955d2288eb2eadac SHA256 ccc546df8a93ccc78eb40f107990897077c79696cee9f8a1e776ed9cfec26bf8
-AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
-AUX 3.4/smbusers 226 RMD160 67f58a146d2dc88974d94fd483171b2bceaf5569 SHA1 176f22416b004b42076ba97b4748b8e49808f8f7 SHA256 140bdd07d40fe346133030973e61075e735b784334d360ce00d310b9b8088212
-AUX 3.4/swat.xinetd 534 RMD160 aa895bfd09bdc8f25bb0f659320c760873d2d176 SHA1 b7620ef3146580d16f467481b423f5937330c2de SHA256 cc04c5305af8760d4179614c41a880e0dd442cc890517e208d22c8aea5741140
-AUX samba-3.4.2-add-zlib-linking.patch 569 RMD160 68b33771eb2f6871a51bf295b4ad10d27bb1e74f SHA1 509f061ef4f382181eb001d060895a9303e2b3dd SHA256 9e01a93c2966c7f55ae80b67f270be4d42a3dc5cbb026d6c34c3f9a6c355c6aa
-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
-DIST samba-3.4.2.tar.gz 34979734 RMD160 741456633afeacccb1942089b9d759ac073d2562 SHA1 4077302ed27b6d9f50bbcfba58ca6a58fe9d0f59 SHA256 8b880e78d175a82df627d61a070461812bba209b21346aa0383cd5c96d364fc4
-EBUILD samba-server-3.4.2.ebuild 7151 RMD160 9c3dc9c0bf87c91c398d0ed3a8d9bf4e249f536d SHA1 e835b8c45207c2d5b4adba771f417104e4550152 SHA256 88bbd40ffefb37995fe159d9a4c2adcc728f5168aa62f0092245374db78bdcc8
diff --git a/net-fs/samba-server/files/3.4/lmhosts b/net-fs/samba-server/files/3.4/lmhosts
deleted file mode 100644
index 97e3cf2..0000000
--- a/net-fs/samba-server/files/3.4/lmhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.3/lmhosts,v 1.1 2009/06/26 20:24:11 patrick Exp $
-127.0.0.1 localhost
diff --git a/net-fs/samba-server/files/3.4/samba.confd b/net-fs/samba-server/files/3.4/samba.confd
deleted file mode 100644
index 6c9567b..0000000
--- a/net-fs/samba-server/files/3.4/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 --pidfile /var/run/samba/smbd.pid"
-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 --pidfile /var/run/samba/nmbd.pid"
-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 --oknodo --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba-server/files/3.4/samba.initd b/net-fs/samba-server/files/3.4/samba.initd
deleted file mode 100644
index 20cca9e..0000000
--- a/net-fs/samba-server/files/3.4/samba.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.3/samba.initd,v 1.1 2009/06/26 20:24:11 patrick Exp $
-
-opts="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}
-}
-start() {
-	${my_service_PRE}
-	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-server/files/3.4/smb.conf.default b/net-fs/samba-server/files/3.4/smb.conf.default
deleted file mode 100644
index 4c9a4a6..0000000
--- a/net-fs/samba-server/files/3.4/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-server/files/3.4/smbusers b/net-fs/samba-server/files/3.4/smbusers
deleted file mode 100644
index 5cf0a49..0000000
--- a/net-fs/samba-server/files/3.4/smbusers
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.3/smbusers,v 1.2 2009/09/15 15:41:22 vostorga Exp $
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
diff --git a/net-fs/samba-server/files/3.4/swat.xinetd b/net-fs/samba-server/files/3.4/swat.xinetd
deleted file mode 100644
index de6e993..0000000
--- a/net-fs/samba-server/files/3.4/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.
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-server/files/3.3/swat.xinetd,v 1.1 2009/06/26 20:24:11 patrick Exp $
-
-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-server/files/samba-3.4.2-add-zlib-linking.patch b/net-fs/samba-server/files/samba-3.4.2-add-zlib-linking.patch
deleted file mode 100644
index b04bca2..0000000
--- a/net-fs/samba-server/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
-@@ -1468,7 +1468,7 @@
- bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
- 	@echo Linking $@
- 	@$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
--		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
-+		$(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils -lz $(KRB5LIBS) \
- 		$(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
- 		$(LIBTDB_LIBS) $(NSCD_LIBS)
-
diff --git a/net-fs/samba-server/files/samba-3.4.2-fix-samba4-automake.patch b/net-fs/samba-server/files/samba-3.4.2-fix-samba4-automake.patch
deleted file mode 100644
index ade4da9..0000000
--- a/net-fs/samba-server/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-server/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch b/net-fs/samba-server/files/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch
deleted file mode 100644
index 8a84921..0000000
--- a/net-fs/samba-server/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-server/files/samba-3.4.2-lib.tevent.python.mk b/net-fs/samba-server/files/samba-3.4.2-lib.tevent.python.mk
deleted file mode 100644
index 3a03755..0000000
--- a/net-fs/samba-server/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-server/files/samba-3.4.2-missing_includes.patch b/net-fs/samba-server/files/samba-3.4.2-missing_includes.patch
deleted file mode 100644
index be26fa0..0000000
--- a/net-fs/samba-server/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-server/files/samba-3.4.2-upgrade-tevent-version.patch b/net-fs/samba-server/files/samba-3.4.2-upgrade-tevent-version.patch
deleted file mode 100644
index 5a614c6..0000000
--- a/net-fs/samba-server/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-server/samba-server-3.4.2.ebuild b/net-fs/samba-server/samba-server-3.4.2.ebuild
deleted file mode 100644
index b3348f9..0000000
--- a/net-fs/samba-server/samba-server-3.4.2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_P="samba-${PV}"
-
-DESCRIPTION="samba-server"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="samba4 acl ads aio avahi caps cluster cups debug doc examples fam ldap quota swat syslog winbind zeroconf"
-
-DEPEND="!<net-fs/samba-3.3
-	ads? ( virtual/krb5 sys-fs/e2fsprogs net-fs/samba-libs[ads] )
-	dev-libs/popt
-	virtual/libiconv
-	avahi? ( net-dns/avahi )
-	zeroconf? ( !avahi? ( || ( 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 )
-	virtual/tdb
-	virtual/talloc
-	net-fs/samba-libs[caps?,cluster?,cups?,ldap?,syslog?,winbind?,ads?,samba4?]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source3"
-
-RESTRICT="test"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-SBINPROGS="bin/smbd bin/nmbd"
-BINPROGS="bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-	bin/profiles bin/sharesec
-	bin/eventlogadm bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"
-
-pkg_setup() {
-	confutils_use_depend_all ads ldap
-}
-
-src_prepare() {
-
-	cd ".."
-
-	epatch \
-		"${FILESDIR}/samba-3.4.2-missing_includes.patch" \
-		"${FILESDIR}/samba-3.4.2-add-zlib-linking.patch" \
-		"${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \
-		"${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.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"
-
-#	sed -i \
-#		-e 's|@LIBTALLOC_SHARED@||g' \
-#		-e 's|@LIBTDB_SHARED@||g' \
-#		-e 's|@LIBWBCLIENT_SHARED@||g' \
-#		-e 's|@LIBNETAPI_SHARED@||g' \
-#		-e 's|$(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ)|$(REG_SMBCONF_OBJ) @LIBNETAPI_LIBS@ $(LIBNET_OBJ)|' \
-#		Makefile.in || die "sed failed"
-
-	./autogen.sh || die "autogen.sh failed"
-
-#	sed -i \
-#		-e 's|"lib32" ||' \
-#		-e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
-#		configure || die "sed failed"
-
-	# Upstream doesn't want us to link certain things dynamically, but those binaries here seem to work
-#	sed -i \
-#		-e '/^LINK_LIBNETAPI/d' \
-#		configure || die "sed failed"
-
-}
-
-src_configure() {
-	local myconf
-
-	# compile franky samba4 hybrid
-	# http://wiki.samba.org/index.php/Franky
-	if use samba4 ; then
-		if ! use ads; then
-			# samba will not compile if ads use flag is not set
-			die "ads use flag must be enabled to compile franky samba4 hybrid"
-		else
-			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
-	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
-	use caps && export ac_cv_header_sys_capability_h=yes
-
-	local dnssd="--disable-dnssd"
-	use zeroconf && ! use avahi && dnssd="--enable-dnssd"
-
-	# 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
-
-	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) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		${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 \
-		--without-cifsmount \
-		--without-cifsupcall \
-		--without-pam \
-		--without-pam_smbpass \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \
-		--without-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)
-
-	use swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
-
-	use winbind && BINPROGS="${BINPROGS} bin/wbinfo"
-}
-
-src_compile() {
-	emake ${SBINPROGS} || die "building server binaries failed"
-	emake modules || die "building modules failed"
-	emake ${BINPROGS} || die "building binaries failed"
-}
-
-src_install() {
-	dosbin ${SBINPROGS} || die "installing server binaries failed"
-
-	emake DESTDIR="${D}" installmodules || die "installing modules failed"
-
-	dobin ${BINPROGS} || die "installing binaries failed"
-
-	for prog in ${BINPROGS} ${SBINPROGS} ; do
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	doman ../docs/manpages/vfs* ../docs/manpages/samba.7 ../docs/manpages/smb.conf.5
-
-	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,smb.conf.default}
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	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
-	fi
-
-	dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	if use examples ; then
-		cd ../examples
-		insinto /usr/share/doc/${PF}/examples
-		doins -r \
-			auth autofs dce-dfs LDAP logon misc pdb perfcounter \
-			printer-accounting printing scripts tridge validchars VFS
-	fi
-}
diff --git a/net-fs/samba/samba-3.4.2.ebuild b/net-fs/samba/samba-3.4.2.ebuild
deleted file mode 100644
index f3c2c28..0000000
--- a/net-fs/samba/samba-3.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="Meta package for samba-{libs,client,server}"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="+client +server"
-
-DEPEND=""
-RDEPEND="~net-fs/samba-libs-${PV}
-	client? ( ~net-fs/samba-client-${PV} )
-	server? ( ~net-fs/samba-server-${PV} )"