some old ebuild cleanup

16 files changed, 66 insertions, 2409 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 7c97ac1facd9..e550067e2e04 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.107 2004/09/13 12:42:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.108 2004/09/14 08:51:49 satya Exp $
+
+  14 Sep 2004; Christian Andreetta <satya@gentoo.org>
+  +files/samba-3.0.x-libdirsymlink.patch, -samba-3.0.1-r1.ebuild,
+  -samba-3.0.2a-r2.ebuild, -samba-3.0.4-r1.ebuild, -samba-3.0.6-r1.ebuild,
+  -samba-3.0.6-r2.ebuild, -samba-3.0.6.ebuild, samba-3.0.7.ebuild:
+  some old files cleanup
 
 *samba-3.0.7 (13 Sep 2004)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 2454e7aad9be..51acb643de48 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,69 +1,60 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2e75c4d509bf879e63c93a5263d5ef00 ChangeLog 20472
-MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 MD5 7d7c900829bc2bdf39895d5890a0d20d samba-3.0.4-r1.ebuild 11146
-MD5 3351b25b7b1bd6afa22023463a51ceb8 samba-3.0.5-r1.ebuild 13685
-MD5 4505c7b9cd715168b75a4dfb5c4ac294 samba-3.0.5.ebuild 11142
-MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
+MD5 55c08f2d48b50d7af452664decd8793a samba-3.0.6-r2.ebuild 13989
+MD5 5ff056e7ae6eec956a55bc0f8c2e5568 samba-3.0.7.ebuild 13956
+MD5 64a8650d49c3501b083cb53d6cfe948f samba-3.0.6-r4.ebuild 14236
 MD5 b8ef78eeab7e9982b8c3459e1792747f samba-3.0.6-r1.ebuild 13867
-MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
 MD5 045d2504d92e3846f34e35c094721c44 samba-3.0.6.ebuild 13730
-MD5 55c08f2d48b50d7af452664decd8793a samba-3.0.6-r2.ebuild 13989
 MD5 fb357b885ebd5c7e7c6093156812efb1 samba-3.0.6-r3.ebuild 14194
-MD5 64a8650d49c3501b083cb53d6cfe948f samba-3.0.6-r4.ebuild 14236
-MD5 86dda1d65375d25ef277d61d8ab46e3d samba-3.0.7.ebuild 13956
+MD5 3351b25b7b1bd6afa22023463a51ceb8 samba-3.0.5-r1.ebuild 13685
+MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
+MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
+MD5 2e75c4d509bf879e63c93a5263d5ef00 ChangeLog 20472
+MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 4505c7b9cd715168b75a4dfb5c4ac294 samba-3.0.5.ebuild 11142
+MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
+MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
+MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
+MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
+MD5 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
+MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
-MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
-MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
-MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.x-python-setup.patch 833
 MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
-MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
-MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
-MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
-MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
+MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
 MD5 43a38a5331805a2fa61e899f18413ccd files/digest-samba-3.0.5 203
-MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.x-python-setup.patch 833
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6 203
+MD5 956ad7dcaf3a4ad60b7e49110cbbce8b files/digest-samba-3.0.7 203
+MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
+MD5 2539fea7a9f177544b05ee84f7dac0e2 files/smb.conf.example-samba3.gz 7840
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
+MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
+MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
+MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r1 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r2 203
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r3 203
-MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
-MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r4 203
-MD5 2539fea7a9f177544b05ee84f7dac0e2 files/smb.conf.example-samba3.gz 7840
+MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
+MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
+MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
-MD5 956ad7dcaf3a4ad60b7e49110cbbce8b files/digest-samba-3.0.7 203
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBRfKSHTu7gpaalycRAq5+AKCVYXkcz+nZrzZd38yNr4Upj8rUQgCgpphj
-8MyN3CXlvr3s3mnX6MrIEUY=
-=SLss
------END PGP SIGNATURE-----
+MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/files/digest-samba-3.0.1-r1 b/net-fs/samba/files/digest-samba-3.0.1-r1
deleted file mode 100644
index 37ce22efcace..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a3d494f139ab7402d8902b0e68c463f samba-3.0.1.tar.bz2 8303432
-MD5 acbcb28cff080dcf2ee732b7f2c0f949 samba-vscan-0.3.4.tar.bz2 131027
-MD5 3998eddca7110a98c99f06210e295b84 smbldap-tools-0.8.2.tgz 57571
diff --git a/net-fs/samba/files/digest-samba-3.0.2a-r2 b/net-fs/samba/files/digest-samba-3.0.2a-r2
deleted file mode 100644
index ba769c6c988e..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.2a-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72979a30ac450c8b0567c1ac9886884a samba-3.0.2a.tar.bz2 9289178
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 34ef159fc49a2c30ff27b481dc8e1215 smbldap-tools-0.8.4.tgz 286290
diff --git a/net-fs/samba/files/digest-samba-3.0.4-r1 b/net-fs/samba/files/digest-samba-3.0.4-r1
deleted file mode 100644
index ca2f2b880262..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0156265c1e95ac662deef386f615504f samba-3.0.4.tar.gz 15046252
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 34ef159fc49a2c30ff27b481dc8e1215 smbldap-tools-0.8.4.tgz 286290
diff --git a/net-fs/samba/files/digest-samba-3.0.6 b/net-fs/samba/files/digest-samba-3.0.6
deleted file mode 100644
index 670161d9a3d8..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8dc06e2bcf63513c2e8d849f6352d8a samba-3.0.6.tar.gz 14947376
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 4bfa0e5328b8420b98d91a046117b7c5 smbldap-tools-0.8.5.tgz 269327
diff --git a/net-fs/samba/files/digest-samba-3.0.6-r1 b/net-fs/samba/files/digest-samba-3.0.6-r1
deleted file mode 100644
index 670161d9a3d8..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8dc06e2bcf63513c2e8d849f6352d8a samba-3.0.6.tar.gz 14947376
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 4bfa0e5328b8420b98d91a046117b7c5 smbldap-tools-0.8.5.tgz 269327
diff --git a/net-fs/samba/files/digest-samba-3.0.6-r2 b/net-fs/samba/files/digest-samba-3.0.6-r2
deleted file mode 100644
index 670161d9a3d8..000000000000
--- a/net-fs/samba/files/digest-samba-3.0.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c8dc06e2bcf63513c2e8d849f6352d8a samba-3.0.6.tar.gz 14947376
-MD5 5f173d549014985d681478897135915b samba-vscan-0.3.5.tar.bz2 161982
-MD5 4bfa0e5328b8420b98d91a046117b7c5 smbldap-tools-0.8.5.tgz 269327
diff --git a/net-fs/samba/files/samba-3.0.x-libdirsymlink.patch b/net-fs/samba/files/samba-3.0.x-libdirsymlink.patch
new file mode 100644
index 000000000000..ecdc0851e264
--- /dev/null
+++ b/net-fs/samba/files/samba-3.0.x-libdirsymlink.patch
@@ -0,0 +1,13 @@
+--- source/configure.in.old	2004-09-09 11:33:06.218241792 +0200
++++ source/configure.in	2004-09-09 11:37:09.844205016 +0200
+@@ -1708,8 +1708,8 @@
+ dnl succeed when the header is found. To counter this, make sure the 
+ dnl library directory is there and check the ABI directory first (which
+ dnl should be harmless on other systems.
+-    for l in "lib32" "lib" ; do
+-        if test -d "$i/$l" ; then
++    for l in "lib" ; do
++        if test -d "$i/$l" -o -L "$i/$l" ; then
+                 LDFLAGS="$save_LDFLAGS -L$i/$l"
+                 LIBS=
+                 export LDFLAGS LIBS CPPFLAGS
diff --git a/net-fs/samba/samba-3.0.1-r1.ebuild b/net-fs/samba/samba-3.0.1-r1.ebuild
deleted file mode 100644
index 9373f7072712..000000000000
--- a/net-fs/samba/samba-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,417 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.1-r1.ebuild,v 1.8 2004/06/24 22:43:47 agriffis Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-
-SMBLDAP_TOOLS_VER=0.8.2
-VSCAN_VER=0.3.4
-VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap clamav} #kapersky
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	kerberos? ( app-crypt/mit-krb5 )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-KEYWORDS="~x86 ppc ~sparc ~mips ~hppa ~amd64 ia64 ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" -o "${ARCH}" = "ppc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	#Bug #36200; sys-kernel/linux-headers dependent
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		${S}/source/smbd/quotas.c
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin
-	cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav
-	then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} \
-			${S}/examples.bin/VFS
-	fi
-
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-
-	myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam" 
-		myconf="${myconf} --without-ldapsam"
-
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use kerberos \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/                CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/                    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--libdir=/usr/lib/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-lockdir=/var/cache/samba \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		\
-		--enable-static --enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	make rpctorture || ewarn "rpctorture didnt build"
-
-	# Build selected samba-vscan plugins.
-	if use oav
-	then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-
-		for i in ${VSCAN_MODS}
-		do
-			cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/$i
-			make USE_INCLMKSDLIB=1 #needed for the mks build
-			assert "problem building $i vscan module"
-		done
-	fi
-
-	# Build mkntpasswd from the smbldap-tools.
-	if use ldap
-	then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		tar --no-same-owner -zxf mkntpwd.tar.gz
-		cd mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-
-	# Build mount.cifs
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-}
-
-src_install() {
-# For testing brokeness of make install
-#	cd source
-#	make DESTDIR=${D} install installmodules install_python
-#	assert "It would be nice if that just worked."
-
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit \
-		smbpasswd rpcclient smbcacls profiles ntlm_auth \
-		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort mount.cifs #smbsh editreg
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	doexe source/script/{smbtar,findsmb}
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs.
-	fperms 4111 /usr/bin/smbumount
-	fperms 4111 /usr/bin/smbmnt
-	fperms 4111 /usr/bin/mount.cifs
-
-	# Install server binaries.
-	for i in smbd nmbd swat winbindd # wrepld
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-	# Python extensions.
-	if use python
-	then
-		cd source
-		python python/setup.py install --root=${D} || die
-		cd ..
-	fi
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	if use oav
-	then
-		doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/*/vscan-*.so
-	fi
-	for i in audit cap default_quota extd_audit fake_perms \
-		netatalk readonly recycle
-	do
-		if [ -x source/bin/${i}.so ]
-		then
-			doexe source/bin/${i}.so
-		fi
-	done
-
-	# Passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/mysql.so
-	use xml && doexe source/bin/xml.so
-
-	# Install codepage data files.
-	insinto /usr/lib/samba
-	doins source/codepages/*.dat
-
-	# Install SWAT helper files.
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-	# Install IDEALX scripts for LDAP backend administration.
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts ; doexe smbldap-*.pl
-		exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		insinto /etc/samba ; doins smbldap_conf.pm
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		cd ${S}
-	fi
-
-	# Install man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	#
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-		cd ${S}
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Now the config files.
-	insinto /etc
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/samba-init samba
-	newexe ${FILESDIR}/winbind-init winbind
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba3
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-}
diff --git a/net-fs/samba/samba-3.0.2a-r2.ebuild b/net-fs/samba/samba-3.0.2a-r2.ebuild
deleted file mode 100644
index cfda6b463d1e..000000000000
--- a/net-fs/samba/samba-3.0.2a-r2.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a-r2.ebuild,v 1.14 2004/06/24 22:43:47 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php"
-
-SMBLDAP_TOOLS_VER=0.8.4
-VSCAN_VER=0.3.5
-# To build the "kapersky" plugin, the kapersky lib must be installed.
-VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai"
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ~ia64 s390"
-IUSE="kerberos mysql xml acl cups ldap pam readline python"
-IUSE="${IUSE} oav"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? ( sys-libs/readline )
-	!arm? ( ldap? ( kerberos? ( app-crypt/mit-krb5 ) ) )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? ( sys-apps/acl )
-	cups? ( net-print/cups )
-	ldap? ( net-nds/openldap )
-	pam? ( sys-libs/pam )
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? ( dev-perl/perl-ldap ) ${_COMMON_DEPS}"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" -o "${ARCH}" = "ppc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	# bug 45965; smbprint tmpfile vulnerability
-	# NOTE that this should be removed for Samba 3.0.3, as it will be included
-	# in that release.
-	# Additional Note: Make sure w're in ${S} before patching.
-	cd ${S}
-	epatch ${FILESDIR}/samba-3.0.2a-smbprint.patch
-
-	#Bug #36200; sys-kernel/linux-headers dependent
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin
-	cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	if use oav
-	then
-		cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} \
-			${S}/examples.bin/VFS
-	fi
-
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-
-	myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-		#this is for old samba 2.x compat
-		#myconf="${myconf} --with-ldapsam"
-		myconf="${myconf} --without-ldapsam"
-
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use kerberos && use ldap \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/		CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/		    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		--libdir=/usr/lib/samba \
-		--with-privatedir=/etc/samba/private \
-		--with-lockdir=/var/cache/samba \
-		--with-piddir=/var/run/samba \
-		--with-swatdir=/usr/share/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		\
-		--enable-static --enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} ${myconf} || die
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	make rpctorture || ewarn "rpctorture didnt build"
-
-	# Build selected samba-vscan plugins.
-	if use oav
-	then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		# as per bug #52009
-		make ${VSCAN_MODS}
-	fi
-
-	# Build mkntpasswd from the smbldap-tools.
-	if use ldap
-	then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		tar --no-same-owner -zxf mkntpwd.tar.gz
-		cd mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-
-	# Build mount.cifs
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-}
-
-src_install() {
-# For testing brokeness of make install
-#	cd source
-#	make DESTDIR=${D} install installmodules install_python
-#	assert "It would be nice if that just worked."
-
-	# Install standard binary files.
-	for i in smbclient net smbspool testparm testprns smbstatus \
-		smbcontrol smbtree tdbbackup nmblookup pdbedit \
-		smbpasswd rpcclient smbcacls profiles ntlm_auth \
-		smbcquotas smbmount smbmnt smbumount wbinfo \
-		debug2html smbfilter talloctort mount.cifs #smbsh editreg
-	do
-		exeinto /usr/bin
-		doexe source/bin/${i}
-	done
-	doexe source/script/{smbtar,findsmb}
-
-	# TORTURE_PROGS / Testing stuff, if they built they will come.
-	for i in smbtorture msgtest masktest locktest locktest2 \
-		nsstest vfstest rpctorture
-	do
-		if [ -x source/bin/${i} ]
-		then
-			exeinto /usr/bin
-			doexe source/bin/${i}
-		fi
-	done
-
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs.
-	fperms 4111 /usr/bin/smbumount
-	fperms 4111 /usr/bin/smbmnt
-	fperms 4111 /usr/bin/mount.cifs
-
-	# Install server binaries.
-	for i in smbd nmbd swat winbindd # wrepld
-	do
-		exeinto /usr/sbin
-		doexe source/bin/${i}
-	done
-
-	# Libraries.
-	exeinto /usr/lib
-	#broken for a while now with some wacky glibc issue
-	#doexe source/bin/smbwrapper.so
-	doexe source/bin/libsmbclient.so
-	insinto /usr/lib
-	doins source/bin/libsmbclient.a
-	insinto /usr/include
-	doins source/include/libsmbclient.h
-	exeinto /lib/security
-	doexe source/nsswitch/pam_winbind.so
-	use pam && doexe source/bin/pam_smbpass.so
-
-	# Nsswitch extensions.
-	for i in wins winbind
-	do
-		exeinto /lib
-		doexe source/nsswitch/libnss_${i}.so
-	done
-	# make link for wins and winbind resolvers..
-	( cd ${D}/lib ; ln -s libnss_wins.so libnss_wins.so.2 )
-	( cd ${D}/lib ; ln -s libnss_winbind.so libnss_winbind.so.2 )
-
-	# Python extensions.
-	if use python
-	then
-		cd source
-		python python/setup.py install --root=${D} || die
-		cd ..
-	fi
-
-	# VFS plugin modules.
-	exeinto /usr/lib/samba/vfs
-	if use oav
-	then
-		doexe examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
-	fi
-	for i in audit cap default_quota extd_audit fake_perms \
-		netatalk readonly recycle
-	do
-		if [ -x source/bin/${i}.so ]
-		then
-			doexe source/bin/${i}.so
-		fi
-	done
-
-	# Passdb modules.
-	exeinto /usr/lib/samba/pdb
-	use mysql && doexe source/bin/mysql.so
-	use xml && doexe source/bin/xml.so
-
-	# Install codepage data files.
-	insinto /usr/lib/samba
-	doins source/codepages/*.dat
-
-	# Install SWAT helper files.
-	for i in swat/help/*.html docs/htmldocs/*.html
-	do
-		insinto /usr/share/swat/help
-		doins ${i}
-	done
-	for i in swat/images/*.gif
-	do
-		insinto /usr/share/swat/images
-		doins ${i}
-	done
-	for i in swat/include/*.html
-	do
-		insinto /usr/share/swat/include
-		doins ${i}
-	done
-
-	# Install IDEALX scripts for LDAP backend administration.
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts ; doexe smbldap-*.pl
-		exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		insinto /etc/samba ; doins smbldap_conf.pm
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		cd ${S}
-	fi
-
-	# Install man pages.
-	doman docs/manpages/*
-
-	# SAMBA has a lot of docs, so this just basically
-	# installs them all!  We don't want two copies of
-	# the book or manpages though, so:
-	rm -rf docs/htmldocs/using_samba docs/manpages
-	#
-	dodoc COPYING Manifest README Roadmap WHATSNEW.txt
-	docinto full_docs
-	cp -a docs/* ${D}/usr/share/doc/${PF}/full_docs
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a examples/* ${D}/usr/share/doc/${PF}/examples
-	prepalldocs
-	# and we should unzip the html docs..
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/faq/*
-	gunzip ${D}/usr/share/doc/${PF}/full_docs/htmldocs/*
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-		cd ${S}
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-		cd ${S}
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-	dosym /usr/bin/mount.cifs /sbin/mount.cifs #see bug #53236
-
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Now the config files.
-	insinto /etc
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-
-	#2004-06-15: satya@gentoo.org: changed invocation method
-	#exeinto /etc/init.d
-	#newexe ${FILESDIR}/samba-init samba
-	#newexe ${FILESDIR}/winbind-init winbind
-	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
-	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	if [ ! -e ${ROOT}/etc/samba/smb.conf ] ; then
-		touch ${ROOT}/etc/samba/smb.conf
-	fi
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba3
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "attribute on all accounts, and ensure it is not 0."
-		ewarn ""
-	fi
-}
diff --git a/net-fs/samba/samba-3.0.4-r1.ebuild b/net-fs/samba/samba-3.0.4-r1.ebuild
deleted file mode 100644
index c4af3ba898a0..000000000000
--- a/net-fs/samba/samba-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.4-r1.ebuild,v 1.10 2004/07/13 23:39:23 kloeri Exp $
-
-inherit eutils
-
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php
-	http://samba.idealx.org"
-
-SMBLDAP_TOOLS_VER=0.8.4
-VSCAN_VER=0.3.5
-VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai"
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	ldap? ( kerberos? ( virtual/krb5 ) )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	postgres? ( dev-db/postgresql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	xml2? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? net-nds/openldap
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-KEYWORDS="x86 ~ppc sparc ~mips hppa ~amd64 ~ia64 alpha ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Clean up CVS
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-
-	# Add patch(es)
-	# This patchset fixes Samba bugs #1315, #1319 and #1345
-	# courtesy of Gerald Carter (jerry@samba.org)
-	epatch ${FILESDIR}/samba-3.0.4.patch
-
-	#Next one is from eger@cc.gatech.edu :)
-	epatch ${FILESDIR}/samba-3.0.4-python-setup.patch || die
-	#Fix for bug #27858
-	if [ "${ARCH}" = "sparc" -o "${ARCH}" = "ppc" ]
-	then
-		cd ${S}/source/include
-		epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	#Bug #36200; sys-kernel/linux-headers dependent
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-
-	# For clean docs packaging sake.
-	rm -rf ${S}/examples.bin
-	cp -a ${S}/examples ${S}/examples.bin
-
-	# Prep samba-vscan source.
-	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples.bin/VFS
-
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-
-	#this is deprecated...
-	#mymods="nisplussam"
-	use xml || use xml2 && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-
-	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
-
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-	#this is for old samba 2.x compat
-	#myconf="${myconf} --with-ldapsam"
-	myconf="${myconf} --without-ldapsam"
-
-	if [ "${ARCH}" != "amd64" ]
-	then
-		use kerberos && use ldap \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-
-	einfo "\$myconf is: $myconf"
-
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/		CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/		    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-
-	cd source
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--localstatedir=/var \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--sysconfdir=/etc/samba \
-		--with-configdir=/etc/samba \
-		--with-privatedir=/etc/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-
-	# Show install dirs
-	einfo "Dir conf:"
-	make showlayout
-
-	# Subshell make: some headers are to be compiled in sequence even for a 
-	# parallel make
-	make proto
-
-	# Compile main SAMBA pieces.
-	make everything || die "SAMBA pieces"
-	make rpctorture || ewarn "rpctorture didnt build"
-
-	# Build mount.cifs
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-	# build smbget
-	make bin/smbget; assert "smbget compile error"
-
-	# Build selected samba-vscan plugins.
-	if use oav
-	then
-		cd ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		# Do not use the Makefiles in the sub directories, use the Makefile
-		# generated by .configure in the top-level samba-vscan directory
-		# - suggested by Rainer Link, samba-vscan maintainer
-		make ${VSCAN_MODS}
-	fi
-
-	# Build mkntpasswd from the smbldap-tools.
-	if use ldap
-	then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		tar --no-same-owner -zxf mkntpwd.tar.gz
-		cd mkntpwd
-		VISUAL="" make || die "mkntpwd compile problem"
-	fi
-}
-
-src_install() {
-	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
-	#smbsh editreg
-	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
-		locktest2 nsstest vfstest rpctorture"
-
-	cd ${S}/source
-	make DESTDIR=${D} install-everything
-
-	# Extra binary files, testing/torture progs
-	exeinto /usr/bin
-	for i in ${extra_bins}
-	do
-		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
-		einfo "Extra binaries: ${i}"
-	done
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs.
-	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs
-	do
-		fperms 4111 ${i}
-		einfo "suid: ${i}"
-	done
-	# Nsswitch extensions. Make link for wins and winbind resolvers.
-	exeinto /lib
-	for i in wins winbind
-	do
-		doexe ${S}/source/nsswitch/libnss_${i}.so
-		( cd ${D}/lib; ln -s libnss_${i}.so libnss_${i}.so.2 )
-	done
-	exeinto /lib/security
-	doexe ${S}/source/nsswitch/pam_winbind.so
-	use pam && doexe ${S}/source/bin/pam_smbpass.so
-
-	# Links
-	# link /usr/bin/smbmount to /sbin/mount.smbfs which allows it
-	# to work transparently with the standard 'mount' command..
-	dodir /sbin
-	dosym /usr/bin/smbmount /sbin/mount.smbfs
-	dosym /usr/bin/mount.cifs /sbin/mount.cifs
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-
-	# Install IDEALX scripts for LDAP backend administration.
-	if use ldap; then
-		# corrections as per bug #41796
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts ; doexe smbldap-*
-		exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		insinto /etc/smbldap-tools ; doins *.conf
-		fperms 644 /etc/smbldap-tools/smbldap.conf
-		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-	fi
-
-	# VFS plugin modules
-	if use oav
-	then
-		exeinto /usr/lib/vfs
-		doexe ${S}/examples.bin/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
-	fi
-
-	# Python extensions.
-	if use python
-	then
-		cd ${S}/source
-		python python/setup.py install --root=${D} || die
-	fi
-
-	# General config files.
-	insinto /etc
-	insinto /etc/samba
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
-	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S}/examples/LDAP/samba.schema
-	fi
-
-	# Docs
-	docinto ""
-	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a ${S}/examples/* ${D}/usr/share/doc/${PF}/examples
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-	fi
-	if ! use doc; then
-		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-
-	# moving manpages
-	mv ${D}/usr/man ${D}/usr/share/man
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
-
-	# empty dirs..
-	install -m0700 -o root -g root -d ${ROOT}/etc/samba/private
-	install -m1777 -o root -g root -d ${ROOT}/var/spool/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/log/samba3
-	install -m0755 -o root -g root -d ${ROOT}/var/run/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/cache/samba
-	install -m0755 -o root -g root -d ${ROOT}/var/lib/samba/{netlogon,profiles}
-	install -m0755 -o root -g root -d \
-		${ROOT}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "attribute on all accounts, and ensure it is not 0."
-		einfo ""
-		einfo "WARNING: the smbldap-tools conf file location has changed to"
-		einfo " /etc/smbldap-tools"
-		einfo "reconfiguration will be necessary."
-		einfo ""
-		einfo "WARNING: the names of the scripts in /usr/shared/samba/scripts"
-		einfo "have changed. Please update your /etc/samba/smb.conf."
-		einfo ""
-	fi
-}
diff --git a/net-fs/samba/samba-3.0.6-r1.ebuild b/net-fs/samba/samba-3.0.6-r1.ebuild
deleted file mode 100644
index 7f160e8d6bda..000000000000
--- a/net-fs/samba/samba-3.0.6-r1.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.6-r1.ebuild,v 1.2 2004/08/22 01:45:47 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php
-	http://samba.idealx.org"
-
-SMBLDAP_TOOLS_VER=0.8.5
-VSCAN_VER=0.3.5
-# all vscan modules are being installed
-#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	ldap? ( kerberos? ( virtual/krb5 ) )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	postgres? ( dev-db/postgresql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	xml2? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash )
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-# some archs are removed due to dependency tree integrity for ldap and
-#   dev-perl/Crypt-SmbHash flags
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~x86 ~sparc ~mips ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-	# Clean up CVS ---------------------------------------------------------
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-	# Add patch(es) --------------------------------------------------------
-	# This patchset fixes Samba bugs #1315, #1319 and #1345
-	# courtesy of Gerald Carter (jerry@samba.org)
-	# they are hopefully fixed in this version !
-	# epatch ${FILESDIR}/samba-3.0.x.patch
-	#Next one is from eger@cc.gatech.edu
-	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
-	#bug #44743 ------------------------------------------------------------
-	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
-	fi
-	#Fix for bug #27858 ----------------------------------------------------
-	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-	# examples: to be copied as docs ---------------------------------------
-	rm -rf ${S}/examples.ORIG
-	cp -a ${S}/examples ${S}/examples.ORIG
-	# Prep samba-vscan source.
-	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-	#mymods="nisplussam" #this is deprecated...
-	#-----------------------------------------------------------------------
-	use xml || use xml2 && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-	#this is for old samba 2.x compat
-	#myconf="${myconf} --with-ldapsam"
-	myconf="${myconf} --without-ldapsam"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#Fix #57063 ------------------------------------------------------------
-	# too cautious for some archs: maybe -O2 is sufficient on some of them
-	strip-flags
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]; then
-		replace-flags -O? -O1
-	else
-		replace-flags -O? -O1
-	fi
-	#-----------------------------------------------------------------------
-	if [ "${ARCH}" != "amd64" ]; then
-		use kerberos && use ldap \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/		CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/		    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS CFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib/samba \
-		--with-libdir=/usr/lib/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--localstatedir=/var \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--sysconfdir=/etc/samba \
-		--with-configdir=/etc/samba \
-		--with-privatedir=/etc/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	make showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-	# Compile main SAMBA pieces --------------------------------------------
-	einfo "make everything" && emake everything || die "SAMBA make everything error"
-	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
-	# Build mount.cifs -----------------------------------------------------
-	einfo "mount.cifs"
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-	# build smbget ---------------------------------------------------------
-	einfo "smbget"
-	emake bin/smbget; assert "smbget compile error"
-	# Build selected samba-vscan plugins -----------------------------------
-	if use oav; then
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure --prefix=/usr --libdir=/usr/lib/samba
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake #${VSCAN_MODS}
-	fi
-	# Build mkntpasswd from the smbldap-tools ------------------------------
-	# Attention: usage of dev-perl/Crypt-SmbHash for smbldap-tool > 0.8.5
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		if [ -f mkntpwd.tar.gz ]; then
-			tar --no-same-owner -zxf mkntpwd.tar.gz
-			cd mkntpwd
-			VISUAL="" make || die "mkntpwd compile problem"
-		fi
-	fi
-}
-
-src_install() {
-	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
-	#smbsh editreg
-	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
-		locktest2 nsstest vfstest rpctorture"
-	# ----------------------------------------------------------------------
-	cd ${S}/source
-	make DESTDIR=${D} install-everything
-	# Extra binary files, testing/torture progs ----------------------------
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
-		einfo "Extra binaries: ${i}"
-	done
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
-	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
-		fperms 4111 ${i} || die "No perms: ${i}"
-		einfo "suid: ${i}"
-	done
-	# Nsswitch extensions. Make link for wins and winbind resolvers --------
-	exeinto /lib
-	for i in wins winbind; do
-		doexe ${S}/source/nsswitch/libnss_${i}.so
-		( cd ${D}/lib; ln -s libnss_${i}.so libnss_${i}.so.2 )
-	done
-	exeinto /lib/security
-	doexe ${S}/source/nsswitch/pam_winbind.so
-	use pam && doexe ${S}/source/bin/pam_smbpass.so
-	# mount backend --------------------------------------------------------
-	dodir /sbin
-	dosym ../usr/bin/smbmount /sbin/mount.smbfs
-	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046 
-	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0
-	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-	# Install IDEALX scripts for LDAP backend administration ---------------
-	if use ldap; then
-		# corrections as per bug #41796
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts; doexe smbldap-*
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		insinto /etc/smbldap-tools ; doins *.conf
-		fperms 644 /etc/smbldap-tools/smbldap.conf
-		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		if [ -f mkntpwd/mkntpwd ]; then
-			exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		fi
-	fi
-	# VFS plugin modules ---------------------------------------------------
-	if use oav; then
-		#exeinto /usr/lib/samba/vfs
-		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
-	fi
-	# Python extensions ----------------------------------------------------
-	if use python; then
-		cd ${S}/source
-		python python/setup.py install --root=${D} || die
-	fi
-	# General config files -------------------------------------------------
-	insinto /etc/samba
-	touch ${D}/etc/samba/smb.conf
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
-	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S}/examples/LDAP/samba.schema
-	fi
-	# dirs -----------------------------------------------------------------
-	diropts -m0700
-	dodir /etc/samba/private
-	touch ${D}/etc/samba/private/.keep
-	diropts -m1777
-	dodir /var/spool/samba
-	touch ${D}/var/spool/samba/.keep
-	diropts -m0755
-	dodir /var/{log,run,cache}/samba
-	dodir /var/lib/samba/{netlogon,profiles}
-	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	touch ${D}/var/{log,run,cache}/samba/.keep
-	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
-	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
-	# docs -----------------------------------------------------------------
-	docinto ""
-	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-	fi
-	if ! use doc; then
-		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-	# moving manpages ------------------------------------------------------
-	mv ${D}/usr/man ${D}/usr/share/man
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
-
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	ewarn "LIBs location change: /usr/lib/samba/*"
-	ewarn "   (due to ldap/vfs external tools assumptions)"
-	ewarn ""
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "    attribute on all accounts, and ensure it is not 0."
-		einfo "WARNING: smbldap-tools changes"
-		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "    /usr/shared/samba/scripts: some script names changed"
-		einfo "    dev-perl/Crypt-SmbHash: new pwd hash validation/conversion system"
-		einfo ""
-	fi
-}
-
diff --git a/net-fs/samba/samba-3.0.6-r2.ebuild b/net-fs/samba/samba-3.0.6-r2.ebuild
deleted file mode 100644
index 03d31168dd78..000000000000
--- a/net-fs/samba/samba-3.0.6-r2.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.6-r2.ebuild,v 1.1 2004/08/26 09:23:00 mglauche Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php
-	http://samba.idealx.org"
-
-SMBLDAP_TOOLS_VER=0.8.5
-VSCAN_VER=0.3.5
-# all vscan modules are being installed
-#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	ldap? ( kerberos? ( virtual/krb5 ) )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	postgres? ( dev-db/postgresql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	xml2? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash )
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-# some archs are removed due to dependency tree integrity for ldap and
-#   dev-perl/Crypt-SmbHash flags
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~x86 ~sparc ~mips ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-	# Clean up CVS ---------------------------------------------------------
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-	# Add patch(es) --------------------------------------------------------
-	# This patchset fixes Samba bugs #1315, #1319 and #1345
-	# courtesy of Gerald Carter (jerry@samba.org)
-	# they are hopefully fixed in this version !
-	# epatch ${FILESDIR}/samba-3.0.x.patch
-	#Next one is from eger@cc.gatech.edu
-	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
-	#bug #44743 ------------------------------------------------------------
-	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
-	fi
-	#Fix for bug #27858 ----------------------------------------------------
-	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-	#Bug 61055; ldap schema not correct in 3.0.6, will be fixed in 3.0.7 !
-	cp -a ${FILESDIR}/samba.schema ${S}/examples/LDAP/
-	# examples: to be copied as docs ---------------------------------------
-	rm -rf ${S}/examples.ORIG
-	cp -a ${S}/examples ${S}/examples.ORIG
-	# Prep samba-vscan source.
-	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-	#mymods="nisplussam" #this is deprecated...
-	#-----------------------------------------------------------------------
-	use xml || use xml2 && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-	#this is for old samba 2.x compat
-	#myconf="${myconf} --with-ldapsam"
-	myconf="${myconf} --without-ldapsam"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#Fix #57063 ------------------------------------------------------------
-	# too cautious for some archs: maybe -O2 is sufficient on some of them
-	strip-flags
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]; then
-		replace-flags -O? -O1
-	else
-		replace-flags -O? -O1
-	fi
-	#-----------------------------------------------------------------------
-	if [ "${ARCH}" != "amd64" ]; then
-		use kerberos && use ldap \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/		CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/		    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS CFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib/samba \
-		--with-libdir=/usr/lib/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--localstatedir=/var \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--sysconfdir=/etc/samba \
-		--with-configdir=/etc/samba \
-		--with-privatedir=/etc/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	make showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-	# Compile main SAMBA pieces --------------------------------------------
-	einfo "make everything" && emake everything || die "SAMBA make everything error"
-	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
-	# Build mount.cifs -----------------------------------------------------
-	einfo "mount.cifs"
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-	# build smbget ---------------------------------------------------------
-	einfo "smbget"
-	emake bin/smbget; assert "smbget compile error"
-	# Build selected samba-vscan plugins -----------------------------------
-	if use oav; then
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure --prefix=/usr --libdir=/usr/lib/samba
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake #${VSCAN_MODS}
-	fi
-	# Build mkntpasswd from the smbldap-tools ------------------------------
-	# Attention: usage of dev-perl/Crypt-SmbHash for smbldap-tool > 0.8.5
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		if [ -f mkntpwd.tar.gz ]; then
-			tar --no-same-owner -zxf mkntpwd.tar.gz
-			cd mkntpwd
-			VISUAL="" make || die "mkntpwd compile problem"
-		fi
-	fi
-}
-
-src_install() {
-	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
-	#smbsh editreg
-	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
-		locktest2 nsstest vfstest rpctorture"
-	# ----------------------------------------------------------------------
-	cd ${S}/source
-	make DESTDIR=${D} install-everything
-	# Extra binary files, testing/torture progs ----------------------------
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
-		einfo "Extra binaries: ${i}"
-	done
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
-	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
-		fperms 4111 ${i} || die "No perms: ${i}"
-		einfo "suid: ${i}"
-	done
-	# Nsswitch extensions. Make link for wins and winbind resolvers --------
-	exeinto /lib
-	for i in wins winbind; do
-		doexe ${S}/source/nsswitch/libnss_${i}.so
-		( cd ${D}/lib; ln -s libnss_${i}.so libnss_${i}.so.2 )
-	done
-	exeinto /lib/security
-	doexe ${S}/source/nsswitch/pam_winbind.so
-	use pam && doexe ${S}/source/bin/pam_smbpass.so
-	# mount backend --------------------------------------------------------
-	dodir /sbin
-	dosym ../usr/bin/smbmount /sbin/mount.smbfs
-	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	# bug #46389: samba doesn't create symlink anymore
-	# beaviour seems to be changed in 3.0.6, see bug #61046 
-	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so.0
-	dosym /usr/lib/samba/libsmbclient.so /usr/lib/libsmbclient.so
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-	# Install IDEALX scripts for LDAP backend administration ---------------
-	if use ldap; then
-		# corrections as per bug #41796
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts; doexe smbldap-*
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		insinto /etc/smbldap-tools ; doins *.conf
-		fperms 644 /etc/smbldap-tools/smbldap.conf
-		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		if [ -f mkntpwd/mkntpwd ]; then
-			exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		fi
-	fi
-	# VFS plugin modules ---------------------------------------------------
-	if use oav; then
-		#exeinto /usr/lib/samba/vfs
-		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
-	fi
-	# Python extensions ----------------------------------------------------
-	if use python; then
-		cd ${S}/source
-		python python/setup.py install --root=${D} || die
-	fi
-	# General config files -------------------------------------------------
-	insinto /etc/samba
-	touch ${D}/etc/samba/smb.conf
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
-	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S}/examples/LDAP/samba.schema
-	fi
-	# dirs -----------------------------------------------------------------
-	diropts -m0700
-	dodir /etc/samba/private
-	touch ${D}/etc/samba/private/.keep
-	diropts -m1777
-	dodir /var/spool/samba
-	touch ${D}/var/spool/samba/.keep
-	diropts -m0755
-	dodir /var/{log,run,cache}/samba
-	dodir /var/lib/samba/{netlogon,profiles}
-	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	touch ${D}/var/{log,run,cache}/samba/.keep
-	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
-	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
-	# docs -----------------------------------------------------------------
-	docinto ""
-	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-	fi
-	if ! use doc; then
-		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-	# moving manpages ------------------------------------------------------
-	mv ${D}/usr/man ${D}/usr/share/man
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
-
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	ewarn "LIBs location change: /usr/lib/samba/*"
-	ewarn "   (due to ldap/vfs external tools assumptions)"
-	ewarn ""
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "    attribute on all accounts, and ensure it is not 0."
-		einfo "WARNING: smbldap-tools changes"
-		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "    /usr/shared/samba/scripts: some script names changed"
-		einfo "    dev-perl/Crypt-SmbHash: new pwd hash validation/conversion system"
-		einfo ""
-	fi
-}
-
diff --git a/net-fs/samba/samba-3.0.6.ebuild b/net-fs/samba/samba-3.0.6.ebuild
deleted file mode 100644
index 10c402c5bad6..000000000000
--- a/net-fs/samba/samba-3.0.6.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.6.ebuild,v 1.2 2004/08/22 01:45:47 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="kerberos mysql postgres xml xml2 acl cups ldap pam readline python doc"
-IUSE="${IUSE} oav"
-
-DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/
-	http://www.openantivirus.org/projects.php
-	http://samba.idealx.org"
-
-SMBLDAP_TOOLS_VER=0.8.5
-VSCAN_VER=0.3.5
-# all vscan modules are being installed
-#VSCAN_MODS="oav sophos fprotd fsav trend icap mksd kavp clamav nai" 
-
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
-
-SRC_URI="mirror://samba/${PN}${_CVS}.tar.gz
-	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2
-	ldap? http://samba.idealx.org/dist/smbldap-tools-${SMBLDAP_TOOLS_VER}.tgz"
-
-_COMMON_DEPS="dev-libs/popt
-	readline? sys-libs/readline
-	ldap? ( kerberos? ( virtual/krb5 ) )
-	mysql? ( dev-db/mysql sys-libs/zlib )
-	postgres? ( dev-db/postgresql sys-libs/zlib )
-	xml? ( dev-libs/libxml2 sys-libs/zlib )
-	xml2? ( dev-libs/libxml2 sys-libs/zlib )
-	acl? sys-apps/acl
-	cups? net-print/cups
-	ldap? ( net-nds/openldap dev-perl/Crypt-SmbHash )
-	pam? sys-libs/pam
-	python? dev-lang/python"
-DEPEND="sys-devel/autoconf
-	>=sys-apps/sed-4
-	${_COMMON_DEPS}"
-#IDEALX scripts are now using Net::LDAP
-RDEPEND="ldap? dev-perl/perl-ldap ${_COMMON_DEPS}"
-
-# some archs are removed due to dependency tree integrity for ldap and
-#   dev-perl/Crypt-SmbHash flags
-#KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~x86 ~sparc ~mips ~arm"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	local i
-	unpack ${A} || die
-	cd ${S} || die
-	# Clean up CVS ---------------------------------------------------------
-	find . -name .cvsignore | xargs rm -f
-	find . -name CVS | xargs rm -rf
-	# Add patch(es) --------------------------------------------------------
-	# This patchset fixes Samba bugs #1315, #1319 and #1345
-	# courtesy of Gerald Carter (jerry@samba.org)
-	# they are hopefully fixed in this version !
-	# epatch ${FILESDIR}/samba-3.0.x.patch
-	#Next one is from eger@cc.gatech.edu
-	epatch ${FILESDIR}/samba-3.0.x-python-setup.patch || die
-	#bug #44743 ------------------------------------------------------------
-	if [ ${ARCH} = "amd64" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S} && epatch ${FILESDIR}/samba-3.0.x-smbumount-uid32.patch
-	fi
-	#Fix for bug #27858 ----------------------------------------------------
-	if [ ${ARCH} = "sparc" -o ${ARCH} = "ppc" -o ${ARCH} = "ppc64" ]; then
-		cd ${S}/source/include && epatch ${FILESDIR}/samba-2.2.8-statfs.patch
-	fi
-	#Bug #36200; sys-kernel/linux-headers dependent ------------------------
-	sed -i -e 's:#define LINUX_QUOTAS_2:#define LINUX_QUOTAS_1:' \
-		-e 's:<linux/quota.h>:<sys/quota.h>:' \
-		${S}/source/smbd/quotas.c
-	# examples: to be copied as docs ---------------------------------------
-	rm -rf ${S}/examples.ORIG
-	cp -a ${S}/examples ${S}/examples.ORIG
-	# Prep samba-vscan source.
-	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	#-----------------------------------------------------------------------
-	cd ${S}/source
-	echo "Running autoconf ..."
-	autoconf || die
-}
-
-src_compile() {
-	local i
-	local myconf
-	local mymods
-	#mymods="nisplussam" #this is deprecated...
-	#-----------------------------------------------------------------------
-	use xml || use xml2 && mymods="xml,${mymods}"
-	use mysql && mymods="mysql,${mymods}"
-	use postgres && mymods="pgsql,${mymods}"
-	[ -n "${mymods}" ] && myconf="--with-expsam=${mymods}"
-	use acl \
-		&& myconf="${myconf} --with-acl-support" \
-		|| myconf="${myconf} --without-acl-support"
-	use pam \
-		&& myconf="${myconf} --with-pam --with-pam_smbpass" \
-		|| myconf="${myconf} --without-pam --without-pam_smbpass"
-	use cups \
-		&& myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-	use ldap \
-		&& myconf="${myconf} --with-ldap" \
-		|| myconf="${myconf} --without-ldap"
-	#this is for old samba 2.x compat
-	#myconf="${myconf} --with-ldapsam"
-	myconf="${myconf} --without-ldapsam"
-	use python \
-		&& myconf="${myconf} --with-python=yes" \
-		|| myconf="${myconf} --with-python=no"
-	use readline \
-		&& myconf="${myconf} --with-readline" \
-		|| myconf="${myconf} --without-readline"
-	#Fix #57063 ------------------------------------------------------------
-	# too cautious for some archs: maybe -O2 is sufficient on some of them
-	strip-flags
-	if [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]; then
-		replace-flags -O? -O1
-	else
-		replace-flags -O? -O1
-	fi
-	#-----------------------------------------------------------------------
-	if [ "${ARCH}" != "amd64" ]; then
-		use kerberos && use ldap \
-			&& myconf="${myconf} --with-ads" \
-			|| myconf="${myconf} --without-ads"
-	else
-		myconf="${myconf} --without-ads"
-	fi
-	#-----------------------------------------------------------------------
-	#default_{static,shared}_modules|source/configure
-	#/usr/lib/samba/auth/.............      AUTH_MODULES
-	#/usr/lib/samba/charset/		CHARSET_MODULES
-	#/usr/lib/samba/pdb/..............      PDB_MODULES
-	#/usr/lib/samba/rpc/		    RPC_MODULES
-	#/usr/lib/samba/vfs/..............      VFS_MODULES|source/Makefile
-	#/usr/lib/samba/lowcase.dat
-	#/usr/lib/samba/upcase.dat
-	#/usr/lib/samba/valid.dat
-	#-----------------------------------------------------------------------
-	for info_var in myconf CFLAGS CFLAGS; do
-		einfo "${info_var} is: ${!info_var}"
-	done
-	cd ${S}/source
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib/samba \
-		--with-libdir=/usr/lib/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--localstatedir=/var \
-		--with-piddir=/var/run/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-logfilebase=/var/log/samba \
-		--sysconfdir=/etc/samba \
-		--with-configdir=/etc/samba \
-		--with-privatedir=/etc/samba/private \
-		\
-		--enable-static \
-		--enable-shared \
-		--with-manpages-langs=en \
-		--without-spinlocks \
-		--with-libsmbclient \
-		--with-automount \
-		--with-smbmount \
-		--with-winbind \
-		--with-quotas \
-		--with-syslog \
-		--with-idmap \
-		--host=${CHOST} \
-		${myconf} || die
-	# Show install dirs ----------------------------------------------------
-	einfo "Dir conf:"
-	make showlayout
-	# serialized headers make ----------------------------------------------
-	make proto
-	# Compile main SAMBA pieces --------------------------------------------
-	einfo "make everything" && emake everything || die "SAMBA make everything error"
-	einfo "make rpctorture" && emake rpctorture || ewarn "rpctorture didn't build"
-	# Build mount.cifs -----------------------------------------------------
-	einfo "mount.cifs"
-	cd ${S}/source
-	gcc ${CFLAGS} client/mount.cifs.c -o bin/mount.cifs
-	assert "mount.cifs compile problem"
-	# build smbget ---------------------------------------------------------
-	einfo "smbget"
-	emake bin/smbget; assert "smbget compile error"
-	# Build selected samba-vscan plugins -----------------------------------
-	if use oav; then
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		./configure --prefix=/usr --libdir=/usr/lib/samba
-		assert "bad ${PN}-vscan-${VSCAN_VER} ./configure"
-		emake #${VSCAN_MODS}
-	fi
-	# Build mkntpasswd from the smbldap-tools ------------------------------
-	# Attention: usage of dev-perl/Crypt-SmbHash for smbldap-tool > 0.8.5
-	if use ldap; then
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		if [ -f mkntpwd.tar.gz ]; then
-			tar --no-same-owner -zxf mkntpwd.tar.gz
-			cd mkntpwd
-			VISUAL="" make || die "mkntpwd compile problem"
-		fi
-	fi
-}
-
-src_install() {
-	local extra_bins="debug2html smbfilter talloctort mount.cifs smbget"
-	#smbsh editreg
-	extra_bins="${extra_bins} smbtorture msgtest masktest locktest \
-		locktest2 nsstest vfstest rpctorture"
-	# ----------------------------------------------------------------------
-	cd ${S}/source
-	make DESTDIR=${D} install-everything
-	# Extra binary files, testing/torture progs ----------------------------
-	exeinto /usr/bin
-	for i in ${extra_bins}; do
-		[ -x ${S}/source/bin/${i} ] && doexe ${S}/source/bin/${i} && \
-		einfo "Extra binaries: ${i}"
-	done
-	# Installing these setuid-root allows users to (un)mount smbfs/cifs ----
-	for i in /usr/bin/smbumount /usr/bin/smbmnt /usr/bin/mount.cifs; do
-		fperms 4111 ${i} || die "No perms: ${i}"
-		einfo "suid: ${i}"
-	done
-	# Nsswitch extensions. Make link for wins and winbind resolvers --------
-	exeinto /lib
-	for i in wins winbind; do
-		doexe ${S}/source/nsswitch/libnss_${i}.so
-		( cd ${D}/lib; ln -s libnss_${i}.so libnss_${i}.so.2 )
-	done
-	exeinto /lib/security
-	doexe ${S}/source/nsswitch/pam_winbind.so
-	use pam && doexe ${S}/source/bin/pam_smbpass.so
-	# mount backend --------------------------------------------------------
-	dodir /sbin
-	dosym ../usr/bin/smbmount /sbin/mount.smbfs
-	dosym ../usr/bin/mount.cifs /sbin/mount.cifs
-	# bug #46389: samba doesn't create symlink anymore
-	dosym ./libsmbclient.so /usr/lib/libsmbclient.so.0
-	# make the smb backend symlink for cups printing support..
-	if use cups; then
-		dodir /usr/lib/cups/backend
-		dosym /usr/bin/smbspool /usr/lib/cups/backend/smb
-	fi
-	# Install IDEALX scripts for LDAP backend administration ---------------
-	if use ldap; then
-		# corrections as per bug #41796
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		exeinto /usr/share/samba/scripts; doexe smbldap-*
-		exeinto /etc/samba ; doexe smbldap_tools.pm
-		insinto /etc/smbldap-tools ; doins *.conf
-		fperms 644 /etc/smbldap-tools/smbldap.conf
-		fperms 600 /etc/smbldap-tools/smbldap_bind.conf
-		eval `perl '-V:installarchlib'`
-		dodir ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm ${installarchlib}
-		#dosym /etc/samba/smbldap_conf.pm /usr/share/samba/scripts
-		dosym /etc/samba/smbldap_tools.pm ${installarchlib}
-		dosym /etc/samba/smbldap_tools.pm /usr/share/samba/scripts
-		if [ -f mkntpwd/mkntpwd ]; then
-			exeinto /usr/sbin ; doexe mkntpwd/mkntpwd
-		fi
-	fi
-	# VFS plugin modules ---------------------------------------------------
-	if use oav; then
-		#exeinto /usr/lib/samba/vfs
-		#doexe ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/vscan-*.so
-		cd ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}
-		make install DESTDIR=${D} || die "VFS: vscan error"
-		insinto /etc/samba
-		doins ${S}/examples/VFS/${PN}-vscan-${VSCAN_VER}/openantivirus/*conf
-	fi
-	# Python extensions ----------------------------------------------------
-	if use python; then
-		cd ${S}/source
-		python python/setup.py install --root=${D} || die
-	fi
-	# General config files -------------------------------------------------
-	insinto /etc/samba
-	touch ${D}/etc/samba/smb.conf
-	doins ${FILESDIR}/smbusers
-	newins ${FILESDIR}/smb.conf.example-samba3 smb.conf.example
-	doins ${FILESDIR}/lmhosts
-	doins ${FILESDIR}/recycle.conf
-	insinto /etc/pam.d
-	newins ${FILESDIR}/samba.pam samba
-	doins ${FILESDIR}/system-auth-winbind
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/swat.xinetd swat
-	exeinto /etc/init.d; newexe ${FILESDIR}/samba-init samba
-	insinto /etc/conf.d; newins ${FILESDIR}/samba-conf samba
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins ${S}/examples/LDAP/samba.schema
-	fi
-	# dirs -----------------------------------------------------------------
-	diropts -m0700
-	dodir /etc/samba/private
-	touch ${D}/etc/samba/private/.keep
-	diropts -m1777
-	dodir /var/spool/samba
-	touch ${D}/var/spool/samba/.keep
-	diropts -m0755
-	dodir /var/{log,run,cache}/samba
-	dodir /var/lib/samba/{netlogon,profiles}
-	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
-	touch ${D}/var/{log,run,cache}/samba/.keep
-	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
-	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
-	# docs -----------------------------------------------------------------
-	docinto ""
-	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt
-	docinto examples
-	dodoc ${FILESDIR}/nsswitch.conf-{wins,winbind}
-	cp -a ${S}/examples.ORIG/* ${D}/usr/share/doc/${PF}/examples
-	if use oav; then
-		docinto ${PN}-vscan-${VSCAN_VER}
-		cd ${WORKDIR}/${PN}-vscan-${VSCAN_VER}
-		dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO
-		dodoc */*.conf
-	fi
-	if use ldap; then
-		docinto smbldap-tools-${SMBLDAP_TOOLS_VER}
-		cd ${WORKDIR}/smbldap-tools-${SMBLDAP_TOOLS_VER}
-		dodoc CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO
-	fi
-	if ! use doc; then
-		rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-		rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
-	fi
-	chown -R root:root ${D}/usr/share/doc/${PF}
-	# moving manpages ------------------------------------------------------
-	mv ${D}/usr/man ${D}/usr/share/man
-}
-
-pkg_postinst() {
-	# touch /etc/samba/smb.conf so that people installing samba just
-	# to mount smb shares don't get annoying warnings all the time..
-	#[ ! -e ${ROOT}/etc/samba/smb.conf ] && touch ${ROOT}/etc/samba/smb.conf
-
-	ewarn ""
-	ewarn "If you are upgrading from a Samba version prior to 3.0.2, and you"
-	ewarn "use Samba's password database, you must run the following command:"
-	ewarn ""
-	ewarn "  pdbedit --force-initialized-passwords"
-	ewarn ""
-	ewarn "LIBs location change: /usr/lib/samba/*"
-	ewarn "   (due to ldap/vfs external tools assumptions)"
-	ewarn ""
-	if use ldap; then
-		ewarn "If you are upgrading from prior to 3.0.2, and you are using LDAP"
-		ewarn "    for Samba authentication, you must check the sambaPwdLastSet"
-		ewarn "    attribute on all accounts, and ensure it is not 0."
-		einfo "WARNING: smbldap-tools changes"
-		einfo "    smbldap-tools conf changed to /etc/smbldap-tools"
-		einfo "    /usr/shared/samba/scripts: some script names changed"
-		einfo "    dev-perl/Crypt-SmbHash: new pwd hash validation/conversion system"
-		einfo ""
-	fi
-}
-
diff --git a/net-fs/samba/samba-3.0.7.ebuild b/net-fs/samba/samba-3.0.7.ebuild
index c7723023b2ea..5f60daeab8b1 100644
--- a/net-fs/samba/samba-3.0.7.ebuild
+++ b/net-fs/samba/samba-3.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.7.ebuild,v 1.2 2004/09/13 19:17:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.7.ebuild,v 1.3 2004/09/14 08:51:49 satya Exp $
 
 inherit eutils flag-o-matic
 
@@ -76,7 +76,7 @@ src_unpack() {
 		${S}/source/smbd/quotas.c
 	#amd64 lib location is not lib32 nor lib -------------------------------
 	cd ${S} || die
-	use amd64 && epatch ${FILESDIR}/samba-3.0.6-libdirsymlink.patch
+	use amd64 && epatch ${FILESDIR}/samba-3.0.x-libdirsymlink.patch
 	# examples: to be copied as docs ---------------------------------------
 	rm -rf ${S}/examples.ORIG
 	cp -a ${S}/examples ${S}/examples.ORIG